Reuse consistent states for viewable datasets

Author: guerler

client/src/components/Dataset/DatasetDisplay.vue

@@ -82,7 +82,7 @@ watch(
         <FontAwesomeIcon :icon="faSpinner" spin />
         <span>Waiting for dataset to become available. Please check the history panel for details.</span>
     </BAlert>
-    <BAlert v-else-if="dataset.state !== STATES.OK" show variant="danger">
+    <BAlert v-else-if="!STATES.OK_STATES.includes(dataset.state)" show variant="danger">
         <FontAwesomeIcon :icon="faExclamationTriangle" />
         <span>Dataset is unavailable. Please check the history panel for details.</span>
     </BAlert>

client/src/components/Dataset/DatasetView.vue

@@ -8,9 +8,9 @@ import { usePersistentToggle } from "@/composables/persistentToggle";
 import { useDatasetStore } from "@/stores/datasetStore";
 import { useDatatypesMapperStore } from "@/stores/datatypesMapperStore";
 import { useDatatypeStore } from "@/stores/datatypeStore";
+import STATES from "@/utils/datasetStates";
 import { withPrefix } from "@/utils/redirect";
 import { bytesToString } from "@/utils/utils";
-import STATES from "@/utils/datasetStates";
 
 import DatasetError from "../DatasetInformation/DatasetError.vue";
 import LoadingSpan from "../LoadingSpan.vue";
@@ -81,10 +81,8 @@ const preferredVisualization = computed(
 );
 
 // Match dataset state
-const showError = computed(
-    () => dataset.value && STATES.ERROR_STATES.includes(dataset.value.state),
-);
-const showOk = computed(() => dataset.value && dataset.value.state === STATES.OK);
+const showError = computed(() => dataset.value && STATES.ERROR === dataset.value.state);
+const showOk = computed(() => dataset.value && STATES.OK_STATES.includes(dataset.value.state));
 
 // Watch for changes to the dataset to fetch datatype info
 watch(

client/src/components/History/Content/ContentItem.vue

@@ -16,6 +16,7 @@ import { getGalaxyInstance } from "@/app";
 import type { ItemUrls } from "@/components/History/Content/Dataset/index";
 import { updateContentFields } from "@/components/History/model/queries";
 import { useEntryPointStore } from "@/stores/entryPointStore";
+import DATASET_STATES from "@/utils/datasetStates";
 import { clearDrag } from "@/utils/setDrag";
 
 import { getContentItemState, type State, STATES } from "./model/states";
@@ -174,7 +175,7 @@ const itemUrls = computed<ItemUrls>(() => {
     let display = `/datasets/${id}`;
     if (props.item.extension == "tool_markdown") {
         display = `/datasets/${id}/report`;
-    } else if (contentState.value !== STATES.ok) {
+    } else if (!DATASET_STATES.OK_STATES.includes(state.value)) {
         display = `/datasets/${id}/details`;
     }
     return {

client/src/utils/datasetStates.ts

@@ -43,6 +43,7 @@ const STATES = {
 
 export default {
     ...STATES,
+    OK_STATES: [STATES.OK, STATES.DEFERRED, STATES.FAILED_METADATA],
     READY_STATES: [
         STATES.DEFERRED,
         STATES.DISCARDED,