Purge config option options.sidebar.exif.showLocation

packages/web-app-files/src/components/SideBar/Exif/ExifPanel.vue

@@ -19,24 +19,22 @@
       <dd data-testid="exif-panel-orientation" v-text="orientation" />
       <dt v-text="$gettext('Taken time')" />
       <dd data-testid="exif-panel-takenDateTime" v-text="takenDateTime" />
-      <template v-if="isLocationVisible">
-        <dt v-text="$gettext('Location')" />
-        <dd v-if="isCopyToClipboardAvailable" data-testid="exif-panel-location">
-          <span>{{ location }}</span>
-          <oc-button
-            v-if="location"
-            v-oc-tooltip="copyLocationToClipboardLabel"
-            size="small"
-            appearance="raw"
-            class="oc-ml-s"
-            :aria-label="copyLocationToClipboardLabel"
-            @click="copyLocationToClipboard"
-          >
-            <oc-icon size="small" :name="isCopiedToClipboard ? 'checkbox-circle' : 'file-copy'" />
-          </oc-button>
-        </dd>
-        <dd v-else data-testid="exif-panel-location" v-text="location" />
-      </template>
+      <dt v-text="$gettext('Location')" />
+      <dd v-if="isCopyToClipboardAvailable" data-testid="exif-panel-location">
+        <span>{{ location }}</span>
+        <oc-button
+          v-if="location"
+          v-oc-tooltip="copyLocationToClipboardLabel"
+          size="small"
+          appearance="raw"
+          class="oc-ml-s"
+          :aria-label="copyLocationToClipboardLabel"
+          @click="copyLocationToClipboard"
+        >
+          <oc-icon size="small" :name="isCopiedToClipboard ? 'checkbox-circle' : 'file-copy'" />
+        </oc-button>
+      </dd>
+      <dd v-else data-testid="exif-panel-location" v-text="location" />
     </dl>
   </div>
 </template>
@@ -114,9 +112,6 @@ export default defineComponent({
       return photo?.takenDateTime ? formatDateFromISO(photo.takenDateTime, language.current) : '-'
     })
 
-    const isLocationVisible = computed(() => {
-      return config.options.sidebar?.exif?.showLocation !== false
-    })
     const location = computed(() => {
       const l = unref(resource).location
       if (!l?.latitude || !l?.longitude) {
@@ -153,7 +148,6 @@ export default defineComponent({
       orientation,
       takenDateTime,
       location,
-      isLocationVisible,
       isCopyToClipboardAvailable,
       isCopiedToClipboard,
       copyLocationToClipboardLabel,
@@ -167,14 +161,17 @@ export default defineComponent({
 .exif-data-list {
   display: grid;
   grid-template-columns: auto minmax(0, 1fr);
+
   dt,
   dd {
     margin-bottom: var(--oc-space-small);
   }
+
   dt {
     font-weight: bold;
     white-space: nowrap;
   }
+
   dd {
     margin-inline-start: var(--oc-space-medium);
   }

packages/web-app-files/tests/unit/components/SideBar/Exif/ExifPanel.spec.ts

@@ -110,38 +110,14 @@ describe('Exif SideBar Panel', () => {
       const { wrapper } = createWrapper({ resource })
       expect(wrapper.find(locationSelector).text()).toEqual('-')
     })
-    it("doesn't show the location at all if forbidden in config", () => {
-      const resource = mock<Resource>({
-        location: mock<GeoCoordinates>({
-          latitude: 51.30044714422953,
-          longitude: 7.373170282627126
-        })
-      })
-      const { wrapper } = createWrapper({ resource, locationForbidden: true })
-      expect(wrapper.find(locationSelector).exists()).toBeFalsy()
-    })
   })
 })
 
-function createWrapper({
-  resource,
-  locationForbidden
-}: {
-  resource: Resource
-  locationForbidden?: boolean
-}) {
+function createWrapper({ resource }: { resource: Resource }) {
   return {
     wrapper: shallowMount(ExifPanel, {
       global: {
-        plugins: [
-          ...defaultPlugins({
-            piniaOptions: {
-              configState: {
-                options: { sidebar: { exif: { showLocation: locationForbidden !== true } } }
-              }
-            }
-          })
-        ],
+        plugins: [...defaultPlugins({})],
         provide: {
           resource
         }

packages/web-pkg/src/composables/piniaStores/config/config.ts

@@ -39,9 +39,6 @@ const defaultOptions = {
   sidebar: {
     shares: {
       showAllOnLoad: false
-    },
-    exif: {
-      showLocation: true
     }
   },
   tokenStorageLocal: true,

packages/web-pkg/src/composables/piniaStores/config/types.ts

@@ -120,11 +120,6 @@ const OptionsConfigSchema = z.object({
         .object({
           showAllOnLoad: z.boolean().optional()
         })
-        .optional(),
-      exif: z
-        .object({
-          showLocation: z.boolean().optional()
-        })
         .optional()
     })
     .optional(),