Reloading Annotations Fix (#1543)

* layer rendering when tracks don't exist

* fix loading original in revision browser

* reorder clearing process

Author: BryonLewis

client/dive-common/components/Viewer.vue

@@ -733,10 +733,10 @@ export default defineComponent({
     loadData();
 
     const reloadAnnotations = async () => {
-      mediaControllerClear();
-      cameraStore.clearAll();
-      discardChanges();
       progress.loaded = false;
+      discardChanges();
+      cameraStore.clearAll();
+      mediaControllerClear();
       await loadData();
       displayComparisons.value = props.comparisonSets.length
         ? props.comparisonSets.slice(0, 1) : props.comparisonSets;

client/platform/web-girder/views/RevisionHistory.vue

@@ -26,7 +26,7 @@ export default defineComponent({
       await loadNextPage((l, o) => loadRevisions(datasetId.value, l, o, undefined, currentSet.value));
     }
 
-    function checkout(id: number) {
+    function checkout(id: number | undefined) {
       emit('update:revision', id, currentSet.value);
       reloadAnnotations();
     }
@@ -78,11 +78,7 @@ export default defineComponent({
       <v-btn
         x-small
         depressed
-        :to="{
-          name: 'viewer',
-          params: { id: datasetId },
-        }
-        "
+        @click="checkout(undefined)"
       >
         Return to newest revision
       </v-btn>

client/platform/web-girder/views/ViewerLoader.vue

@@ -161,12 +161,17 @@ export default defineComponent({
       window.removeEventListener('beforeunload', viewerRef.value.warnBrowserExit);
     });
 
-    function routeRevision(revisionId: number, set?: string) {
-      if (set && set !== 'default') {
+    function routeRevision(revisionId: number | undefined, set?: string) {
+      if (set && set !== 'default' && revisionId !== undefined) {
         router.replace({
           name: 'revision set viewer',
           params: { id: props.id, revision: revisionId.toString(), set },
         });
+      } else if (revisionId === undefined) {
+        router.replace({
+          name: 'viewer',
+          params: { id: props.id },
+        });
       } else {
         router.replace({
           name: 'revision viewer',

client/src/components/LayerManager.vue

@@ -200,7 +200,7 @@ export default defineComponent({
       }
       currentFrameIds.forEach(
         (trackId: AnnotationId) => {
-          const track = trackStore?.get(trackId);
+          const track = trackStore?.getPossible(trackId);
           if (track === undefined) {
             // Track may be located in another Camera
             // TODO: Find a better way to represent tracks outside of cameras