Unverified Commit 5c681088 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #18388 from itisAliRH/dataset-pooling-rerender-fix

[24.1] Fix dataset details polling re-render
parents 222a2aa0 092b77f0
Loading
Loading
Loading
Loading
+2 −7
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ const userStore = useUserStore();
const { currentUser } = storeToRefs(userStore);

const loading = ref(false);
const jobLoading = ref(true);
const jobTimeOut = ref<any>(null);
const jobDetails = ref<JobDetails>();
const dataset = ref<HDADetailed | null>(null);
@@ -57,8 +56,6 @@ async function getDatasetDetails() {
}

async function loadJobDetails() {
    jobLoading.value = true;

    try {
        const { data } = await fetchJobDetails({ job_id: dataset.value?.creating_job as string, full: true });

@@ -73,8 +70,6 @@ async function loadJobDetails() {
        const error = e as AxiosError<{ err_msg?: string }>;

        jobLoadingError.value = error.response?.data?.err_msg || "Unable to fetch available dataset details.";
    } finally {
        jobLoading.value = false;
    }
}

@@ -102,7 +97,7 @@ onUnmounted(() => {
            {{ datasetLoadingError }}
        </BAlert>
        <div v-else-if="dataset">
            <div v-if="dataset.creating_job && !jobLoading" class="details">
            <div v-if="dataset.creating_job" class="details">
                <DatasetInformation :dataset="dataset" />

                <JobParameters dataset_type="hda" :dataset-id="datasetId" />
@@ -124,7 +119,7 @@ onUnmounted(() => {

                <JobDestinationParams v-if="currentUser?.is_admin" :job-id="dataset.creating_job" />

                <JobDependencies v-if="jobDetails.dependencies" :dependencies="jobDetails.dependencies" />
                <JobDependencies v-if="jobDetails?.dependencies" :dependencies="jobDetails.dependencies" />

                <div v-if="dataset.peek">
                    <h2 class="h-md">Dataset Peek</h2>