From 8246bdc66632af757be1b29a7251bde6b3d0227c Mon Sep 17 00:00:00 2001
From: f-osorio <fosorio@loc.gov>
Date: Tue, 28 Jan 2025 11:01:15 -0500
Subject: [PATCH 1/2] Make subject entity uniform between Builder and MARC

They use the same icons and the link opens the builder
---
 .../panels/edit/fields/LookupComplex.vue      | 33 ++++++++++++++++---
 .../edit/fields/helpers/ValidationIcon.vue    |  9 +++--
 .../panels/edit/modals/SubjectEditor.vue      |  3 +-
 src/lib/utils_network.js                      |  1 -
 src/lib/utils_profile.js                      |  1 -
 src/lib/utils_rdf.js                          | 20 +++++------
 src/stores/profile.js                         |  9 +++--
 7 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/src/components/panels/edit/fields/LookupComplex.vue b/src/components/panels/edit/fields/LookupComplex.vue
index 59e53abd9..b44000dd6 100644
--- a/src/components/panels/edit/fields/LookupComplex.vue
+++ b/src/components/panels/edit/fields/LookupComplex.vue
@@ -147,14 +147,37 @@
         <template v-if="configStore.useSubjectEditor.includes(structure.propertyURI)">
 
           <div class="marc-deliminated-lcsh-mode-container" v-if="marcDeliminatedLCSHModeResults && marcDeliminatedLCSHModeResults.hit && Array.isArray(marcDeliminatedLCSHModeResults.hit)">
-            <template v-for="heading in marcDeliminatedLCSHModeResults.hit">
+            <div class="selected-value-container">
+              <AuthTypeIcon passClass="complex-lookup-inline" :type="marcDeliminatedLCSHModeResults.hit[0].heading.rdfType"/>
+              <a href="#" @click="openAuthority()" ref="el">
+                {{ marcDeliminatedLCSHModeResults.hit.map((item)=>item.label).join("--") }}
+              </a>
+              <template v-if="marcDeliminatedLCSHModeResults.hit.length == 1">
+                <ValidationIcon :value="{
+                  '@guid': profileStore.returnStructureByGUID(guid).userValue[propertyPath[0].propertyURI][0]['@guid'],
+                  'URI': marcDeliminatedLCSHModeResults.hit[0].uri,
+                }" />
+              </template>
+              <template v-else>
+                <ValidationIcon :value="{'@guid': profileStore.returnStructureByGUID(guid).userValue[propertyPath[0].propertyURI][0]['@guid']}" />
+              </template>
+            </div>
+
+            <!-- <template v-for="heading in marcDeliminatedLCSHModeResults.hit">
               <span v-if="heading.literal==false" class="marc-deliminated-lcsh-mode-entity"> <span class="material-icons marc-deliminated-lcsh-mode-icon">check_circle</span> <a :href="heading.uri" target="_blank">{{ heading.label }}</a></span>
               <span v-if="heading.literal==true" class="marc-deliminated-lcsh-mode-entity"> <span class="material-icons marc-deliminated-lcsh-mode-icon-warning">warning</span> {{ heading.label }} </span>
-            </template>
+            </template> -->
           </div>
 
           <div class="marc-deliminated-lcsh-mode-container" v-else-if="marcDeliminatedLCSHModeResults && marcDeliminatedLCSHModeResults.resultType == 'COMPLEX'">
-            <span class="marc-deliminated-lcsh-mode-entity"> <span class="material-icons marc-deliminated-lcsh-mode-icon">check_circle</span> <a :href="marcDeliminatedLCSHModeResults.hit.uri" target="_blank">{{ marcDeliminatedLCSHModeResults.hit.label }}</a></span>
+            <div class="selected-value-container">
+              <AuthTypeIcon passClass="complex-lookup-inline" :type="marcDeliminatedLCSHModeResults.hit.heading.rdfType"/>
+              <a href="#" @click="openAuthority()" ref="el">
+                {{ marcDeliminatedLCSHModeResults.hit.label }}
+              </a>
+              <ValidationIcon :value="marcDeliminatedLCSHModeResults.hit" />
+            </div>
+            <!-- <span class="marc-deliminated-lcsh-mode-entity"> <span class="material-icons marc-deliminated-lcsh-mode-icon">check_circle</span> <a :href="marcDeliminatedLCSHModeResults.hit.uri" target="_blank">{{ marcDeliminatedLCSHModeResults.hit.label }}</a></span> -->
           </div>
 
           <div class="marc-deliminated-lcsh-mode-container" v-else-if="marcDeliminatedLCSHModeResults && marcDeliminatedLCSHModeResults.resultType == 'ERROR'">
@@ -749,10 +772,10 @@ export default {
         this.searchType = selected
       } catch {}
 
-      let label = this.$refs.el[0].innerHTML
+      let label = this.$refs.el[0] ? this.$refs.el[0].innerHTML : this.$refs.el.innerHTML
       this.profileData = this.profileStore.returnStructureByGUID(this.guid)
 
-      let sibling = this.$refs.el[0].parentNode.childNodes[2]
+      let sibling = this.$refs.el[0] ? this.$refs.el[0].parentNode.childNodes[2] :  this.$refs.el.parentNode.childNodes[2]
       if (sibling.className == "uncontrolled") {
         this.isLiteral = true
       } else {
diff --git a/src/components/panels/edit/fields/helpers/ValidationIcon.vue b/src/components/panels/edit/fields/helpers/ValidationIcon.vue
index b2f7df419..ae4cea8c1 100644
--- a/src/components/panels/edit/fields/helpers/ValidationIcon.vue
+++ b/src/components/panels/edit/fields/helpers/ValidationIcon.vue
@@ -41,8 +41,7 @@ export default {
 
 
     useIcon(){
-
-      if (this.value && this.value.URI){
+      if (this.value && (this.value.URI || this.value.uri)){
         return ['verified','Linked']
       }else{
         return this.profileStore.returnValidationType( this.value['@guid'])
@@ -50,9 +49,9 @@ export default {
 
       return [null,null]
 
-    }, 
+    },
+
 
-    
 
 
   },
@@ -133,7 +132,7 @@ export default {
   padding: 2px;
   font-size: 13px;
 
-  
+
   content: attr(data-tooltip);
   white-space: nowrap;
 }
diff --git a/src/components/panels/edit/modals/SubjectEditor.vue b/src/components/panels/edit/modals/SubjectEditor.vue
index 7d85d3150..dc3e2b97d 100644
--- a/src/components/panels/edit/modals/SubjectEditor.vue
+++ b/src/components/panels/edit/modals/SubjectEditor.vue
@@ -974,6 +974,7 @@ methods: {
             console.error(err)
         }
     }
+
   },
 
   /**
@@ -2956,7 +2957,7 @@ updated: function() {
 
   //When there is existing data, we need to make sure that the number of components matches
   // the number subjects in the searchValue
-  if (this.searchValue && this.components.length != this.searchValue.split("--").length && !this.searchValue.endsWith('-')){
+  if (this.searchValue && (this.components.length != this.searchValue.split("--").length || this.components[0].label != this.searchValue) && !this.searchValue.endsWith('-')){
     this.buildLookupComponents(incomingSubjects)
     this.buildComponents(this.searchValue)
 
diff --git a/src/lib/utils_network.js b/src/lib/utils_network.js
index 990b3d352..0b73794bd 100644
--- a/src/lib/utils_network.js
+++ b/src/lib/utils_network.js
@@ -374,7 +374,6 @@ const utilsNetwork = {
               url = url.replace('https://preprod-8288.id.loc.gov','https://id.loc.gov')
             }
 
-
             url = url + "&blastdacache=" + Date.now()
 
             // don't allow a ? in the keyword if it is already marked as keyword search
diff --git a/src/lib/utils_profile.js b/src/lib/utils_profile.js
index 4f1499893..685441d75 100644
--- a/src/lib/utils_profile.js
+++ b/src/lib/utils_profile.js
@@ -20,7 +20,6 @@ const utilsProfile = {
   returnGuidLocation: function(obj,guid){
     // use a pattern that looks at many possible levels down for a @guid
     let foundPos = objectScan(['*.**.@guid,*.**.@guid.**.@guid,*.**.@guid.**.@guid.**.@guid,*.**.@guid.**.@guid.**.@guid.**.@guid'])(obj);
-
     for (let fp of foundPos){
       // eventuall pointer will point to the @guid value
       let pointer = obj
diff --git a/src/lib/utils_rdf.js b/src/lib/utils_rdf.js
index a6eb18a3f..9262412cf 100644
--- a/src/lib/utils_rdf.js
+++ b/src/lib/utils_rdf.js
@@ -64,7 +64,7 @@ const utilsRDF = {
   * @return {bolean}
   */
   isUriALiteral: function(URI){
-      if (this.LITERAL_TYPES.map((v) => {return v.toLowerCase()}).indexOf(URI.toLowerCase()) > -1){
+      if (URI && this.LITERAL_TYPES.map((v) => {return v.toLowerCase()}).indexOf(URI.toLowerCase()) > -1){
           return true
       }
       return false
@@ -82,7 +82,7 @@ const utilsRDF = {
       // grab the rtLookup from the profile store
       if (!rtLookup){
         rtLookup= useProfileStore().rtLookup
-      } 
+      }
 
       // if the component itself has it set then just return it we dont need to dig around
       if (propertyURI == pt.propertyURI){
@@ -129,7 +129,7 @@ const utilsRDF = {
           if (!pt.userValue[pt.propertyURI]){
               lookForResourceURI = true
           }else{
-              if (pt.userValue[pt.propertyURI] && pt.userValue[pt.propertyURI][0]){                  
+              if (pt.userValue[pt.propertyURI] && pt.userValue[pt.propertyURI][0]){
                   if (!pt.userValue[pt.propertyURI][0]['@type']){
                       lookForResourceURI = true
                   }
@@ -152,14 +152,14 @@ const utilsRDF = {
           }
       }
 
-      
+
       return false
 
   },
 
   /**
-  * 
-  * 
+  *
+  *
   * @param {string} propertyURI - the string URI to test
   * @param {obj} pt - the pt template from the profile
   * @return {string} URI - the uri of the type
@@ -169,7 +169,7 @@ const utilsRDF = {
       // grab the rtLookup from the profile store
       if (!rtLookup){
         rtLookup= useProfileStore().rtLookup
-      } 
+      }
       // only do this on templates that have one reference templates for now (may need to expand)
       if (pt.valueConstraint && pt.valueConstraint.valueTemplateRefs && pt.valueConstraint.valueTemplateRefs.length==1){
         let valueTemplateRef = pt.valueConstraint.valueTemplateRefs[0]
@@ -195,7 +195,7 @@ const utilsRDF = {
       // grab the rtLookup from the profile store
       if (!rtLookup){
         rtLookup= useProfileStore().rtLookup
-      } 
+      }
 
       let template = rtLookup[valueTemplateRef]
       let foundProperty = null
@@ -255,7 +255,7 @@ const utilsRDF = {
       return 'http://www.w3.org/2000/01/rdf-schema#Resource'
     }
 
-    
+
 
 
     // at this point we have a well cached lookup of the whole onotlogy in localstorage
@@ -275,7 +275,7 @@ const utilsRDF = {
       // check if it has a rdfs:subPropertyOf, if it does then we can ask for that
       let subPropertyOf = prop.getElementsByTagName("rdfs:subPropertyOf")
       if (subPropertyOf.length>0){
-        if (subPropertyOf[0].attributes['rdf:resource']){          
+        if (subPropertyOf[0].attributes['rdf:resource']){
           let subPropertyResult = await this.suggestTypeNetwork(subPropertyOf[0].attributes['rdf:resource'].value)
           if (subPropertyResult){
             return subPropertyResult
diff --git a/src/stores/profile.js b/src/stores/profile.js
index 96debf0a0..6b96a0b96 100644
--- a/src/stores/profile.js
+++ b/src/stores/profile.js
@@ -249,7 +249,7 @@ export const useProfileStore = defineStore('profile', {
 
       }
 
-      // now go through and see if there are the the same group being used in multiple profiles if so 
+      // now go through and see if there are the the same group being used in multiple profiles if so
       // that means they have cross profile components (2 fields in Work 1 in instance for exmaple)
 
 
@@ -268,7 +268,7 @@ export const useProfileStore = defineStore('profile', {
               }
             }
 
-          }          
+          }
         }
       }
 
@@ -285,7 +285,7 @@ export const useProfileStore = defineStore('profile', {
           groupsOrder: [],
           label: 'Multi',
           profileId: 'Multi'
-        } 
+        }
 
         for (let groupName of groupsToMerge){
 
@@ -318,7 +318,7 @@ export const useProfileStore = defineStore('profile', {
 
 
         results.push(multiProfile)
-        
+
 
 
       }
@@ -4476,7 +4476,6 @@ export const useProfileStore = defineStore('profile', {
     * @param {string} fieldGuid - the guid of the field
     */
     returnValidationType: function(fieldGuid){
-
       let fieldValue=null
 
       for (let rt of this.activeProfile.rtOrder){

From 1139f08212a2115e30535c040e81a1d74dd598ca Mon Sep 17 00:00:00 2001
From: f-osorio <fosorio@loc.gov>
Date: Tue, 28 Jan 2025 11:26:00 -0500
Subject: [PATCH 2/2] version++

---
 src/components/panels/edit/fields/LookupComplex.vue | 1 -
 src/stores/config.js                                | 2 +-
 src/stores/profile.js                               | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/panels/edit/fields/LookupComplex.vue b/src/components/panels/edit/fields/LookupComplex.vue
index b44000dd6..aa8a3ed35 100644
--- a/src/components/panels/edit/fields/LookupComplex.vue
+++ b/src/components/panels/edit/fields/LookupComplex.vue
@@ -100,7 +100,6 @@
 
           <template v-if="preferenceStore.returnValue('--b-edit-main-splitpane-edit-shortcode-display-mode') == false">
             <div class="lookup-fake-input-entities" v-if="marcDeliminatedLCSHMode == false">
-
               <div v-for="(avl,idx) in complexLookupValues" class="selected-value-container">
                 <div class="selected-value-container-auth">
                   <AuthTypeIcon passClass="complex-lookup-inline" v-if="avl.type && preferenceStore.returnValue('--b-edit-complex-use-value-icons')"  :type="avl.type"/>
diff --git a/src/stores/config.js b/src/stores/config.js
index 6c23d58b5..2f83548d9 100644
--- a/src/stores/config.js
+++ b/src/stores/config.js
@@ -7,7 +7,7 @@ export const useConfigStore = defineStore('config', {
 
     versionMajor: 0,
     versionMinor: 17,
-    versionPatch: 27,
+    versionPatch: 28,
 
     regionUrls: {
 
diff --git a/src/stores/profile.js b/src/stores/profile.js
index 6b96a0b96..a7c01779b 100644
--- a/src/stores/profile.js
+++ b/src/stores/profile.js
@@ -2050,7 +2050,6 @@ export const useProfileStore = defineStore('profile', {
     * @return {array} - an array of objs representing the simple lookup values
     */
     returnComplexLookupValueFromProfile: function(componentGuid, propertyPath){
-
       // TODO: reconcile this to how the profiles are built, or dont..
       // remove the sameAs from this property path, which will be the last one, we don't need it
       propertyPath = propertyPath.filter((v)=> { return (v.propertyURI!=='http://www.w3.org/2002/07/owl#sameAs')  })