@beinformed/ui 1.9.0-beta.6 → 1.9.1

package/src/models/caseview/__tests__/caseviewContributions.json

@@ -0,0 +1,147 @@
+{
+  "label": "Book",
+  "resourcetype": "CaseView",
+  "texts": [
+    {
+      "type": "master",
+      "text": "<p>This is introtext</p>"
+    }
+  ],
+  "_links": {
+    "panel": [
+      {
+        "name": "Creator",
+        "label": "Creator",
+        "resourcetype": "CaseRelationListPanel"
+      },
+      {
+        "name": "Editions",
+        "label": "Editions",
+        "resourcetype": "RecordListPanel"
+      },
+      {
+        "name": "Activities",
+        "label": "Activities",
+        "resourcetype": "GroupingPanel"
+      }
+    ],
+    "taskgroup": [
+      {
+        "name": "Tasks",
+        "label": "Tasks",
+        "resourcetype": "TaskGroup"
+      }
+    ]
+  },
+  "metadata": {
+    "_id": {
+      "label": "Id",
+      "type": "integer"
+    }
+  },
+  "attributes": [
+    {
+      "CaseName": {
+        "label": "Case name",
+        "type": "string",
+        "layouthint": ["title"]
+      }
+    },
+    {
+      "CaseType": {
+        "label": "Case type",
+        "type": "string",
+        "layouthint": ["type"]
+      }
+    },
+    {
+      "Owner": {
+        "label": "Case owner",
+        "type": "string",
+        "layouthint": ["owner"]
+      }
+    },
+    {
+      "State": {
+        "label": "State",
+        "type": "string",
+        "layouthint": ["state"],
+        "options": [
+          {
+            "code": "Registered",
+            "label": "Registered"
+          }
+        ]
+      }
+    },
+    {
+      "Format": {
+        "label": "Format",
+        "type": "string",
+        "multiplechoice": false,
+        "layouthint": ["combobox"],
+        "options": [
+          {
+            "code": "Hardcover",
+            "label": "Hardcover"
+          },
+          {
+            "code": "Paperback",
+            "label": "Paperback"
+          },
+          {
+            "code": "Ebook",
+            "label": "Ebook"
+          },
+          {
+            "code": "Audio",
+            "label": "Audio book"
+          }
+        ]
+      }
+    },
+    {
+      "ISBN10": {
+        "label": "ISBN10",
+        "type": "string",
+        "displaysize": 50
+      }
+    },
+    {
+      "ISBN13": {
+        "label": "ISBN13",
+        "type": "string",
+        "displaysize": 50
+      }
+    },
+    {
+      "Language": {
+        "label": "Language",
+        "type": "string",
+        "multiplechoice": false,
+        "layouthint": ["radiobutton"],
+        "options": [
+          {
+            "code": "EN",
+            "label": "English"
+          },
+          {
+            "code": "DU",
+            "label": "Dutch"
+          }
+        ]
+      }
+    },
+    {
+      "NumberOfPages": {
+        "label": "Number of pages",
+        "type": "number",
+        "format": "0",
+        "groupingSeparator": ".",
+        "decimalSeparator": ",",
+        "minimum": 1,
+        "maximum": 1000
+      }
+    }
+  ]
+}

package/src/models/concepts/__mock__/business_scenario.js

@@ -1,13 +1,26 @@
 import BusinessScenarioModel from "../BusinessScenarioModel";
 import ModularUIResponse from "../../../modularui/ModularUIResponse";
+import ConceptDetailModel from "../ConceptDetailModel";
 
 import data from "./business_scenario_data.json";
 import contributions from "./conceptdetail_contributions.json";
 
+import stepData from "./business_scenario_step.json";
+import conceptType from "./concepttype";
+
 const response = ModularUIResponse.create({
   key: "business_scenario",
   data,
   contributions,
 });
+const scenario = new BusinessScenarioModel(response);
+
+const stepResponse = ModularUIResponse.create({
+  key: "business_scenario_step",
+  data: stepData,
+  contributions,
+});
+const step = new ConceptDetailModel(stepResponse);
+step.conceptType = conceptType;
 
-export default new BusinessScenarioModel(response);
+export { scenario, step };

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

@@ -0,0 +1,64 @@
+{
+  "concept": {
+    "_id": "StaandehoudingScSt",
+    "_links": {
+      "self": {
+        "href": "/concepts/Incident/Business design/Business scenario/Scenario incident.bixml/StaandehoudingScSt"
+      },
+      "api_doc": {
+        "href": "/api-docs/v3/concepts/(knowledge-model-identifier)/(concept-identifier)"
+      },
+      "contributions": {
+        "href": "/contributions/concepts/(knowledge-model-identifier)/(concept-identifier)"
+      },
+      "concepttype": {
+        "href": "/concepttypes/Library/KMTs/Business scenarios.bixml/ScenarioStep"
+      }
+    },
+    "filter": {
+      "entryDate": {
+        "param": "entryDate",
+        "name": "entryDate",
+        "value": "2020-11-20"
+      }
+    },
+    "conceptLabel": "Staandehouding",
+    "taxonomyType": "default",
+    "relations": [
+      {
+        "relationLabel": "performed by",
+        "relationType": "performedBy",
+        "relationDirection": "outgoing",
+        "concept": {
+          "_links": {
+            "self": {
+              "href": "/concepts/Incident/Business design/Business scenario/Scenario incident.bixml/Agent"
+            },
+            "concepttype": {
+              "href": "/concepttypes/Library/KMTs/Business scenarios.bixml/Persona"
+            }
+          },
+          "conceptLabel": "Agent",
+          "_id": "Agent"
+        }
+      },
+      {
+        "relationLabel": "consists of",
+        "relationType": "consistsOf",
+        "relationDirection": "incoming",
+        "concept": {
+          "_links": {
+            "self": {
+              "href": "/concepts/Incident/Business design/Business scenario/Scenario incident.bixml/ScenarioIncident"
+            },
+            "concepttype": {
+              "href": "/concepttypes/Library/KMTs/Business scenarios.bixml/BusinessScenario"
+            }
+          },
+          "conceptLabel": "Scenario incident",
+          "_id": "ScenarioIncident"
+        }
+      }
+    ]
+  }
+}

package/src/models/concepts/__mock__/conceptdetail.js

@@ -1,18 +1,27 @@
 import ConceptDetailModel from "../ConceptDetailModel";
+import ConceptTypeDetailModel from "../ConceptTypeDetailModel";
 import ModularUIResponse from "../../../modularui/ModularUIResponse";
 
 import data from "./conceptdetail_data.json";
 import contributions from "./conceptdetail_contributions.json";
+import conceptTypeData from "./concepttype_Calculation.json";
+import conceptTypeContributions from "./concepttype_contributions.json";
 
-import conceptType from "./concepttype";
-
-const response = ModularUIResponse.create({
-  key: "conceptdetail",
+const conceptResponse = ModularUIResponse.create({
+  key: "concept",
   data,
   contributions,
 });
 
-const conceptDetail = new ConceptDetailModel(response);
+const conceptTypeResponse = ModularUIResponse.create({
+  key: "concepttype",
+  data: conceptTypeData,
+  contributions: conceptTypeContributions,
+});
+
+const conceptType = new ConceptTypeDetailModel(conceptTypeResponse);
+
+const conceptDetail = new ConceptDetailModel(conceptResponse);
 conceptDetail.conceptType = conceptType;
 
-export default conceptDetail;
+export { conceptDetail };

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

@@ -1,9 +1,9 @@
 {
   "concept": {
-    "_id": "StaandehoudingScSt",
+    "_id": "DurationDrivingBan",
     "_links": {
       "self": {
-        "href": "/concepts/Incident/Business design/Business scenario/Scenario incident.bixml/StaandehoudingScSt"
+        "href": "/concepts/_Models and content/Police incident handling/Models/Sanctions/Driving ban/Duration driving ban.bixml/DurationDrivingBan"
       },
       "api_doc": {
         "href": "/api-docs/v3/concepts/(knowledge-model-identifier)/(concept-identifier)"
@@ -12,51 +12,151 @@
         "href": "/contributions/concepts/(knowledge-model-identifier)/(concept-identifier)"
       },
       "concepttype": {
-        "href": "/concepttypes/Library/KMTs/Business scenarios.bixml/ScenarioStep"
+        "href": "/concepttypes/Library/KMTs/Products.bixml/Calculation"
       }
     },
     "filter": {
       "entryDate": {
         "param": "entryDate",
         "name": "entryDate",
-        "value": "2020-11-20"
+        "value": "2021-09-23"
       }
     },
-    "conceptLabel": "Staandehouding",
+    "conceptLabel": "Duration driving ban",
+    "formula": "IF (NoviceDriver) (NUMBER)DurationDrivingBanNoviceDriver ELSE IF\n(ExperiencedDriver) (NUMBER)DurationDrivingBanExperiencedDriver ENDIF ENDIF",
     "taxonomyType": "default",
+    "sourceReferences": [
+      {
+        "label": "Duration driving ban",
+        "type": "DescriptionFormalSourceSubsection",
+        "sourceLabel": "Duration driving ban (formal source, subsections)",
+        "_links": {
+          "self": {
+            "href": "/content/_Models and content/Police incident handling/Content/Driving ban/Subsections/Duration driving ban.formalsource/Introduction#DurationDrivingBan"
+          },
+          "content": {
+            "href": "/content/_Models and content/Police incident handling/Content/Driving ban/Subsections/Duration driving ban.formalsource"
+          }
+        }
+      },
+      {
+        "label": "Duration driving ban",
+        "type": "DescriptionTextileSource",
+        "sourceLabel": "Duration driving ban (textile source)",
+        "_links": {
+          "self": {
+            "href": "/content/_Models and content/Police incident handling/Content/Driving ban/Duration driving ban.textilesource/duration"
+          },
+          "content": {
+            "href": "/content/_Models and content/Police incident handling/Content/Driving ban/Duration driving ban.textilesource"
+          }
+        }
+      }
+    ],
+    "properties": [
+      {
+        "value": "DDB",
+        "type": "Abbreviation"
+      }
+    ],
+    "labels": [
+      {
+        "type": "ResultLabel",
+        "value": "Duration of driving ban (in months)"
+      }
+    ],
+    "textFragments": [
+      {
+        "type": "Description",
+        "id": "DurationDrivingBan.tv852.Description",
+        "text": "Text fragment for duration driving ban"
+      }
+    ],
     "relations": [
       {
-        "relationLabel": "performed by",
-        "relationType": "performedBy",
+        "relationLabel": "depends on",
+        "relationType": "depends_on",
+        "relationDirection": "outgoing",
+        "concept": {
+          "_links": {
+            "self": {
+              "href": "/concepts/_Models and content/Police incident handling/Models/Sanctions/Driver.bixml/NoviceDriver"
+            },
+            "concepttype": {
+              "href": "/concepttypes/Library/KMTs/Products.bixml/Class"
+            }
+          },
+          "conceptLabel": "Novice driver",
+          "_id": "NoviceDriver"
+        }
+      },
+      {
+        "relationLabel": "depends on",
+        "relationType": "depends_on",
+        "relationDirection": "outgoing",
+        "concept": {
+          "_links": {
+            "self": {
+              "href": "/concepts/_Models and content/Police incident handling/Models/Sanctions/Driver.bixml/ExperiencedDriver"
+            },
+            "concepttype": {
+              "href": "/concepttypes/Library/KMTs/Products.bixml/Class"
+            }
+          },
+          "conceptLabel": "Experienced driver",
+          "_id": "ExperiencedDriver"
+        }
+      },
+      {
+        "relationLabel": "depends on",
+        "relationType": "depends_on",
+        "relationDirection": "outgoing",
+        "concept": {
+          "_links": {
+            "self": {
+              "href": "/concepts/_Models and content/Police incident handling/Models/Sanctions/Driving ban/Duration driving ban.bixml/DurationDrivingBanNoviceDriver"
+            },
+            "concepttype": {
+              "href": "/concepttypes/Library/KMTs/Products.bixml/Ground"
+            }
+          },
+          "conceptLabel": "Duration driving ban novice driver",
+          "_id": "DurationDrivingBanNoviceDriver"
+        }
+      },
+      {
+        "relationLabel": "depends on",
+        "relationType": "depends_on",
         "relationDirection": "outgoing",
         "concept": {
           "_links": {
             "self": {
-              "href": "/concepts/Incident/Business design/Business scenario/Scenario incident.bixml/Agent"
+              "href": "/concepts/_Models and content/Police incident handling/Models/Sanctions/Driving ban/Duration driving ban.bixml/DurationDrivingBanExperiencedDriver"
             },
             "concepttype": {
-              "href": "/concepttypes/Library/KMTs/Business scenarios.bixml/Persona"
+              "href": "/concepttypes/Library/KMTs/Products.bixml/Ground"
             }
           },
-          "conceptLabel": "Agent",
-          "_id": "Agent"
+          "conceptLabel": "Duration driving ban experienced driver",
+          "_id": "DurationDrivingBanExperiencedDriver"
         }
       },
       {
-        "relationLabel": "consists of",
-        "relationType": "consistsOf",
+        "relationLabel": "required by with condition",
+        "relationType": "requiresWithCondition",
+        "relationCondition": "DurationDrivingBan >= 0",
         "relationDirection": "incoming",
         "concept": {
           "_links": {
             "self": {
-              "href": "/concepts/Incident/Business design/Business scenario/Scenario incident.bixml/ScenarioIncident"
+              "href": "/concepts/_Models and content/Police incident handling/Models/Approvals/Approved duration driving ban.bixml/ApprovedDurationDrivingBan"
             },
             "concepttype": {
-              "href": "/concepttypes/Library/KMTs/Business scenarios.bixml/BusinessScenario"
+              "href": "/concepttypes/Library/KMTs/Products.bixml/Decision"
             }
           },
-          "conceptLabel": "Scenario incident",
-          "_id": "ScenarioIncident"
+          "conceptLabel": "Approved duration driving ban",
+          "_id": "ApprovedDurationDrivingBan"
         }
       }
     ]

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

@@ -0,0 +1,75 @@
+{
+  "concepttype": {
+    "_links": {
+      "self": {
+        "href": "/concepttypes/Library/KMTs/Products.bixml/Calculation"
+      },
+      "api_doc": {
+        "href": "/api-docs/v3/concepttypes/(knowledge-model-type-identifier)/(concept-type-identifier)"
+      },
+      "contributions": {
+        "href": "/contributions/concepttypes/(knowledge-model-type-identifier)/(concept-type-identifier)"
+      }
+    },
+    "_id": "Calculation",
+    "label": "Calculation",
+    "icon": "/resource/Library/General/Icons/Products/calculation_24x24.png",
+    "textColor": "#000000",
+    "lineColor": "#000000",
+    "backgroundColor": "#F3A60D",
+    "coreTaxonomy": "false",
+    "textFragmentTypes": [
+      { "_id": "Definition", "label": "Definition" },
+      { "_id": "Description", "label": "Description" },
+      { "_id": "IconSmall", "label": "Icon-small" },
+      { "_id": "IconMedium", "label": "Icon-medium" },
+      { "_id": "IconLarge", "label": "Icon-large" },
+      {
+        "_id": "NonFunctionalRequirement",
+        "label": "Non functional requirement"
+      },
+      { "_id": "FunctionalRequirement", "label": "Functional requirement" },
+      { "_id": "Rationale", "label": "Rationale" },
+      { "_id": "tfNote", "label": "NL TF NOTE" }
+    ],
+    "labelTypes": [
+      { "_id": "QuestionLabel", "label": "Question label" },
+      { "_id": "ResultLabel", "label": "Result label" }
+    ],
+    "propertyTypes": [
+      {
+        "_id": "PartnerService",
+        "label": "Partner Service",
+        "type": "string",
+        "mandatory": "false"
+      },
+      {
+        "_id": "Abbreviation",
+        "label": "Abbreviation",
+        "type": "string",
+        "mandatory": "false"
+      }
+    ],
+    "sectionReferenceTypes": [
+      { "_id": "crDescription", "label": "Description" },
+      {
+        "_id": "DescriptionFormalSource",
+        "label": "Description (formal source)"
+      },
+      {
+        "_id": "DescriptionFormalSourceSubsection",
+        "label": "Description (formal source, subsection)"
+      },
+      {
+        "_id": "DescriptionLocalSource",
+        "label": "Description (local source)"
+      },
+      {
+        "_id": "DescriptionTextileSource",
+        "label": "Description (textile source)"
+      },
+      { "_id": "Reference", "label": "Reference" },
+      { "_id": "Satisfies", "label": "Satisfies" }
+    ]
+  }
+}

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

@@ -1,6 +1,5 @@
 import BusinessScenarioModel from "../BusinessScenarioModel";
-import businessScenario from "../__mock__/business_scenario";
-import conceptDetail from "../__mock__/conceptdetail";
+import { scenario, step } from "../__mock__/business_scenario";
 import conceptType from "../__mock__/concepttype";
 
 describe("businessScenarioModel", () => {
@@ -12,16 +11,16 @@ describe("businessScenarioModel", () => {
   });
 
   it("can retrieve child model links", () => {
-    const initialChildModelLinks = businessScenario.getInitialChildModelLinks();
+    const initialChildModelLinks = scenario.getInitialChildModelLinks();
 
     expect(initialChildModelLinks).toHaveLength(13);
   });
 
   it("can set scenarioSteps", () => {
-    businessScenario.setChildModels([conceptType, conceptDetail]);
+    scenario.setChildModels([conceptType, step]);
 
-    const scenarioSteps = businessScenario.scenarioSteps;
-    const actors = businessScenario.actors;
+    const scenarioSteps = scenario.scenarioSteps;
+    const actors = scenario.actors;
 
     expect(scenarioSteps).toHaveLength(1);
     expect(actors).toHaveLength(1);

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

@@ -1,10 +1,65 @@
 import ConceptDetailModel from "../ConceptDetailModel";
 
-describe("conceptDetailModel", () => {
-  it("should be able to create an empty ConceptDetailModel object", () => {
-    const conceptDetail = new ConceptDetailModel();
+import { conceptDetail } from "../__mock__/conceptdetail";
 
+describe("conceptDetailModel", () => {
+  it("should be able to create a ConceptDetailModel object", () => {
     expect(conceptDetail).toBeInstanceOf(ConceptDetailModel);
     expect(conceptDetail.type).toBe("ConceptDetail");
+
+    expect(conceptDetail.key).toBe("DurationDrivingBan");
+    expect(conceptDetail.conceptType.label).toBe("Calculation");
+
+    expect(conceptDetail.label).toBe("Duration driving ban");
+    expect(conceptDetail.taxonomyType).toBe("default");
+
+    expect(conceptDetail.formula).toBe(
+      "IF (NoviceDriver) (NUMBER)DurationDrivingBanNoviceDriver ELSE IF\n(ExperiencedDriver) (NUMBER)DurationDrivingBanExperiencedDriver ENDIF ENDIF"
+    );
+    expect(conceptDetail.labels).toStrictEqual([
+      {
+        _id: "QuestionLabel",
+        label: "Question label",
+      },
+      {
+        _id: "ResultLabel",
+        label: "Result label",
+        type: "ResultLabel",
+        value: "Duration of driving ban (in months)",
+      },
+    ]);
+    expect(conceptDetail.conceptProperties).toStrictEqual([
+      {
+        _id: "PartnerService",
+        label: "Partner Service",
+        mandatory: "false",
+        type: "string",
+      },
+      {
+        _id: "Abbreviation",
+        label: "Abbreviation",
+        mandatory: "false",
+        type: "Abbreviation",
+        value: "DDB",
+      },
+    ]);
+    expect(conceptDetail.textfragments).toStrictEqual([
+      {
+        _id: "Description",
+        label: "Description",
+        id: "DurationDrivingBan.tv852.Description",
+        text: "Text fragment for duration driving ban",
+        type: "Description",
+      },
+      { _id: "Definition", label: "Definition" },
+      { _id: "IconSmall", label: "Icon-small" },
+      { _id: "IconMedium", label: "Icon-medium" },
+      { _id: "IconLarge", label: "Icon-large" },
+      { _id: "NonFunctionalRequirement", label: "Non functional requirement" },
+      { _id: "FunctionalRequirement", label: "Functional requirement" },
+      { _id: "Rationale", label: "Rationale" },
+      { _id: "tfNote", label: "NL TF NOTE" },
+    ]);
+    expect(conceptDetail.entryDate).toBe("2021-09-23");
   });
 });

package/src/models/content/SectionModel.js

@@ -7,6 +7,7 @@ import { createHashFromHref } from "../../utils/helpers/createHash";
 import LinkModel from "../links/LinkModel";
 
 import type Href from "../href/Href";
+import { retrieveText } from "../../utils";
 
 class SectionModel extends BaseModel {
   _entryDate: ISO_DATE | null;
@@ -88,7 +89,7 @@ class SectionModel extends BaseModel {
    * Get content body
    */
   get body(): ?string {
-    return this.data.body;
+    return retrieveText(this.data.body);
   }
 
   /**

package/src/models/content/SubSectionModel.js

@@ -5,6 +5,7 @@ import BaseModel from "../base/BaseModel";
 import LinkCollection from "../links/LinkCollection";
 import Href from "../href/Href";
 import LinkModel from "../links/LinkModel";
+import { retrieveText } from "../../utils";
 
 /**
  * Link to a concept
@@ -41,7 +42,8 @@ export default class SubSectionModel extends BaseModel {
    * Retrieve html body
    */
   get body(): string {
-    return this.getData("body", "");
+    const body = this.getData("body", "");
+    return retrieveText(body);
   }
 
   /**

package/src/models/contentconfiguration/ContentConfigurationResults.js

@@ -35,8 +35,8 @@ class ContentConfigurationResults {
     }
 
     const description = this._configuration.description;
-    if (isPlainObject(description) && "rawText" in description) {
-      return description.rawText;
+    if (isPlainObject(description) && "message" in description) {
+      return description.message;
     }
 
     return description;