Merge pull request #643 from kbss-cvut/bug#642-custom-iri-with-hashtag

Bug#642 custom iri with hashtag

Author: ledsoft

src/component/resource/document/FileContentActions.tsx

@@ -52,8 +52,8 @@ const FileContentActions: React.FC<FileContentActionsProps> = ({
       ["fileName", fileIri.fragment],
     ]);
     const query = new Map<string, string>([
-      ["namespace", vocabularyIri.namespace!],
-      ["fileNamespace", fileIri.namespace!],
+      ["namespace", encodeURIComponent(vocabularyIri.namespace!)],
+      ["fileNamespace", encodeURIComponent(fileIri.namespace!)],
     ]);
     Routing.transitionTo(Routes.annotateFile, { params, query });
   };

src/component/term/CreateTerm.tsx

@@ -6,7 +6,7 @@ import { ThunkDispatch } from "../../util/Types";
 import { createTerm } from "../../action/AsyncTermActions";
 import { loadVocabulary } from "../../action/AsyncActions";
 import TermMetadataCreate from "./TermMetadataCreate";
-import Routing from "../../util/Routing";
+import Routing, { namespaceQueryParam } from "../../util/Routing";
 import Routes from "../../util/Routes";
 import IdentifierResolver from "../../util/IdentifierResolver";
 import TermItState from "../../model/TermItState";
@@ -54,7 +54,7 @@ export class CreateTerm extends React.Component<CreateTermProps> {
       }
       const termName = IdentifierResolver.extractNameFromLocation(location);
       const params = new Map([["name", vocabularyIri.fragment]]);
-      const query = new Map([["namespace", vocabularyIri.namespace!]]);
+      const query = namespaceQueryParam(vocabularyIri.namespace!);
       if (newTerm) {
         Routing.transitionTo(Routes.createVocabularyTerm, { params, query });
         Routing.reload();

src/component/term/Terms.tsx

@@ -13,7 +13,7 @@ import {
   consumeNotification,
   selectVocabularyTerm,
 } from "../../action/SyncActions";
-import Routing from "../../util/Routing";
+import Routing, { namespaceQueryParam } from "../../util/Routing";
 import Routes from "../../util/Routes";
 import Term, { TermData } from "../../model/Term";
 import { loadTerms } from "../../action/AsyncActions";
@@ -180,7 +180,7 @@ export class Terms extends React.Component<GlossaryTermsProps, TermsState> {
     Routing.transitionTo(Routes.createVocabularyTerm, {
       params: new Map([["name", vocabularyIri.fragment]]),
       query: vocabularyIri.namespace
-        ? new Map([["namespace", vocabularyIri.namespace]])
+        ? namespaceQueryParam(vocabularyIri.namespace)
         : undefined,
     });
   };

src/component/term/__tests__/CreateTerm.test.tsx

@@ -13,7 +13,11 @@ import { langString } from "../../../model/MultilingualString";
 import Constants from "../../../util/Constants";
 import { intlFunctions } from "../../../__tests__/environment/IntlUtil";
 
-jest.mock("../../../util/Routing");
+jest.mock("../../../util/Routing", () => ({
+  default: jest.fn(),
+  namespaceQueryParam: jest.requireActual("../../../util/Routing")
+    .namespaceQueryParam,
+}));
 
 describe("CreateTerm", () => {
   const namespace = "http://onto.fel.cvut.cz/ontologies/termit/vocabularies/";
@@ -59,6 +63,8 @@ describe("CreateTerm", () => {
       isExact: true,
       url: "http://localhost:3000/" + location.pathname,
     };
+    Routing.transitionTo = jest.fn();
+    Routing.reload = jest.fn();
   });
 
   it("invokes on create on create call", () => {
@@ -107,7 +113,9 @@ describe("CreateTerm", () => {
         "test-term"
       );
       expect((call[1].query as Map<string, string>).get("namespace")).toEqual(
-        "http://onto.fel.cvut.cz/ontologies/termit/vocabularies/"
+        encodeURIComponent(
+          "http://onto.fel.cvut.cz/ontologies/termit/vocabularies/"
+        )
       );
     });
   });
@@ -135,7 +143,9 @@ describe("CreateTerm", () => {
         "test-vocabulary"
       );
       expect((call[1].query as Map<string, string>).get("namespace")).toEqual(
-        "http://onto.fel.cvut.cz/ontologies/termit/vocabularies/"
+        encodeURIComponent(
+          "http://onto.fel.cvut.cz/ontologies/termit/vocabularies/"
+        )
       );
     });
   });

src/component/term/__tests__/TermLink.test.tsx

@@ -54,7 +54,9 @@ describe("TermLink", () => {
       </MemoryRouter>
     ).find(Link);
     expect((link.props() as any).to).toEqual(
-      `/vocabularies/${vocFragment}/terms/${termFragment}?namespace=${vocNamespace}`
+      `/vocabularies/${vocFragment}/terms/${termFragment}?namespace=${encodeURIComponent(
+        vocNamespace
+      )}`
     );
   });
 
@@ -93,7 +95,9 @@ describe("TermLink", () => {
       </MemoryRouter>
     ).find(Link);
     expect((link.props() as any).to).toEqual(
-      `/public/vocabularies/${vocFragment}/terms/${termFragment}?namespace=${vocNamespace}`
+      `/public/vocabularies/${vocFragment}/terms/${termFragment}?namespace=${encodeURIComponent(
+        vocNamespace
+      )}`
     );
   });
 

src/component/vocabulary/__tests__/VocabularyLink.test.tsx

@@ -31,7 +31,10 @@ describe("Vocabulary Link links to correct internal asset", () => {
       </MemoryRouter>
     ).find(Link);
     expect((link.props() as any).to).toEqual(
-      "/vocabularies/" + fragment + "?namespace=" + namespace
+      "/vocabularies/" +
+        fragment +
+        "?namespace=" +
+        encodeURIComponent(namespace)
     );
   });
 
@@ -43,7 +46,10 @@ describe("Vocabulary Link links to correct internal asset", () => {
       </MemoryRouter>
     ).find(Link);
     expect((link.props() as any).to).toEqual(
-      "/public/vocabularies/" + fragment + "?namespace=" + namespace
+      "/public/vocabularies/" +
+        fragment +
+        "?namespace=" +
+        encodeURIComponent(namespace)
     );
   });
 });

src/util/Routing.ts

@@ -219,6 +219,12 @@ const INSTANCE = new Routing();
 
 export default INSTANCE;
 
+export function namespaceQueryParam(namespace: string) {
+  return new Map<string, string>([
+    ["namespace", encodeURIComponent(namespace)],
+  ]);
+}
+
 export class Terms {
   public static getTermRoutingOptions(term: Term | TermData | TermInfo) {
     const loggedIn = isLoggedIn(TermItStore.getState().user);
@@ -240,7 +246,7 @@ export class Terms {
           ["termName", termName],
           ["timestamp", timestamp],
         ]),
-        query: new Map<string, string>([["namespace", namespace]]),
+        query: namespaceQueryParam(namespace),
       };
     } else {
       const iri = VocabularyUtils.create(term.iri!);
@@ -251,7 +257,7 @@ export class Terms {
           ["name", vocIri.fragment],
           ["termName", iri.fragment],
         ]),
-        query: new Map<string, string>([["namespace", vocIri.namespace!]]),
+        query: namespaceQueryParam(vocIri.namespace!),
       };
     }
   }
@@ -304,14 +310,14 @@ export class Vocabularies {
           ["name", name],
           ["timestamp", timestamp],
         ]),
-        query: new Map<string, string>([["namespace", namespace]]),
+        query: namespaceQueryParam(namespace),
       };
     } else {
       const iri = VocabularyUtils.create(vocabulary.iri);
       return {
         route,
         params: new Map<string, string>([["name", iri.fragment]]),
-        query: new Map<string, string>([["namespace", iri.namespace!]]),
+        query: namespaceQueryParam(iri.namespace!),
       };
     }
   }
@@ -348,7 +354,7 @@ export class Vocabularies {
       route,
       params: new Map<string, string>([["name", iri.fragment]]),
       query: new Map<string, string>([
-        ["namespace", iri.namespace!],
+        ["namespace", encodeURIComponent(iri.namespace!)],
         ["activeTab", TABS.document],
       ]),
     };

src/util/VocabularyUtils.ts

@@ -200,7 +200,10 @@ const VocabularyUtils = {
   create(iri: string): IRIImpl {
     const hashFragment = iri.indexOf("#");
     const slashFragment = iri.lastIndexOf("/");
-    const fragment = hashFragment < 0 ? slashFragment : hashFragment;
+    const fragment =
+      hashFragment < 0 || hashFragment < slashFragment
+        ? slashFragment
+        : hashFragment;
     return new IRIImpl(
       iri.substring(fragment + 1),
       iri.substring(0, fragment + 1)

src/util/__tests__/Routing.test.ts

@@ -35,12 +35,12 @@ describe("Routing", () => {
       const name = "test-vocabulary";
       const namespace = "http://onto.fel.cvut.cz/ontologies/termit/vocabulary/";
       const path = Routing.getTransitionPath(Routes.vocabularies, {
-        query: new Map([["namespace", namespace]]),
+        query: new Map([["namespace", encodeURIComponent(namespace)]]),
       });
       const expectedPath =
         Routes.vocabularies.path.replace(":name", name) +
         "?namespace=" +
-        namespace;
+        encodeURIComponent(namespace);
       expect(path).toEqual(expectedPath);
     });
   });
@@ -58,14 +58,14 @@ describe("Routing", () => {
     const iri = namespace + label;
 
     it("transitions to vocabulary summary for a vocabulary", () => {
-      const vocabulary = new Vocabulary({ iri, label });
+      const vocabulary = new Vocabulary({ iri, label: langString(label) });
       TermItStore.getState().user = Generator.generateUser();
 
       RoutingInstance.transitionToAsset(vocabulary);
       expect(historyMock.push).toHaveBeenCalledWith(
         Routing.getTransitionPath(Routes.vocabularySummary, {
           params: new Map([["name", label]]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });
@@ -87,7 +87,7 @@ describe("Routing", () => {
             ["name", label],
             ["timestamp", timestamp],
           ]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });
@@ -105,7 +105,7 @@ describe("Routing", () => {
             ["name", label],
             ["termName", termName],
           ]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });
@@ -129,7 +129,7 @@ describe("Routing", () => {
             ["termName", termName],
             ["timestamp", timestamp],
           ]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });
@@ -142,12 +142,12 @@ describe("Routing", () => {
 
     it("transitions to public vocabulary summary for a vocabulary", () => {
       TermItStore.getState().user = EMPTY_USER;
-      const vocabulary = new Vocabulary({ iri, label });
+      const vocabulary = new Vocabulary({ iri, label: langString(label) });
       RoutingInstance.transitionToPublicAsset(vocabulary);
       expect(historyMock.push).toHaveBeenCalledWith(
         Routing.getTransitionPath(Routes.publicVocabularySummary, {
           params: new Map([["name", label]]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });
@@ -164,7 +164,7 @@ describe("Routing", () => {
             ["name", label],
             ["termName", term.label[Constants.DEFAULT_LANGUAGE]],
           ]),
-          query: new Map([["namespace", namespace]]),
+          query: new Map([["namespace", encodeURIComponent(namespace)]]),
         })
       );
     });