Merge pull request #477 from diggsweden/DIGG-384

Digg 384

Author: AlessandroGasperini

pages/terminology/[terminology]/index.tsx

@@ -15,7 +15,7 @@ export default function Concept() {
   if (env.ENTRYSCAPE_TERMS_PATH.includes("sandbox"))
     entryUri = `https://www-sandbox.dataportal.se/concepts/${curi}`;
   else entryUri = `https://dataportal.se/concepts/${curi}`;
-
+  const hasResourceUri = `https://www.dataportal.se/terminology/${curi}`;
   const postscribeStatus = useScript(
     "/postscribe.min.js",
     "sha384-1nPAWyZS0cvGLWSoWOrkTZAy8Xq8g6llEe985qo5NRPAeDi+F9h9U+0R8v56XWCM",
@@ -28,6 +28,7 @@ export default function Concept() {
       entryUri={entryUri}
       entrystoreUrl={env.ENTRYSCAPE_TERMS_PATH}
       fetchMore={false}
+      hasResourceUri={hasResourceUri}
     >
       <ConceptPage curi={curi as string} />
     </EntrystoreProvider>

providers/EntrystoreProvider/index.tsx

@@ -22,6 +22,7 @@ export interface EntrystoreProviderProps {
   entrystoreUrl: string | "admin.dataportal.se";
   fetchMore: boolean;
   isConcept?: boolean;
+  hasResourceUri?: string;
 }
 
 export interface ESEntry {
@@ -74,6 +75,7 @@ export const EntrystoreProvider: React.FC<EntrystoreProviderProps> = ({
   entrystoreUrl,
   fetchMore,
   isConcept,
+  hasResourceUri,
 }) => {
   const [state, setState] = useState(defaultESEntry);
   const { lang: nextLang } = useTranslation("common");
@@ -138,8 +140,11 @@ export const EntrystoreProvider: React.FC<EntrystoreProviderProps> = ({
 
               const hasResource = await es
                 .newSolrQuery()
+                .uriProperty(
+                  "http://www.w3.org/ns/dx/prof/hasResource",
+                  hasResourceUri || entryUri,
+                )
                 .rdfType(["dcterms:Standard", "prof:Profile"])
-                .uriProperty("prof:hasResource", resourceURI)
                 .getEntries();
 
               const datasetArr = await Promise.all(
@@ -278,29 +283,39 @@ export const EntrystoreProvider: React.FC<EntrystoreProviderProps> = ({
               const resourceURI = entry.getResourceURI();
               const valuePromises: Promise<string>[] = [];
 
-              const maybeSpecs = graph
-                .find(null, "dcterms:conformsTo")
+              const conformsToURIs = graph
+                .find(resourceURI, "dcterms:conformsTo")
                 .map((stmt: any) => stmt.getValue());
+              const util = new ESJS.EntryStoreUtil(
+                new ESJS.EntryStore(`https://editera.dataportal.se/store`),
+              );
 
-              const findSpec =
-                maybeSpecs.length > 0
-                  ? await es
-                      .newSolrQuery()
-                      .resource(maybeSpecs, null)
-                      .rdfType(["dcterms:Standard", "prof:Profile"])
-                      .getEntries()
-                  : [];
+              const conformsToEntries = await util.loadEntriesByResourceURIs(
+                conformsToURIs,
+                undefined,
+                true,
+              );
+              const specfications = conformsToEntries.filter((s: any) => s);
+              const extractHREF = (s: any) => {
+                if (s.getResourceURI().startsWith("https://dataportal.se"))
+                  return s.getResourceURI();
+                return `https://dataportal.se/externalspecification/${s.getResourceURI()}`;
+              };
+
+              const specificationHREF = specfications.map((s: any) =>
+                extractHREF(s),
+              );
 
               const specArr = await Promise.all(
-                findSpec.map(async (spec: any) => {
+                conformsToEntries.map(async (spec: any) => {
                   return {
                     title: await getLocalizedValue(
                       spec.getAllMetadata(),
                       "dcterms:title",
                       nextLang,
                       es,
                     ),
-                    url: spec.getResourceURI(),
+                    url: specificationHREF[0],
                   };
                 }),
               );