@beinformed/ui 1.62.1 → 1.62.2

package/src/models/concepts/__tests__/RelatedConcepts.spec.js

@@ -9,10 +9,10 @@ describe("Related concepts", () => {
 
     expect(relatedConcepts.label).toBe("Related concepts of content");
     expect(relatedConcepts.selfhref.toString()).toBe(
-      "/content/bundle-com.beinformed.source.Highlevelrequirements/ResearchGrant/High%20level%20requirements.formalsource/relatedConcepts?entryDate=2025-06-03",
+      "/content/bundle-com.beinformed.source.Highlevelrequirements/ResearchGrant/High%20level%20requirements.formalsource/relatedConcepts?entryDate=2025-06-04",
     );
 
-    expect(relatedConcepts.entryDate).toBe("2025-06-03");
+    expect(relatedConcepts.entryDate).toBe("2025-06-04");
     expect(relatedConcepts.modelCategoryFilter.label).toBe("Model category");
 
     expect(relatedConcepts.items.size).toBe(116);
@@ -26,16 +26,14 @@ describe("Related concepts", () => {
     );
     expect(firstItem.modelCategory).toBe("Requirements");
     expect(firstItem.selfhref.toString()).toBe(
-      "/concepts/bundle-com.beinformed.frames.ResearchGrantRequirements/frames.beimodel.json/SystemMustSendAutomatedNotificationsForStatusChanges?entryDate=2025-06-03",
+      "/concepts/bundle-com.beinformed.frames.ResearchGrantRequirements/frames.beimodel.json/SystemMustSendAutomatedNotificationsForStatusChanges?entryDate=2025-06-04",
     );
     expect(firstItem.conceptTypeLink.href.toString()).toBe(
       "/concepttypes/bundle-com.beinformed.research.grant.metamodels/High%20level%20requirements.bixml/ArchitecturalSignificantRequirement",
     );
 
-    expect(firstItem.fragment.sectionId).toBe(
-      "AutomatedNotifications_Requirement",
-    );
-    expect(firstItem.fragment.text).toBeUndefined();
+    expect(firstItem.sectionId).toBe("AutomatedNotifications_Requirement");
+    expect(firstItem.fragment).toBeUndefined();
 
     const secondItem = relatedConcepts.items.get(1);
 
@@ -48,7 +46,7 @@ describe("Related concepts", () => {
 
     expect(secondItem.modelCategory).toBe("Requirements");
 
-    expect(secondItem.fragment.sectionId).toBe(
+    expect(secondItem.sectionId).toBe(
       "MaximumFlexibilityWithinPolicyConstraints",
     );
     expect(secondItem.fragment.text).toBe(

package/src/models/concepts/__tests__/SourceReferenceModel.spec.js

@@ -14,8 +14,8 @@ const data = {
       href: "/content/bundle-com.beinformed.source.GrantFundingAgreementTermsandConditions/Grant%20Funding%20Agreement.formalsource",
     },
   },
+  sectionId: "Chapter4",
   sectionFragment: {
-    sectionId: "Chapter4",
     text: "Research Grant",
     startOffset: 32,
     endOffset: 18,
@@ -39,6 +39,8 @@ describe("sourceReferenceModel", () => {
     expect(sourceReference.type).toBe("Reference");
     expect(sourceReference.sourceAbbreviation).toBe("GFA-TC-01");
     expect(sourceReference.referenceHash).toBe(10443215482258);
+
+    expect(sourceReference.sectionId).toBe("Chapter4");
     expect(sourceReference.fragment.text).toBe("Research Grant");
     expect(sourceReference.fragment.startOffset).toBe(32);
     expect(sourceReference.fragment.endOffset).toBe(18);
@@ -60,7 +62,6 @@ describe("sourceReferenceModel", () => {
         contextPath: "/BeInformed",
         fragment: {
           endOffset: 18,
-          sectionId: "Chapter4",
           startOffset: 32,
           text: "Research Grant",
         },
@@ -95,7 +96,6 @@ describe("sourceReferenceModel", () => {
         contextPath: "/BeInformed",
         fragment: {
           endOffset: 18,
-          sectionId: "Chapter4",
           startOffset: 32,
           text: "Research Grant",
         },

package/src/models/content/ContentLinkModel.js

@@ -183,7 +183,7 @@ export default class ContentLinkModel
         selflink = this.links.getLinkByKey("content");
       }
 
-      if (selflink != null) {
+      if (selflink != null && !selflink.href.path.endsWith(this.data.section)) {
         selflink.href.addParameter("complete", "true");
         selflink.href.hash = this.data.section;
       }

package/src/models/content/__tests__/Formalsource.spec.js

@@ -9,6 +9,7 @@ import sectionContributions from "./formalsource-section-contributions.json";
 
 import ContentTOCModel from "../ContentTOCModel";
 import ContentModel from "../ContentModel";
+import { setSetting } from "../../../constants";
 
 describe("formalsource", () => {
   it("TOC model", () => {
@@ -37,6 +38,8 @@ describe("formalsource", () => {
   });
 
   it("Complete model", () => {
+    setSetting("COMPLETE_SOURCE", true);
+
     const response = ModularUIResponse.create({
       key: "contentmodel",
       data: complete,
@@ -62,6 +65,9 @@ describe("formalsource", () => {
     expect(completeModel.isCompleteSource).toBe(true);
 
     const firstSection = completeModel.sections[0];
+    expect(firstSection.selfhref.toString()).toBe(
+      "/content/bundle-com.beinformed.source.GrantFundingAgreementTermsandConditions/Grant%20Funding%20Agreement.formalsource/Chapter1",
+    );
     expect(firstSection.label).toBe("Introduction");
     expect(firstSection.number).toBe("1.");
     expect(firstSection.body).toBe(null);
@@ -75,6 +81,8 @@ describe("formalsource", () => {
     expect(secondSection.sections[0].label).toBe("Payment of Grant");
     expect(secondSection.sections[0].number).toBe("2.1");
     expect(secondSection.sections[0].body).toHaveLength(222);
+
+    setSetting("COMPLETE_SOURCE", false);
   });
 
   it("Section model", () => {
@@ -92,4 +100,26 @@ describe("formalsource", () => {
 
     expect(sectionModel.childSectionLinks).toHaveLength(2);
   });
+
+  it("Can handle complete sources setting", () => {
+    setSetting("COMPLETE_SOURCE", true);
+
+    const response = ModularUIResponse.create({
+      key: "contentmodel",
+      data: section,
+      contributions: sectionContributions,
+    });
+    const sectionModel = new ContentModel(response);
+
+    expect(sectionModel.subSections).toHaveLength(0);
+    expect(sectionModel.childSectionLinks).toHaveLength(2);
+
+    const firstChildSection = sectionModel.childSectionLinks[0];
+    expect(firstChildSection.label).toBe("2.1 Payment of Grant");
+    expect(firstChildSection.selfhref.toString()).toBe(
+      "/content/bundle-com.beinformed.source.GrantFundingAgreementTermsandConditions/Grant%20Funding%20Agreement.formalsource/Chapter2_1?entryDate=2025-05-28",
+    );
+
+    setSetting("COMPLETE_SOURCE", false);
+  });
 });

package/src/models/types.js

@@ -263,7 +263,6 @@ export type ContentData = {
 };
 
 export type SectionFragment = {
-  sectionId?: string,
   text: string,
   startOffset: number,
   endOffset: number,