diff --git a/package-lock.json b/package-lock.json index fe0599e7a..f67b021d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "version": "0.1.0", "dependencies": { "@bimdata/design-system": "^0.3.4", - "@bimdata/typescript-fetch-api-client": "^6.12.0", + "@bimdata/typescript-fetch-api-client": "^6.12.1", "@bimdata/viewer": "^1.6.2", "@uppy/core": "^1.18.1", "@uppy/xhr-upload": "^1.7.2", @@ -462,9 +462,9 @@ "integrity": "sha512-AtVcZ7sw1WCcIZhJrRnF7fpepvKcYhWRH5jF+TXGyvhWpMCatyYSnQAKkYiaDLMm9c7aMYNRAz6Wfb8c4EUE9A==" }, "node_modules/@bimdata/typescript-fetch-api-client": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@bimdata/typescript-fetch-api-client/-/typescript-fetch-api-client-6.12.0.tgz", - "integrity": "sha512-yl22DspV/Io6WlMYeMVDbzIZG39A4lrnUhQanUYIyUBdoNO9ZHigpTa7jBKNb1V8eg3OlZBpxoXTQfBBrbxdNw==" + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/@bimdata/typescript-fetch-api-client/-/typescript-fetch-api-client-6.12.1.tgz", + "integrity": "sha512-m5ldSbaSYTZw9IYx7NhjJcnsXW+4+SJWHXU43MMkP9P8FsbKVKwf3dCxvM/qc8TH1z3Q9IvRT3AWogQ9avgMxA==" }, "node_modules/@bimdata/viewer": { "version": "1.6.2", @@ -20594,9 +20594,9 @@ "integrity": "sha512-AtVcZ7sw1WCcIZhJrRnF7fpepvKcYhWRH5jF+TXGyvhWpMCatyYSnQAKkYiaDLMm9c7aMYNRAz6Wfb8c4EUE9A==" }, "@bimdata/typescript-fetch-api-client": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/@bimdata/typescript-fetch-api-client/-/typescript-fetch-api-client-6.12.0.tgz", - "integrity": "sha512-yl22DspV/Io6WlMYeMVDbzIZG39A4lrnUhQanUYIyUBdoNO9ZHigpTa7jBKNb1V8eg3OlZBpxoXTQfBBrbxdNw==" + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/@bimdata/typescript-fetch-api-client/-/typescript-fetch-api-client-6.12.1.tgz", + "integrity": "sha512-m5ldSbaSYTZw9IYx7NhjJcnsXW+4+SJWHXU43MMkP9P8FsbKVKwf3dCxvM/qc8TH1z3Q9IvRT3AWogQ9avgMxA==" }, "@bimdata/viewer": { "version": "1.6.2", diff --git a/package.json b/package.json index 50a4b853c..de9f168d5 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@bimdata/design-system": "^0.3.4", - "@bimdata/typescript-fetch-api-client": "^6.12.0", + "@bimdata/typescript-fetch-api-client": "^6.12.1", "@bimdata/viewer": "^1.6.2", "@uppy/core": "^1.18.1", "@uppy/xhr-upload": "^1.7.2", diff --git a/src/views/model-viewer/ModelViewer.vue b/src/views/model-viewer/ModelViewer.vue index 562c20203..515321240 100644 --- a/src/views/model-viewer/ModelViewer.vue +++ b/src/views/model-viewer/ModelViewer.vue @@ -65,16 +65,28 @@ export default { merge(pluginsConfig, spacePluginsConfig); - // Extract space specific plugins urls - const pluginUrls = currentSpace.value.features + // Extract space specific plugins urls from deprecated features + const featurePlugins = currentSpace.value.features .filter(feature => feature.name.startsWith("viewer-plugin-")) .map(feature => feature.name.split("viewer-plugin-")[1]) .map(pluginName => availablePlugins[pluginName]) .filter(Boolean); // keep only existing plugins + // Extract space specific plugins urls from marketplace + const appPlugins = currentSpace.value.marketplaceApps + .filter(app => app.viewerPluginsUrls && app.viewerPluginsUrls.length) + .map(app => app.viewerPluginsUrls) + .reduce((urls, acc) => { + urls.forEach(url => { + acc.push(url); + }); + return acc; + }, []); + + const pluginUrls = featurePlugins.concat(appPlugins); + let unwatchAccessToken; let unwatchLocale; - onMounted(async () => { const bimdataViewer = makeBIMDataViewer({ api: { @@ -99,12 +111,11 @@ export default { }); const viewer = bimdataViewer.mount("#viewer", window); - unwatchAccessToken = watch(accessToken, token => { - viewer.setAccessToken(token); + bimdataViewer.setAccessToken(token); }); unwatchLocale = watch(locale, lang => { - viewer.$i18n.locale = lang; + bimdataViewer.setLocale(lang); }); });