From 3fc307c831a7279c231eade3fff0d858baefa5f0 Mon Sep 17 00:00:00 2001
From: Aldo Mihasi <amihasi@cite-sa.gr>
Date: Fri, 21 Jul 2023 17:04:41 +0300
Subject: [PATCH] #8912: adding new metadata/registries api in the configs

---
 .../resources/externalUrls/ExternalUrls.xml   | 36 ++++++++++++++-----
 .../externalUrls/ExternalUrlsStaging.xml      | 36 ++++++++++++++-----
 ...et-external-references-editor.component.ts |  2 +-
 .../form-field/form-field.component.ts        |  2 +-
 4 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
index 4281c6d37..5752ced62 100644
--- a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
+++ b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml
@@ -6,22 +6,40 @@
 
     <registries>
         <urls>
+<!--            <urlConfig>-->
+<!--                <key>cristin</key>-->
+<!--                <label>Cristin</label>-->
+<!--                <ordinal>1</ordinal>-->
+<!--                <type>External</type>-->
+<!--                <url>https://eestore.paas2.uninett.no/api/metadataschema/?search={like}&amp;page={page}&amp;size={pageSize}</url>-->
+<!--                <firstPage>1</firstPage>-->
+<!--                <contenttype>application/vnd.api+json; charset=utf-8</contenttype>-->
+<!--                <data>-->
+<!--                    <path>$['data'][*]['attributes']</path>-->
+<!--                    <fields>-->
+<!--                        <id>'pid'</id>-->
+<!--                        <name>'name'</name>-->
+<!--                        <uri>'uri'</uri>-->
+<!--                        <description>'description'</description>-->
+<!--                        <source>'source'</source>-->
+<!--                    </fields>-->
+<!--                </data>-->
+<!--                <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>-->
+<!--            </urlConfig>-->
             <urlConfig>
-                <key>cristin</key>
-                <label>Cristin</label>
+                <key>rda-metadata-schemes</key>
+                <label>RDA Metadata Schemes</label>
                 <ordinal>1</ordinal>
                 <type>External</type>
-                <url>https://eestore.paas2.uninett.no/api/metadataschema/?search={like}&amp;page={page}&amp;size={pageSize}</url>
-                <firstPage>1</firstPage>
-                <contenttype>application/vnd.api+json; charset=utf-8</contenttype>
+                <url>https://rdamsc.bath.ac.uk/api2/m?q={like}&amp;start=1&amp;pageSize=111</url>
+                <contenttype>application/json; charset=utf-8</contenttype>
                 <data>
-                    <path>$['data'][*]['attributes']</path>
+                    <path>$['data']['items'][*]</path>
                     <fields>
-                        <id>'pid'</id>
-                        <name>'name'</name>
+                        <id>'mscid'</id>
+                        <name>'title'</name>
                         <uri>'uri'</uri>
                         <description>'description'</description>
-                        <source>'source'</source>
                     </fields>
                 </data>
                 <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
diff --git a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrlsStaging.xml b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrlsStaging.xml
index 14c945367..365ea535a 100644
--- a/dmp-backend/web/src/main/resources/externalUrls/ExternalUrlsStaging.xml
+++ b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrlsStaging.xml
@@ -6,22 +6,40 @@
 
     <registries>
         <urls>
+<!--            <urlConfig>-->
+<!--                <key>cristin</key>-->
+<!--                <label>Cristin</label>-->
+<!--                <ordinal>1</ordinal>-->
+<!--                <type>External</type>-->
+<!--                <url>https://eestore.paas2.uninett.no/api/metadataschema/?search={like}&amp;page={page}&amp;size={pageSize}</url>-->
+<!--                <firstPage>1</firstPage>-->
+<!--                <contenttype>application/vnd.api+json; charset=utf-8</contenttype>-->
+<!--                <data>-->
+<!--                    <path>$['data'][*]['attributes']</path>-->
+<!--                    <fields>-->
+<!--                        <id>'pid'</id>-->
+<!--                        <name>'name'</name>-->
+<!--                        <uri>'uri'</uri>-->
+<!--                        <description>'description'</description>-->
+<!--                        <source>'source'</source>-->
+<!--                    </fields>-->
+<!--                </data>-->
+<!--                <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>-->
+<!--            </urlConfig>-->
             <urlConfig>
-                <key>cristin</key>
-                <label>Cristin</label>
+                <key>rda-metadata-schemes</key>
+                <label>RDA Metadata Schemes</label>
                 <ordinal>1</ordinal>
                 <type>External</type>
-                <url>https://eestore.paas2.uninett.no/api/metadataschema/?search={like}&amp;page={page}&amp;size={pageSize}</url>
-                <firstPage>1</firstPage>
-                <contenttype>application/vnd.api+json; charset=utf-8</contenttype>
+                <url>https://rdamsc.bath.ac.uk/api2/m?q={like}&amp;start=1&amp;pageSize=111</url>
+                <contenttype>application/json; charset=utf-8</contenttype>
                 <data>
-                    <path>$['data'][*]['attributes']</path>
+                    <path>$['data']['items'][*]</path>
                     <fields>
-                        <id>'pid'</id>
-                        <name>'name'</name>
+                        <id>'mscid'</id>
+                        <name>'title'</name>
                         <uri>'uri'</uri>
                         <description>'description'</description>
-                        <source>'source'</source>
                     </fields>
                 </data>
                 <paginationpath>$['meta']['pagination']['page','pages','count']</paginationpath>
diff --git a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
index fc991bc70..b3cc56cc1 100644
--- a/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/dataset-wizard/external-references/dataset-external-references-editor.component.ts
@@ -60,7 +60,7 @@ export class DatasetExternalReferencesEditorComponent extends BaseComponent impl
 		initialItems: (type) => this.searchDatasetExternalRegistries('', type),
 		displayFn: (item) => item ? item.name : null,
 		titleFn: (item) => item ? item.name : null,
-		subtitleFn: (item) => item.source ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.source : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE')
+		subtitleFn: (item) => item.source ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.source : item.tag ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.tag : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE')
 	};
 
 	dataRepositoriesAutoCompleteConfiguration: SingleAutoCompleteConfiguration = {
diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts
index b124dfd5a..0bc73c23f 100644
--- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts
+++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.ts
@@ -271,7 +271,7 @@ export class FormFieldComponent extends BaseComponent implements OnInit {
 					initialItems: () => this.searchDatasetExternalRegistries(''),
 					displayFn: (item) => { try { return typeof (item) == 'string' ? JSON.parse(item)['name'] : item.name } catch { return '' } },
 					titleFn: (item) => { try { return typeof (item) == 'string' ? JSON.parse(item)['name'] : item.name } catch { return '' } },
-					subtitleFn: (item) => { try { return item.source ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.source : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') } catch { return '' } },
+					subtitleFn: (item) => { try { return item.source ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.source : item.tag ? this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.SOURCE:') + item.tag : this.language.instant('TYPES.EXTERNAL-DATASET-TYPE.NO-SOURCE') } catch { return '' } },
 					valueAssign: (item) => { try { return typeof (item) == 'string' ? item : JSON.stringify(item) } catch { return '' } }
 				};
 				break;