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>
184 lines
5.4 KiB
Vue
184 lines
5.4 KiB
Vue
<template>
|
|
<ViewerLayoutPanel @close="$emit('close')">
|
|
<template #actions>
|
|
<FormButton size="sm" text :icon-left="ChevronLeftIcon" @click="clearDiff">
|
|
Back
|
|
</FormButton>
|
|
</template>
|
|
<div class="flex flex-col space-y-2 text-sm p-2">
|
|
<div class="text-body-2xs bg-foundation-2 text-foreground p-1 rounded">
|
|
This is an experimental feature.
|
|
</div>
|
|
<div class="flex space-x-2">
|
|
<div class="grow w-1/2">
|
|
<ViewerCompareChangesVersion
|
|
v-if="diffState.newVersion.value"
|
|
:version="diffState.newVersion.value"
|
|
:is-newest="true"
|
|
@click="localDiffTime = 0"
|
|
/>
|
|
</div>
|
|
<div class="grow w-1/2">
|
|
<ViewerCompareChangesVersion
|
|
v-if="diffState.oldVersion.value"
|
|
:version="diffState.oldVersion.value"
|
|
:is-newest="false"
|
|
@click="localDiffTime = 1"
|
|
/>
|
|
</div>
|
|
</div>
|
|
<div class="grow flex items-center space-x-2 py-2">
|
|
<label for="diffTime" class="sr-only">Diff time</label>
|
|
<input
|
|
id="diffTime"
|
|
v-model="localDiffTime"
|
|
class="h-2 w-full"
|
|
type="range"
|
|
name="diffTime"
|
|
min="0"
|
|
max="1"
|
|
step="0.01"
|
|
/>
|
|
</div>
|
|
<div class="flex items-center justify-between w-full px-1">
|
|
<span class="text-body-xs text-left">Color objects by status</span>
|
|
<FormButton
|
|
size="sm"
|
|
:color="
|
|
diffState.mode.value !== VisualDiffMode.COLORED ? 'outline' : undefined
|
|
"
|
|
@click="swapDiffMode()"
|
|
>
|
|
{{ diffState.mode.value === VisualDiffMode.COLORED ? 'ON' : 'OFF' }}
|
|
</FormButton>
|
|
</div>
|
|
<!-- <div class="ml-1">Change summary:</div> -->
|
|
<div class="grid grid-cols-2 gap-2">
|
|
<ViewerCompareChangesObjectGroup name="unchanged" :object-ids="unchangedIds" />
|
|
<ViewerCompareChangesObjectGroup name="modified" :object-ids="modifiedIds" />
|
|
<ViewerCompareChangesObjectGroup name="added" :object-ids="addedIds" />
|
|
<ViewerCompareChangesObjectGroup name="removed" :object-ids="removedIds" />
|
|
</div>
|
|
</div>
|
|
</ViewerLayoutPanel>
|
|
</template>
|
|
<script setup lang="ts">
|
|
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
import { ChevronLeftIcon } from '@heroicons/vue/24/solid'
|
|
import { VisualDiffMode } from '@speckle/viewer'
|
|
import { useInjectedViewerState } from '~~/lib/viewer/composables/setup'
|
|
import { uniqBy, debounce } from 'lodash-es'
|
|
import type { SpeckleObject } from '~~/lib/viewer/helpers/sceneExplorer'
|
|
import { useMixpanel } from '~~/lib/core/composables/mp'
|
|
|
|
defineEmits<{
|
|
(e: 'close'): void
|
|
}>()
|
|
|
|
const {
|
|
ui: { diff: diffState },
|
|
urlHashState: { diff }
|
|
} = useInjectedViewerState()
|
|
|
|
const localDiffTime = ref(diffState.time.value)
|
|
|
|
watch(
|
|
localDiffTime,
|
|
(newVal) => {
|
|
diffState.time.value = newVal
|
|
debouncedTrackChangeDiffTime()
|
|
},
|
|
{ immediate: false }
|
|
)
|
|
|
|
const debouncedTrackChangeDiffTime = debounce(() => {
|
|
mp.track('Viewer Action', {
|
|
type: 'action',
|
|
name: 'diffs',
|
|
action: 'set-diff-time',
|
|
value: localDiffTime.value
|
|
})
|
|
}, 1000)
|
|
|
|
watch(diffState.result, () => {
|
|
localDiffTime.value = 0.5
|
|
if (diffState.result.value) {
|
|
mp.track('Viewer Action', {
|
|
type: 'stats',
|
|
name: 'diffs',
|
|
size: {
|
|
changed: diffState.result.value.modified.length,
|
|
removed: diffState.result.value.removed.length,
|
|
added: diffState.result.value.added.length,
|
|
unchanged: diffState.result.value.unchanged.length
|
|
}
|
|
})
|
|
}
|
|
})
|
|
|
|
function swapDiffMode() {
|
|
if (diffState.mode.value === VisualDiffMode.COLORED) {
|
|
diffState.mode.value = VisualDiffMode.PLAIN
|
|
mp.track('Viewer Action', {
|
|
type: 'action',
|
|
name: 'diffs',
|
|
action: 'set-mode-plain'
|
|
})
|
|
return
|
|
}
|
|
mp.track('Viewer Action', {
|
|
type: 'action',
|
|
name: 'diffs',
|
|
action: 'set-mode-colored'
|
|
})
|
|
diffState.mode.value = VisualDiffMode.COLORED
|
|
}
|
|
|
|
// NOTE: deduping will not be needed anymore
|
|
const added = computed(() => {
|
|
const mapped = diffState.result.value?.added.map(
|
|
(node) => node.model.raw as SpeckleObject
|
|
)
|
|
return uniqBy(mapped, (node) => node.id)
|
|
})
|
|
const addedIds = computed(() => added.value.map((o) => o.id as string))
|
|
|
|
const removed = computed(() => {
|
|
const mapped = diffState.result.value?.removed.map(
|
|
(node) => node.model.raw as SpeckleObject
|
|
)
|
|
return uniqBy(mapped, (node) => node.id)
|
|
})
|
|
const removedIds = computed(() => removed.value.map((o) => o.id as string))
|
|
|
|
const unchanged = computed(() => {
|
|
const mapped = diffState.result.value?.unchanged.map(
|
|
(node) => node.model.raw as SpeckleObject
|
|
)
|
|
return uniqBy(mapped, (node) => node.id)
|
|
})
|
|
const unchangedIds = computed(() => unchanged.value.map((o) => o.id as string))
|
|
const modified = computed(() => {
|
|
const mapped = diffState.result.value?.modified.map((tuple) => {
|
|
return [tuple[0].model.raw as SpeckleObject, tuple[1].model.raw as SpeckleObject]
|
|
})
|
|
return uniqBy(mapped, (tuple) => tuple[0].id)
|
|
})
|
|
const modifiedIds = computed(() => {
|
|
return [
|
|
...modified.value.map((t) => t[0].id as string),
|
|
...modified.value.map((t) => t[1].id as string)
|
|
]
|
|
})
|
|
|
|
const mp = useMixpanel()
|
|
const clearDiff = async () => {
|
|
mp.track('Viewer Action', {
|
|
type: 'action',
|
|
name: 'diffs',
|
|
action: 'disable'
|
|
})
|
|
await diff.update(null)
|
|
}
|
|
</script>
|