@beinformed/ui 1.43.3 → 1.43.5

package/src/models/attributes/__tests__/AttributeContent.spec.js

@@ -45,14 +45,14 @@ const json = {
         label: "Description Content",
         sections: [
           {
-            id: "Alert",
+            id: "Alert.:-",
             type: "Reference",
             label: "Alert",
             number: "1",
             body: "<p>The limit of 0.5 per mille has been exceeded.</p>",
             _links: {
               self: {
-                href: "/content/_Context/Police incident decisions/Content/Breath analysis/Breathalyzer test.formalsource/Alert",
+                href: "/content/_Context/Police%20incident%20decisions/Content/Breath%20analysis/Breathalyzer%20test.formalsource/Alert.%3A-",
               },
             },
             childSections: [
@@ -183,10 +183,10 @@ describe("AttributeContent", () => {
     expect(firstSection instanceof SectionModel).toBe(true);
 
     expect(firstSection.selflink.href.toString()).toBe(
-      "/content/_Context/Police incident decisions/Content/Breath analysis/Breathalyzer test.formalsource/Alert",
+      "/content/_Context/Police%20incident%20decisions/Content/Breath%20analysis/Breathalyzer%20test.formalsource/Alert.%3A-",
     );
     expect(firstSection.selfhref.toString()).toBe(
-      "/content/_Context/Police incident decisions/Content/Breath analysis/Breathalyzer test.formalsource/Alert",
+      "/content/_Context/Police%20incident%20decisions/Content/Breath%20analysis/Breathalyzer%20test.formalsource/Alert.%3A-",
     );
 
     expect(firstSection.type).toBe("Reference");
@@ -197,15 +197,15 @@ describe("AttributeContent", () => {
     );
     expect(firstSection.childSectionLinks).toHaveLength(2);
     expect(firstSection.selfContentLink.selfhref.toString()).toBe(
-      "/content/_Context/Police incident decisions/Content/Breath analysis/Breathalyzer test.formalsource/Alert",
+      "/content/_Context/Police%20incident%20decisions/Content/Breath%20analysis/Breathalyzer%20test.formalsource/Alert.%3A-",
     );
     expect(firstSection.selfContentLink.encodedHref.toString()).toBe(
-      "/content/_Context%2FPolice%20incident%20decisions%2FContent%2FBreath%20analysis%2FBreathalyzer%20test.formalsource/Alert",
+      "/content/_Context%2FPolice%2520incident%2520decisions%2FContent%2FBreath%2520analysis%2FBreathalyzer%2520test.formalsource/Alert.%3A-",
     );
 
     expect(firstSection.childSections).toHaveLength(2);
     expect(firstSection.subSections).toHaveLength(2);
-    expect(firstSection.referenceHash).toBe(-2144469773);
+    expect(firstSection.referenceHash).toBe(-1954774597);
   });
 
   it("can handle referredSections", () => {

package/src/models/content/ContentLinkModel.js

@@ -100,24 +100,36 @@ export default class ContentLinkModel
   }
 
   /**
-   * Encode the content-identifier of the path to the content resource.
-   * This makes it a single uri part, which can be used on routes to make nested routes
    */
-  get encodedHref(): Href {
+  createEncodedHref(): Href {
     const startURI = "/content/";
     const selfhref = this.data._links.self.href;
+
     const section = this.data.section;
+    const sourceId = section
+      ? selfhref.substring(startURI.length, selfhref.lastIndexOf("/"))
+      : selfhref.substring(startURI.length, selfhref.lastIndexOf("#"));
 
-    const path = section
-      ? `${startURI}${encodeURIComponent(
-          selfhref.substring(
-            startURI.length,
-            selfhref.indexOf(this.data.section) - 1,
-          ),
-        )}/${encodeURIComponent(section)}`
-      : `${startURI}${encodeURIComponent(selfhref.substring(startURI.length))}`;
+    let hash = "";
+    if (selfhref.hash) {
+      hash = `#${selfhref.hash}`;
+    }
+
+    if (section) {
+      return new Href(
+        `${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}${hash}`,
+      );
+    }
 
-    const href = new Href(path);
+    return new Href(`${startURI}${encodeURIComponent(sourceId)}${hash}`);
+  }
+
+  /**
+   * Encode the content-identifier of the path to the content resource.
+   * This makes it a single uri part, which can be used on routes to make nested routes
+   */
+  get encodedHref(): Href {
+    const href = this.createEncodedHref();
 
     if (this._entryDate !== null) {
       return href.addParameter(TIMEVERSION_FILTER_NAME, this._entryDate);