@beinformed/ui 1.56.0 → 1.57.0-contextpath.0

package/src/models/actions/ActionCollection.js

@@ -6,7 +6,12 @@ import ActionModel from "./ActionModel";
  * Collection of actions
  */
 export default class ActionCollection extends BaseCollection<ActionModel> {
-  constructor(actions?: Object, actionsContributions?: Object) {
+  constructor(
+    actions?: Object,
+    actionsContributions?: Object,
+    origin?: string,
+    contextPath?: string,
+  ) {
     super();
 
     // no actions gives an empty collection
@@ -22,7 +27,14 @@ export default class ActionCollection extends BaseCollection<ActionModel> {
         );
 
         if (actionContribution) {
-          actionModels.push(new ActionModel(actionData, actionContribution));
+          actionModels.push(
+            new ActionModel(
+              actionData,
+              actionContribution,
+              origin,
+              contextPath,
+            ),
+          );
         }
       }
 

package/src/models/actions/ActionModel.js

@@ -6,12 +6,13 @@ import AttributeCollection from "../attributes/AttributeCollection";
 import BaseModel from "../base/BaseModel";
 import Href from "../href/Href";
 
-import { HTTP_METHODS } from "../../constants/Constants";
 import {
+  getBasePath,
+  HTTP_METHODS,
   CREATE_ACTION,
   UPDATE_ACTION,
   DELETE_ACTION,
-} from "../../constants/LayoutHints";
+} from "../../constants";
 
 import type { AttributeType } from "../types";
 
@@ -22,14 +23,23 @@ export default class ActionModel extends BaseModel {
   _fieldCollection: AttributeCollection;
   _href: Href;
   _icon: string;
-
-  constructor(data: Object, contributions: Object) {
+  _origin: ?string;
+  _contextPath: ?string;
+
+  constructor(
+    data: Object,
+    contributions: Object,
+    origin?: string,
+    contextPath?: string,
+  ) {
     super(data, contributions);
 
     this._fieldCollection = new AttributeCollection(
       this.data.fields,
       this.contributions.fields,
     );
+    this._origin = origin;
+    this._contextPath = contextPath;
   }
 
   /**
@@ -39,18 +49,12 @@ export default class ActionModel extends BaseModel {
     href: string,
     label: string,
     type: string = "form",
+    origin?: string,
+    contextPath?: string,
   ): ActionModel {
-    return new ActionModel(
-      {
-        name,
-        href,
-      },
-      {
-        name,
-        label: label || name,
-        type,
-      },
-    );
+    const data = { name, href };
+    const contributions = { name, label: label ?? name, type };
+    return new ActionModel(data, contributions, origin, contextPath);
   }
 
   /**
@@ -59,12 +63,30 @@ export default class ActionModel extends BaseModel {
     return this.data.href == null;
   }
 
+  /**
+   */
+  get origin(): string {
+    return this._origin ?? "";
+  }
+
+  /**
+   */
+  get contextPath(): string {
+    return this._contextPath ?? getBasePath();
+  }
+
   /**
    * retrieve href of action
    */
   get selfhref(): Href {
     return (
-      this._href || new Href(`${this.data.href}?${this.querystring}`, "Form")
+      this._href ??
+      new Href(
+        `${this.data.href}?${this.querystring}`,
+        "Form",
+        this.origin,
+        this.contextPath,
+      )
     );
   }
 

package/src/models/application/ApplicationModel.js

@@ -102,7 +102,13 @@ export default class ApplicationModel extends ResourceModel {
    * Get modelcatalog link
    */
   get modelcatalog(): LinkModel {
-    return LinkModel.create("modelcatalog", "/modelcatalog", "Model catalog");
+    return LinkModel.create(
+      "modelcatalog",
+      "/modelcatalog",
+      "Model catalog",
+      this.origin,
+      this.contextPath,
+    );
   }
 
   /**

package/src/models/base/ResourceModel.js

@@ -13,6 +13,7 @@ import type LinkModel from "../links/LinkModel";
 import type Href from "../href/Href";
 import type { ModularUIModel, IModelWithChildModels } from "../types";
 import type ErrorResponse from "../error/ErrorResponse";
+import { getBasePath } from "../../constants";
 
 /**
  * Base model, this the foundation for models that represent modular ui services, e.g. application, tab, caseview, etc
@@ -23,6 +24,8 @@ class ResourceModel extends BaseModel implements IModelWithChildModels {
   _childModels: Array<ModularUIModel>;
   _links: LinkCollection;
   _lastServerUpdate: number;
+  _origin: string = "";
+  _contextPath: string = getBasePath();
 
   /**
    * constructor
@@ -32,10 +35,12 @@ class ResourceModel extends BaseModel implements IModelWithChildModels {
 
     this._key = modularuiResponse.key;
     this._locale = modularuiResponse.locale;
-
     this._childModels = [];
 
     this._lastServerUpdate = Date.now();
+
+    this._origin = modularuiResponse.origin;
+    this._contextPath = modularuiResponse.contextPath;
   }
 
   /**
@@ -109,21 +114,39 @@ class ResourceModel extends BaseModel implements IModelWithChildModels {
     return this.getContribution("label", "");
   }
 
+  /**
+   */
+  get origin(): string {
+    return this._origin;
+  }
+
+  /**
+   */
+  get contextPath(): string {
+    return this._contextPath;
+  }
+
   /**
    * Getting the links of the resource
    */
   get links(): LinkCollection {
     if (!this._links) {
-      this._links = new LinkCollection(
-        Array.isArray(this.data._links)
-          ? this.data._links[0]
-          : this.data._links,
-        {
-          self: {
-            resourcetype: this.resourcetype,
-          },
-          ...this.contributions._links,
+      const linksData = Array.isArray(this.data._links)
+        ? this.data._links[0]
+        : this.data._links;
+
+      const linksContrubtions = {
+        self: {
+          resourcetype: this.resourcetype,
         },
+        ...this.contributions._links,
+      };
+
+      this._links = new LinkCollection(
+        linksData,
+        linksContrubtions,
+        this.origin,
+        this.contextPath,
       );
     }
     return this._links;
@@ -231,6 +254,8 @@ class ResourceModel extends BaseModel implements IModelWithChildModels {
       childModels: this._childModels.map<ModularUIModel>(
         (childModel: ModularUIModel) => childModel.dehydrate(),
       ),
+      origin: this._origin,
+      contextPath: this._contextPath,
     };
   }
 }

package/src/models/caseview/CaseViewModel.js

@@ -134,7 +134,7 @@ export default class CaseViewModel extends DetailModel {
       throw new IllegalStateException("No self href available");
     }
 
-    return new Href(selfLink.href);
+    return selfLink.href;
   }
 
   /**
@@ -160,6 +160,8 @@ export default class CaseViewModel extends DetailModel {
           taskgroup.name,
           taskgroup,
           taskgroupContributions,
+          this.origin,
+          this.contextPath,
         );
       });
   }

package/src/models/concepts/ConceptLinkModel.js

@@ -156,6 +156,7 @@ export default class ConceptLinkModel
   /**
    */
   asLinkModel(): LinkModel {
+    // TODO SBO: origin and contextpath
     const link = LinkModel.create(this.key, this.selfhref.href, this.label);
     link.href = this.selfhref;
 

package/src/models/concepts/SourceReferenceModel.js

@@ -37,7 +37,8 @@ class SourceReferenceModel {
   /**
    */
   get selfhref(): Href {
-    return new Href(this._sourceReference._links.self.href);
+    // TODO SBO: origin and context
+    return new Href(this._sourceReference._links.self.href, "SourceReference");
   }
 
   /**

package/src/models/content/ContentIndexModel.js

@@ -73,7 +73,7 @@ export default class ContentIndexModel extends ResourceModel {
    * Getting the self link of this list
    */
   get selfhref(): Href {
-    const href = new Href(this.selflink.href);
+    const href = this.selflink.href;
 
     this.filterCollection.forEach((filter) => {
       filter.params.forEach((param) => {
@@ -150,6 +150,6 @@ export default class ContentIndexModel extends ResourceModel {
       )[0].code;
     }
 
-    return new Href(this.selfhref.path).addParameter("index", firstChar);
+    return new Href(this.selfhref).addParameter("index", firstChar);
   }
 }

package/src/models/content/ContentLinkModel.js

@@ -102,6 +102,7 @@ export default class ContentLinkModel
   /**
    */
   createEncodedHref(): Href {
+    // TODO SBO: origin and context
     const startURI = "/content/";
     const selfHref = new Href(this.data._links.self.href);
     const href = selfHref.path;
@@ -139,6 +140,7 @@ 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]

package/src/models/content/SectionModel.js

@@ -32,6 +32,7 @@ class SectionModel extends BaseModel {
    */
   get selflink(): LinkModel {
     if (!this._selflink) {
+      // TODO SBO: origin and context
       this._selflink = new LinkModel(this.data._links?.self);
     }
     return this._selflink;

package/src/models/detail/DetailModel.js

@@ -171,6 +171,8 @@ export default class DetailModel extends ResourceModel {
     this._actionCollection = new ActionCollection(
       this.data.actions,
       this.contributions.actions,
+      this.origin,
+      this.contextPath,
     );
   }
 

package/src/models/error/ErrorResponse.js

@@ -161,6 +161,7 @@ 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);
     }
@@ -290,6 +291,7 @@ 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;
   }
 

package/src/models/form/FormModel.js

@@ -605,7 +605,7 @@ class FormModel extends ResourceModel {
    */
   get successRedirect(): Href | null {
     return this.isFinished && this.success
-      ? new Href(this.success.redirect)
+      ? new Href(this.success.redirect, "", this.origin, this.contextPath)
       : null;
   }
 

package/src/models/href/Href.js

@@ -29,11 +29,18 @@ class Href {
   _method: $Keys<typeof HTTP_METHODS> = HTTP_METHODS.GET;
   _state: any = null;
   _referenceHash: ?number;
+  _origin: string = "";
+  _contextPath: string = getBasePath();
 
   /**
    * Create a Href
    */
-  constructor(href?: HrefInput, resourcetype?: string) {
+  constructor(
+    href?: HrefInput,
+    resourcetype?: string,
+    origin?: string,
+    contextPath?: string,
+  ) {
     this.resourcetype = resourcetype ?? "";
 
     if (href instanceof Href) {
@@ -43,12 +50,22 @@ class Href {
     } else if (typeof href === "object") {
       this.setFromLocationOrObject(href);
     }
+
+    if (typeof origin === "string") {
+      this.origin = origin;
+    }
+
+    if (typeof contextPath === "string") {
+      this.contextPath = contextPath;
+    }
   }
 
   /**
    * Set parameters from Href model input
    */
   setFromHref(href: Href) {
+    this.origin = href.origin;
+    this.contextPath = href.contextPath;
     this.path = href.path;
     this.parameters = href.parameters;
     this.hash = href.hash;
@@ -58,6 +75,15 @@ class Href {
   /**
    */
   setFromLocationOrObject(href: LocationShape | HrefObject) {
+    // $FlowFixMe
+    if (typeof href._origin === "string") {
+      this.origin = href._origin;
+    }
+    // $FlowFixMe
+    if (typeof href._contextPath === "string") {
+      this.contextPath = href._contextPath;
+    }
+
     if (typeof href["pathname"] === "string") {
       this.path = href.pathname;
     } else if (typeof href._path === "string") {
@@ -303,7 +329,36 @@ class Href {
    * Retrieve the path
    */
   get path(): string {
-    return this._path || "";
+    return this._path ?? "";
+  }
+
+  /**
+   * Retrieve the origin (e.g. http://example.com:18080)<br>
+   * Empty when the default must be used
+   */
+  get origin(): string {
+    return this._origin ?? "";
+  }
+
+  /**
+   * Set the origin (e.g. http://example.com:18080)
+   */
+  set origin(origin: string) {
+    this._origin = origin;
+  }
+
+  /**
+   * Get the context path
+   */
+  get contextPath(): string {
+    return this._contextPath;
+  }
+
+  /**
+   * Set the context path if different from default
+   */
+  set contextPath(contextPath: string) {
+    this._contextPath = contextPath;
   }
 
   /**
@@ -362,7 +417,7 @@ class Href {
       return this.path;
     }
 
-    return getBasePath() + this.path;
+    return this.origin + this.contextPath + this.path;
   }
 
   /**

package/src/models/href/ListHref.js

@@ -22,7 +22,7 @@ export default class ListHref extends Href {
    * Create a ListHref
    */
   constructor(href?: HrefInput, list?: ListModel, isPrefixed: boolean = true) {
-    super(href);
+    super(href, undefined);
 
     this._isPrefixed = isPrefixed;
 

package/src/models/links/LinkCollection.js

@@ -14,12 +14,18 @@ export default class LinkCollection extends BaseCollection<LinkModel> {
   /**
    * Constructs the link collection
    */
-  constructor(linkData: Object = {}, linkContributions: Object = {}) {
+  constructor(
+    linkData: Object = {},
+    linkContributions: Object = {},
+    origin?: string,
+    contextPath?: string,
+  ) {
     super();
 
     // There can be links in data and/or contributions (e.g. concept link is available through contributions)
     this.collection = normalizeLinkJSON(linkData, linkContributions).map(
-      ({ data, contributions }) => new LinkModel(data, contributions),
+      ({ data, contributions }) =>
+        new LinkModel(data, contributions, origin, contextPath),
     );
   }
 

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`;
     }