Rename Hierarchical to Tree

UtrechtUniversity · Dec 16, 2024 · e54ac97 · e54ac97
1 parent 809d226
commit e54ac97
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 38 deletions.
diff --git a/deposit/metadata-form/src/index.js b/deposit/metadata-form/src/index.js
@@ -7,7 +7,7 @@ import { getTemplate } from '@rjsf/utils';
 import Select from 'react-select';
 import AffiliationIdentifier from 'YodaFields/AffiliationIdentifier'
 import Geolocation from 'YodaFields/Geolocation'
-import HierarchicalKeywordSelector from 'YodaFields/HierarchicalKeywordSelector'
+import TreeKeywordSelector from 'YodaFields/TreeKeywordSelector'
 import PersonIdentifier from 'YodaFields/PersonIdentifier'
 import Vocabulary from 'YodaFields/Vocabulary'
 import { withTheme } from "@rjsf/core";
@@ -206,7 +206,7 @@ const fields = {
     vocabulary: Vocabulary,
     affiliation_identifier: AffiliationIdentifier,
     person_identifier: PersonIdentifier,
-    hierarchical_keyword_selector: HierarchicalKeywordSelector
+    tree_keyword_selector: TreeKeywordSelector
 };
 
 const CustomArrayFieldTemplate = (props) => {
@@ -470,13 +470,13 @@ class YodaForm extends React.Component {
         // Turn save mode off.
         formContext.saving = false;
 
-        if (id === "yoda_HierarchicalKeyword" &&
-            form.formData.HierarchicalKeyword && 
-            form.formData.HierarchicalKeyword.value &&
-            form.formData.HierarchicalKeyword.value.length &&
-            Object.keys(form.schema.properties.HierarchicalKeyword.items.properties).includes("subject")) {
+        if (id === "yoda_TreeKeyword" &&
+            form.formData.TreeKeyword && 
+            form.formData.TreeKeyword.value &&
+            form.formData.TreeKeyword.value.length &&
+            Object.keys(form.schema.properties.TreeKeyword.items.properties).includes("subject")) {
 
-            form.formData.HierarchicalKeyword = this.updateHierarchicalKeywords(form, form.formData.HierarchicalKeyword.value)
+            form.formData.TreeKeyword = this.updateTreeKeywords(form, form.formData.TreeKeyword.value)
         }
 
         this.setState({
@@ -485,7 +485,7 @@ class YodaForm extends React.Component {
         });
     }
 
-    updateHierarchicalKeywords = (form, value) => {
+    updateTreeKeywords = (form, value) => {
         const newVal = value.map(val => {
             if (val.value.endsWith(":")) {
                 // User created keyword
@@ -495,8 +495,8 @@ class YodaForm extends React.Component {
             } else {
                 return {
                     "subject": val.label,
-                    "subjectScheme": form.uiSchema.HierarchicalKeyword["ui:subjectScheme"],
-                    "schemeUri": form.uiSchema.HierarchicalKeyword["ui:schemeUri"],
+                    "subjectScheme": form.uiSchema.TreeKeyword["ui:subjectScheme"],
+                    "schemeUri": form.uiSchema.TreeKeyword["ui:schemeUri"],
                     "valueUri": val.value.split(":").slice(1).join(":")
                 }
             }

diff --git a/deposit/static/deposit/js/metadata-form.js b/deposit/static/deposit/js/metadata-form.js
diff --git a/...orm/src/js/HierarchicalKeywordSelector.js → metadata_form/src/js/TreeKeywordSelector.js b/...orm/src/js/HierarchicalKeywordSelector.js → metadata_form/src/js/TreeKeywordSelector.js
@@ -2,7 +2,7 @@ import React from 'react'
 import axios from 'axios'
 import { TreeSelect, ConfigProvider, theme } from 'antd'
 
-class HierarchicalKeywordSelector extends React.Component {
+class TreeKeywordSelector extends React.Component {
   constructor (props) {
     super(props)
     this.state = {
@@ -234,4 +234,4 @@ class HierarchicalKeywordSelector extends React.Component {
   }
 }
 
-export default HierarchicalKeywordSelector
+export default TreeKeywordSelector
diff --git a/research/metadata-form/src/index.js b/research/metadata-form/src/index.js
@@ -7,7 +7,7 @@ import { getTemplate } from '@rjsf/utils';
 import Select from 'react-select';
 import AffiliationIdentifier from 'YodaFields/AffiliationIdentifier'
 import Geolocation from 'YodaFields/Geolocation'
-import HierarchicalKeywordSelector from 'YodaFields/HierarchicalKeywordSelector'
+import TreeKeywordSelector from 'YodaFields/TreeKeywordSelector'
 import PersonIdentifier from 'YodaFields/PersonIdentifier'
 import Vocabulary from 'YodaFields/Vocabulary'
 import { withTheme } from "@rjsf/core";
@@ -205,7 +205,7 @@ const fields = {
     vocabulary: Vocabulary,
     affiliation_identifier: AffiliationIdentifier,
     person_identifier: PersonIdentifier,
-    hierarchical_keyword_selector: HierarchicalKeywordSelector
+    tree_keyword_selector: TreeKeywordSelector
 };
 
 const CustomArrayFieldTemplate = (props) => {
@@ -469,13 +469,13 @@ class YodaForm extends React.Component {
         // Turn save mode off.
         formContext.saving = false;
 
-        if (id === "yoda_HierarchicalKeyword" &&
-            form.formData.HierarchicalKeyword && 
-            form.formData.HierarchicalKeyword.value &&
-            form.formData.HierarchicalKeyword.value.length &&
-            Object.keys(form.schema.properties.HierarchicalKeyword.items.properties).includes("subject")) {
+        if (id === "yoda_TreeKeyword" &&
+            form.formData.TreeKeyword && 
+            form.formData.TreeKeyword.value &&
+            form.formData.TreeKeyword.value.length &&
+            Object.keys(form.schema.properties.TreeKeyword.items.properties).includes("subject")) {
 
-            form.formData.HierarchicalKeyword = this.updateHierarchicalKeywords(form, form.formData.HierarchicalKeyword.value)
+            form.formData.TreeKeyword = this.updateTreeKeywords(form, form.formData.TreeKeyword.value)
         }
 
         this.setState({
@@ -487,7 +487,7 @@ class YodaForm extends React.Component {
         updateCompleteness();
     }
 
-    updateHierarchicalKeywords = (form, value) => {
+    updateTreeKeywords = (form, value) => {
         const newVal = value.map(val => {
             if (val.value.endsWith(":")) {
                 // User created keyword
@@ -497,8 +497,8 @@ class YodaForm extends React.Component {
             } else {
                 return {
                     "subject": val.label,
-                    "subjectScheme": form.uiSchema.HierarchicalKeyword["ui:subjectScheme"],
-                    "schemeUri": form.uiSchema.HierarchicalKeyword["ui:schemeUri"],
+                    "subjectScheme": form.uiSchema.TreeKeyword["ui:subjectScheme"],
+                    "schemeUri": form.uiSchema.TreeKeyword["ui:schemeUri"],
                     "valueUri": val.value.split(":").slice(1).join(":")
                 }
             }

diff --git a/research/static/research/js/metadata-form.js b/research/static/research/js/metadata-form.js
diff --git a/vault/metadata-form/src/index.js b/vault/metadata-form/src/index.js
@@ -7,7 +7,7 @@ import { getTemplate } from '@rjsf/utils';
 import Select from 'react-select';
 import AffiliationIdentifier from 'YodaFields/AffiliationIdentifier'
 import Geolocation from 'YodaFields/Geolocation'
-import HierarchicalKeywordSelector from 'YodaFields/HierarchicalKeywordSelector'
+import TreeKeywordSelector from 'YodaFields/TreeKeywordSelector'
 import PersonIdentifier from 'YodaFields/PersonIdentifier'
 import Vocabulary from 'YodaFields/Vocabulary'
 import { withTheme } from "@rjsf/core";
@@ -207,7 +207,7 @@ const fields = {
     vocabulary: Vocabulary,
     affiliation_identifier: AffiliationIdentifier,
     person_identifier: PersonIdentifier,
-    hierarchical_keyword_selector: HierarchicalKeywordSelector
+    tree_keyword_selector: TreeKeywordSelector
 };
 
 const CustomArrayFieldTemplate = (props) => {
@@ -471,13 +471,13 @@ class YodaForm extends React.Component {
         // Turn save mode off.
         formContext.saving = false;
 
-        if (id === "yoda_HierarchicalKeyword" &&
-            form.formData.HierarchicalKeyword && 
-            form.formData.HierarchicalKeyword.value &&
-            form.formData.HierarchicalKeyword.value.length &&
-            Object.keys(form.schema.properties.HierarchicalKeyword.items.properties).includes("subject")) {
+        if (id === "yoda_TreeKeyword" &&
+            form.formData.TreeKeyword && 
+            form.formData.TreeKeyword.value &&
+            form.formData.TreeKeyword.value.length &&
+            Object.keys(form.schema.properties.TreeKeyword.items.properties).includes("subject")) {
 
-            form.formData.HierarchicalKeyword = this.updateHierarchicalKeywords(form, form.formData.HierarchicalKeyword.value)
+            form.formData.TreeKeyword = this.updateTreeKeywords(form, form.formData.TreeKeyword.value)
         }
 
         this.setState({
@@ -489,7 +489,7 @@ class YodaForm extends React.Component {
         updateCompleteness();
     }
 
-    updateHierarchicalKeywords = (form, value) => {
+    updateTreeKeywords = (form, value) => {
         const newVal = value.map(val => {
             if (val.value.endsWith(":")) {
                 // User created keyword
@@ -499,8 +499,8 @@ class YodaForm extends React.Component {
             } else {
                 return {
                     "subject": val.label,
-                    "subjectScheme": form.uiSchema.HierarchicalKeyword["ui:subjectScheme"],
-                    "schemeUri": form.uiSchema.HierarchicalKeyword["ui:schemeUri"],
+                    "subjectScheme": form.uiSchema.TreeKeyword["ui:subjectScheme"],
+                    "schemeUri": form.uiSchema.TreeKeyword["ui:schemeUri"],
                     "valueUri": val.value.split(":").slice(1).join(":")
                 }
             }

diff --git a/vault/static/vault/js/metadata-form.js b/vault/static/vault/js/metadata-form.js