@beinformed/ui 1.56.1 → 1.56.4

package/src/models/concepts/ConceptTypeDetailModel.js

@@ -2,7 +2,6 @@
 import ResourceModel from "../base/ResourceModel";
 
 import type ModularUIResponse from "../../modularui/ModularUIResponse";
-import type LinkCollection from "../links/LinkCollection";
 
 /**
  * Model for concept details, available through modelcatalog
@@ -12,8 +11,8 @@ class ConceptTypeDetailModel extends ResourceModel {
    * The name of the concept type consists of the functional id of the kmt and the functional id of the concept type separated by a #.<br>
    * For example BEI_CaseManagement#Case
    */
-  get name(): string {
-    return this.getData("name", "");
+  get kmtId(): string {
+    return this.getData("kmtId", "");
   }
 
   /**
@@ -119,31 +118,10 @@ class ConceptTypeDetailModel extends ResourceModel {
     return this.getData("sectionReferenceTypes", []);
   }
 
-  /**
-   */
-  get conceptTypeHierarchy(): LinkCollection {
-    return this.links.getLinksByGroup("conceptTypeHierarchy");
-  }
-
   /**
    */
   isOfConceptType(conceptTypeId: string): boolean {
-    return (
-      this.conceptTypeHierarchy?.hasLinkByKey(conceptTypeId) ||
-      this.conceptTypeHierarchy?.hasLinkByHref(conceptTypeId) ||
-      this.selfhref.equals(conceptTypeId)
-    );
-  }
-
-  /**
-   * Indicates if the given metamodel functional identifier exists in the hierarchy of concept types
-   */
-  hasMetamodelIdInHierarchy(metamodelId: string): boolean {
-    return (
-      this.conceptTypeHierarchy?.all.some((link) =>
-        link.key.startsWith(metamodelId + "#"),
-      ) || false
-    );
+    return this.selfhref.equals(conceptTypeId);
   }
 }
 

package/src/models/concepts/__mock__/concepttype_hierarchy.json

@@ -9,17 +9,7 @@
       },
       "contributions": {
         "href": "/contributions/concepttypes/(knowledge-model-type-identifier)/(concept-type-identifier)"
-      },
-      "conceptTypeHierarchy": [
-        {
-          "href": "/concepttypes/bundle-com.beinformed.fs.demo.metamodels/Advice%20and%20request%20business%20scenarios.bixml/ScenarioStep_Advice",
-          "name": "Adviceandrequestbusinessscenarios#ScenarioStep_Advice"
-        },
-        {
-          "href": "/concepttypes/bundle-com.beinformed.fs.demo.metamodels/Business%20scenarios.bixml/ScenarioStep",
-          "name": "BusinessScenarios#ScenarioStep"
-        }
-      ]
+      }
     },
     "_id": "ScenarioStep_Advice",
     "label": "Advice scenario step",

package/src/models/concepts/__tests__/ConceptTypeDetailModel.spec.js

@@ -19,30 +19,13 @@ describe("conceptTypeDetailModel", () => {
     expect(conceptTypeDetail.backgroundColor).toBe("#FFFF3C");
     expect(conceptTypeDetail.borderColor).toBe("#000000");
 
-    expect(conceptTypeDetail.conceptTypeHierarchy.length).toBe(2);
     expect(
       conceptTypeDetail.isOfConceptType(
-        "Adviceandrequestbusinessscenarios#ScenarioStep_Advice",
+        "/concepttypes/bundle-com.beinformed.fs.demo.metamodels/Advice%20and%20request%20business%20scenarios.bixml/ScenarioStep_Advice",
       ),
     ).toBe(true);
-    expect(
-      conceptTypeDetail.isOfConceptType("BusinessScenarios#ScenarioStep"),
-    ).toBe(true);
     expect(conceptTypeDetail.isOfConceptType("BEI_CaseManagement#Case")).toBe(
       false,
     );
-
-    expect(
-      conceptTypeDetail.isOfConceptType(
-        "/concepttypes/bundle-com.beinformed.fs.demo.metamodels/Business%20scenarios.bixml/ScenarioStep",
-      ),
-    ).toBe(true);
-
-    expect(
-      conceptTypeDetail.hasMetamodelIdInHierarchy("BusinessScenarios"),
-    ).toBe(true);
-    expect(
-      conceptTypeDetail.hasMetamodelIdInHierarchy("BEI_CaseManagement"),
-    ).toBe(false);
   });
 });

package/src/redux/_modularui/ModularUISelectors.js

@@ -16,6 +16,7 @@ import FormModel from "../../models/form/FormModel";
 
 import type { ReduxState, PreferenceValue } from "../types";
 import type { ModularUIModel } from "../../models/types";
+import { MODULARUI_STATUS } from "../../constants";
 
 /**
  */
@@ -308,9 +309,13 @@ export const getAllFinishedModels: (
   (state: ReduxState) => state.modularui,
   (modularui): Array<ModularUIModel> => {
     if (modularui) {
-      return Object.values(modularui)
-        .filter((entry) => entry.status === "FINISHED")
-        .map((entry) => entry.model);
+      return Object.keys(modularui)
+        .filter(
+          (key) =>
+            modularui[key] &&
+            modularui[key].status === MODULARUI_STATUS.FINISHED,
+        )
+        .map((key) => modularui[key].model);
     }
     return [];
   },