fcb924d3a5
* refactor WIP * Button design changes * FE2 FormButton Updates * ts composition api * CommonTextLink Changes * CommonTextLink prop updates * Add disabled styles * WIP * Design system updates * Colour Updates * New Text Styles. Initial FE2 changes * More fe2 styling classes * Minor update * Minor update * Fix build * More updates for discussion * More styling updates * Minor updates to inputs * Revert change to size options * More text updates * More font class swapping * Revert dui3 changes * Confirmed Lineheights * Add story files for new text styles * Minor copy changes * Minor typo * Revert variant>color * New Colours WIP * andrew/web-1371-misalignment-in-account-dropdown * andrew/web-1374-settings-text-styles-are-not-right * andrew/web-1375-nav-texts-should-be-14px * andrew/web-1376-decrease-size-of-versions-header * andrew/web-1377-version-card-title * Updates * semibold>medium * Colour updates * Sizing updates * Colour updates * Colour updates * Measure mode * Updates * Fix build * Fix build * WIP Updates * Changes from PR * Updated login, registration and reset password styling * Make share dropdown bg white * Updated viewer titles * Fix: Resize panel highlight color in the viewer should be blue * Fix: Blue + Add link in Models. And other blue links in Viewer * Add labelPosition Prop. Fix Button stories * Updated CommonLink to remove default underline * Add Highlight Color * Card updates from Michal * Updated discussion icon on version card * Small tweaks to version card * Small tweaks to version card * Fix: Ghost button doesn't have padding * Fix: Write Delete... * Fix: Version hover border color * Updates to Project Card. Updates to PageTabs * Fix: Adjust title in announcement modal * Updates from Comments * Select Background Colour * Fix: Select dropdown color * Improve list view. Improve discussions * Fix: Minor tweaks to onboarding checklist * Fix: Clean up nav * Hide third item when not >md * Change project heading size * Add border to version card * Adjust spacing in dropdowns * Slight change * Update button style in Version card * Tweaked nav menu * Tweaked nav menu * Various styling tweaks * Fix settings modal subheader * Various styling tweaks and fixes * Tweak settings dialog styling * Tweak simple scrollbar * Minor tweaks to model page * Minor tweaks to model page * Minor tweak to login * Tweak discussion card * Tweak settings page * Tweak vertical tabs * Tweak Dialog alignment * Fix some paddings * Change IconVersions to ClockIcon * Tweak spacing between icons * Updates to Card Icons * Bold "connectors" in empty project message * Remove padding in Profile field * Update inline model create * Remove icons from share menu * Updated Delete dialog * Wrong text positioning in alert * Updated copy in dropdown * Change bg to bg-foundation in select dropdown component * Fix merge conflicy * Selection Info title colour * Wrong text class * Update card colours based on call * Update card colours * Update empty state * Input label font weight * Updates to Embed * Various styling fixes * Fix; Viewer panel header styling * Fix; Adjust BG in dev mode list items * Fix; Fix button placement in video modal * Fix: Share menu is not using LayoutMenu * Fix: Buttons clash under filters * Fix: Adjust spacing in selection info * Fix: Adjust gray BG behind model preview images * Fix: No hover cursor on model card * Fix: Align text styling in dev mode and selection info panel * Fix for menu width * Fix mobile problems * Fix Add spacing on new login screens * Revert prose change. Add prose-sm * Text - Use contain for bg image * Fix onboarding screens * Responsive fixes * Fix hydration errors * Added padding to Add Model Dialog * Fix versions buttons * Fix build problem * Changes PRE PR * Final Pre PR Changes * Remove DUI3 change * Fix small issue with dialog after merge conflict * Remove label classes from Visibility Select * Revert changes made in Controls.vue * Remove old-webhooks * Add highlight colours to Storybook * Add v-keyboard-clickable --------- Co-authored-by: Mike Tasset <mike.tasset@gmail.com>
230 lines
6.9 KiB
Vue
230 lines
6.9 KiB
Vue
<!-- eslint-disable vuejs-accessibility/no-static-element-interactions -->
|
|
<template>
|
|
<div class="relative">
|
|
<!-- eslint-disable-next-line vuejs-accessibility/click-events-have-key-events -->
|
|
<div
|
|
:class="`rounded-md border-l-4 ${
|
|
showVersions
|
|
? 'border-primary max-h-96 shadow-md'
|
|
: 'hover:border-primary border-transparent'
|
|
}`"
|
|
@mouseenter="highlightObject"
|
|
@mouseleave="unhighlightObject"
|
|
@focusin="highlightObject"
|
|
@focusout="unhighlightObject"
|
|
>
|
|
<!-- eslint-disable-next-line vuejs-accessibility/click-events-have-key-events -->
|
|
<div
|
|
:class="`${
|
|
showVersions ? 'bg-primary' : 'bg-foundation hover:bg-foundation-2'
|
|
} group sticky cursor-pointer top-0 z-20 flex h-10 sm:h-16 min-w-0 max-w-full items-center justify-between space-x-2 px-2 py-1 select-none`"
|
|
@click="showVersions = !showVersions"
|
|
>
|
|
<div>
|
|
<UserAvatar :user="loadedVersion?.authorUser" />
|
|
</div>
|
|
<div class="flex min-w-0 flex-grow flex-col">
|
|
<div
|
|
v-tippy="modelName.subheader ? model.name : null"
|
|
:class="`${
|
|
showVersions ? 'text-foundation' : ''
|
|
} text-heading-sm truncate min-w-0`"
|
|
>
|
|
{{ modelName.header }}
|
|
</div>
|
|
<div class="truncate -mt-1">
|
|
<span
|
|
v-tippy="createdAtFormatted.full"
|
|
:class="`${
|
|
showVersions ? 'text-foundation' : ''
|
|
} text-body-2xs opacity-70`"
|
|
>
|
|
{{ isLatest ? 'Latest version' : createdAtFormatted.relative }}
|
|
</span>
|
|
</div>
|
|
</div>
|
|
<div
|
|
v-if="!showVersions"
|
|
class="flex flex-none items-center space-x-1 text-xs font-medium"
|
|
>
|
|
<IconVersions class="h-4 w-4" />
|
|
<span>{{ model.versions?.totalCount }}</span>
|
|
</div>
|
|
<div
|
|
v-else
|
|
:class="`${
|
|
showVersions ? 'text-white' : ''
|
|
} flex flex-none items-center space-x-2 text-xs font-medium opacity-80 transition-opacity group-hover:opacity-100`"
|
|
>
|
|
<ChevronUpIcon class="h-4 w-4" />
|
|
</div>
|
|
</div>
|
|
<ViewerResourcesActiveVersionCard
|
|
v-if="loadedVersion && showVersions"
|
|
:version="loadedVersion"
|
|
/>
|
|
</div>
|
|
<Transition>
|
|
<div
|
|
v-if="showRemove"
|
|
class="to-foundation group absolute inset-0 z-[21] flex h-full w-full items-center justify-end space-x-2 rounded bg-gradient-to-r from-blue-500/0 p-4"
|
|
>
|
|
<FormButton
|
|
color="danger"
|
|
size="sm"
|
|
class="rounded-full"
|
|
@click="$emit('remove', props.model.id)"
|
|
>
|
|
<XMarkIcon class="h-5 w-5" />
|
|
</FormButton>
|
|
</div>
|
|
</Transition>
|
|
<div
|
|
v-show="showVersions && !showRemove"
|
|
class="mt-2 ml-4 flex h-auto flex-col space-y-0"
|
|
>
|
|
<ViewerResourcesVersionCard
|
|
v-for="(version, index) in props.model.versions.items"
|
|
:key="version.id"
|
|
:model-id="modelId"
|
|
:version="version"
|
|
:is-latest-version="version.id === latestVersionId"
|
|
:is-loaded-version="version.id === loadedVersion?.id"
|
|
:last="index === props.model.versions.totalCount - 1"
|
|
:last-loaded="index === props.model.versions.items.length - 1"
|
|
:clickable="version.id !== loadedVersion?.id"
|
|
@change-version="handleVersionChange"
|
|
@view-changes="handleViewChanges"
|
|
/>
|
|
<div class="mt-4 px-2 py-2">
|
|
<FormButton full-width text :disabled="!showLoadMore" @click="onLoadMore">
|
|
{{ showLoadMore ? 'View older versions' : 'No more versions' }}
|
|
</FormButton>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
<script setup lang="ts">
|
|
import dayjs from 'dayjs'
|
|
import { graphql } from '~~/lib/common/generated/gql'
|
|
import { XMarkIcon, ChevronUpIcon } from '@heroicons/vue/24/solid'
|
|
import type {
|
|
ViewerLoadedResourcesQuery,
|
|
ViewerModelVersionCardItemFragment
|
|
} from '~~/lib/common/generated/gql/graphql'
|
|
import type { Get } from 'type-fest'
|
|
import {
|
|
useInjectedViewerLoadedResources,
|
|
useInjectedViewerRequestedResources
|
|
} from '~~/lib/viewer/composables/setup'
|
|
import {
|
|
useDiffUtilities,
|
|
useHighlightedObjectsUtilities
|
|
} from '~~/lib/viewer/composables/ui'
|
|
|
|
type ModelItem = NonNullable<Get<ViewerLoadedResourcesQuery, 'project.models.items[0]'>>
|
|
|
|
defineEmits<{
|
|
(e: 'remove', val: string): void
|
|
}>()
|
|
|
|
const props = defineProps<{
|
|
model: ModelItem
|
|
versionId: string
|
|
showRemove: boolean
|
|
}>()
|
|
|
|
const { switchModelToVersion } = useInjectedViewerRequestedResources()
|
|
const { loadMoreVersions } = useInjectedViewerLoadedResources()
|
|
const { diffModelVersions } = useDiffUtilities()
|
|
const { highlightObjects, unhighlightObjects } = useHighlightedObjectsUtilities()
|
|
|
|
const showVersions = ref(false)
|
|
|
|
graphql(`
|
|
fragment ViewerModelVersionCardItem on Version {
|
|
id
|
|
message
|
|
referencedObject
|
|
sourceApplication
|
|
createdAt
|
|
previewUrl
|
|
authorUser {
|
|
...LimitedUserAvatar
|
|
}
|
|
}
|
|
`)
|
|
|
|
const modelId = computed(() => props.model.id)
|
|
const versions = computed(() => [
|
|
...props.model.loadedVersion.items,
|
|
...props.model.versions.items
|
|
])
|
|
const showLoadMore = computed(() => {
|
|
const totalCount = props.model.versions.totalCount
|
|
const currentCount = versions.value.length
|
|
return currentCount < totalCount
|
|
})
|
|
|
|
const loadedVersion = computed(() =>
|
|
versions.value.find((v) => v.id === props.versionId)
|
|
)
|
|
|
|
const createdAt = computed(() => loadedVersion.value?.createdAt)
|
|
|
|
const createdAtFormatted = computed(() => {
|
|
return {
|
|
full: formattedFullDate(createdAt.value),
|
|
relative: formattedRelativeDate(createdAt.value, { capitalize: true })
|
|
}
|
|
})
|
|
|
|
const latestVersion = computed(() => {
|
|
return versions.value
|
|
.slice()
|
|
.sort((a, b) => (dayjs(a.createdAt).isBefore(dayjs(b.createdAt)) ? 1 : -1))[0]
|
|
})
|
|
|
|
const isLatest = computed(() => loadedVersion.value?.id === latestVersion.value.id)
|
|
|
|
const latestVersionId = computed(() => latestVersion.value.id)
|
|
|
|
const modelName = computed(() => {
|
|
const parts = props.model.name.split('/')
|
|
if (parts.length > 1) {
|
|
const name = parts[parts.length - 1]
|
|
parts.pop()
|
|
return {
|
|
subheader: parts.join('/'),
|
|
header: name
|
|
}
|
|
} else {
|
|
return {
|
|
subheader: null,
|
|
header: props.model.name
|
|
}
|
|
}
|
|
})
|
|
|
|
async function handleVersionChange(versionId: string) {
|
|
await switchModelToVersion(props.model.id, versionId)
|
|
}
|
|
|
|
const onLoadMore = async () => {
|
|
await loadMoreVersions(props.model.id)
|
|
}
|
|
|
|
async function handleViewChanges(version: ViewerModelVersionCardItemFragment) {
|
|
if (!loadedVersion.value?.id) return
|
|
await diffModelVersions(modelId.value, loadedVersion.value.id, version.id)
|
|
}
|
|
|
|
const highlightObject = () => {
|
|
highlightObjects([props.model.loadedVersion.items[0].referencedObject])
|
|
}
|
|
|
|
const unhighlightObject = () => {
|
|
unhighlightObjects([props.model.loadedVersion.items[0].referencedObject])
|
|
}
|
|
</script>
|