From 1c3c8c78350d74f47d35784ff585310e0c190abc Mon Sep 17 00:00:00 2001
From: f-osorio <fosorio@loc.gov>
Date: Thu, 23 Jan 2025 14:25:09 -0500
Subject: [PATCH 1/6] Don't show ReadOnly Admin metadata fields

---
 src/components/panels/edit/EditPanel.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/panels/edit/EditPanel.vue b/src/components/panels/edit/EditPanel.vue
index feb962e7..46ae9424 100644
--- a/src/components/panels/edit/EditPanel.vue
+++ b/src/components/panels/edit/EditPanel.vue
@@ -82,8 +82,8 @@
               <template v-if="(preferenceStore.returnValue('--b-edit-main-splitpane-edit-adhoc-mode') === true && activeProfile.rt[profileName].pt[profileCompoent].canBeHidden === false) || preferenceStore.returnValue('--b-edit-main-splitpane-edit-adhoc-mode') === false">
 
                 <template v-if="((preferenceStore.returnValue('--b-edit-main-splitpane-edit-switch-between-resource-button') === false) || (preferenceStore.returnValue('--b-edit-main-splitpane-edit-switch-between-resource-button') === true && profileName == activeResourceName ))">
-
-                  <template v-if="!activeProfile.rt[profileName].pt[profileCompoent].deleted">
+                  <!-- if it's readonly and admin metadata don't show it -->
+                  <template v-if="!activeProfile.rt[profileName].pt[profileCompoent].deleted && !(isReadOnly(activeProfile.rt[profileName].pt[profileCompoent]) && activeProfile.rt[profileName].pt[profileCompoent].propertyLabel == 'Admin Metadata')">
                     <!-- if createLatoutMode is active, and there is an active layout, show everything -->
                     <div v-if="(!preferenceStore.returnValue('--c-general-ad-hoc') || (createLayoutMode && !layoutActive)) || (layoutActive || (preferenceStore.returnValue('--c-general-ad-hoc') && !profileStore.emptyComponents[profileName].includes(profileCompoent)))" :class="{ 'inline-mode' : (preferenceStore.returnValue('--b-edit-main-splitpane-edit-inline-mode')), 'edit-panel-scroll-x-child': preferenceStore.returnValue('--b-edit-main-splitpane-edit-scroll-x'), 'read-only': isReadOnly(activeProfile.rt[profileName].pt[profileCompoent])}">
                       <!-- =={{ layoutActiveFilter['properties'][profileName].includes(activeProfile.rt[profileName].pt[profileCompoent].id) }} -->

From da0608bd340c3268331894df36f1886c0f250afb Mon Sep 17 00:00:00 2001
From: f-osorio <fosorio@loc.gov>
Date: Thu, 23 Jan 2025 14:40:57 -0500
Subject: [PATCH 2/6] Simplify check for readonly admin fields

`isReadOnly()` already checks if it's an admin field.
---
 src/components/panels/edit/EditPanel.vue              | 3 +--
 src/components/panels/sidebar_property/Properties.vue | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/panels/edit/EditPanel.vue b/src/components/panels/edit/EditPanel.vue
index 46ae9424..2c3e135c 100644
--- a/src/components/panels/edit/EditPanel.vue
+++ b/src/components/panels/edit/EditPanel.vue
@@ -82,8 +82,7 @@
               <template v-if="(preferenceStore.returnValue('--b-edit-main-splitpane-edit-adhoc-mode') === true && activeProfile.rt[profileName].pt[profileCompoent].canBeHidden === false) || preferenceStore.returnValue('--b-edit-main-splitpane-edit-adhoc-mode') === false">
 
                 <template v-if="((preferenceStore.returnValue('--b-edit-main-splitpane-edit-switch-between-resource-button') === false) || (preferenceStore.returnValue('--b-edit-main-splitpane-edit-switch-between-resource-button') === true && profileName == activeResourceName ))">
-                  <!-- if it's readonly and admin metadata don't show it -->
-                  <template v-if="!activeProfile.rt[profileName].pt[profileCompoent].deleted && !(isReadOnly(activeProfile.rt[profileName].pt[profileCompoent]) && activeProfile.rt[profileName].pt[profileCompoent].propertyLabel == 'Admin Metadata')">
+                  <template v-if="!activeProfile.rt[profileName].pt[profileCompoent].deleted && !isReadOnly(activeProfile.rt[profileName].pt[profileCompoent])">
                     <!-- if createLatoutMode is active, and there is an active layout, show everything -->
                     <div v-if="(!preferenceStore.returnValue('--c-general-ad-hoc') || (createLayoutMode && !layoutActive)) || (layoutActive || (preferenceStore.returnValue('--c-general-ad-hoc') && !profileStore.emptyComponents[profileName].includes(profileCompoent)))" :class="{ 'inline-mode' : (preferenceStore.returnValue('--b-edit-main-splitpane-edit-inline-mode')), 'edit-panel-scroll-x-child': preferenceStore.returnValue('--b-edit-main-splitpane-edit-scroll-x'), 'read-only': isReadOnly(activeProfile.rt[profileName].pt[profileCompoent])}">
                       <!-- =={{ layoutActiveFilter['properties'][profileName].includes(activeProfile.rt[profileName].pt[profileCompoent].id) }} -->
diff --git a/src/components/panels/sidebar_property/Properties.vue b/src/components/panels/sidebar_property/Properties.vue
index 3eb6aa12..7f04a7df 100644
--- a/src/components/panels/sidebar_property/Properties.vue
+++ b/src/components/panels/sidebar_property/Properties.vue
@@ -7,6 +7,7 @@
 
 
   import { mapStores, mapState, mapWritableState } from 'pinia'
+import { isReadonly } from 'vue';
 
   export default {
     data() {
@@ -295,6 +296,13 @@
           this.activeComponent = this.activeProfile.rt[profileName].pt[elementName]
         }
       },
+
+      isReadOnly: function(component){
+        if (component.adminMetadataType && component.adminMetadataType == 'secondary'){
+          return true
+        }
+        return false
+      },
     },
   }
 
@@ -348,6 +356,7 @@
                             item-key="id">
                             <template #item="{element}">
                               <template v-if="!activeProfile.rt[profileName].pt[element].deleted && !hideProps.includes(activeProfile.rt[profileName].pt[element].propertyURI) && ( (layoutActive && layoutActiveFilter['properties'][profileName] && layoutActiveFilter['properties'][profileName].includes(activeProfile.rt[profileName].pt[element].id)) || !layoutActive || (createLayoutMode && layoutActive))">
+                                ?? {{ activeProfile.rt[profileName].pt[element] }}
                                 <li @click.stop="jumpToElement(profileName, element)" :class="['sidebar-property-li sidebar-property-li-empty', {'user-populated': (hasData(activeProfile.rt[profileName].pt[element]) == 'user')} , {'system-populated': (hasData(activeProfile.rt[profileName].pt[element])) == 'system'}  , {'not-populated-hide': (preferenceStore.returnValue('--c-general-ad-hoc') && emptyComponents[profileName] && emptyComponents[profileName].includes(element) && !layoutActive )}]">
                                   <a href="#" @click.stop="jumpToElement(profileName, element)" class="sidebar-property-ul-alink">
                                       <template v-if="preferenceStore.returnValue('--b-edit-main-splitpane-properties-number-labels')">{{activeProfile.rt[profileName].ptOrder.indexOf(element)}}</template>

From f64a498560d610829b9f02d04714b08c439bf68d Mon Sep 17 00:00:00 2001
From: f-osorio <fosorio@loc.gov>
Date: Thu, 23 Jan 2025 14:48:45 -0500
Subject: [PATCH 3/6] Hide readonly Admin data from property Panel

---
 src/components/panels/sidebar_property/Properties.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/panels/sidebar_property/Properties.vue b/src/components/panels/sidebar_property/Properties.vue
index 7f04a7df..3e0782dc 100644
--- a/src/components/panels/sidebar_property/Properties.vue
+++ b/src/components/panels/sidebar_property/Properties.vue
@@ -297,7 +297,7 @@ import { isReadonly } from 'vue';
         }
       },
 
-      isReadOnly: function(component){
+      isReadOnlyField: function(component){
         if (component.adminMetadataType && component.adminMetadataType == 'secondary'){
           return true
         }
@@ -355,8 +355,7 @@ import { isReadonly } from 'vue';
                             @change="change"
                             item-key="id">
                             <template #item="{element}">
-                              <template v-if="!activeProfile.rt[profileName].pt[element].deleted && !hideProps.includes(activeProfile.rt[profileName].pt[element].propertyURI) && ( (layoutActive && layoutActiveFilter['properties'][profileName] && layoutActiveFilter['properties'][profileName].includes(activeProfile.rt[profileName].pt[element].id)) || !layoutActive || (createLayoutMode && layoutActive))">
-                                ?? {{ activeProfile.rt[profileName].pt[element] }}
+                              <template v-if="!isReadOnlyField(activeProfile.rt[profileName].pt[element]) && !activeProfile.rt[profileName].pt[element].deleted && !hideProps.includes(activeProfile.rt[profileName].pt[element].propertyURI) && ( (layoutActive && layoutActiveFilter['properties'][profileName] && layoutActiveFilter['properties'][profileName].includes(activeProfile.rt[profileName].pt[element].id)) || !layoutActive || (createLayoutMode && layoutActive))">
                                 <li @click.stop="jumpToElement(profileName, element)" :class="['sidebar-property-li sidebar-property-li-empty', {'user-populated': (hasData(activeProfile.rt[profileName].pt[element]) == 'user')} , {'system-populated': (hasData(activeProfile.rt[profileName].pt[element])) == 'system'}  , {'not-populated-hide': (preferenceStore.returnValue('--c-general-ad-hoc') && emptyComponents[profileName] && emptyComponents[profileName].includes(element) && !layoutActive )}]">
                                   <a href="#" @click.stop="jumpToElement(profileName, element)" class="sidebar-property-ul-alink">
                                       <template v-if="preferenceStore.returnValue('--b-edit-main-splitpane-properties-number-labels')">{{activeProfile.rt[profileName].ptOrder.indexOf(element)}}</template>

From 89b85742659ea811fd567b3ff3529cc3ae1a19eb Mon Sep 17 00:00:00 2001
From: f-osorio <fosorio@loc.gov>
Date: Thu, 23 Jan 2025 14:55:06 -0500
Subject: [PATCH 4/6] Don't show AdminMetadata under `Work`

---
 src/components/panels/edit/EditPanel.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/panels/edit/EditPanel.vue b/src/components/panels/edit/EditPanel.vue
index 2c3e135c..1aa95a3b 100644
--- a/src/components/panels/edit/EditPanel.vue
+++ b/src/components/panels/edit/EditPanel.vue
@@ -82,7 +82,8 @@
               <template v-if="(preferenceStore.returnValue('--b-edit-main-splitpane-edit-adhoc-mode') === true && activeProfile.rt[profileName].pt[profileCompoent].canBeHidden === false) || preferenceStore.returnValue('--b-edit-main-splitpane-edit-adhoc-mode') === false">
 
                 <template v-if="((preferenceStore.returnValue('--b-edit-main-splitpane-edit-switch-between-resource-button') === false) || (preferenceStore.returnValue('--b-edit-main-splitpane-edit-switch-between-resource-button') === true && profileName == activeResourceName ))">
-                  <template v-if="!activeProfile.rt[profileName].pt[profileCompoent].deleted && !isReadOnly(activeProfile.rt[profileName].pt[profileCompoent])">
+
+                  <template v-if="!activeProfile.rt[profileName].pt[profileCompoent].deleted && !isReadOnly(activeProfile.rt[profileName].pt[profileCompoent]) && !(profileName.includes(':Work') && activeProfile.rt[profileName].pt[profileCompoent].propertyURI.includes('adminMetadata'))">
                     <!-- if createLatoutMode is active, and there is an active layout, show everything -->
                     <div v-if="(!preferenceStore.returnValue('--c-general-ad-hoc') || (createLayoutMode && !layoutActive)) || (layoutActive || (preferenceStore.returnValue('--c-general-ad-hoc') && !profileStore.emptyComponents[profileName].includes(profileCompoent)))" :class="{ 'inline-mode' : (preferenceStore.returnValue('--b-edit-main-splitpane-edit-inline-mode')), 'edit-panel-scroll-x-child': preferenceStore.returnValue('--b-edit-main-splitpane-edit-scroll-x'), 'read-only': isReadOnly(activeProfile.rt[profileName].pt[profileCompoent])}">
                       <!-- =={{ layoutActiveFilter['properties'][profileName].includes(activeProfile.rt[profileName].pt[profileCompoent].id) }} -->

From 7134b0ebe2841a16cc4c55374cefbb60c0994447 Mon Sep 17 00:00:00 2001
From: f-osorio <fosorio@loc.gov>
Date: Fri, 24 Jan 2025 07:26:07 -0500
Subject: [PATCH 5/6] Consolidate logic for hiding admin fields

---
 src/components/panels/edit/EditPanel.vue             | 12 +++++++++++-
 .../panels/sidebar_property/Properties.vue           | 10 +++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/components/panels/edit/EditPanel.vue b/src/components/panels/edit/EditPanel.vue
index 1aa95a3b..3bc1e1a9 100644
--- a/src/components/panels/edit/EditPanel.vue
+++ b/src/components/panels/edit/EditPanel.vue
@@ -83,7 +83,7 @@
 
                 <template v-if="((preferenceStore.returnValue('--b-edit-main-splitpane-edit-switch-between-resource-button') === false) || (preferenceStore.returnValue('--b-edit-main-splitpane-edit-switch-between-resource-button') === true && profileName == activeResourceName ))">
 
-                  <template v-if="!activeProfile.rt[profileName].pt[profileCompoent].deleted && !isReadOnly(activeProfile.rt[profileName].pt[profileCompoent]) && !(profileName.includes(':Work') && activeProfile.rt[profileName].pt[profileCompoent].propertyURI.includes('adminMetadata'))">
+                  <template v-if="!activeProfile.rt[profileName].pt[profileCompoent].deleted && !hideAdminField(activeProfile.rt[profileName].pt[profileCompoent], profileName)">
                     <!-- if createLatoutMode is active, and there is an active layout, show everything -->
                     <div v-if="(!preferenceStore.returnValue('--c-general-ad-hoc') || (createLayoutMode && !layoutActive)) || (layoutActive || (preferenceStore.returnValue('--c-general-ad-hoc') && !profileStore.emptyComponents[profileName].includes(profileCompoent)))" :class="{ 'inline-mode' : (preferenceStore.returnValue('--b-edit-main-splitpane-edit-inline-mode')), 'edit-panel-scroll-x-child': preferenceStore.returnValue('--b-edit-main-splitpane-edit-scroll-x'), 'read-only': isReadOnly(activeProfile.rt[profileName].pt[profileCompoent])}">
                       <!-- =={{ layoutActiveFilter['properties'][profileName].includes(activeProfile.rt[profileName].pt[profileCompoent].id) }} -->
@@ -244,6 +244,16 @@
 
         },
 
+        //We only want the editable admin field under instances to show up
+        // Don't show READONLY ADMIN fields in the instance, Don't show any admin fields in the work
+        hideAdminField: function(component, profileName){
+          let readOnly = this.isReadOnly(component)
+          let isWork = profileName.includes(':Work')
+          let isAdminField = component.propertyURI.includes('adminMetadata')
+
+          return (readOnly) || (isWork && isAdminField )
+        },
+
         inlineRowButtonMouseEnter: function(event){
           console.log(event)
 
diff --git a/src/components/panels/sidebar_property/Properties.vue b/src/components/panels/sidebar_property/Properties.vue
index 3e0782dc..e15df61c 100644
--- a/src/components/panels/sidebar_property/Properties.vue
+++ b/src/components/panels/sidebar_property/Properties.vue
@@ -303,6 +303,14 @@ import { isReadonly } from 'vue';
         }
         return false
       },
+
+      hideAdminField: function(component, profileName){
+          let readOnly = this.isReadOnlyField(component)
+          let isWork = profileName.includes(':Work')
+          let isAdminField = component.propertyURI.includes('adminMetadata')
+
+          return (readOnly) || (isWork && isAdminField )
+        },
     },
   }
 
@@ -355,7 +363,7 @@ import { isReadonly } from 'vue';
                             @change="change"
                             item-key="id">
                             <template #item="{element}">
-                              <template v-if="!isReadOnlyField(activeProfile.rt[profileName].pt[element]) && !activeProfile.rt[profileName].pt[element].deleted && !hideProps.includes(activeProfile.rt[profileName].pt[element].propertyURI) && ( (layoutActive && layoutActiveFilter['properties'][profileName] && layoutActiveFilter['properties'][profileName].includes(activeProfile.rt[profileName].pt[element].id)) || !layoutActive || (createLayoutMode && layoutActive))">
+                              <template v-if="!hideAdminField(activeProfile.rt[profileName].pt[element], profileName) && !activeProfile.rt[profileName].pt[element].deleted && !hideProps.includes(activeProfile.rt[profileName].pt[element].propertyURI) && ( (layoutActive && layoutActiveFilter['properties'][profileName] && layoutActiveFilter['properties'][profileName].includes(activeProfile.rt[profileName].pt[element].id)) || !layoutActive || (createLayoutMode && layoutActive))">
                                 <li @click.stop="jumpToElement(profileName, element)" :class="['sidebar-property-li sidebar-property-li-empty', {'user-populated': (hasData(activeProfile.rt[profileName].pt[element]) == 'user')} , {'system-populated': (hasData(activeProfile.rt[profileName].pt[element])) == 'system'}  , {'not-populated-hide': (preferenceStore.returnValue('--c-general-ad-hoc') && emptyComponents[profileName] && emptyComponents[profileName].includes(element) && !layoutActive )}]">
                                   <a href="#" @click.stop="jumpToElement(profileName, element)" class="sidebar-property-ul-alink">
                                       <template v-if="preferenceStore.returnValue('--b-edit-main-splitpane-properties-number-labels')">{{activeProfile.rt[profileName].ptOrder.indexOf(element)}}</template>

From db7d8df8d9c52b564695f80f2730972a2da5b0c0 Mon Sep 17 00:00:00 2001
From: f-osorio <fosorio@loc.gov>
Date: Fri, 24 Jan 2025 07:26:53 -0500
Subject: [PATCH 6/6] version++

---
 src/stores/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/config.js b/src/stores/config.js
index 78002257..d129d8ec 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: 25,
+    versionPatch: 26,
 
     regionUrls: {