style: remove unnecessary Metadata ending and unnecessary files

subugoe · Jan 16, 2025 · 9e560b1 · 9e560b1
1 parent f4ea7b9
commit 9e560b1
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 29 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/examples/ahiqar-arabic-karshuni-local.html b/examples/ahiqar-arabic-karshuni-local.html
@@ -72,21 +72,21 @@
                         all: true,
                       },
                       citationKey: "Citation",
-                      orderDocuments: ["manifest", "collection", "item"],
-                      orderCollectionMetadata: [
+                      documentsOrder: ["manifest", "collection", "item"],
+                      collectionOrder: [
                         "title",
                         "collector",
                         "description",
                       ],
-                      orderManifestMetadata: [
+                      manifestOrder: [
                         "Label",
                         "License",
                         "Date of creation",
                         "Place of origin",
                         "Current location",
                         "TEI document",
                       ],
-                      orderItemMetadata: [
+                      itemOrder: [
                         "label",
                         "language",
                         "image_license",

diff --git a/src/.prettierrc.json b/src/.prettierrc.json
diff --git a/src/components/metadata/CollectionMetadata.vue b/src/components/metadata/CollectionMetadata.vue
@@ -31,12 +31,12 @@ function getCollectorsName(collection: Collection): string | null {
 const collection = computed<Collection>(() => contentStore.collection)
 
 const metadata = computed(() => {
-  let collectionOrderMetadata = getMetadataView(useConfigStore().config.panels)
-    .connector.options.orderCollectionMetadata
+  let collectionOrder = getMetadataView(useConfigStore().config.panels)
+    .connector.options.collectionOrder
 
-  let collectionOrderMetadataLower
-  if (collectionOrderMetadata?.length > 0) {
-    collectionOrderMetadataLower = collectionOrderMetadata.map((word) =>
+  let collectionOrderLower
+  if (collectionOrder?.length > 0) {
+    collectionOrderLower = collectionOrder.map((word) =>
       word.toLowerCase()
     )
   }
@@ -64,9 +64,9 @@ const metadata = computed(() => {
   ]
 
   let orderedMetadata = []
-  if (collectionOrderMetadataLower?.length > 0) {
+  if (collectionOrderLower?.length > 0) {
     orderedMetadata = orderMetadataItems(
-      collectionOrderMetadataLower,
+      collectionOrderLower,
       defaultMetadata
     )
     return orderedMetadata

diff --git a/src/components/metadata/ItemMetadata.vue b/src/components/metadata/ItemMetadata.vue
@@ -34,8 +34,8 @@ const number = computed<number>(() =>
 const total = computed<number>(() => itemsCount.value ?? 1)
 
 const metadata = computed(() => {
-  let itemOrderMetadata = getMetadataView(useConfigStore().config.panels)
-    .connector.options.orderItemMetadata
+  let itemOrder = getMetadataView(useConfigStore().config.panels)
+    .connector.options.itemOrder
 
   let defaultMetadata = [
     { key: 'label', value: item.value.n },
@@ -45,8 +45,8 @@ const metadata = computed(() => {
   ].filter((i) => i.value)
 
   let orderedMetadata = []
-  if (itemOrderMetadata?.length > 0) {
-    orderedMetadata = orderMetadataItems(itemOrderMetadata, defaultMetadata)
+  if (itemOrder?.length > 0) {
+    orderedMetadata = orderMetadataItems(itemOrder, defaultMetadata)
     return orderedMetadata
   }
   return defaultMetadata

diff --git a/src/components/metadata/ManifestMetadata.vue b/src/components/metadata/ManifestMetadata.vue
@@ -41,8 +41,8 @@ const labels = computed<Labels>(() => configStore.config.labels)
 const metadata = computed(() => {
   if (!manifest.value) return []
 
-  let manifestOrderMetadata = getMetadataView(useConfigStore().config.panels)
-    .connector.options.orderManifestMetadata
+  let manifestOrder = getMetadataView(useConfigStore().config.panels)
+    .connector.options.manifestOrder
 
   let defaultMetadata = [
     { key: 'Label', value: manifest.value.label },
@@ -57,8 +57,8 @@ const metadata = computed(() => {
   ]
 
   let orderedMetadata = []
-  if (manifestOrderMetadata?.length > 0) {
-    orderedMetadata = orderMetadataItems(manifestOrderMetadata, defaultMetadata)
+  if (manifestOrder?.length > 0) {
+    orderedMetadata = orderMetadataItems(manifestOrder, defaultMetadata)
     return orderedMetadata
   }
 

diff --git a/src/components/metadata/MetadataView.vue b/src/components/metadata/MetadataView.vue
@@ -26,12 +26,12 @@ const config = computed(() => configStore.config)
 
 const metadataView = computed(() => getMetadataView(config.value.panels))
 
-const userOrderDocuments = computed(
-  () => metadataView.value.connector.options.orderDocuments
+const userDocumentsOrder = computed(
+  () => metadataView.value.connector.options.documentsOrder
 )
 
 let orderDocumentsMetadata = computed(() =>
-  getOrderDocuments(userOrderDocuments.value)
+  getOrderDocuments(userDocumentsOrder.value)
 )
 
 function getOrderDocuments(userOrderDocuments) {