From 9e560b1e9f47329eeb869684ad6a4f04f5ee34a3 Mon Sep 17 00:00:00 2001 From: orlinmalkja Date: Thu, 16 Jan 2025 09:36:53 +0100 Subject: [PATCH] style: remove unnecessary Metadata ending and unnecessary files --- .vscode/settings.json | 3 --- examples/ahiqar-arabic-karshuni-local.html | 8 ++++---- src/.prettierrc.json | 4 ---- src/components/metadata/CollectionMetadata.vue | 14 +++++++------- src/components/metadata/ItemMetadata.vue | 8 ++++---- src/components/metadata/ManifestMetadata.vue | 8 ++++---- src/components/metadata/MetadataView.vue | 6 +++--- 7 files changed, 22 insertions(+), 29 deletions(-) delete mode 100644 .vscode/settings.json delete mode 100644 src/.prettierrc.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 23fd35f0..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "editor.formatOnSave": true -} \ No newline at end of file diff --git a/examples/ahiqar-arabic-karshuni-local.html b/examples/ahiqar-arabic-karshuni-local.html index 9da1759e..3d21f42c 100644 --- a/examples/ahiqar-arabic-karshuni-local.html +++ b/examples/ahiqar-arabic-karshuni-local.html @@ -72,13 +72,13 @@ all: true, }, citationKey: "Citation", - orderDocuments: ["manifest", "collection", "item"], - orderCollectionMetadata: [ + documentsOrder: ["manifest", "collection", "item"], + collectionOrder: [ "title", "collector", "description", ], - orderManifestMetadata: [ + manifestOrder: [ "Label", "License", "Date of creation", @@ -86,7 +86,7 @@ "Current location", "TEI document", ], - orderItemMetadata: [ + itemOrder: [ "label", "language", "image_license", diff --git a/src/.prettierrc.json b/src/.prettierrc.json deleted file mode 100644 index b2095be8..00000000 --- a/src/.prettierrc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "semi": false, - "singleQuote": true -} diff --git a/src/components/metadata/CollectionMetadata.vue b/src/components/metadata/CollectionMetadata.vue index a5e5c632..b0dec8d1 100644 --- 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(() => 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 index a03a1ca1..b3e65e21 100644 --- a/src/components/metadata/ItemMetadata.vue +++ b/src/components/metadata/ItemMetadata.vue @@ -34,8 +34,8 @@ const number = computed(() => const total = computed(() => 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 index 7a17903a..2a15a573 100644 --- a/src/components/metadata/ManifestMetadata.vue +++ b/src/components/metadata/ManifestMetadata.vue @@ -41,8 +41,8 @@ const labels = computed(() => 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 index 8d28333f..53a7c146 100644 --- 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) {