@beinformed/ui 1.31.0 → 1.31.3

package/src/constants/Settings.js

@@ -132,7 +132,7 @@ export const setSettings = (config: Object) => {
 export const getSetting = (key: string, defaultValue?: any): any => {
   if (!has(settings, key) && defaultValue === undefined) {
     throw new Error(
-      `Setting with name ${key} not found and no defaultValue given`
+      `Setting with name ${key} not found and no defaultValue given`,
     );
   }
 
@@ -213,7 +213,7 @@ export const LOGOUT_PATH: string = logoutPath();
 export const getSwimLaneDiagramConfiguration: Object = () => {
   let configLocation = getSetting(
     "SWIM_LANE_DIAGRAM_CONFIGURATION",
-    "/Library/Diagrams/Overviews.json"
+    "/Library/Diagrams/Overviews.json",
   );
   if (!configLocation.startsWith("/")) {
     configLocation = `/${configLocation}`;

package/src/exceptions/FetchException.js

@@ -26,7 +26,7 @@ const CLIENT_ERROR_CODE = 400;
  */
 const getErrorInfo = (
   errorResponse: ?ModularUIErrorResponse,
-  requestOptions: ?RequestOptions
+  requestOptions: ?RequestOptions,
 ) => {
   const defaultErrorInfo = {
     id: "Error.CannotRequestResource",
@@ -75,7 +75,7 @@ export default class FetchException extends Error {
   constructor(
     errorResponse: ?ModularUIErrorResponse,
     failedRequest?: ?RequestResult | XMLHttpRequest,
-    requestOptions?: RequestOptions
+    requestOptions?: RequestOptions,
   ) {
     const errorInfo = getErrorInfo(errorResponse, requestOptions);
     super(errorInfo.id);

package/src/exceptions/NetworkException.js

@@ -8,7 +8,7 @@ class NetworkException extends Error {
 
   constructor(url: string, method: string) {
     super(
-      `An unexpected network error occurred, cannot request resource ${url} with method ${method}`
+      `An unexpected network error occurred, cannot request resource ${url} with method ${method}`,
     );
 
     this.name = "NetworkException";

package/src/exceptions/UnauthorizedException.js

@@ -12,7 +12,7 @@ class UnauthorizedException extends Error {
   constructor(
     url: string,
     method: string,
-    errorResponse: ?ModularUIErrorResponse
+    errorResponse: ?ModularUIErrorResponse,
   ) {
     super(`Cannot request resource ${url} with method ${method}`);
 

package/src/hooks/__tests__/UseModularUIModel.spec.js

@@ -96,7 +96,7 @@ describe("modularui hooks", () => {
       () => useApplication(),
       "application",
       "/",
-      ApplicationModel
+      ApplicationModel,
     );
   });
 
@@ -111,7 +111,7 @@ describe("modularui hooks", () => {
       () => useCaseView("/tab/caseview/1"),
       "caseview",
       "/tab/caseview/1",
-      CaseViewModel
+      CaseViewModel,
     );
   });
 
@@ -120,7 +120,7 @@ describe("modularui hooks", () => {
     assertTargetModel(
       () => usePanel("/tab/caseview/1/panel"),
       "panel",
-      "/tab/caseview/1/panel"
+      "/tab/caseview/1/panel",
     );
   });
 
@@ -130,7 +130,7 @@ describe("modularui hooks", () => {
       () => useList("/tab/list"),
       "list",
       "/tab/list",
-      ListModel
+      ListModel,
     );
   });
 
@@ -140,7 +140,7 @@ describe("modularui hooks", () => {
       () => useListDetail("/tab/list/1"),
       "listdetail",
       "/tab/list/1",
-      ListDetailModel
+      ListDetailModel,
     );
   });
 
@@ -150,7 +150,7 @@ describe("modularui hooks", () => {
       () => useGroupingPanel("/tab/groupingpanel"),
       "groupingpanel",
       "/tab/groupingpanel",
-      GroupingPanelModel
+      GroupingPanelModel,
     );
   });
 
@@ -160,7 +160,7 @@ describe("modularui hooks", () => {
       () => useDetailPanel("/tab/detailpanel"),
       "detailpanel",
       "/tab/detailpanel",
-      DetailModel
+      DetailModel,
     );
   });
 
@@ -170,7 +170,7 @@ describe("modularui hooks", () => {
       () => useQuicksearch("/quicksearch"),
       "quicksearch",
       "/quicksearch",
-      CaseSearchModel
+      CaseSearchModel,
     );
   });
 
@@ -180,7 +180,7 @@ describe("modularui hooks", () => {
       () => useUserProfile("/user"),
       "userprofile",
       "/user",
-      UserProfileModel
+      UserProfileModel,
     );
   });
 });

package/src/hooks/__tests__/useAuthentication.spec.js

@@ -28,7 +28,7 @@ describe("authentication hooks", () => {
       .get("/BeInformed/login", (req, res) => {
         expect(req.header("accept")).toBe(JSON_TYPE);
         expect(req.header("Content-Type")).toBe(
-          "application/x-www-form-urlencoded"
+          "application/x-www-form-urlencoded",
         );
         expect(req.header("accept-language")).toBe("en");
         return res.status(200).body({ data: "ok" });
@@ -36,7 +36,7 @@ describe("authentication hooks", () => {
       .post("/BeInformed/j_security_check", (req, res) => {
         expect(req.header("accept")).toBe(JSON_TYPE);
         expect(req.header("Content-Type")).toBe(
-          "application/x-www-form-urlencoded"
+          "application/x-www-form-urlencoded",
         );
         expect(req.body()).toBe("j_username=a&j_password=b");
         return res.status(200).body({ data: "ok" });

package/src/hooks/__tests__/useForm.spec.js

@@ -243,7 +243,7 @@ describe("form hooks", () => {
 
     const { result } = renderHook(
       () => useAttributeUpdate(form, form.currentFormObject),
-      { wrapper }
+      { wrapper },
     );
 
     expect(typeof result.current).toBe("function");
@@ -292,7 +292,7 @@ describe("form hooks", () => {
     store.clearActions();
 
     expect(() => result.current.remove(form.currentFormObject)).toThrow(
-      IllegalArgumentException
+      IllegalArgumentException,
     );
   });
 });

package/src/hooks/__tests__/useModelCatalog.spec.js

@@ -91,7 +91,7 @@ describe("modelcatalog hooks", () => {
         useModelCatalog("modelcatalog", "/modelcatalog", [ModelCatalogModel]),
       "modelcatalog",
       "/modelcatalog",
-      ModelCatalogModel
+      ModelCatalogModel,
     );
   });
 
@@ -101,7 +101,7 @@ describe("modelcatalog hooks", () => {
       () => useConceptIndex("/conceptindex"),
       "conceptindex",
       "/conceptindex",
-      ConceptIndexModel
+      ConceptIndexModel,
     );
   });
 
@@ -110,7 +110,7 @@ describe("modelcatalog hooks", () => {
     assertTargetModel(
       () => useConceptDetail("/conceptdetail"),
       "conceptdetail",
-      "/concepts/conceptdetail"
+      "/concepts/conceptdetail",
     );
   });
 
@@ -120,7 +120,7 @@ describe("modelcatalog hooks", () => {
       () => useContentIndex("/contentindex"),
       "contentindex",
       "/contentindex",
-      ContentIndexModel
+      ContentIndexModel,
     );
   });
 
@@ -130,7 +130,7 @@ describe("modelcatalog hooks", () => {
       () => useContentTOC("/contenttoc"),
       "contenttoc",
       "/content/contenttoc",
-      ContentTOCModel
+      ContentTOCModel,
     );
   });
 
@@ -140,7 +140,7 @@ describe("modelcatalog hooks", () => {
       () => useContent("/contentdetail"),
       "content",
       "/content/contentdetail",
-      ContentModel
+      ContentModel,
     );
   });
 
@@ -150,7 +150,7 @@ describe("modelcatalog hooks", () => {
       () => useContentType("/contenttypes/contenttype"),
       "contenttypes",
       "/contenttypes/contenttype",
-      ContentTypeModel
+      ContentTypeModel,
     );
   });
 });

package/src/hooks/__tests__/useModularUIBasic.spec.js

@@ -51,7 +51,7 @@ describe("modularui hooks", () => {
         }),
       {
         wrapper,
-      }
+      },
     );
 
     expect(result.current).toBeNull();
@@ -101,7 +101,7 @@ describe("modularui hooks", () => {
         }),
       {
         wrapper,
-      }
+      },
     );
 
     expect(result.current).toBeNull();

package/src/hooks/__tests__/usePreference.spec.js

@@ -44,7 +44,7 @@ describe("preferences hooks", () => {
       () => usePreference(["name1", "name2", "name3"]),
       {
         wrapper,
-      }
+      },
     );
 
     expect(result.current).toStrictEqual({ name1: "value1", name2: "value2" });

package/src/hooks/useAllFormsOnModel.js

@@ -18,7 +18,7 @@ import type ActionModel from "../models/actions/ActionModel";
  * @returns Object - { actionName: FormModel }
  */
 export const useRetrieveFormsOnModel = (
-  model: ListModel | DetailModel | TabModel
+  model: ListModel | DetailModel | TabModel,
 ): null | { [actionName: string]: FormModel } => {
   const modularui = useModularUIRequest();
   const [forms, setForms] = useState(null);
@@ -57,7 +57,7 @@ export const useRetrieveFormsOnModel = (
 };
 
 const getActions = (
-  model: ListModel | DetailModel | TabModel
+  model: ListModel | DetailModel | TabModel,
 ): Array<ActionModel> => {
   if (!model.actionCollection) {
     return [];

package/src/hooks/useAuthentication.js

@@ -55,14 +55,14 @@ export const useLogin = (): LoginHook => {
         throw new IllegalStateException(
           `Could not redirect to '${
             authenticationType.authentication
-          }' using url: '${authenticationType.redirectUri ?? ""}'`
+          }' using url: '${authenticationType.redirectUri ?? ""}'`,
         );
       }
 
       if (!isAuthenticated) {
         Cache.setItem("isRedirectLogin", true);
         window.location.assign(
-          `${getBasePath()}${authenticationType.redirectUri ?? ""}`
+          `${getBasePath()}${authenticationType.redirectUri ?? ""}`,
         );
       }
     },

package/src/hooks/useContent.js

@@ -14,7 +14,7 @@ import type ContentModel from "../models/content/ContentModel";
  */
 export const useContentFromSourceReferences = (
   sourceReferences: SourceReferenceCollection,
-  renderChildSections: boolean
+  renderChildSections: boolean,
 ): Array<ContentModel> => {
   const [content, setContent] = useState([]);
   const localeCode = useLocale();

package/src/hooks/useDeepCompareEffect.js

@@ -25,7 +25,7 @@ const useDeepCompareMemoize = (value: DependencyList) => {
  */
 export function useDeepCompareEffect(
   callback: Callback,
-  dependencies: DependencyList
+  dependencies: DependencyList,
 ): void {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   return React.useEffect(callback, useDeepCompareMemoize(dependencies));

package/src/hooks/useForm.js

@@ -44,7 +44,7 @@ type AttributeSetHook = {
 type AttributeUpdateHook = (
   attribute: AttributeType,
   value: string,
-  options: UpdateFormOptions
+  options: UpdateFormOptions,
 ) => void;
 
 /**
@@ -86,7 +86,7 @@ export const useFormNavigation = (): FormNavigationHook => {
         data: form.formdata,
         updateModel: form,
         targetModel: FormModel,
-      })
+      }),
     );
 
   const remove = (form: FormModel) =>
@@ -109,14 +109,14 @@ export const useFormNavigation = (): FormNavigationHook => {
  */
 export const useAttributeUpdate = (
   form: FormModel,
-  object: FormObjectModel
+  object: FormObjectModel,
 ): AttributeUpdateHook => {
   const dispatch = useDispatch();
 
   return (
     attribute: AttributeType,
     value: string,
-    options: UpdateFormOptions
+    options: UpdateFormOptions,
   ) => dispatch(updateFormAttribute(form, object, attribute, value, options));
 };
 

package/src/hooks/useI18n.js

@@ -13,8 +13,8 @@ const getMessage = createSelector(
         locales
           .getLocale(localeCode)
           .getMessage(id, defaultMessage, placeholders),
-      (...args) => JSON.stringify(args)
-    )
+      (...args) => JSON.stringify(args),
+    ),
 );
 
 /**
@@ -22,7 +22,7 @@ const getMessage = createSelector(
 const useMessage = (
   id: string,
   defaultMessage?: string,
-  placeholders?: Object | null
+  placeholders?: Object | null,
 ): any => useSelector(getMessage)(id, defaultMessage, placeholders);
 
 /**

package/src/hooks/useModal.js

@@ -19,13 +19,13 @@ type ModalHook = (modalId: string) => {
 export const useModal: ModalHook = (modalId: string) => {
   if (!modalId) {
     throw new IllegalArgumentException(
-      "Missing modalId argument for useModal hook"
+      "Missing modalId argument for useModal hook",
     );
   }
 
   const dispatch = useDispatch();
   const modal = useSelector(({ modals }) =>
-    modals.modals.find((m) => m.key === modalId)
+    modals.modals.find((m) => m.key === modalId),
   );
 
   const show = useCallback(() => {

package/src/hooks/useModelCatalog.js

@@ -47,7 +47,7 @@ const getHref = (context: string, dynamic: string, location?: Location) => {
 /**
  */
 export const useConceptDetail = (
-  concept: string
+  concept: string,
 ): ?ConceptDetailModel | ?BusinessScenarioModel => {
   const location = useLocation();
 

package/src/hooks/useModularUI.js

@@ -31,7 +31,7 @@ export const useModularUI = (
   options: RequestModularUIOptions = {
     method: HTTP_METHODS.GET,
     removeOnUnmount: false,
-  }
+  },
 ): any => {
   const dispatch = useDispatch();
   const href = url.toString();

package/src/hooks/useModularUIBasic.js

@@ -22,7 +22,7 @@ export const useModularUIBasic = <T: ModularUIModel>(
     expectedModels: [],
     targetModel: undefined,
     forceTargetModel: false,
-  }
+  },
 ): T | null => {
   const location = useLocation();
   if (!href) {

package/src/hooks/useModularUIModel.js

@@ -41,7 +41,7 @@ export const useCaseView = (href: string): CaseViewModel | null =>
 /**
  */
 export const usePanel = (
-  href: string
+  href: string,
 ): ListModel | GroupingPanelModel | DetailModel | null =>
   useModularUIBasic("panel", href, {
     expectedModels: ["List", "GroupingPanel", "Detail"],

package/src/hooks/useModularUIRequest.js

@@ -21,5 +21,5 @@ const getModularUIRequest = createSelector([getLocale], (localeCode) => {
  */
 export const useModularUIRequest = (): ((
   href: Href,
-  options?: $Shape<RequestModularUIOptions>
+  options?: $Shape<RequestModularUIOptions>,
 ) => ModularUIRequest) => useSelector(getModularUIRequest);

package/src/hooks/useNotification.js

@@ -18,7 +18,7 @@ type NotificationHook = {
 };
 type ErrorNotificationHook = (
   message: MessageObject,
-  error?: ?ErrorResponse
+  error?: ?ErrorResponse,
 ) => ShowNotificationAction;
 
 /**
@@ -26,7 +26,7 @@ type ErrorNotificationHook = (
 export const useNotification = (): NotificationHook => {
   const dispatch = useDispatch();
   const { render, messageType, message, error } = useSelector(
-    (state) => state.notification
+    (state) => state.notification,
   );
 
   return {

package/src/hooks/usePreference.js

@@ -1,17 +1,27 @@
 // @flow
 import pick from "lodash/pick";
 import { useSelector } from "react-redux";
+import { createSelector } from "reselect";
 
-import type { PreferencesState } from "../redux/types";
+import type { PreferencesState, ReduxState } from "../redux/types";
+
+const getPreferences = (state: ReduxState) => state.preferences;
+const getPreferenceNames = (
+  state: ReduxState,
+  preferenceNames: string | Array<string>,
+) => (Array.isArray(preferenceNames) ? preferenceNames : [preferenceNames]);
+
+const selectPreference = createSelector(
+  [getPreferences, getPreferenceNames],
+  (preferences, preferenceNames) => {
+    return pick(preferences, preferenceNames);
+  },
+);
 
 /**
  */
 export const usePreference = (
-  preferenceNames: string | Array<string>
+  preferenceNames: string | Array<string>,
 ): PreferencesState => {
-  const requestedPreferences = Array.isArray(preferenceNames)
-    ? preferenceNames
-    : [preferenceNames];
-
-  return useSelector((state) => pick(state.preferences, requestedPreferences));
+  return useSelector((state) => selectPreference(state, preferenceNames));
 };

package/src/i18n/Locale.js

@@ -58,7 +58,7 @@ class Locale {
     }
 
     throw new IllegalStateException(
-      `Can not find language name based on locale: ${this.code}`
+      `Can not find language name based on locale: ${this.code}`,
     );
   }
 
@@ -86,7 +86,7 @@ class Locale {
     return JSON.parse(
       JSON.stringify(messages)
         .replace(/'\$\{(?<key>.*?)}'/g, "''{$<key>}''")
-        .replace(/\$\{(?<key>.*?)}/g, "{$<key>}")
+        .replace(/\$\{(?<key>.*?)}/g, "{$<key>}"),
     );
   }
 
@@ -109,7 +109,7 @@ class Locale {
     ) {
       // eslint-disable-next-line no-console
       console.debug(
-        `Message with id ${id} not found for locale ${this.code} in layout translations`
+        `Message with id ${id} not found for locale ${this.code} in layout translations`,
       );
     }
     return messageFromLocale || this.fixPlaceHolders(defaultMessage) || id;
@@ -132,7 +132,7 @@ class Locale {
   getMessage(
     id: string,
     defaultMessage?: string,
-    parameters?: MessageParameters
+    parameters?: MessageParameters,
   ): string {
     const message = this.getBaseMessage(id, defaultMessage);
     return this.formatMessage(message, parameters);

package/src/i18n/Locales.js

@@ -51,7 +51,7 @@ export const availableLocales: Array<LocaleConfiguration> = [
  * Merge an object with custom error messages (exported and translated from be informed for example) and merge them with the existing translations.
  */
 export const createLocalesWithConfiguredErrors = (
-  configuredErrors: ErrorMessageObject
+  configuredErrors: ErrorMessageObject,
 ): Array<Object> =>
   availableLocales.map((availableLocale) => {
     if (configuredErrors[availableLocale.code]) {
@@ -85,7 +85,7 @@ class Locales extends BaseCollection<Locale> {
           code: locale._code,
           messages: locale._messages,
           errors: locale._errors,
-        }))
+        })),
       );
     }
 
@@ -110,7 +110,7 @@ class Locales extends BaseCollection<Locale> {
       }
     }
     throw new IllegalArgumentException(
-      `Locale configuration for locale ${localeCode} not found`
+      `Locale configuration for locale ${localeCode} not found`,
     );
   }
 
@@ -132,13 +132,13 @@ class Locales extends BaseCollection<Locale> {
       const preferredLocales = acceptLanguages
         .filter((locale) =>
           this.availableLocaleCodes.some((availableLocale) =>
-            locale.startsWith(availableLocale)
-          )
+            locale.startsWith(availableLocale),
+          ),
         )
         .map((locale) =>
           this.availableLocaleCodes.find((availableLocale) =>
-            locale.startsWith(availableLocale)
-          )
+            locale.startsWith(availableLocale),
+          ),
         );
 
       if (preferredLocales.length > 0) {
@@ -162,7 +162,7 @@ class Locales extends BaseCollection<Locale> {
           code: locale,
           messages,
           errors,
-        })
+        }),
       );
     }
   }

package/src/i18n/Message.js

@@ -31,7 +31,7 @@ const Message: React$AbstractComponent<MessageProps, mixed> =
       const translatedMessage = useMessage(
         id,
         defaultMessage || children,
-        data
+        data,
       );
 
       if (screenreaderOnly) {
@@ -58,7 +58,7 @@ const Message: React$AbstractComponent<MessageProps, mixed> =
       }
 
       return <span className={className}>{translatedMessage}</span>;
-    }
+    },
   );
 
 Message.displayName = "BI.Message";

package/src/i18n/__tests__/Locale.spec.js

@@ -16,7 +16,7 @@ jest.mock(
     messageWithParams: "Param 1: {param1}, Param 2: {param2}",
     messageWithJavaParams: "Param 1: ${param1}, Param 2: ${param2}", // NOSONAR
   }),
-  { virtual: true }
+  { virtual: true },
 );
 
 describe("locale", () => {
@@ -81,7 +81,7 @@ describe("locale", () => {
     expect(
       locale.getMessage("code", "", {
         parameter: "parameterName",
-      })
+      }),
     ).toBe("Parameter 'parameterName' is niet toegestaan");
   });
 
@@ -91,7 +91,7 @@ describe("locale", () => {
     const msg = locale.getMessage("non-existing");
     expect(msg).toBe("non-existing");
     expect(global.console.debug).toHaveBeenCalledWith(
-      "Message with id non-existing not found for locale de in layout translations"
+      "Message with id non-existing not found for locale de in layout translations",
     );
 
     const msgWithDefault = locale.getMessage("non-existing", "Default");