@beinformed/ui 1.55.2 → 1.57.0-contextpath.0

package/src/modularui/__tests__/contributions.json

@@ -0,0 +1,312 @@
+{
+  "webapplication": {
+    "label": "Webapp",
+    "resourcetype": "Application",
+    "_links": {
+      "tab": [
+        {
+          "name": "Books",
+          "label": "Books",
+          "resourcetype": "Tab",
+          "components": [
+            {
+              "name": "Books",
+              "label": "Books",
+              "layouthint": ["CardView", "ListView", "TableView"],
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksByPersonRole",
+              "label": "Books by person role",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BookPrints",
+              "label": "Book prints",
+              "resourcetype": "DatastoreList"
+            },
+            {
+              "name": "LatestBooks",
+              "label": "Latest books",
+              "resourcetype": "DatastoreList"
+            }
+          ]
+        },
+        {
+          "name": "Persons",
+          "label": "Persons",
+          "resourcetype": "Tab",
+          "components": [
+            {
+              "name": "Persons",
+              "label": "Persons",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "AuthorsAndCo_authors",
+              "label": "Authors and co-authors",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "InformationAboutAuthors",
+              "label": "Information about authors",
+              "resourcetype": "DatastoreList"
+            }
+          ]
+        },
+        {
+          "name": "PublishingHouses",
+          "label": "Publishing houses",
+          "resourcetype": "Tab",
+          "components": [
+            {
+              "name": "PublishingHouses",
+              "label": "Publishing houses",
+              "resourcetype": "CaseList"
+            }
+          ]
+        },
+        {
+          "name": "UT_Books",
+          "label": "UT_Books",
+          "resourcetype": "Tab",
+          "components": [
+            {
+              "name": "Books",
+              "label": "Books",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksByPerson",
+              "label": "Books by person",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksByPersonAndFormat",
+              "label": "Books by person and format",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksByPersonRoleAndFormat",
+              "label": "Books by person role and format",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksByPersonByLanguage",
+              "label": "Books by person by language",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksByFormat",
+              "label": "Books by format",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksByPublishingHouse",
+              "label": "Books by publishing house",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksByYoungAuthors",
+              "label": "Books by young authors",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksByYoungAuthorsNamedCoupland",
+              "label": "Books by young authors named Coupland",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksPublishedByPublishingHouseLocatedInLondon",
+              "label": "Books published by publishing house located in London",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksWithPublishingHouseCategoryYoungAdults",
+              "label": "Books with publishing house category Young adults",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksByDeceasedAuthors",
+              "label": "Books by deceased authors",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksWithLargeEditions",
+              "label": "Books with large editions",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksWithPrintAssignments",
+              "label": "Books with print assignments",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksFromAuthorsFromNewYork",
+              "label": "Books from authors from New York",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksByAuthorFromNewYork",
+              "label": "Books by author from New York",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BookPrints",
+              "label": "Book prints",
+              "resourcetype": "DatastoreList"
+            },
+            {
+              "name": "LatestBooks",
+              "label": "Latest books",
+              "resourcetype": "DatastoreList"
+            },
+            {
+              "name": "LatestBooksMultipleRecordTypes",
+              "label": "Latest books multiple record types",
+              "resourcetype": "DatastoreList"
+            }
+          ]
+        },
+        {
+          "name": "UT_Persons",
+          "label": "UT_Persons",
+          "resourcetype": "Tab",
+          "components": [
+            {
+              "name": "Persons",
+              "label": "Persons",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "PersonsWithDetails",
+              "label": "Persons with details",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "PersonsByBookIndividual",
+              "label": "Persons by book (individual)",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "PersonsByBookDistinct",
+              "label": "Persons by book (distinct)",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "AuthorsByBookIndividual",
+              "label": "Authors by book (individual)",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "PersonsWithBooks",
+              "label": "Persons with books",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "PersonsLivingInLondon",
+              "label": "Persons living in London",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "AuthorsLivingInNewYork",
+              "label": "Authors living in New York",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "BooksAndPersonsRestrictedToNewYork",
+              "label": "Books and Persons restricted to New York",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "AuthorsByPublishingHouseFromLonden",
+              "label": "Authors by Publishing house from Londen",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "AuthorsByPublishingHouseFromLondenOrNrOfPages350",
+              "label": "Authors by Publishing house from Londen or Nr of Pages > 350",
+              "resourcetype": "CaseList"
+            },
+            {
+              "name": "AuthorsWithBooksWithEditionPublishedAfter2013",
+              "label": "Authors with books with edition published after 2013",
+              "resourcetype": "CaseList"
+            }
+          ]
+        },
+        {
+          "name": "UT_PublishingHouses",
+          "label": "UT_Publishing houses",
+          "resourcetype": "Tab",
+          "components": [
+            {
+              "name": "PublishingHouses",
+              "label": "Publishing houses",
+              "resourcetype": "CaseList"
+            }
+          ]
+        },
+        {
+          "name": "UTBookPrints",
+          "label": "UT Book prints",
+          "resourcetype": "Tab",
+          "components": [
+            {
+              "name": "BookPrints",
+              "label": "Book prints",
+              "resourcetype": "DatastoreList"
+            },
+            {
+              "name": "BookPrintsOnePerPage",
+              "label": "Book prints (one per page)",
+              "resourcetype": "DatastoreList"
+            },
+            {
+              "name": "BookPrintsMaxOneResultInDetailMode",
+              "label": "Book prints (max one result in detail mode)",
+              "resourcetype": "DatastoreList"
+            },
+            {
+              "name": "BookPrintsMaxOneResultInTableMode",
+              "label": "Book prints (max one result in table mode)",
+              "resourcetype": "DatastoreList"
+            },
+            {
+              "name": "BookPrintsSortedByPrintingHouse",
+              "label": "Book prints (sorted by printing house)",
+              "resourcetype": "DatastoreList"
+            },
+            {
+              "name": "BookPrintsGroupedByBooksPrintedPrintingHouse",
+              "label": "Book prints (grouped by BooksPrinted, Printing house)",
+              "resourcetype": "DatastoreList"
+            }
+          ]
+        },
+        {
+          "name": "UsersAndOrganizations",
+          "label": "Users and organizations",
+          "resourcetype": "Tab"
+        },
+        {
+          "name": "RebuildDB",
+          "label": "Rebuild DB",
+          "resourcetype": "Tab"
+        }
+      ],
+      "authentication": [
+        {
+          "name": "login",
+          "label": "Login",
+          "resourcetype": null
+        },
+        {
+          "name": "UserServices",
+          "label": "Gebruikerservices",
+          "resourcetype": "user_services"
+        }
+      ]
+    }
+  }
+}

package/src/modularui/__tests__/data.json

@@ -0,0 +1,263 @@
+{
+  "webapplication": {
+    "_links": {
+      "self": {
+        "href": "/"
+      },
+      "api_doc": {
+        "href": "/api-docs/v3/"
+      },
+      "contributions": {
+        "href": "/contributions/"
+      },
+      "modelcatalog": {
+        "href": "/modelcatalog"
+      },
+      "tab": [
+        {
+          "href": "/books",
+          "name": "Books",
+          "components": [
+            {
+              "href": "/books/books",
+              "name": "Books"
+            },
+            {
+              "href": "/books/booksbypersonrole",
+              "name": "BooksByPersonRole"
+            },
+            {
+              "href": "/books/BookPrints",
+              "name": "BookPrints"
+            },
+            {
+              "href": "/books/LatestBooks",
+              "name": "LatestBooks"
+            }
+          ]
+        },
+        {
+          "href": "/persons",
+          "name": "Persons",
+          "components": [
+            {
+              "href": "/persons/persons",
+              "name": "Persons"
+            },
+            {
+              "href": "/persons/authorscoauthors",
+              "name": "AuthorsAndCo_authors"
+            },
+            {
+              "href": "/persons/InformationAboutAuthors",
+              "name": "InformationAboutAuthors"
+            }
+          ]
+        },
+        {
+          "href": "/publishinghouses",
+          "name": "PublishingHouses",
+          "components": [
+            {
+              "href": "/publishinghouses/publishinghouses",
+              "name": "PublishingHouses"
+            }
+          ]
+        },
+        {
+          "href": "/UT_books",
+          "name": "UT_Books",
+          "components": [
+            {
+              "href": "/UT_books/books",
+              "name": "Books"
+            },
+            {
+              "href": "/UT_books/booksbyperson",
+              "name": "BooksByPerson"
+            },
+            {
+              "href": "/UT_books/Booksbypersonandformat",
+              "name": "BooksByPersonAndFormat"
+            },
+            {
+              "href": "/UT_books/Booksbypersonroleandformat",
+              "name": "BooksByPersonRoleAndFormat"
+            },
+            {
+              "href": "/UT_books/booksbypersonbylanguage",
+              "name": "BooksByPersonByLanguage"
+            },
+            {
+              "href": "/UT_books/byformat",
+              "name": "BooksByFormat"
+            },
+            {
+              "href": "/UT_books/booksbypublishinghouse",
+              "name": "BooksByPublishingHouse"
+            },
+            {
+              "href": "/UT_books/booksbyyoungauthors",
+              "name": "BooksByYoungAuthors"
+            },
+            {
+              "href": "/UT_books/booksbyyoungauthorsnamedcoupland",
+              "name": "BooksByYoungAuthorsNamedCoupland"
+            },
+            {
+              "href": "/UT_books/bookspublishedbypublishinghouselocatedinlondon",
+              "name": "BooksPublishedByPublishingHouseLocatedInLondon"
+            },
+            {
+              "href": "/UT_books/bookswithpublishinghousecategoryyoungddults",
+              "name": "BooksWithPublishingHouseCategoryYoungAdults"
+            },
+            {
+              "href": "/UT_books/booksbydeceasedauthors",
+              "name": "BooksByDeceasedAuthors"
+            },
+            {
+              "href": "/UT_books/bookswithlargeeditions",
+              "name": "BooksWithLargeEditions"
+            },
+            {
+              "href": "/UT_books/bookswithprintassignments",
+              "name": "BooksWithPrintAssignments"
+            },
+            {
+              "href": "/UT_books/BooksFromAuthorsFromNewYork",
+              "name": "BooksFromAuthorsFromNewYork"
+            },
+            {
+              "href": "/UT_books/booksbyauthorfromnewyork",
+              "name": "BooksByAuthorFromNewYork"
+            },
+            {
+              "href": "/UT_books/BookPrints",
+              "name": "BookPrints"
+            },
+            {
+              "href": "/UT_books/LatestBooks",
+              "name": "LatestBooks"
+            },
+            {
+              "href": "/UT_books/LatestBooksmultipleRecordTypes",
+              "name": "LatestBooksMultipleRecordTypes"
+            }
+          ]
+        },
+        {
+          "href": "/UT_persons",
+          "name": "UT_Persons",
+          "components": [
+            {
+              "href": "/UT_persons/persons",
+              "name": "Persons"
+            },
+            {
+              "href": "/UT_persons/details",
+              "name": "PersonsWithDetails"
+            },
+            {
+              "href": "/UT_persons/personsByBookIndividual",
+              "name": "PersonsByBookIndividual"
+            },
+            {
+              "href": "/UT_persons/personsByBookDistinct",
+              "name": "PersonsByBookDistinct"
+            },
+            {
+              "href": "/UT_persons/authorsByBookIndividual",
+              "name": "AuthorsByBookIndividual"
+            },
+            {
+              "href": "/UT_persons/PersonsWithBooks",
+              "name": "PersonsWithBooks"
+            },
+            {
+              "href": "/UT_persons/personslivinginlondon",
+              "name": "PersonsLivingInLondon"
+            },
+            {
+              "href": "/UT_persons/authorslivinginnewyork",
+              "name": "AuthorsLivingInNewYork"
+            },
+            {
+              "href": "/UT_persons/booksandpersonsrestrictedtonewyork",
+              "name": "BooksAndPersonsRestrictedToNewYork"
+            },
+            {
+              "href": "/UT_persons/authorsbypublishinghousefromlonden",
+              "name": "AuthorsByPublishingHouseFromLonden"
+            },
+            {
+              "href": "/UT_persons/authorsbypublishinghousefromlondenornrofpages350",
+              "name": "AuthorsByPublishingHouseFromLondenOrNrOfPages350"
+            },
+            {
+              "href": "/UT_persons/authorswithbookswitheditionpublishedafter2013",
+              "name": "AuthorsWithBooksWithEditionPublishedAfter2013"
+            }
+          ]
+        },
+        {
+          "href": "/UT_publishinghouses",
+          "name": "UT_PublishingHouses",
+          "components": [
+            {
+              "href": "/UT_publishinghouses/publishinghouses",
+              "name": "PublishingHouses"
+            }
+          ]
+        },
+        {
+          "href": "/UT_bookPrints",
+          "name": "UTBookPrints",
+          "components": [
+            {
+              "href": "/UT_bookPrints/BookPrints",
+              "name": "BookPrints"
+            },
+            {
+              "href": "/UT_bookPrints/BookPrints1PP",
+              "name": "BookPrintsOnePerPage"
+            },
+            {
+              "href": "/UT_bookPrints/BookPrintsMax1DetailMode",
+              "name": "BookPrintsMaxOneResultInDetailMode"
+            },
+            {
+              "href": "/UT_bookPrints/BookPrintsMax1TableMode",
+              "name": "BookPrintsMaxOneResultInTableMode"
+            },
+            {
+              "href": "/UT_bookPrints/BookPrintsSortedByPrintingHouse",
+              "name": "BookPrintsSortedByPrintingHouse"
+            },
+            {
+              "href": "/UT_bookPrints/BookPrintsByNumberAndHouse",
+              "name": "BookPrintsGroupedByBooksPrintedPrintingHouse"
+            }
+          ]
+        },
+        {
+          "href": "/UsersAndOrganizations",
+          "name": "UsersAndOrganizations"
+        },
+        {
+          "href": "/RebuildDB",
+          "name": "RebuildDB"
+        }
+      ],
+      "login": {
+        "href": "/login"
+      },
+      "user_services": [
+        {
+          "href": "/Login",
+          "name": "UserServices"
+        }
+      ]
+    }
+  }
+}

package/src/redux/_modularui/ModularUIActions.js

@@ -109,7 +109,12 @@ export const loadModel = (
 ): ModularUIAction => ({
   type: "MODULARUI/FETCH",
   payload: {
-    href: href instanceof Href ? href : new Href(href),
+    origin: options?.origin,
+    contextPath: options?.contextPath,
+    href:
+      href instanceof Href
+        ? href
+        : new Href(href, "", options?.origin, options?.contextPath),
     method: options?.method ?? HTTP_METHODS.GET,
     data: options?.data,
     locale: options?.locale ?? "en",

package/src/redux/_modularui/ModularUIMiddleware.js

@@ -19,6 +19,8 @@ import type { ModularUIAction, SuccessAction, ErrorAction } from "./types";
 import type { TargetModel } from "../../modularui/types";
 
 type RequestOptions = {
+  origin?: string,
+  contextPath?: string,
   href: Href,
   method?: $Keys<typeof HTTP_METHODS>,
   data?: any,
@@ -43,6 +45,14 @@ const createRequest = (modularui: RequestOptions): ModularUIRequest => {
     cache: modularui.cache,
   });
 
+  if (modularui.origin) {
+    request.origin = modularui.origin;
+  }
+
+  if (modularui.contextPath) {
+    request.contextPath = modularui.contextPath;
+  }
+
   if (modularui.targetModel) {
     request.targetModel = modularui.targetModel;
     request.forceTargetModel = modularui.forceTargetModel ?? false;

package/src/redux/_modularui/ModularUISelectors.js

@@ -295,3 +295,16 @@ export const getModelsByType = (
 
   return [];
 };
+
+/**
+ */
+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 [];
+};

package/src/redux/_modularui/types.js

@@ -65,6 +65,8 @@ export type ErrorAction = (
 export type ModularUIAction = {
   type: "MODULARUI/FETCH",
   payload: {
+    origin?: string,
+    contextPath?: string,
     href: Href,
     method?: $Keys<HTTP_METHODS>,
     data?: any,

package/src/redux/actions/Application.js

@@ -18,6 +18,7 @@ export const reloadApplication =
       dispatch(removeModelByKey(key));
     }
 
+    // TODO SBO: origin and context
     const modelKey = `application(/)(${getLocale(getState())})`;
     return dispatch(
       loadModularUI(modelKey, new Href("/", "Application"), {

package/src/redux/connectors/PanelRenderer.js

@@ -15,6 +15,7 @@ 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/fetch/types.js

@@ -8,6 +8,8 @@ export type RequestURLOptions = {
 };
 
 export type RequestBaseOptions = {
+  origin?: string,
+  contextPath?: string,
   method?: $Keys<HTTP_METHODS>,
   params?: string,
   data?: any,

package/src/utils/helpers/checkResource.js

@@ -9,6 +9,7 @@ import Href from "../../models/href/Href";
  * @returns {boolean}
  */
 export const resourceExists = (url: string | Href): boolean => {
+  // TODO SBO: origin and context?
   const fullUrl = new Href(url).absolutehref;
 
   const xhr = new XMLHttpRequest();
@@ -28,6 +29,7 @@ export const resourceExists = (url: string | Href): boolean => {
  * @returns {boolean}
  */
 export const resourceRedirectsToSecureLogin = (url: string | Href): boolean => {
+  // TODO SBO: origin and context?
   const fullUrl = new Href(url).absolutehref;
 
   const xhr = new XMLHttpRequest();