@beinformed/ui 1.57.0-contextpath.1 → 1.57.0

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/models/content/ContentLinkModel.js

@@ -8,6 +8,7 @@ import { TIMEVERSION_FILTER_NAME } from "../../constants/Constants";
 import LinkCollection from "../links/LinkCollection";
 
 import type { ModularUIModel, IModelWithChildModels } from "../types";
+import { getBasePath } from "../../constants";
 
 /**
  * Link to a concept
@@ -20,13 +21,22 @@ export default class ContentLinkModel
   _entryDate: ?ISO_DATE;
   _contentType: ContentTypeModel | null = null;
   _items: Array<ContentLinkModel>;
+  _origin: string = "";
+  _contextPath: string = getBasePath();
 
   /**
    */
-  constructor(data: Object, entryDate: ?ISO_DATE = null) {
+  constructor(
+    data: Object,
+    entryDate: ?ISO_DATE = null,
+    origin?: string,
+    contextPath?: string,
+  ) {
     super(data, {});
 
     this._entryDate = entryDate;
+    this._origin = origin || "";
+    this._contextPath = contextPath || getBasePath();
   }
 
   /**
@@ -102,9 +112,12 @@ export default class ContentLinkModel
   /**
    */
   createEncodedHref(): Href {
-    // TODO SBO: origin and context
     const startURI = "/content/";
-    const selfHref = new Href(this.data._links.self.href);
+    const selfHref = new Href(
+      this.data._links.self.href,
+      this._origin,
+      this._contextPath,
+    );
     const href = selfHref.path;
 
     const section = this.data.section;
@@ -140,11 +153,13 @@ export default class ContentLinkModel
    */
   get links(): LinkCollection {
     if (!this._links) {
-      // TODO SBO: origin and context
       this._links = new LinkCollection(
         Array.isArray(this.data._links)
           ? this.data._links[0]
           : this.data._links,
+        null,
+        this._origin,
+        this._contextPath,
       );
     }
 

package/src/models/content/SectionModel.js

@@ -8,6 +8,7 @@ import LinkModel from "../links/LinkModel";
 
 import type Href from "../href/Href";
 import { retrieveText } from "../../utils";
+import { getBasePath } from "../../constants";
 
 /**
  */
@@ -15,11 +16,20 @@ class SectionModel extends BaseModel {
   _entryDate: ISO_DATE | null;
   _selflink: ?LinkModel;
   _childSections: Array<SectionModel>;
-
-  constructor(data: Object, entryDate: ISO_DATE | null) {
+  _origin: string = "";
+  _contextPath: string = getBasePath();
+
+  constructor(
+    data: Object,
+    entryDate: ISO_DATE | null,
+    origin?: string,
+    contextPath?: string,
+  ) {
     super(data, {});
 
     this._entryDate = entryDate;
+    this._origin = origin || "";
+    this._contextPath = contextPath || getBasePath();
   }
 
   /**
@@ -32,8 +42,12 @@ class SectionModel extends BaseModel {
    */
   get selflink(): LinkModel {
     if (!this._selflink) {
-      // TODO SBO: origin and context
-      this._selflink = new LinkModel(this.data._links?.self);
+      this._selflink = new LinkModel(
+        this.data._links?.self,
+        null,
+        this._origin,
+        this._contextPath,
+      );
     }
     return this._selflink;
   }
@@ -111,6 +125,8 @@ class SectionModel extends BaseModel {
                 _links: childSection._links,
               },
               this.entryDate,
+              this._origin,
+              this._contextPath,
             ),
         )
       : [];
@@ -128,6 +144,8 @@ class SectionModel extends BaseModel {
         _links: this.data._links,
       },
       this.entryDate,
+      this._origin,
+      this._contextPath,
     );
   }
 
@@ -138,7 +156,15 @@ class SectionModel extends BaseModel {
     if (!this._childSections && this.data.childSections) {
       this._childSections = this.data.childSections
         .filter((childSection) => "body" in childSection)
-        .map((childSection) => new SectionModel(childSection, this.entryDate));
+        .map(
+          (childSection) =>
+            new SectionModel(
+              childSection,
+              this.entryDate,
+              this._origin,
+              this._contextPath,
+            ),
+        );
     }
     return this._childSections || [];
   }

package/src/models/error/ErrorResponse.js

@@ -3,6 +3,7 @@ import Href from "../href/Href";
 
 import type { MessageParameters } from "../../i18n/types";
 import LayoutHintCollection from "../layouthint/LayoutHintCollection";
+import { getBasePath } from "../../constants";
 
 /**
  */
@@ -33,12 +34,23 @@ export default class ErrorResponse {
   _error: Object;
   _connectKey: ?string;
 
+  _origin: string = "";
+  _contextPath: string = getBasePath();
+
   /**
    * Construct ErrorResponse
    */
-  constructor(data: Object, connectKey?: string) {
+  constructor(
+    data: Object,
+    connectKey?: string,
+    origin?: string,
+    contextPath?: string,
+  ) {
     this._error = data;
     this._connectKey = connectKey;
+
+    this._origin = origin || "";
+    this._contextPath = contextPath || getBasePath();
   }
 
   /**
@@ -53,6 +65,18 @@ export default class ErrorResponse {
     return this._connectKey;
   }
 
+  /**
+   */
+  get origin(): string {
+    return this._origin;
+  }
+
+  /**
+   */
+  get contextPath(): string {
+    return this._contextPath;
+  }
+
   /**
    * Return error information
    */
@@ -161,9 +185,13 @@ export default class ErrorResponse {
    *  Return response error redirect href
    */
   get redirectHref(): Href {
-    // TODO SBO: origin and context
     if (this.response.redirect?.href) {
-      return new Href(this.response.redirect?.href);
+      return new Href(
+        this.response.redirect?.href,
+        "",
+        this.origin,
+        this.contextPath,
+      );
     }
     return new Href();
   }
@@ -291,8 +319,9 @@ export default class ErrorResponse {
    * Get response url
    */
   get changePasswordHref(): ?Href {
-    // TODO SBO: origin and context
-    return this.properties.redirect ? new Href(this.properties.redirect) : null;
+    return this.properties.redirect
+      ? new Href(this.properties.redirect, "", this.origin, this.contextPath)
+      : null;
   }
 
   /**

package/src/modularui/CaptchaRequest.js

@@ -1,6 +1,6 @@
 // @flow
 import xhr from "../utils/fetch/xhr";
-import { getCaptchaPath, HTTP_METHODS } from "../constants";
+import { getBasePath, getCaptchaPath, HTTP_METHODS } from "../constants";
 
 type CaptchaInitialResponse = {
   tokenId: string,
@@ -25,11 +25,25 @@ type CaptchaResponse = {
   error: { id: string } | null,
 };
 
+type CaptchaRequestOptions = {
+  origin?: string,
+  contextPath?: string,
+};
+
 /**
  */
 class CaptchaRequest {
   _tokenId: string;
   _image: string;
+  _origin: string = "";
+  _contextPath: string = getBasePath();
+
+  /**
+   */
+  CaptchaRequest(options?: CaptchaRequestOptions) {
+    this._origin = options?.origin || "";
+    this._contextPath = options?.contextPath || getBasePath();
+  }
 
   /**
    */
@@ -55,7 +69,7 @@ class CaptchaRequest {
    */
   init(): Promise<CaptchaResponse> {
     return xhr({
-      url: getCaptchaPath(),
+      url: getCaptchaPath(this._contextPath, this._origin),
     }).then((response) => this.captchaResponse(response));
   }
 
@@ -64,7 +78,7 @@ class CaptchaRequest {
    */
   send(answer?: string): Promise<CaptchaResponse> {
     return xhr({
-      url: getCaptchaPath(),
+      url: getCaptchaPath(this._contextPath, this._origin),
       method: HTTP_METHODS.POST,
       data: {
         tokenId: this._tokenId ?? "",

package/src/modularui/ModularUIRequest.js

@@ -724,7 +724,9 @@ class ModularUIRequest {
               reason,
             );
           }
-          errorChildModels.push(new ErrorResponse(reason));
+          errorChildModels.push(
+            new ErrorResponse(reason, "", this.origin, this.contextPath),
+          );
         } else {
           resolvedChildModels.push(childModel.value);
         }

package/src/modularui/UploadRequest.js

@@ -1,5 +1,5 @@
 // @flow
-import { getUploadPath, HTTP_METHODS } from "../constants";
+import { getBasePath, getUploadPath, HTTP_METHODS } from "../constants";
 
 import xhr from "../utils/fetch/xhr";
 
@@ -11,6 +11,11 @@ import ErrorModel from "../models/error/ErrorModel";
 
 type ProgressHandler = (file: File, uploadInfo: Object) => void;
 
+type UploadRequestOptions = {
+  origin?: string,
+  contextPath?: string,
+};
+
 type UploadResponse = {
   token: string,
 };
@@ -25,6 +30,8 @@ class UploadRequest {
     acceptedFiles: Array<string>,
   };
   _progressHandler: ProgressHandler;
+  _origin: string = "";
+  _contextPath: string = getBasePath();
 
   constructor(
     uploadConstraints: {
@@ -33,9 +40,12 @@ class UploadRequest {
       acceptedFiles: Array<string>,
     },
     progressHandler: ProgressHandler,
+    options?: UploadRequestOptions,
   ) {
     this._uploadConstraints = uploadConstraints;
     this._progressHandler = progressHandler;
+    this._origin = options?.origin || "";
+    this._contextPath = options?.contextPath || getBasePath();
   }
 
   /**
@@ -102,7 +112,7 @@ class UploadRequest {
     }
 
     return xhr({
-      url: getUploadPath(),
+      url: getUploadPath(this._contextPath, this._origin),
       method: HTTP_METHODS.POST,
       headers: {
         "Content-Type": file.type,

package/src/redux/_modularui/ModularUIActions.js

@@ -109,6 +109,7 @@ export const loadModel = (
 ): ModularUIAction => ({
   type: "MODULARUI/FETCH",
   payload: {
+    key,
     origin: options?.origin,
     contextPath: options?.contextPath,
     href:
@@ -129,7 +130,12 @@ export const loadModel = (
     /**
      */
     errorAction: (error) => {
-      const errorResponse = new ErrorResponse(error, key);
+      const errorResponse = new ErrorResponse(
+        error,
+        key,
+        options?.origin,
+        options?.contextPath,
+      );
       if (errorResponse.isChangePassword) {
         return {
           type: "NO_ACTION",
@@ -151,20 +157,24 @@ export const loadModularUI =
     href: Href | string,
     options?: RequestModularUIOptions,
   ): ThunkAction =>
-  (dispatch: Dispatch) => {
-    dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));
+  (dispatch: Dispatch, getState) => {
+    const modularuiStore = getState()?.modularui;
+    if (
+      modularuiStore &&
+      modularuiStore[key]?.status === MODULARUI_STATUS.LOADING
+    ) {
+      // don't create duplicate requests during loading
+      return dispatch({
+        type: "NO_ACTION",
+      });
+    }
+
     dispatch(startProgress());
 
     const loadModelPromise = dispatch(loadModel(key, href, options));
 
     return Promise.resolve(loadModelPromise)
-      .then((response) => {
-        if (response?.type === "FINISH_PROGRESS") {
-          dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));
-        }
-
-        return dispatch(finishProgress());
-      })
+      .then(() => dispatch(finishProgress()))
       .catch((error) => dispatch(handleError(error)));
   };
 

package/src/redux/_modularui/ModularUIMiddleware.js

@@ -1,11 +1,12 @@
 // @flow
 import ModularUIRequest from "../../modularui/ModularUIRequest";
-import { HTTP_METHODS } from "../../constants/Constants";
+import { HTTP_METHODS, MODULARUI_STATUS } from "../../constants/Constants";
 
 import { startProgress, finishProgress } from "../actions/ProgressIndicator";
-
 import { handleError } from "../actions/Error";
 
+import { updateStatus } from "./ModularUIActions";
+
 import type { Middleware, MiddlewareAPI } from "redux";
 import type {
   ReduxAction,
@@ -127,11 +128,13 @@ const handleFetch = (
 ) => {
   dispatch(startProgress());
 
-  const { successAction, errorAction, ...requestOptions } = action.payload;
+  const { key, successAction, errorAction, ...requestOptions } = action.payload;
   requestOptions.locale = locale;
 
   const modularuiRequest = createRequest(requestOptions);
 
+  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));
+
   return modularuiRequest
     .fetch()
     .then((model) => responseHandler(next, dispatch, successAction, model))

package/src/redux/_modularui/ModularUIReducer.js

@@ -46,6 +46,7 @@ const setModel = (
         ...state[key],
         model,
         lastModification: Date.now(),
+        status: MODULARUI_STATUS.FINISHED,
       },
     };
   }

package/src/redux/_modularui/ModularUISelectors.js

@@ -1,5 +1,9 @@
 // @flow
-import { createSelectorCreator, defaultMemoize } from "reselect";
+import {
+  createSelector,
+  createSelectorCreator,
+  defaultMemoize,
+} from "reselect";
 import { has } from "../../utils/helpers/objects";
 
 import Href from "../../models/href/Href";
@@ -12,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";
 
 /**
  */
@@ -298,13 +303,20 @@ export const getModelsByType = (
 
 /**
  */
-export const getAllFinishedModels = (
+export const getAllFinishedModels: (
   state: ReduxState,
-): Array<ModularUIModel> => {
-  if (state && state.modularui) {
-    return Object.values(state.modularui)
-      .filter((entry) => entry.status === "FINISHED")
-      .map((entry) => entry.model);
-  }
-  return [];
-};
+) => Array<ModularUIModel> = createSelector(
+  (state: ReduxState) => state.modularui,
+  (modularui): Array<ModularUIModel> => {
+    if (modularui) {
+      return Object.keys(modularui)
+        .filter(
+          (key) =>
+            modularui[key] &&
+            modularui[key].status === MODULARUI_STATUS.FINISHED,
+        )
+        .map((key) => modularui[key].model);
+    }
+    return [];
+  },
+);

package/src/redux/_modularui/__tests__/actions.spec.js

@@ -134,16 +134,13 @@ describe("modularui actions", () => {
     await store.dispatch(loadModularUI("application", "/", {}));
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application", status: MODULARUI_STATUS.LOADING },
-      },
       {
         type: "START_PROGRESS",
       },
       {
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "application",
           href: new Href("/"),
           method: HTTP_METHODS.GET,
           data: undefined,

package/src/redux/_modularui/types.js

@@ -65,6 +65,7 @@ export type ErrorAction = (
 export type ModularUIAction = {
   type: "MODULARUI/FETCH",
   payload: {
+    key: string,
     origin?: string,
     contextPath?: string,
     href: Href,

package/src/redux/actions/__tests__/Application.spec.js

@@ -16,14 +16,11 @@ describe("application actions", () => {
     await store.dispatch(reloadApplication());
 
     expect(store.getActions()).toStrictEqual([
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       expect.objectContaining({
         type: "MODULARUI/FETCH",
         payload: expect.objectContaining({
+          key: "application(/)(en)",
           href: new Href("/", "Application"),
         }),
       }),
@@ -43,10 +40,6 @@ describe("application actions", () => {
         type: "MODULARUI/REMOVE_KEY",
         payload: "/",
       },
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       { type: "START_PROGRESS" },
       expect.objectContaining({
         type: "MODULARUI/FETCH",

package/src/redux/actions/__tests__/Authorization.spec.js

@@ -43,10 +43,6 @@ describe("authorization actions", () => {
         type: "MODULARUI/REMOVE_KEY",
         payload: "/",
       },
-      {
-        type: "MODULARUI/STATUS",
-        payload: { key: "application(/)(en)", status: "LOADING" },
-      },
       {
         type: "START_PROGRESS",
       },

package/src/redux/connectors/PanelRenderer.js

@@ -15,7 +15,6 @@ export const connectPanel: ModularUIConnector = modularui(
       );
     }
 
-    // TODO SBO: origin and context?
     const panelHref = href ? new Href(href) : new Href(match.url);
 
     if (match && match.isExact) {

package/src/utils/helpers/repositoryResource.js

@@ -5,16 +5,18 @@ import { getBasePath, RESOURCE_PATH } from "../../constants";
  * Creates an url to a resource in the Be Informed repository
  * Only possible when serving using the UI Servlet of Be Informed
  */
-export const getRepositoryResourceUrl = (resourceUrl: string): string => {
-  const basePath = getBasePath();
-
-  if (resourceUrl.startsWith(basePath)) {
+export const getRepositoryResourceUrl = (
+  resourceUrl: string,
+  contextPath: string = getBasePath(),
+  origin: string = "",
+): string => {
+  if (resourceUrl.startsWith(origin + contextPath)) {
     return resourceUrl;
   }
 
   if (resourceUrl.startsWith(RESOURCE_PATH)) {
-    return `${basePath}${resourceUrl}`;
+    return `${origin}${contextPath}${resourceUrl}`;
   }
 
-  return `${basePath}${RESOURCE_PATH}${resourceUrl}`;
+  return `${origin}${contextPath}${RESOURCE_PATH}${resourceUrl}`;
 };