@startinblox/components-ds4go 3.3.0 → 3.3.2

package/dist/index.js

@@ -8972,24 +8972,18 @@ let Ce = class extends re {
   constructor() {
     super(), this.header = "DSP Catalog", this.search = [], this.resultCount = this.objects?.length || 0, this._getResource = new be(this, {
       task: async ([t]) => {
-        if (!this.orbit || !this.noRouter && this.route && this.currentRoute && !this.route.startsWith(this.currentRoute))
-          return;
-        (!this.providers || this.providers.length === 0) && this.component?.parameters?.providers && (this.providers = this.component.parameters.providers);
-        let e;
-        if (this.dspConnector?.instance)
-          await this.dspConnector.instance.loadAll(), e = this.dspConnector.instance.datas;
-        else {
-          const i = () => {
-            this.caching++, this.requestUpdate(), document.removeEventListener("dsp-connector-ready", i);
-          };
-          document.addEventListener("dsp-connector-ready", i);
-          return;
+        if (!(!this.orbit || !this.noRouter && this.route && this.currentRoute && !this.route.startsWith(this.currentRoute))) {
+          if (this.dspConnector?.instance)
+            await this.dspConnector.instance.loadAll(), this.datas = this.dspConnector.instance.datas, this.providers = this.dspConnector.instance.providers;
+          else {
+            const e = () => {
+              this.caching++, this.requestUpdate(), document.removeEventListener("dsp-connector-ready", e);
+            };
+            document.addEventListener("dsp-connector-ready", e);
+            return;
+          }
+          return t ? this.object = this.datas.find((e) => e["@id"] === t) : this.object = void 0, this.datas;
         }
-        return e !== void 0 && Array.isArray(e) && (this.datas = await Promise.all(
-          e.map(
-            async (i) => await this._responseAdaptator(i)
-          )
-        )), t ? this.object = this.datas.find((i) => i["@id"] === t) : this.object = void 0, this.datas;
       },
       args: () => [this.dataSrc, this.caching, this.currentRoute]
     }), di(this, {
@@ -9001,26 +8995,13 @@ let Ce = class extends re {
       (t) => t.type === "dsp-connector"
     ), Promise.resolve();
   }
-  async _responseAdaptator(t) {
-    return t.images && (Array.isArray(t.images) || (t.images = t.images["ldp:contains"]?.filter(
-      (e) => e
-    ) || [t.images])), t.providers ? Array.isArray(t.providers) || (t.providers = [t.providers].filter((e) => e)) : t.provider && (t.providers = [t.provider].filter((e) => e)), t._provider && (t.providers = [
-      {
-        name: t._provider,
-        "@id": t._providerAddress,
-        color: t._providerColor
-      }
-    ]), t.categories && (Array.isArray(t.categories) || (t.categories = t.categories["ldp:contains"]?.filter(
-      (e) => e
-    ) || [t.categories])), t["dcterms:title"] && !t.name && (t.name = t["dcterms:title"]), t["dcterms:description"] && !t.description && (t.description = t["dcterms:description"]), t;
-  }
   _search(t) {
     t.preventDefault(), this.search = t.detail, this.filterCount = this.search.filter((e) => e.name !== "search").length;
   }
   _openModal(t) {
     if (t.preventDefault(), this.route)
       if ("use-id" in (this.component.routeAttributes || {}))
-        M(this.route, t.detail["@id"]);
+        this.object = t.detail, this.dataSrc = t.detail["@id"], M(this.route, t.detail["@id"]);
       else {
         const e = t.detail["@type"]?.at(-1) ?? t.detail["@type"];
         if (e) {
@@ -9035,10 +9016,10 @@ let Ce = class extends re {
       }
   }
   _closeModal(t) {
-    t.preventDefault(), this.route && M(this.route, this.defaultDataSrc);
+    t.preventDefault(), this.route && (M(this.route, this.defaultDataSrc), this.dataSrc = void 0, this.object = void 0);
   }
   _closeModalFromBackground(t) {
-    t.preventDefault(), this.route && t.target?.classList.contains("modal") && M(this.route, this.defaultDataSrc);
+    t.preventDefault(), this.route && t.target?.classList.contains("modal") && (M(this.route, this.defaultDataSrc), this.dataSrc = void 0, this.object = void 0);
   }
   _resultCountUpdate(t) {
     this.resultCount = t.detail ?? 0;
@@ -9100,10 +9081,10 @@ let Ce = class extends re {
                   class="modal"
                   @click=${this._closeModalFromBackground}
                 >
-                  <ds4go-catalog
+                  <ds4go-catalog-modal
                     .object=${this.object}
                     @close=${this._closeModal}
-                  ></ds4go-catalog>
+                  ></ds4go-catalog-modal>
                 </div>` : l}
           </div>
         </tems-viewport>`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startinblox/components-ds4go",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "description": "Startin'blox DS4GO",
   "main": "dist/index.js",
   "type": "module",

package/src/components/solid-dsp-catalog.ts

@@ -64,53 +64,6 @@ export class DSPCatalog extends OrbitDSPComponent {
     return Promise.resolve();
   }
 
-  async _responseAdaptator(response: Resource): Promise<Resource> {
-    if (response.images) {
-      if (!Array.isArray(response.images)) {
-        response.images = response.images["ldp:contains"]?.filter(
-          (i: any) => i,
-        ) || [response.images];
-      }
-    }
-
-    if (response.providers) {
-      if (!Array.isArray(response.providers)) {
-        response.providers = [response.providers].filter((i: any) => i);
-      }
-    } else if (response.provider) {
-      response.providers = [response.provider].filter((i: any) => i);
-    }
-
-    // Map DSP provider metadata to standard format
-    if (response._provider) {
-      response.providers = [
-        {
-          name: response._provider,
-          "@id": response._providerAddress,
-          color: response._providerColor,
-        },
-      ];
-    }
-
-    if (response.categories) {
-      if (!Array.isArray(response.categories)) {
-        response.categories = response.categories["ldp:contains"]?.filter(
-          (i: any) => i,
-        ) || [response.categories];
-      }
-    }
-
-    // Map DSP dataset fields to TEMS format
-    if (response["dcterms:title"] && !response.name) {
-      response.name = response["dcterms:title"];
-    }
-    if (response["dcterms:description"] && !response.description) {
-      response.description = response["dcterms:description"];
-    }
-
-    return response;
-  }
-
   _getResource = new Task(this, {
     task: async ([objSrc]) => {
       if (
@@ -122,18 +75,10 @@ export class DSPCatalog extends OrbitDSPComponent {
       )
         return;
 
-      // Initialize providers from component parameters if not already set
-      if (
-        (!this.providers || this.providers.length === 0) &&
-        this.component?.parameters?.providers
-      ) {
-        this.providers = this.component.parameters.providers;
-      }
-
-      let datasets: Resource[] | undefined;
       if (this.dspConnector?.instance) {
         await this.dspConnector.instance.loadAll();
-        datasets = this.dspConnector.instance.datas;
+        this.datas = this.dspConnector.instance.datas;
+        this.providers = this.dspConnector.instance.providers;
       } else {
         const listener = () => {
           this.caching++;
@@ -141,16 +86,7 @@ export class DSPCatalog extends OrbitDSPComponent {
           document.removeEventListener("dsp-connector-ready", listener);
         };
         document.addEventListener("dsp-connector-ready", listener);
-      return;
-      }
-
-      if (datasets !== undefined && Array.isArray(datasets)) {
-        // Process each dataset through the response adaptator
-        this.datas = await Promise.all(
-          datasets.map(
-            async (dataset) => await this._responseAdaptator(dataset),
-          ),
-        );
+        return;
       }
 
       if (objSrc) {
@@ -174,6 +110,8 @@ export class DSPCatalog extends OrbitDSPComponent {
     e.preventDefault();
     if (this.route) {
       if ("use-id" in (this.component.routeAttributes || {})) {
+        this.object = e.detail;
+        this.dataSrc = e.detail["@id"];
         utils.requestNavigation(this.route, e.detail["@id"]);
       } else {
         const rdfType = e.detail["@type"]?.at(-1) ?? e.detail["@type"];
@@ -195,13 +133,20 @@ export class DSPCatalog extends OrbitDSPComponent {
 
   _closeModal(e: Event) {
     e.preventDefault();
-    if (this.route) utils.requestNavigation(this.route, this.defaultDataSrc);
+    if (this.route) {
+      utils.requestNavigation(this.route, this.defaultDataSrc);
+      this.dataSrc = undefined;
+      this.object = undefined;
+    }
   }
 
   _closeModalFromBackground(e: Event) {
     e.preventDefault();
-    if (this.route && e.target?.classList.contains("modal"))
+    if (this.route && e.target?.classList.contains("modal")) {
       utils.requestNavigation(this.route, this.defaultDataSrc);
+      this.dataSrc = undefined;
+      this.object = undefined;
+    }
   }
 
   _resultCountUpdate(e: Event) {
@@ -284,10 +229,10 @@ export class DSPCatalog extends OrbitDSPComponent {
                   class="modal"
                   @click=${this._closeModalFromBackground}
                 >
-                  <ds4go-catalog
+                  <ds4go-catalog-modal
                     .object=${this.object}
                     @close=${this._closeModal}
-                  ></ds4go-catalog>
+                  ></ds4go-catalog-modal>
                 </div>`
               : nothing}
           </div>