@startinblox/components-ds4go 3.3.5 → 3.3.7

package/src/components/modal/ds4go-customer-modal.ts

@@ -8,8 +8,8 @@ import type {
   NegotiationState,
   OrbitComponent as OrbitComponentConfig,
   PolicyDefinition,
-  Resource,
 } from "@src/component";
+import type { Customer, FactBundle } from "@src/ds4go";
 
 import ModalStyle from "@styles/modal/ds4go-customer-modal.scss?inline";
 import { css, html, nothing, unsafeCSS } from "lit";
@@ -17,7 +17,7 @@ import { customElement, state } from "lit/decorators.js";
 
 type ExtendedContractNegotiation = ContractNegotiation & {
   agreement?: ContractAgreement;
-  relatedBundle?: Resource;
+  relatedBundle?: FactBundle;
 };
 
 @customElement("ds4go-customer-modal")
@@ -41,7 +41,7 @@ export class Ds4goCustomerModal extends OrbitComponent {
   policies: PolicyDefinition[] = [];
 
   @state()
-  bundles: Resource[] = [];
+  bundles: FactBundle[] = [];
 
   @state()
   negotiations: ExtendedContractNegotiation[] = [];
@@ -130,7 +130,7 @@ export class Ds4goCustomerModal extends OrbitComponent {
 
         // Get all fact bundles from the connector's datas
         const allDatas = this.dspConnector.instance.datas || [];
-        this.bundles = allDatas.filter((data: Resource) => {
+        this.bundles = allDatas.filter((data: FactBundle) => {
           const type = data["@type"];
           if (Array.isArray(type)) {
             return type.includes("ds4go:FactBundle");
@@ -264,7 +264,7 @@ export class Ds4goCustomerModal extends OrbitComponent {
   render() {
     return this._getResource.render({
       pending: () => html`<solid-loader></solid-loader>`,
-      complete: (obj?: Resource) => {
+      complete: (obj?: Customer) => {
         if (!obj) {
           this._closeModal();
           return nothing;

package/src/components/modal/ds4go-fact-bundle-modal.ts

@@ -8,8 +8,8 @@ import type {
   ContractNegotiation,
   OrbitComponent as OrbitComponentConfig,
   PolicyDefinition,
-  Resource,
 } from "@src/component";
+import type { Category, Fact, FactBundle } from "@src/ds4go";
 
 import ModalStyle from "@styles/modal/ds4go-fact-bundle-modal.scss?inline";
 import { css, html, nothing, unsafeCSS } from "lit";
@@ -73,8 +73,7 @@ export class Ds4goFactBundleModal extends OrbitComponent {
       if (this.dspConnector?.instance) {
         this.assets = this.dspConnector.instance.assets.filter(
           (a: Asset) =>
-            a.dataAddress?.baseUrl ===
-            "https://api.stg.ds4go.startinblox.com/factbundles/21/",
+            a.dataAddress?.baseUrl === this.object["@id"],
         );
 
         this.contracts = this.dspConnector.instance.contracts.filter(
@@ -133,7 +132,7 @@ export class Ds4goFactBundleModal extends OrbitComponent {
   render() {
     return this._getResource.render({
       pending: () => html`<solid-loader></solid-loader>`,
-      complete: (obj?: Resource) => {
+      complete: (obj?: FactBundle) => {
         if (!obj) {
           this._closeModal();
           return nothing;
@@ -160,8 +159,8 @@ export class Ds4goFactBundleModal extends OrbitComponent {
                   ><div>${msg("All facts in this bundle")}</div></tems-division
                 >
                 <div class="card-grid card-grid-vertical">
-                  ${obj.facts.map((fact: Resource) => {
-                    const tags = fact.categories.map((c: Resource) => ({
+                  ${(obj.facts || []).map((fact: Fact) => {
+                    const tags = (fact.categories || []).map((c: Category) => ({
                       name: c.name,
                       type: "information",
                     }));

package/src/components/solid-customer-list.ts

@@ -9,14 +9,17 @@ import { Task } from "@lit/task";
 import type {
   OrbitComponent as OrbitComponentConfig,
   PropertiesPicker,
-  Resource,
   SearchObject,
 } from "@src/component";
+import type { Customer } from "@src/ds4go";
 import { css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
 
 @customElement("solid-customer-list")
 export class SolidCustomerList extends OrbitComponent {
+  @property({ attribute: false })
+  objects?: Customer[] = [];
+
   static styles = css`
     .modal {
       position: fixed;
@@ -82,7 +85,7 @@ export class SolidCustomerList extends OrbitComponent {
       if (!this.hasCachedDatas || this.oldDataSrc !== dataSrc) {
         if (!dataSrc) return;
 
-        this.objects = (await this._getProxyValue(dataSrc)) as Resource[];
+        this.objects = (await this._getProxyValue(dataSrc)) as Customer[];
         this.hasCachedDatas = true;
       }
 
@@ -96,7 +99,7 @@ export class SolidCustomerList extends OrbitComponent {
 
       if (objSrc) {
         this.object = this.objects.find(
-          (obj: Resource) => obj["@id"] === objSrc,
+          (obj: Customer) => obj["@id"] === objSrc,
         );
       } else {
         this.dataSrc = dataSrc;

package/src/components/solid-fact-bundle-creation.ts

@@ -14,14 +14,17 @@ import type {
   PolicyDefinition,
   PolicyTemplate,
   PropertiesPicker,
-  Resource,
 } from "@src/component";
+import type { Category, Fact } from "@src/ds4go";
 import ComponentStyles from "@styles/fact-bundle-creation.scss?inline";
 import { html, nothing, unsafeCSS } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
 
 @customElement("solid-fact-bundle-creation")
 export class SolidFactBundle extends OrbitComponent {
+  @property({ attribute: false })
+  objects?: Fact[] = [];
+
   static styles = [unsafeCSS(ComponentStyles)];
 
   @property({ attribute: "header", type: String })
@@ -31,7 +34,7 @@ export class SolidFactBundle extends OrbitComponent {
   factsSrc?: string;
 
   @state()
-  selectedFacts: Resource[] = [];
+  selectedFacts: Fact[] = [];
 
   @state()
   bundleName = "";
@@ -92,7 +95,7 @@ export class SolidFactBundle extends OrbitComponent {
       key: "categories",
       value: "categories",
       expand: true,
-      cast: (c: Resource[]) => sort(c, "name"),
+      cast: (c: Category[]) => sort(c, "name"),
     },
   ];
 
@@ -111,7 +114,7 @@ export class SolidFactBundle extends OrbitComponent {
       if (!this.hasCachedDatas || this.oldDataSrc !== factsSrc) {
         if (!factsSrc) return;
 
-        this.facts = (await this._getProxyValue(factsSrc)) as Resource[];
+        this.facts = (await this._getProxyValue(factsSrc)) as Fact[];
         this.hasCachedDatas = true;
       }
 
@@ -124,7 +127,7 @@ export class SolidFactBundle extends OrbitComponent {
       }
 
       const factsWithoutSelected = this.facts.filter(
-        (fact: Resource) => !selectedFacts.includes(fact),
+        (fact: Fact) => !selectedFacts.includes(fact),
       );
 
       if (filterText) {
@@ -209,7 +212,7 @@ export class SolidFactBundle extends OrbitComponent {
       name: this.bundleName,
       category: this.bundleCategory,
       description: this.bundleDescription || "",
-      "ldp:contains": this.selectedFacts.map((fact: Resource) => ({
+      "ldp:contains": this.selectedFacts.map((fact: Fact) => ({
         "@id": fact["@id"],
       })),
     };
@@ -442,7 +445,7 @@ export class SolidFactBundle extends OrbitComponent {
     }
   }
 
-  _toggleFactSelection(fact: Resource) {
+  _toggleFactSelection(fact: Fact) {
     if (this.selectedFacts.includes(fact)) {
       this.selectedFacts = this.selectedFacts.filter((f) => f !== fact);
     } else {
@@ -512,8 +515,8 @@ export class SolidFactBundle extends OrbitComponent {
                           </div></tems-division
                         >
                         <div class="card-grid card-grid-vertical">
-                          ${this.selectedFacts.map((fact: Resource) => {
-                            const tags = fact.categories.map((c: Resource) => ({
+                          ${this.selectedFacts.map((fact: Fact) => {
+                            const tags = (fact.categories || []).map((c: Category) => ({
                               name: c.name,
                               type: "information",
                             }));
@@ -556,9 +559,9 @@ export class SolidFactBundle extends OrbitComponent {
                             </div>
                             ${splicedDatas.length > 0
                               ? html` <div class="card-grid card-grid-vertical">
-                                    ${splicedDatas.map((fact: Resource) => {
-                                      const tags = fact.categories.map(
-                                        (c: Resource) => ({
+                                    ${splicedDatas.map((fact: Fact) => {
+                                      const tags = (fact.categories || []).map(
+                                        (c: Category) => ({
                                           name: c.name,
                                           type: "information",
                                         }),
@@ -653,9 +656,9 @@ export class SolidFactBundle extends OrbitComponent {
                             </option>
                             ${Array.from(
                               new Set(
-                                this.selectedFacts.flatMap((fact) =>
-                                  fact.categories.map((category: Resource) =>
-                                    formatCase(category.name),
+                                this.selectedFacts.flatMap((fact: Fact) =>
+                                  (fact.categories || []).map((category: Category) =>
+                                    formatCase(category.name || ""),
                                   ),
                                 ),
                               ),

package/src/components/solid-fact-bundle.ts

@@ -10,14 +10,17 @@ import { Task } from "@lit/task";
 import type {
   OrbitComponent as OrbitComponentConfig,
   PropertiesPicker,
-  Resource,
   SearchObject,
 } from "@src/component";
+import type { Category, Fact, FactBundle } from "@src/ds4go";
 import { css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators.js";
 
 @customElement("solid-fact-bundle")
 export class SolidFactBundle extends OrbitComponent {
+  @property({ attribute: false })
+  objects?: FactBundle[] = [];
+
   static styles = css`
     .modal {
       position: fixed;
@@ -53,11 +56,11 @@ export class SolidFactBundle extends OrbitComponent {
     { key: "description", value: "description" },
   ];
 
-  async _responseAdaptator(response: Resource): Promise<Resource> {
+  async _responseAdaptator(response: FactBundle): Promise<FactBundle> {
     if (response?._originalResource?.hasType("ds4go:FactBundle")) {
       response.facts = await Promise.all(
         (await response._originalResource["ldp:contains"]).map(
-          (fact: Resource) => {
+          (fact: Fact) => {
             return this._getProxyValue(fact["@id"], false, [
               { key: "updated_at", value: "updated_at", cast: formatDate },
               { key: "name", value: "name" },
@@ -66,7 +69,7 @@ export class SolidFactBundle extends OrbitComponent {
                 key: "categories",
                 value: "categories",
                 expand: true,
-                cast: (c: Resource[]) => sort(c, "name"),
+                cast: (c: Category[]) => sort(c, "name"),
               },
               { key: "author", value: "author" },
               { key: "link", value: "link" },
@@ -128,7 +131,7 @@ export class SolidFactBundle extends OrbitComponent {
       if (!this.hasCachedDatas || this.oldDataSrc !== dataSrc) {
         if (!dataSrc) return;
 
-        this.objects = (await this._getProxyValue(dataSrc)) as Resource[];
+        this.objects = (await this._getProxyValue(dataSrc)) as FactBundle[];
         this.hasCachedDatas = true;
       }
 
@@ -142,7 +145,7 @@ export class SolidFactBundle extends OrbitComponent {
 
       if (objSrc) {
         this.object = this.objects.find(
-          (obj: Resource) => obj["@id"] === objSrc,
+          (obj: FactBundle) => obj["@id"] === objSrc,
         );
       } else {
         this.dataSrc = dataSrc;

package/src/ds4go.d.ts

@@ -0,0 +1,45 @@
+import type { LimitedResource } from "@src/component";
+
+export interface FactBundle extends LimitedResource {
+  "@type"?: "ds4go:FactBundle" | "ldp:Container" | ["ldp:Container", "ds4go:FactBundle"];
+  name?: string;
+  category?: string;
+  description?: string;
+  facts?: Fact[];
+}
+
+export interface Customer extends LimitedResource {
+  "@type"?: "ds4go:Customer";
+  name?: string;
+  participant_id?: string;
+  balance?: number;
+}
+
+export interface Category extends LimitedResource {
+  "@type"?: "ds4go:Category";
+  name?: string;
+  parent_category?: Category | null;
+}
+
+export interface Fact extends LimitedResource {
+  "@type"?: "ds4go:Fact";
+  name?: string;
+  link?: string;
+  description?: string;
+  content?: string;
+  author?: string;
+  categories?: Category[];
+  enclosure?: string;
+  medias?: Media[];
+  review?: Record<string, any>;
+}
+
+export interface Media extends LimitedResource {
+  "@type"?: "ds4go:Media";
+  url?: string;
+  file_size?: number;
+  width?: number;
+  height?: number;
+  file_type?: string;
+  description?: string;
+}