@bimdata/bcf-components 6.0.2 → 6.1.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bimdata/bcf-components",
-  "version": "6.0.2",
+  "version": "6.1.0-rc.2",
   "files": [
     "src",
     "vue3-plugin.js"

package/src/components/bcf-topic-form/BcfTopicForm.vue

@@ -196,9 +196,8 @@
 </template>
 
 <script>
-import { computed, ref, watch } from "vue";
+import { computed, inject, ref, watch } from "vue";
 import service from "../../service.js";
-import { getViewerList } from "../../utils/viewer.js";
 import { setViewpointDefaults } from "../../utils/viewpoints.js";
 // Components
 import BcfTopicImages from "./bcf-topic-images/BcfTopicImages.vue";
@@ -263,10 +262,6 @@ export default {
        */
       type: Array,
     },
-    getViewers: {
-      type: Function,
-      default: () => () => ({})
-    },
   },
   emits: [
     "back",
@@ -279,6 +274,8 @@ export default {
     "topic-update-error",
   ],
   setup(props, { emit }) {
+    const $viewer = inject("$viewer", null);
+
     const isCreation = computed(() => !props.topic);
     const nextIndex = computed(() => Math.max(0, ...props.topics.map((t) => t.index)) + 1);
 
@@ -349,9 +346,11 @@ export default {
 
     const createViewpoints = () => {
       Promise.all(
-        getViewerList(props.getViewers()).map(viewer =>
-          viewer.getViewpoint().then(viewpoint => viewpointsToCreate.value.push(viewpoint))
-        )
+        ($viewer?.globalContext.getViewers() ?? [])
+          .filter(viewer => viewer.getLoadedModels().length > 0)
+          .map(viewer =>
+            viewer.getViewpoint().then(viewpoint => viewpointsToCreate.value.push(viewpoint))
+          )
       );
     };
 
@@ -449,8 +448,10 @@ export default {
 
         let newTopic;
         if (isCreation.value) {
-          data.models = getViewerList(props.getViewers())
-            .flatMap(v => v.getLoadedModels().map(m => m.id));
+          if ($viewer) {
+            data.models = $viewer.globalContext.getViewers()
+              .flatMap(v => v.getLoadedModels().map(m => m.id));
+          }
           newTopic = await service.createTopic(props.project, data);
         } else {
           newTopic = await service.updateTopic(props.project, data);

package/src/components/bcf-topic-overview/BcfTopicOverview.vue

@@ -201,7 +201,6 @@
         :project="project"
         :topic="topic"
         :currentUserEmail="currentUserEmail"
-        :getViewers="getViewers"
         @comment-created="$emit('comment-created', $event)"
         @comment-updated="$emit('comment-updated', $event)"
         @comment-deleted="$emit('comment-deleted', $event)"
@@ -269,10 +268,6 @@ export default {
       type: Object,
       required: true,
     },
-    getViewers: {
-      type: Function,
-      default: () => () => ({})
-    },
   },
   emits: [
     "back",

package/src/components/bcf-topic-overview/bcf-topic-comments/BcfTopicComments.vue

@@ -27,27 +27,29 @@
           <div class="flex items-center justify-between">
             <div class="flex items-center">
               <div
+                v-if="isViewer && !viewerSelectVisible"
                 class="bcf-topic-comments__post-comment__camera m-r-12"
                 @click="setCommentViewpoint"
-                v-if="!viewerSelectVisible && isViewer"
               >
                 <BIMDataIconCamera fill color="default" />
               </div>
               <BIMDataDropdownList
-                v-if="viewerSelectVisible && isViewer"
+                v-if="isViewer && viewerSelectVisible"
                 :list="viewerSelectOptions"
                 elementKey="key"
                 @element-click="createViewpoint"
                 width="180px"
               >
-                <template #header>{{ $t("BcfComponents.BcfTopicComments.takeSnapshot") }}</template>
+                <template #header>
+                  {{ $t("BcfComponents.BcfTopicComments.takeSnapshot") }}
+                </template>
                 <template #element="{ element }">
                   <div
                     style="width: 100%"
                     @mouseenter="highlightViewer(element.viewer)"
                     @mouseleave="unhighlightViewer(element.viewer)"
                   >
-                    {{ `${element.id} (${element.index})` }}
+                    {{ `(${element.index}) ${element.name}` }}
                   </div>
                 </template>
               </BIMDataDropdownList>
@@ -78,7 +80,6 @@
           :topic="topic"
           :comment="comment"
           :currentUserEmail="currentUserEmail"
-          :get-viewers="getViewers"
           @comment-updated="onCommentUpdated"
           @comment-deleted="onCommentDeleted"
           @view-comment-snapshot="$emit('view-comment-snapshot', $event)"
@@ -121,10 +122,6 @@ export default {
       type: String,
       required: true,
     },
-    getViewers: {
-      type: Function,
-      required: true,
-    },
   },
   emis: ["comment-created", "comment-updated", "comment-deleted", "view-comment-snapshot"],
   setup(props, { emit }) {
@@ -207,12 +204,12 @@ export default {
 
     onMounted(() => {
       if ($viewer) {
-        viewerSelectOptions.value = getViewerOptions(props.getViewers());
+        viewerSelectOptions.value = getViewerOptions($viewer);
         pluginCreatedSub = $viewer.globalContext.hub.on("plugin-created", () => {
-          viewerSelectOptions.value = getViewerOptions(props.getViewers());
+          viewerSelectOptions.value = getViewerOptions($viewer);
         });
         pluginDestroyedSub = $viewer.globalContext.hub.on("plugin-destroyed", () => {
-          viewerSelectOptions.value = getViewerOptions(props.getViewers());
+          viewerSelectOptions.value = getViewerOptions($viewer);
         });
       }
     });
@@ -229,12 +226,12 @@ export default {
       comments,
       input,
       isOpen,
+      isViewer: Boolean($viewer),
       loading,
       text,
       viewerSelectOptions,
       viewerSelectVisible,
       viewpoint,
-      isViewer: Boolean($viewer),
       // Methods
       createViewpoint,
       deleteViewpoint,

package/src/components/bcf-topic-overview/bcf-topic-comments/topic-comment/TopicComment.vue

@@ -107,7 +107,7 @@
               @mouseenter="highlightViewer(element.viewer)"
               @mouseleave="unhighlightViewer(element.viewer)"
             >
-              {{ `${element.id} (${element.index})` }}
+              {{ `(${element.index}) ${element.name}` }}
             </div>
           </template>
         </BIMDataDropdownList>
@@ -165,10 +165,6 @@ export default {
       type: String,
       required: true,
     },
-    getViewers: {
-      type: Function,
-      required: true,
-    },
   },
   emits: ["comment-updated", "comment-deleted", "view-comment-snapshot"],
   setup(props, { emit }) {
@@ -278,12 +274,12 @@ export default {
         await loadViewpoint();
       }
       if ($viewer) {
-        viewerSelectOptions.value = getViewerOptions(props.getViewers());
+        viewerSelectOptions.value = getViewerOptions($viewer);
         pluginCreatedSub = $viewer.globalContext.hub.on("plugin-created", () => {
-          viewerSelectOptions.value = getViewerOptions(props.getViewers());
+          viewerSelectOptions.value = getViewerOptions($viewer);
         });
         pluginDestroyedSub = $viewer.globalContext.hub.on("plugin-destroyed", () => {
-          viewerSelectOptions.value = getViewerOptions(props.getViewers());
+          viewerSelectOptions.value = getViewerOptions($viewer);
         });
       }
     });

package/src/utils/viewer.js

@@ -1,11 +1,6 @@
-export function getViewerList(viewers) {
-  return Object.values(viewers).flat();
-}
-
-export function getViewerOptions(viewers) {
-  return Object.entries(viewers)
-    .map(([id, list]) => list.map((v, i) => ({ key: `${id}-${i}`, id, index: i, viewer: v })))
-    .flat();
+export function getViewerOptions($viewer) {
+  return $viewer.globalContext.getViewers()
+    .map((v, i) => ({ key: `${i}-${v.plugin.name}`, index: i, name: v.plugin.name, viewer: v }));
 }
 
 export function highlightViewer(viewer) {