@beinformed/ui 1.55.2 → 1.57.0-contextpath.0

package/src/models/links/LinkModel.js

@@ -27,10 +27,15 @@ class LinkModel extends BaseModel {
   /**
    * Create a Link
    */
-  constructor(data: Object, contributions: Object) {
+  constructor(
+    data: Object,
+    contributions: Object,
+    origin?: string,
+    contextPath?: string,
+  ) {
     super(data, contributions);
 
-    this.createHref();
+    this.createHref(origin, contextPath);
 
     this._isCacheable = false;
   }
@@ -38,24 +43,27 @@ class LinkModel extends BaseModel {
   /**
    * Create a simple Link Model
    */
-  static create(name: string, href: string | Href, label: string): LinkModel {
-    return new LinkModel(
-      {
-        name,
-        href,
-      },
-      {
-        label,
-      },
-    );
+  static create(
+    name: string,
+    href: string | Href,
+    label: string,
+    origin?: string,
+    contextPath?: string,
+  ): LinkModel {
+    const data = { name, href };
+    const contributions = { label };
+    return new LinkModel(data, contributions, origin, contextPath);
   }
 
   /**
    */
-  createHref() {
-    const href = new Href(this.data.href);
-    href.resourcetype = this.resourcetype;
-
+  createHref(origin?: string, contextPath?: string) {
+    const href = new Href(
+      this.data.href,
+      this.resourcetype,
+      origin,
+      contextPath,
+    );
     this.handleInitialFilters(href);
 
     this.href = href;

package/src/models/list/ListItemModel.js

@@ -20,11 +20,15 @@ export default class ListItemModel extends DetailModel {
     key: string,
     data: Object,
     contributions: Object,
+    origin?: string,
+    contextPath?: string,
   ): ListItemModel {
     const listitemInput = new ModularUIResponse();
     listitemInput.key = key;
     listitemInput.data = data;
     listitemInput.contributions = contributions;
+    listitemInput.origin = origin;
+    listitemInput.contextPath = contextPath;
 
     return new ListItemModel(listitemInput);
   }

package/src/models/list/ListModel.js

@@ -313,7 +313,12 @@ export default class ListModel extends ResourceModel {
   /**
    */
   setActionCollection(): ActionCollection {
-    return new ActionCollection(this.data.actions, this.contributions.actions);
+    return new ActionCollection(
+      this.data.actions,
+      this.contributions.actions,
+      this.origin,
+      this.contextPath,
+    );
   }
 
   /**

package/src/models/panels/GroupingPanelModel.js

@@ -129,6 +129,8 @@ export default class GroupingPanelModel extends ResourceModel {
           taskgroup.name,
           taskgroup,
           taskgroupContributions,
+          this.origin,
+          this.contextPath,
         );
       });
   }

package/src/models/tab/TabModel.js

@@ -26,6 +26,8 @@ export default class TabModel extends ResourceModel {
     this._actionCollection = new ActionCollection(
       this.data.actions,
       this.contributions.actions,
+      this.origin,
+      this.contextPath,
     );
   }
 
@@ -93,6 +95,8 @@ export default class TabModel extends ResourceModel {
                 taskgroup.name,
                 taskgroup,
                 taskgroupContributions,
+                this.origin,
+                this.contextPath,
               );
             }
 

package/src/models/taskgroup/TaskGroupModel.js

@@ -19,6 +19,8 @@ export default class TaskGroupModel extends ResourceModel {
     this._actionCollection = new ActionCollection(
       this.data.actions,
       this.contributions.actions,
+      this.origin,
+      this.contextPath,
     );
 
     const selfHref = this.links.getLinkByKey("self")
@@ -36,11 +38,15 @@ export default class TaskGroupModel extends ResourceModel {
     key: string,
     data: Object,
     contributions: Object,
+    origin?: string,
+    contextPath?: string,
   ): TaskGroupModel {
     const taskgroup = new ModularUIResponse();
     taskgroup.key = key;
     taskgroup.data = data;
     taskgroup.contributions = contributions;
+    taskgroup.origin = origin;
+    taskgroup.contextPath = contextPath;
 
     return new TaskGroupModel(taskgroup);
   }

package/src/modularui/Authenticate.js

@@ -109,8 +109,9 @@ class Authenticate {
   getFormLoginUrl(): string {
     switch (this.authenticationType) {
       case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
+        return `${getBasePath()}${loginPath("DirectBasicAuthClient")}`;
       case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
-        return `${getBasePath()}${loginPath()}`;
+        return `${getBasePath()}${loginPath("FormClient")}`;
       default:
         return `${getBasePath()}/j_security_check`;
     }

package/src/modularui/ModularUIRequest.js

@@ -46,7 +46,8 @@ class ModularUIRequest {
 
   _progressEvent: ProgressEventHandler;
 
-  _basePath: string = "/BeInformed";
+  _origin: string = "";
+  _contextPath: string = getBasePath();
 
   /**
    */
@@ -60,8 +61,6 @@ class ModularUIRequest {
       );
     }
 
-    this._basePath = getBasePath();
-
     this.options = options;
 
     this._response = new ModularUIResponse();
@@ -73,6 +72,18 @@ class ModularUIRequest {
     // self links are missing the request parameters
     this._response.parameters = this.href.parameters;
 
+    if (options.contextPath) {
+      this.contextPath = options.contextPath;
+    } else if (this.href.contextPath) {
+      this.contextPath = this.href.contextPath;
+    }
+
+    if (options.origin) {
+      this.origin = options.origin;
+    } else if (this.href.origin) {
+      this.origin = this.href.origin;
+    }
+
     if (options.targetModel) {
       this.targetModel = options.targetModel;
     }
@@ -84,6 +95,32 @@ class ModularUIRequest {
     }
   }
 
+  /**
+   */
+  get origin(): string {
+    return this._origin;
+  }
+
+  /**
+   */
+  set origin(origin: ?string) {
+    this._origin = origin ?? "";
+    this._response.origin = origin ?? "";
+  }
+
+  /**
+   */
+  get contextPath(): string {
+    return this._contextPath;
+  }
+
+  /**
+   */
+  set contextPath(contextPath: ?string) {
+    this._contextPath = contextPath ?? getBasePath();
+    this._response.contextPath = contextPath ?? getBasePath();
+  }
+
   /**
    */
   get contributionsHref(): string {
@@ -284,7 +321,11 @@ class ModularUIRequest {
   handleDataError(error: Object): void {
     if (error.properties) {
       const errorMessage = error.properties?.message ?? "Error in data";
-      throw new ModularUIError(errorMessage, error, this.href.path.toString());
+      throw new ModularUIError(
+        errorMessage,
+        error,
+        this.href.absolutepath.toString(),
+      );
     }
 
     throw new IllegalArgumentException(error);
@@ -332,7 +373,7 @@ class ModularUIRequest {
     }
 
     return universalFetch({
-      url: `${this._basePath}${this.contributionsHref}`,
+      url: `${this.origin}${this.contextPath}${this.contributionsHref}`,
       cache: true,
       locale: this.options.locale,
     });
@@ -343,7 +384,7 @@ class ModularUIRequest {
   fetchDataService(): Promise<any> {
     return universalFetch({
       ...this.requestOptions,
-      url: `${this._basePath}${this.href.path}`,
+      url: `${this.origin}${this.contextPath}${this.href.path}`,
       params: this.href.getQuerystringForModularUI(),
       locale: this.options.locale,
       onProgress: this.onProgress,
@@ -520,7 +561,7 @@ class ModularUIRequest {
 
     return universalFetch({
       ...this.requestOptions,
-      url: `${this._basePath}${href}`,
+      url: `${this.origin}${this.contextPath}${href}`,
     })
       .then((response: Object) => {
         if (isPlainObject(response)) {
@@ -588,7 +629,7 @@ class ModularUIRequest {
       const validationHref = this.href.setParameter("commit", "false");
       return universalFetch({
         ...this.requestOptions,
-        url: `${this._basePath}${this.href.path}`,
+        url: `${this.origin}${this.contextPath}${this.href.path}`,
         params: validationHref.getQuerystringForModularUI(),
         data: this.getDynamicValidationData(model),
       }).then((data) => {

package/src/modularui/ModularUIResponse.js

@@ -1,5 +1,6 @@
 // @flow
 import { has } from "../utils/helpers/objects";
+import { getBasePath } from "../constants";
 
 import type Parameter from "../models/parameter/Parameter";
 
@@ -11,6 +12,8 @@ class ModularUIResponse {
   _contributions: Object;
   _locale: string = "en";
   _parameters: Array<Parameter> = [];
+  _contextPath: string = getBasePath();
+  _origin: string = "";
 
   /**
    */
@@ -18,6 +21,8 @@ class ModularUIResponse {
     key: string,
     data: Object,
     contributions: Object,
+    origin?: string,
+    contextPath?: string,
   }): ModularUIResponse {
     const response = new ModularUIResponse();
 
@@ -28,11 +33,37 @@ class ModularUIResponse {
       response.key = input.key ?? contributionsKey;
       response.data = input.data?.[dataKey];
       response.contributions = input.contributions?.[contributionsKey];
+      response.origin = input.origin;
+      response.contextPath = input.contextPath;
     }
 
     return response;
   }
 
+  /**
+   */
+  set origin(origin: ?string) {
+    this._origin = origin ?? "";
+  }
+
+  /**
+   */
+  get origin(): string {
+    return this._origin;
+  }
+
+  /**
+   */
+  set contextPath(contextPath: ?string) {
+    this._contextPath = contextPath ?? getBasePath();
+  }
+
+  /**
+   */
+  get contextPath(): string {
+    return this._contextPath;
+  }
+
   /**
    */
   set locale(locale: string) {
@@ -100,9 +131,13 @@ class ModularUIResponse {
     locale: string,
     data: Object,
     contributions: Object,
+    origin?: string,
+    contextPath?: string,
   }): ModularUIResponse {
     const modelData = new ModularUIResponse();
 
+    modelData.origin = data.origin;
+    modelData.contextPath = data.contextPath;
     modelData.locale = data.locale;
     modelData.key = data.key;
     modelData.data = data.data;

package/src/modularui/__tests__/CustomContextPath.spec.js

@@ -0,0 +1,61 @@
+import xhrMock from "xhr-mock";
+
+import ModularUIRequest from "../ModularUIRequest";
+
+import dataJSON from "./data.json";
+import contributionsJSON from "./contributions.json";
+
+import ApplicationModel from "../../models/application/ApplicationModel";
+
+const JSON_TYPE = "application/json";
+
+describe("modularUIRequest", () => {
+  // replace the real XHR object with the mock XHR object before each test
+  // eslint-disable-next-line jest/no-hooks
+  beforeEach(() => xhrMock.setup());
+
+  // put the real XHR object back and clear the mocks after each test
+  // eslint-disable-next-line jest/no-hooks
+  afterEach(() => xhrMock.teardown());
+
+  it("creates a model from a response with custom origin and contextPath", async () => {
+    expect.assertions(12);
+    xhrMock.get("http://www.example.com/custom-path/", (req, res) => {
+      expect(req.header("accept")).toBe(JSON_TYPE);
+      expect(req.header("Content-Type")).toBe(JSON_TYPE);
+      expect(req.header("accept-language")).toBe("en");
+
+      return res.status(200).body(dataJSON);
+    });
+    xhrMock.get(
+      "http://www.example.com/custom-path/contributions/",
+      (req, res) => {
+        expect(req.header("accept")).toBe(JSON_TYPE);
+        expect(req.header("Content-Type")).toBe(JSON_TYPE);
+        expect(req.header("accept-language")).toBe("en");
+
+        return res.status(200).body(contributionsJSON);
+      },
+    );
+
+    const request = new ModularUIRequest("/", {
+      origin: "http://www.example.com",
+      contextPath: "/custom-path",
+      childmodels: false,
+    });
+
+    const model = await request.fetch();
+    expect(model).toBeInstanceOf(ApplicationModel);
+    expect(model.origin).toBe("http://www.example.com");
+    expect(model.contextPath).toBe("/custom-path");
+    expect(model.selfhref.absolutehref).toBe(
+      "http://www.example.com/custom-path/",
+    );
+    expect(model.modelcatalog.href.absolutehref).toBe(
+      "http://www.example.com/custom-path/modelcatalog",
+    );
+    expect(model.tabs.first.href.absolutehref).toBe(
+      "http://www.example.com/custom-path/books",
+    );
+  });
+});