@beinformed/ui 1.62.1 → 1.62.3

package/src/hooks/useModelCatalog.js

@@ -18,7 +18,7 @@ import { ContentTypeModel } from "../models";
 import { getEntryDate } from "../redux/selectors/modelcatalog";
 import { updateEntryDate } from "../redux/actions/ModelCatalog";
 
-import type Href from "../models/href/Href";
+import Href from "../models/href/Href";
 import type { UseModularUIBasicOptions } from "./useModularUIBasic";
 import type { UpdateEntryDateAction } from "../redux";
 export type SearchFilter = {
@@ -108,7 +108,9 @@ export const useContentTOC = (
   const { entryDate } = useEntryDate();
   const location = useLocation();
 
-  const href = createHref("content", content, entryDate, location, []);
+  const href = createHref("content", content, entryDate, location, [
+    "complete",
+  ]);
 
   return useModularUIBasic(key, href, {
     expectedModels: ["ContentTOC"],
@@ -127,7 +129,33 @@ export const useContent = (
   const { entryDate } = useEntryDate();
   const location = useLocation();
 
-  const href = createHref("content", content, entryDate, location, []);
+  const href = createHref("content", content, entryDate, location, [
+    "complete",
+  ]);
+
+  return useModularUIBasic(key, href, {
+    expectedModels: ["Content", "ContentTOC"],
+    ...options,
+  });
+};
+
+/**
+ */
+export const useCompleteSource = (
+  content: string | Href,
+  key?: string = "content",
+  options?: UseModularUIBasicOptions<ContentModel>,
+): ?ContentModel | ?ContentTOCModel => {
+  const { entryDate } = useEntryDate();
+  const location = useLocation();
+
+  let contentHref = new Href(content);
+  contentHref.removeParameter("complete");
+  contentHref.addParameter("complete", "true");
+
+  const href = createHref("content", contentHref, entryDate, location, [
+    "complete",
+  ]);
 
   return useModularUIBasic(key, href, {
     expectedModels: ["Content", "ContentTOC"],

package/src/models/concepts/ConceptLinkModel.js

@@ -9,16 +9,10 @@ import type {
   IModelWithChildModels,
   ModelOptions,
   ModularUIModel,
+  SectionFragment,
 } from "../types";
 import type Href from "../href/Href";
 
-type SectionFragment = {
-  sectionId: string,
-  text: string,
-  startOffset: number,
-  endOffset: number,
-};
-
 /**
  * Link to a concept
  */
@@ -199,10 +193,16 @@ export default class ConceptLinkModel
     return this.getData("modelCategory");
   }
 
+  /**
+   */
+  get sectionId(): string {
+    return this.data.section?._id;
+  }
+
   /**
    *
    */
   get fragment(): SectionFragment {
-    return this.getData("sectionFragment");
+    return this.data.section?.fragment;
   }
 }

package/src/models/concepts/SourceReferenceModel.js

@@ -32,7 +32,7 @@ class SourceReferenceModel {
    */
   get link(): ContentLinkModel {
     const section =
-      this.fragment?.sectionId ||
+      this.sectionId ||
       this._sourceReference._links.self.href.replace(
         `${this._sourceReference._links.content.href}/`,
         "",
@@ -85,6 +85,12 @@ class SourceReferenceModel {
     return createHashFromHref(this.selfhref);
   }
 
+  /**
+   */
+  get sectionId(): string {
+    return this._sourceReference.sectionId;
+  }
+
   /**
    *
    */