@beinformed/ui 1.52.2 → 1.53.0

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.53.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.52.2...v1.53.0) (2024-09-17)
+
+
+### Features
+
+* **modelcatalog:** new hooks for searching concepts or content by filter ([ef8e0a5](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/ef8e0a5c6e6c9496756ecabdc3a9ec79469e98ed))
+
 ## [1.52.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.52.1...v1.52.2) (2024-08-23)
 
 

package/esm/hooks/useModelCatalog.js

@@ -1,3 +1,4 @@
+import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import { useLocation } from "./useRouter";
 import { createHref, filterParameters } from "../utils/helpers/createHref";
 import ModelCatalogModel from "../models/modelcatalog/ModelCatalogModel";
@@ -9,7 +10,6 @@ import ContentTOCModel from "../models/content/ContentTOCModel";
 import ContentModel from "../models/content/ContentModel";
 import { useModularUIBasic } from "./useModularUIBasic";
 import { ContentTypeModel } from "../models";
-
 /**
  */
 export const useModelCatalog = () => useModularUIBasic("modelcatalog", "/modelcatalog", {
@@ -83,4 +83,37 @@ export const useContentType = function (contentType) {
     targetModel: ContentTypeModel
   });
 };
+
+/**
+ */
+const getSearchHref = (uri, filters) => {
+  const filterString = [];
+  for (const key of _Object$keys(filters)) {
+    const filterValue = filters[key];
+    if (filterValue) {
+      let value = Array.isArray(filterValue) ? filterValue.join(",") : filterValue;
+      if (key === "type") {
+        value = value.replace("#", "%23"); // handles un-encoded #
+      }
+      filterString.push(`${key}=${value}`);
+    }
+  }
+  return filterString.length ? `${uri}?${filterString.join("&")}` : uri;
+};
+
+/**
+ */
+export const useConceptSearch = function (filters) {
+  let key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "conceptSearch";
+  const href = getSearchHref("/concepts", filters);
+  return useConceptIndex(href, key);
+};
+
+/**
+ */
+export const useContentSearch = function (filters) {
+  let key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "contentSearch";
+  const href = getSearchHref("/content", filters);
+  return useContentIndex(href, key);
+};
 //# sourceMappingURL=useModelCatalog.js.map

package/esm/hooks/useModelCatalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModelCatalog.js","names":["useLocation","createHref","filterParameters","ModelCatalogModel","ConceptIndexModel","ConceptDetailModel","default","BusinessScenarioModel","ContentIndexModel","ContentTOCModel","ContentModel","useModularUIBasic","ContentTypeModel","useModelCatalog","expectedModels","targetModel","useConceptIndex","href","key","arguments","length","undefined","url","useConceptDetail","concept","location","useContentIndex","useContentTOC","content","useContent","contentSection","useContentType","contentType"],"sources":["../../src/hooks/useModelCatalog.js"],"sourcesContent":["// @flow\nimport { useLocation } from \"./useRouter\";\n\nimport { createHref, filterParameters } from \"../utils/helpers/createHref\";\n\nimport ModelCatalogModel from \"../models/modelcatalog/ModelCatalogModel\";\nimport ConceptIndexModel from \"../models/concepts/ConceptIndexModel\";\nimport ConceptDetailModel from \"../models/concepts/ConceptDetailModel\";\nimport { default as BusinessScenarioModel } from \"../models/concepts/BusinessScenarioModel\";\nimport ContentIndexModel from \"../models/content/ContentIndexModel\";\nimport ContentTOCModel from \"../models/content/ContentTOCModel\";\nimport ContentModel from \"../models/content/ContentModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { ContentTypeModel } from \"../models\";\n\n/**\n */\nexport const useModelCatalog = (): ?ModelCatalogModel =>\n  useModularUIBasic(\"modelcatalog\", \"/modelcatalog\", {\n    expectedModels: [\"ModelCatalog\"],\n    targetModel: ModelCatalogModel,\n  });\n\n/**\n */\nexport const useConceptIndex = (\n  href: string,\n  key?: string = \"conceptindex\",\n): ?ConceptIndexModel => {\n  const url = filterParameters(href, [\"entryDate\", \"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ConceptIndex\"],\n    targetModel: ConceptIndexModel,\n  });\n};\n\n/**\n */\nexport const useConceptDetail = (\n  concept: string,\n  key?: string = \"conceptdetail\",\n): ?ConceptDetailModel | ?BusinessScenarioModel => {\n  const location = useLocation();\n\n  const href = createHref(\"concepts\", concept, location, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ConceptDetail\", \"BusinessScenario\"],\n  });\n};\n\n/**\n */\nexport const useContentIndex = (\n  href: string,\n  key?: string = \"contentindex\",\n): ?ContentIndexModel => {\n  const url = filterParameters(href, [\"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ContentIndex\"],\n    targetModel: ContentIndexModel,\n  });\n};\n\n/**\n */\nexport const useContentTOC = (\n  content: string,\n  key?: string = \"contenttoc\",\n): ?ContentTOCModel => {\n  const location = useLocation();\n  const href = createHref(\"content\", content, location, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentTOC\"],\n    targetModel: ContentTOCModel,\n  });\n};\n\n/**\n */\nexport const useContent = (\n  contentSection: string,\n  key?: string = \"content\",\n): ?ContentModel => {\n  const href = createHref(\"content\", contentSection, null, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"Content\"],\n    targetModel: ContentModel,\n  });\n};\n\n/**\n */\nexport const useContentType = (\n  contentType: string,\n  key?: string = \"contenttypes\",\n): ?ContentTypeModel => {\n  const href = createHref(\"contenttypes\", contentType, null, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentType\"],\n    targetModel: ContentTypeModel,\n  });\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useModelCatalog.js","names":["useLocation","createHref","filterParameters","ModelCatalogModel","ConceptIndexModel","ConceptDetailModel","default","BusinessScenarioModel","ContentIndexModel","ContentTOCModel","ContentModel","useModularUIBasic","ContentTypeModel","useModelCatalog","expectedModels","targetModel","useConceptIndex","href","key","arguments","length","undefined","url","useConceptDetail","concept","location","useContentIndex","useContentTOC","content","useContent","contentSection","useContentType","contentType","getSearchHref","uri","filters","filterString","_Object$keys","filterValue","value","Array","isArray","join","replace","push","useConceptSearch","useContentSearch"],"sources":["../../src/hooks/useModelCatalog.js"],"sourcesContent":["// @flow\nimport { useLocation } from \"./useRouter\";\n\nimport { createHref, filterParameters } from \"../utils/helpers/createHref\";\n\nimport ModelCatalogModel from \"../models/modelcatalog/ModelCatalogModel\";\nimport ConceptIndexModel from \"../models/concepts/ConceptIndexModel\";\nimport ConceptDetailModel from \"../models/concepts/ConceptDetailModel\";\nimport { default as BusinessScenarioModel } from \"../models/concepts/BusinessScenarioModel\";\nimport ContentIndexModel from \"../models/content/ContentIndexModel\";\nimport ContentTOCModel from \"../models/content/ContentTOCModel\";\nimport ContentModel from \"../models/content/ContentModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { ContentTypeModel } from \"../models\";\n\nexport type SearchFilter = {\n  index?: string,\n  label?: string,\n  type?: string | Array<string>,\n  entryDate?: string,\n};\n\n/**\n */\nexport const useModelCatalog = (): ?ModelCatalogModel =>\n  useModularUIBasic(\"modelcatalog\", \"/modelcatalog\", {\n    expectedModels: [\"ModelCatalog\"],\n    targetModel: ModelCatalogModel,\n  });\n\n/**\n */\nexport const useConceptIndex = (\n  href: string,\n  key?: string = \"conceptindex\",\n): ?ConceptIndexModel => {\n  const url = filterParameters(href, [\"entryDate\", \"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ConceptIndex\"],\n    targetModel: ConceptIndexModel,\n  });\n};\n\n/**\n */\nexport const useConceptDetail = (\n  concept: string,\n  key?: string = \"conceptdetail\",\n): ?ConceptDetailModel | ?BusinessScenarioModel => {\n  const location = useLocation();\n\n  const href = createHref(\"concepts\", concept, location, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ConceptDetail\", \"BusinessScenario\"],\n  });\n};\n\n/**\n */\nexport const useContentIndex = (\n  href: string,\n  key?: string = \"contentindex\",\n): ?ContentIndexModel => {\n  const url = filterParameters(href, [\"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ContentIndex\"],\n    targetModel: ContentIndexModel,\n  });\n};\n\n/**\n */\nexport const useContentTOC = (\n  content: string,\n  key?: string = \"contenttoc\",\n): ?ContentTOCModel => {\n  const location = useLocation();\n  const href = createHref(\"content\", content, location, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentTOC\"],\n    targetModel: ContentTOCModel,\n  });\n};\n\n/**\n */\nexport const useContent = (\n  contentSection: string,\n  key?: string = \"content\",\n): ?ContentModel => {\n  const href = createHref(\"content\", contentSection, null, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"Content\"],\n    targetModel: ContentModel,\n  });\n};\n\n/**\n */\nexport const useContentType = (\n  contentType: string,\n  key?: string = \"contenttypes\",\n): ?ContentTypeModel => {\n  const href = createHref(\"contenttypes\", contentType, null, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentType\"],\n    targetModel: ContentTypeModel,\n  });\n};\n\n/**\n */\nconst getSearchHref = (uri: string, filters: SearchFilter): string => {\n  const filterString = [];\n\n  for (const key of Object.keys(filters)) {\n    const filterValue = filters[key];\n    if (filterValue) {\n      let value: string = Array.isArray(filterValue)\n        ? filterValue.join(\",\")\n        : filterValue;\n      if (key === \"type\") {\n        value = value.replace(\"#\", \"%23\"); // handles un-encoded #\n      }\n      filterString.push(`${key}=${value}`);\n    }\n  }\n\n  return filterString.length ? `${uri}?${filterString.join(\"&\")}` : uri;\n};\n\n/**\n */\nexport const useConceptSearch = (\n  filters: SearchFilter,\n  key?: string = \"conceptSearch\",\n): ?ConceptIndexModel => {\n  const href = getSearchHref(\"/concepts\", filters);\n  return useConceptIndex(href, key);\n};\n\n/**\n */\nexport const useContentSearch = (\n  filters: SearchFilter,\n  key?: string = \"contentSearch\",\n): ?ContentIndexModel => {\n  const href = getSearchHref(\"/content\", filters);\n  return useContentIndex(href, key);\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/hooks/useModelCatalog.js

@@ -4,7 +4,8 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useModelCatalog = exports.useContentType = exports.useContentTOC = exports.useContentIndex = exports.useContent = exports.useConceptIndex = exports.useConceptDetail = void 0;
+exports.useModelCatalog = exports.useContentType = exports.useContentTOC = exports.useContentSearch = exports.useContentIndex = exports.useContent = exports.useConceptSearch = exports.useConceptIndex = exports.useConceptDetail = void 0;
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _useRouter = require("./useRouter");
 var _createHref = require("../utils/helpers/createHref");
 var _ModelCatalogModel = _interopRequireDefault(require("../models/modelcatalog/ModelCatalogModel"));
@@ -95,5 +96,40 @@ const useContentType = function (contentType) {
     targetModel: _models.ContentTypeModel
   });
 };
+
+/**
+ */
 exports.useContentType = useContentType;
+const getSearchHref = (uri, filters) => {
+  const filterString = [];
+  for (const key of (0, _keys.default)(filters)) {
+    const filterValue = filters[key];
+    if (filterValue) {
+      let value = Array.isArray(filterValue) ? filterValue.join(",") : filterValue;
+      if (key === "type") {
+        value = value.replace("#", "%23"); // handles un-encoded #
+      }
+      filterString.push(`${key}=${value}`);
+    }
+  }
+  return filterString.length ? `${uri}?${filterString.join("&")}` : uri;
+};
+
+/**
+ */
+const useConceptSearch = function (filters) {
+  let key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "conceptSearch";
+  const href = getSearchHref("/concepts", filters);
+  return useConceptIndex(href, key);
+};
+
+/**
+ */
+exports.useConceptSearch = useConceptSearch;
+const useContentSearch = function (filters) {
+  let key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "contentSearch";
+  const href = getSearchHref("/content", filters);
+  return useContentIndex(href, key);
+};
+exports.useContentSearch = useContentSearch;
 //# sourceMappingURL=useModelCatalog.js.map

package/lib/hooks/useModelCatalog.js.flow

@@ -14,6 +14,13 @@ import ContentModel from "../models/content/ContentModel";
 import { useModularUIBasic } from "./useModularUIBasic";
 import { ContentTypeModel } from "../models";
 
+export type SearchFilter = {
+  index?: string,
+  label?: string,
+  type?: string | Array<string>,
+  entryDate?: string,
+};
+
 /**
  */
 export const useModelCatalog = (): ?ModelCatalogModel =>
@@ -101,3 +108,44 @@ export const useContentType = (
     targetModel: ContentTypeModel,
   });
 };
+
+/**
+ */
+const getSearchHref = (uri: string, filters: SearchFilter): string => {
+  const filterString = [];
+
+  for (const key of Object.keys(filters)) {
+    const filterValue = filters[key];
+    if (filterValue) {
+      let value: string = Array.isArray(filterValue)
+        ? filterValue.join(",")
+        : filterValue;
+      if (key === "type") {
+        value = value.replace("#", "%23"); // handles un-encoded #
+      }
+      filterString.push(`${key}=${value}`);
+    }
+  }
+
+  return filterString.length ? `${uri}?${filterString.join("&")}` : uri;
+};
+
+/**
+ */
+export const useConceptSearch = (
+  filters: SearchFilter,
+  key?: string = "conceptSearch",
+): ?ConceptIndexModel => {
+  const href = getSearchHref("/concepts", filters);
+  return useConceptIndex(href, key);
+};
+
+/**
+ */
+export const useContentSearch = (
+  filters: SearchFilter,
+  key?: string = "contentSearch",
+): ?ContentIndexModel => {
+  const href = getSearchHref("/content", filters);
+  return useContentIndex(href, key);
+};

package/lib/hooks/useModelCatalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModelCatalog.js","names":["_useRouter","require","_createHref","_ModelCatalogModel","_interopRequireDefault","_ConceptIndexModel","_ConceptDetailModel","_BusinessScenarioModel","_ContentIndexModel","_ContentTOCModel","_ContentModel","_useModularUIBasic","_models","useModelCatalog","useModularUIBasic","expectedModels","targetModel","ModelCatalogModel","exports","useConceptIndex","href","key","arguments","length","undefined","url","filterParameters","ConceptIndexModel","useConceptDetail","concept","location","useLocation","createHref","useContentIndex","ContentIndexModel","useContentTOC","content","ContentTOCModel","useContent","contentSection","ContentModel","useContentType","contentType","ContentTypeModel"],"sources":["../../src/hooks/useModelCatalog.js"],"sourcesContent":["// @flow\nimport { useLocation } from \"./useRouter\";\n\nimport { createHref, filterParameters } from \"../utils/helpers/createHref\";\n\nimport ModelCatalogModel from \"../models/modelcatalog/ModelCatalogModel\";\nimport ConceptIndexModel from \"../models/concepts/ConceptIndexModel\";\nimport ConceptDetailModel from \"../models/concepts/ConceptDetailModel\";\nimport { default as BusinessScenarioModel } from \"../models/concepts/BusinessScenarioModel\";\nimport ContentIndexModel from \"../models/content/ContentIndexModel\";\nimport ContentTOCModel from \"../models/content/ContentTOCModel\";\nimport ContentModel from \"../models/content/ContentModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { ContentTypeModel } from \"../models\";\n\n/**\n */\nexport const useModelCatalog = (): ?ModelCatalogModel =>\n  useModularUIBasic(\"modelcatalog\", \"/modelcatalog\", {\n    expectedModels: [\"ModelCatalog\"],\n    targetModel: ModelCatalogModel,\n  });\n\n/**\n */\nexport const useConceptIndex = (\n  href: string,\n  key?: string = \"conceptindex\",\n): ?ConceptIndexModel => {\n  const url = filterParameters(href, [\"entryDate\", \"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ConceptIndex\"],\n    targetModel: ConceptIndexModel,\n  });\n};\n\n/**\n */\nexport const useConceptDetail = (\n  concept: string,\n  key?: string = \"conceptdetail\",\n): ?ConceptDetailModel | ?BusinessScenarioModel => {\n  const location = useLocation();\n\n  const href = createHref(\"concepts\", concept, location, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ConceptDetail\", \"BusinessScenario\"],\n  });\n};\n\n/**\n */\nexport const useContentIndex = (\n  href: string,\n  key?: string = \"contentindex\",\n): ?ContentIndexModel => {\n  const url = filterParameters(href, [\"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ContentIndex\"],\n    targetModel: ContentIndexModel,\n  });\n};\n\n/**\n */\nexport const useContentTOC = (\n  content: string,\n  key?: string = \"contenttoc\",\n): ?ContentTOCModel => {\n  const location = useLocation();\n  const href = createHref(\"content\", content, location, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentTOC\"],\n    targetModel: ContentTOCModel,\n  });\n};\n\n/**\n */\nexport const useContent = (\n  contentSection: string,\n  key?: string = \"content\",\n): ?ContentModel => {\n  const href = createHref(\"content\", contentSection, null, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"Content\"],\n    targetModel: ContentModel,\n  });\n};\n\n/**\n */\nexport const useContentType = (\n  contentType: string,\n  key?: string = \"contenttypes\",\n): ?ContentTypeModel => {\n  const href = createHref(\"contenttypes\", contentType, null, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentType\"],\n    targetModel: ContentTypeModel,\n  });\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useModelCatalog.js","names":["_useRouter","require","_createHref","_ModelCatalogModel","_interopRequireDefault","_ConceptIndexModel","_ConceptDetailModel","_BusinessScenarioModel","_ContentIndexModel","_ContentTOCModel","_ContentModel","_useModularUIBasic","_models","useModelCatalog","useModularUIBasic","expectedModels","targetModel","ModelCatalogModel","exports","useConceptIndex","href","key","arguments","length","undefined","url","filterParameters","ConceptIndexModel","useConceptDetail","concept","location","useLocation","createHref","useContentIndex","ContentIndexModel","useContentTOC","content","ContentTOCModel","useContent","contentSection","ContentModel","useContentType","contentType","ContentTypeModel","getSearchHref","uri","filters","filterString","_keys","default","filterValue","value","Array","isArray","join","replace","push","useConceptSearch","useContentSearch"],"sources":["../../src/hooks/useModelCatalog.js"],"sourcesContent":["// @flow\nimport { useLocation } from \"./useRouter\";\n\nimport { createHref, filterParameters } from \"../utils/helpers/createHref\";\n\nimport ModelCatalogModel from \"../models/modelcatalog/ModelCatalogModel\";\nimport ConceptIndexModel from \"../models/concepts/ConceptIndexModel\";\nimport ConceptDetailModel from \"../models/concepts/ConceptDetailModel\";\nimport { default as BusinessScenarioModel } from \"../models/concepts/BusinessScenarioModel\";\nimport ContentIndexModel from \"../models/content/ContentIndexModel\";\nimport ContentTOCModel from \"../models/content/ContentTOCModel\";\nimport ContentModel from \"../models/content/ContentModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { ContentTypeModel } from \"../models\";\n\nexport type SearchFilter = {\n  index?: string,\n  label?: string,\n  type?: string | Array<string>,\n  entryDate?: string,\n};\n\n/**\n */\nexport const useModelCatalog = (): ?ModelCatalogModel =>\n  useModularUIBasic(\"modelcatalog\", \"/modelcatalog\", {\n    expectedModels: [\"ModelCatalog\"],\n    targetModel: ModelCatalogModel,\n  });\n\n/**\n */\nexport const useConceptIndex = (\n  href: string,\n  key?: string = \"conceptindex\",\n): ?ConceptIndexModel => {\n  const url = filterParameters(href, [\"entryDate\", \"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ConceptIndex\"],\n    targetModel: ConceptIndexModel,\n  });\n};\n\n/**\n */\nexport const useConceptDetail = (\n  concept: string,\n  key?: string = \"conceptdetail\",\n): ?ConceptDetailModel | ?BusinessScenarioModel => {\n  const location = useLocation();\n\n  const href = createHref(\"concepts\", concept, location, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ConceptDetail\", \"BusinessScenario\"],\n  });\n};\n\n/**\n */\nexport const useContentIndex = (\n  href: string,\n  key?: string = \"contentindex\",\n): ?ContentIndexModel => {\n  const url = filterParameters(href, [\"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ContentIndex\"],\n    targetModel: ContentIndexModel,\n  });\n};\n\n/**\n */\nexport const useContentTOC = (\n  content: string,\n  key?: string = \"contenttoc\",\n): ?ContentTOCModel => {\n  const location = useLocation();\n  const href = createHref(\"content\", content, location, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentTOC\"],\n    targetModel: ContentTOCModel,\n  });\n};\n\n/**\n */\nexport const useContent = (\n  contentSection: string,\n  key?: string = \"content\",\n): ?ContentModel => {\n  const href = createHref(\"content\", contentSection, null, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"Content\"],\n    targetModel: ContentModel,\n  });\n};\n\n/**\n */\nexport const useContentType = (\n  contentType: string,\n  key?: string = \"contenttypes\",\n): ?ContentTypeModel => {\n  const href = createHref(\"contenttypes\", contentType, null, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentType\"],\n    targetModel: ContentTypeModel,\n  });\n};\n\n/**\n */\nconst getSearchHref = (uri: string, filters: SearchFilter): string => {\n  const filterString = [];\n\n  for (const key of Object.keys(filters)) {\n    const filterValue = filters[key];\n    if (filterValue) {\n      let value: string = Array.isArray(filterValue)\n        ? filterValue.join(\",\")\n        : filterValue;\n      if (key === \"type\") {\n        value = value.replace(\"#\", \"%23\"); // handles un-encoded #\n      }\n      filterString.push(`${key}=${value}`);\n    }\n  }\n\n  return filterString.length ? `${uri}?${filterString.join(\"&\")}` : uri;\n};\n\n/**\n */\nexport const useConceptSearch = (\n  filters: SearchFilter,\n  key?: string = \"conceptSearch\",\n): ?ConceptIndexModel => {\n  const href = getSearchHref(\"/concepts\", filters);\n  return useConceptIndex(href, key);\n};\n\n/**\n */\nexport const useContentSearch = (\n  filters: SearchFilter,\n  key?: string = \"contentSearch\",\n): ?ContentIndexModel => {\n  const href = getSearchHref(\"/content\", filters);\n  return useContentIndex(href, key);\n};\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.52.2",
+  "version": "1.53.0",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -82,9 +82,9 @@
     "styled-components": "^5.0.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.25.0",
-    "big.js": "^6.2.1",
-    "date-fns": "^3.6.0",
+    "@babel/runtime-corejs3": "^7.25.6",
+    "big.js": "^6.2.2",
+    "date-fns": "^4.1.0",
     "deepmerge": "^4.3.1",
     "dequal": "^2.0.3",
     "file-size": "^1.0.0",
@@ -98,7 +98,7 @@
     "setimmediate": "^1.0.5"
   },
   "devDependencies": {
-    "@babel/cli": "^7.24.8",
+    "@babel/cli": "^7.25.6",
     "@babel/core": "^7.25.2",
     "@babel/eslint-parser": "^7.25.1",
     "@babel/eslint-plugin": "^7.25.1",
@@ -108,24 +108,24 @@
     "@babel/preset-env": "^7.25.4",
     "@babel/preset-flow": "^7.24.7",
     "@babel/preset-react": "^7.24.7",
-    "@commitlint/cli": "^19.4.0",
-    "@commitlint/config-conventional": "^19.2.2",
-    "@testing-library/react": "^16.0.0",
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
+    "@testing-library/react": "^16.0.1",
     "auditjs": "^4.0.45",
     "babel-jest": "^29.7.0",
     "babel-plugin-styled-components": "^2.1.4",
     "cherry-pick": "^0.5.0",
-    "commit-and-tag-version": "^12.4.1",
+    "commit-and-tag-version": "^12.4.4",
     "cross-env": "^7.0.3",
     "documentation": "^14.0.2",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^3.0.11",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^28.8.0",
-    "eslint-plugin-jsdoc": "^50.2.2",
-    "eslint-plugin-react": "^7.35.0",
+    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-jest": "^28.8.3",
+    "eslint-plugin-jsdoc": "^50.2.3",
+    "eslint-plugin-react": "^7.36.1",
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
     "flow-bin": "^0.200.1",
@@ -133,13 +133,13 @@
     "flow-typed": "^3.9.0",
     "hermes-eslint": "^0.23.1",
     "history": "^4.0.0",
-    "husky": "^9.1.5",
+    "husky": "^9.1.6",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-junit": "^16.0.0",
     "jest-sonar-reporter": "^2.0.0",
     "jscodeshift": "^0.16.1",
-    "lint-staged": "^15.2.9",
+    "lint-staged": "^15.2.10",
     "polished": "^4.0.0",
     "prettier": "^3.3.3",
     "react": "^18.3.1",

package/src/hooks/useModelCatalog.js

@@ -14,6 +14,13 @@ import ContentModel from "../models/content/ContentModel";
 import { useModularUIBasic } from "./useModularUIBasic";
 import { ContentTypeModel } from "../models";
 
+export type SearchFilter = {
+  index?: string,
+  label?: string,
+  type?: string | Array<string>,
+  entryDate?: string,
+};
+
 /**
  */
 export const useModelCatalog = (): ?ModelCatalogModel =>
@@ -101,3 +108,44 @@ export const useContentType = (
     targetModel: ContentTypeModel,
   });
 };
+
+/**
+ */
+const getSearchHref = (uri: string, filters: SearchFilter): string => {
+  const filterString = [];
+
+  for (const key of Object.keys(filters)) {
+    const filterValue = filters[key];
+    if (filterValue) {
+      let value: string = Array.isArray(filterValue)
+        ? filterValue.join(",")
+        : filterValue;
+      if (key === "type") {
+        value = value.replace("#", "%23"); // handles un-encoded #
+      }
+      filterString.push(`${key}=${value}`);
+    }
+  }
+
+  return filterString.length ? `${uri}?${filterString.join("&")}` : uri;
+};
+
+/**
+ */
+export const useConceptSearch = (
+  filters: SearchFilter,
+  key?: string = "conceptSearch",
+): ?ConceptIndexModel => {
+  const href = getSearchHref("/concepts", filters);
+  return useConceptIndex(href, key);
+};
+
+/**
+ */
+export const useContentSearch = (
+  filters: SearchFilter,
+  key?: string = "contentSearch",
+): ?ContentIndexModel => {
+  const href = getSearchHref("/content", filters);
+  return useContentIndex(href, key);
+};