@beinformed/ui 1.13.5 → 1.14.1

package/src/models/concepts/BusinessScenarioModel.js

@@ -1,6 +1,7 @@
 // @flow
 import ConceptDetailModel from "./ConceptDetailModel";
 import ConceptTypeDetailModel from "./ConceptTypeDetailModel";
+import { getSetting } from "../../constants/Settings";
 
 import type { ModularUIResponse } from "../../modularui";
 import type { ModularUIModel } from "../types";
@@ -21,13 +22,43 @@ class BusinessScenarioModel extends ConceptDetailModel {
   /**
    */
   static isApplicableModel(data: ModularUIResponse): boolean {
-    const conceptTypeHref = data?.data?._links?.concepttype?.href;
-    return (
-      conceptTypeHref ===
-      "/concepttypes/Library/KMTs/Business scenarios.bixml/BusinessScenario"
+    return BusinessScenarioModel.isOfConceptType(
+      data?.data?._links?.concepttype?.href,
+      "SCENARIO"
     );
   }
 
+  /**
+   */
+  static isOfConceptType(
+    conceptTypeHref: ?string,
+    settingName: "STEP" | "PERSONA" | "SCENARIO"
+  ): boolean {
+    if (!conceptTypeHref) {
+      return false;
+    }
+
+    const pathToKmt = "/Library/KMTs/Business scenarios.bixml";
+
+    const conceptTypeSettings = {
+      STEP: getSetting(
+        "BUSINESS_SCENARIO_STEP_CONCEPT_TYPE",
+        `${pathToKmt}/ScenarioStep`
+      ),
+      PERSONA: getSetting(
+        "BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE",
+        `${pathToKmt}/Persona`
+      ),
+      SCENARIO: getSetting(
+        "BUSINESS_SCENARIO_CONCEPT_TYPE",
+        `${pathToKmt}/BusinessScenario`
+      ),
+    };
+
+    const conceptTypeSetting = conceptTypeSettings[settingName];
+    return conceptTypeHref.endsWith(conceptTypeSetting);
+  }
+
   /**
    */
   getInitialChildModelLinks(): Array<LinkModel> {
@@ -42,8 +73,10 @@ class BusinessScenarioModel extends ConceptDetailModel {
       .filter(
         (relation) =>
           relation.direction === "outgoing" &&
-          relation.concept.concepttypeHref?.path ===
-            "/concepttypes/Library/KMTs/Business scenarios.bixml/ScenarioStep"
+          BusinessScenarioModel.isOfConceptType(
+            relation.concept.concepttypeHref?.path,
+            "STEP"
+          )
       )
       .map((relation) => relation.concept.asLinkModel());
 
@@ -63,14 +96,15 @@ class BusinessScenarioModel extends ConceptDetailModel {
     );
 
     const scenarioSteps = [];
-    const SCENARIO_STEP_HREF =
-      "/concepttypes/Library/KMTs/Business scenarios.bixml/ScenarioStep";
     for (let i = 0; i < models.length; i++) {
       const model = models[i];
 
       if (
         model instanceof ConceptDetailModel &&
-        model.conceptType?.selfhref.path === SCENARIO_STEP_HREF
+        BusinessScenarioModel.isOfConceptType(
+          model.conceptType?.selfhref.path,
+          "STEP"
+        )
       ) {
         scenarioSteps.push(model);
       }
@@ -100,8 +134,10 @@ class BusinessScenarioModel extends ConceptDetailModel {
       const relationsToActor = scenarioStep.relationsCollection.find(
         (relation) =>
           relation.direction === "outgoing" &&
-          relation.concept.concepttypeHref?.path ===
-            "/concepttypes/Library/KMTs/Business scenarios.bixml/Persona"
+          BusinessScenarioModel.isOfConceptType(
+            relation.concept.concepttypeHref?.path,
+            "PERSONA"
+          )
       );
 
       const newRelationToActor =

package/src/models/href/Href.js

@@ -4,7 +4,7 @@ import { BASE, CONTENT_PATH, HTTP_METHODS } from "../../constants/Constants";
 import Parameter from "../parameter/Parameter";
 import { IllegalArgumentException } from "../../exceptions";
 
-import type { LocationShape, Location } from "react-router";
+import type { LocationShape } from "react-router";
 
 type HrefObject = {
   _path: string,
@@ -439,7 +439,7 @@ class Href {
 
   /**
    */
-  toLocation(): Location {
+  toLocation(): LocationShape {
     return {
       pathname: this.path,
       search: this.querystring.length > 0 ? `?${this.querystring}` : "",

package/src/react-server/renderSSRComplete.js

@@ -48,6 +48,8 @@ const renderSSRComplete = ({
 
   const sheet = new ServerStyleSheet();
 
+  // $FlowFixMe[incompatible-type]
+  // $FlowFixMe[prop-missing]
   const location: Location = requestHref.toLocation();
 
   return createSSRComplete(store, () =>

package/src/redux/actions/Authorization.js

@@ -58,6 +58,7 @@ export const handleUnauthorized =
       );
     }
 
+    // add current location as from location before redirect
     const location = getState().router.location;
     if (location?.pathname !== LOGIN_PATH) {
       const locationFrom = location?.state?.from;

package/src/utils/helpers/checkResourceExists.js

@@ -0,0 +1,21 @@
+// @flow
+import { BASE } from "../../constants/Constants";
+
+/**
+ * Checks if a given url to a modular ui resource exists using a HEAD request to the resource (synchronous)
+ * When the resource returns a 404, the resource does not exists and the method returns false
+ *
+ * @param url
+ * @returns {boolean}
+ */
+export const resourceExists = (url: string): boolean => {
+  const fullUrl = `${BASE}/${url}`.replace(/\/\//g, "/");
+
+  const xhr = new XMLHttpRequest();
+  xhr.open("HEAD", fullUrl, false);
+  xhr.setRequestHeader("Accept", "application/json");
+  xhr.setRequestHeader("Content-Type", "application/json");
+  xhr.send();
+
+  return xhr.status !== 404;
+};

package/src/utils/index.js

@@ -19,6 +19,7 @@ export { default as createUUID } from "./helpers/createUUID";
 export * from "./helpers/sanitizeHtml";
 export * from "./helpers/objects";
 export * from "./helpers/text";
+export * from "./helpers/checkResourceExists";
 
 // number
 export { default as DecimalFormat } from "./number/DecimalFormat";