From 200ee9b0e70f67326aecc73c14cdf9b7b6aea0a1 Mon Sep 17 00:00:00 2001 From: Bryon Lewis Date: Mon, 20 Apr 2026 07:34:27 -0400 Subject: [PATCH 1/4] dataset info attributes section --- client/dive-common/components/DatasetInfo.vue | 12 +- .../components/DatasetInfoAttributes.vue | 313 ++++++++++++++++++ 2 files changed, 321 insertions(+), 4 deletions(-) create mode 100644 client/dive-common/components/DatasetInfoAttributes.vue diff --git a/client/dive-common/components/DatasetInfo.vue b/client/dive-common/components/DatasetInfo.vue index 074b5b1..93b6fc0 100644 --- a/client/dive-common/components/DatasetInfo.vue +++ b/client/dive-common/components/DatasetInfo.vue @@ -19,6 +19,7 @@ import { setDiveDatasetMetadataKey, } from 'platform/web-girder/api/divemetadata.service'; import { usePrompt } from 'dive-common/vue-utilities/prompt-service'; +import DatasetInfoAttributes from './DatasetInfoAttributes.vue'; export default defineComponent({ name: 'DatasetInfo', @@ -26,6 +27,7 @@ export default defineComponent({ StackedVirtualSidebarContainer, DIVEMetadataEditKey, MetadataKeyLabel, + DatasetInfoAttributes, }, props: { @@ -244,7 +246,7 @@ export default defineComponent({ /> - {{ item.value !== undefined ? item.value.toString() : '' }} + {{ item.value !== undefined && item.value !== null ? item.value.toString() : '' }} @@ -287,7 +289,7 @@ export default defineComponent({ /> - {{ item.value !== undefined ? item.value.toString() : '' }} + {{ item.value !== undefined && item.value !== null ? item.value.toString() : '' }} @@ -318,7 +320,7 @@ export default defineComponent({ /> - {{ item.value !== undefined ? item.value.toString() : '' }} + {{ item.value !== undefined && item.value !== null ? item.value.toString() : '' }} @@ -361,7 +363,7 @@ export default defineComponent({ /> - {{ item.value !== undefined ? item.value.toString() : '' }} + {{ item.value !== undefined && item.value !== null ? item.value.toString() : '' }} @@ -374,6 +376,7 @@ export default defineComponent({ + @@ -385,4 +388,5 @@ export default defineComponent({ white-space: normal !important; word-break: break-word; } + diff --git a/client/dive-common/components/DatasetInfoAttributes.vue b/client/dive-common/components/DatasetInfoAttributes.vue new file mode 100644 index 0000000..71b5e95 --- /dev/null +++ b/client/dive-common/components/DatasetInfoAttributes.vue @@ -0,0 +1,313 @@ + + + + + From 19b7ba3d379c82cdc52cda9bf36c556ab65989d3 Mon Sep 17 00:00:00 2001 From: Bryon Lewis Date: Mon, 20 Apr 2026 07:38:31 -0400 Subject: [PATCH 2/4] update tooltip --- .../components/DatasetInfoAttributes.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/client/dive-common/components/DatasetInfoAttributes.vue b/client/dive-common/components/DatasetInfoAttributes.vue index 71b5e95..9597e5a 100644 --- a/client/dive-common/components/DatasetInfoAttributes.vue +++ b/client/dive-common/components/DatasetInfoAttributes.vue @@ -84,6 +84,11 @@ export default defineComponent({ const value = getDisplayValue(attribute); return value === undefined ? 'N/A' : String(value); }; + const shouldShowPredefinedValues = (attribute: Attribute) => ( + attribute.datatype === 'text' + && !!attribute.values + && attribute.values.length > 0 + ); watch( detectionAttributes, (newAttributes) => { @@ -103,6 +108,7 @@ export default defineComponent({ stickyDetectionEnabled, getDisplayValue, getDisplayString, + shouldShowPredefinedValues, }; }, }); @@ -137,7 +143,7 @@ export default defineComponent({
Type: {{ attribute.datatype }}
-