Unverified Commit 60d02a22 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_24.1' into release_24.2

parents a1c9dc65 8c986bc8

client/src/components/Collections/common/CollectionEditView.vue

+13 −5
Original line number Diff line number Diff line
@@ -53,18 +53,26 @@ const collectionChangeKey = ref(0); 
const attributesData = computed(() => {

    return collectionAttributesStore.getAttributes(props.collectionId);

});

const attributesLoadError = computed(() =>

    errorMessageAsString(collectionAttributesStore.hasItemLoadError(props.collectionId))

);



const attributesLoadError = computed(() => {

    const itemLoadError = collectionAttributesStore.getItemLoadError(props.collectionId);

    if (itemLoadError) {

        return errorMessageAsString(itemLoadError);

    }

    return undefined;

});



const collection = computed(() => {

    return collectionStore.getCollectionById(props.collectionId);

});

const collectionLoadError = computed(() => {

    if (collection.value) {

        return errorMessageAsString(collectionStore.hasLoadingCollectionElementsError(collection.value));

        const collectionElementLoadError = collectionStore.getLoadingCollectionElementsError(collection.value);

        if (collectionElementLoadError) {

            return errorMessageAsString(collectionElementLoadError);

        }

    }

    return "";

    return undefined;

});

watch([attributesLoadError, collectionLoadError], () => {

    if (attributesLoadError.value) {

client/src/components/History/CurrentCollection/CollectionPanel.vue

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ watch( 


const collectionElements = computed(() => collectionElementsStore.getCollectionElements(dsc.value) ?? []);

const loading = computed(() => collectionElementsStore.isLoadingCollectionElements(dsc.value));

const error = computed(() => collectionElementsStore.hasLoadingCollectionElementsError(dsc.value));

const error = computed(() => collectionElementsStore.getLoadingCollectionElementsError(dsc.value));

const jobState = computed(() => ("job_state_summary" in dsc.value ? dsc.value.job_state_summary : undefined));

const populatedStateMsg = computed(() =>

    "populated_state_message" in dsc.value ? dsc.value.populated_state_message : undefined

client/src/composables/keyedCache.ts

+4 −4
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ export function useKeyedCache<T>( 
        };

    });



    const hasItemLoadError = computed(() => {

    const getItemLoadError = computed(() => {

        return (id: string) => {

            return loadingErrors.value[id] ?? null;

        };
@@ -106,11 +106,11 @@ export function useKeyedCache<T>( 
         */

        getItemById,

        /**

         * A computed function that returns true if the item with the given id is currently being fetched.

         * A computed function holding errors

         */

        hasItemLoadError,

        getItemLoadError,

        /**

         * A computed function holding errors

         * A computed function that returns true if the item with the given id is currently being fetched.

         */

        isLoadingItem,

        /**

client/src/stores/collectionAttributesStore.ts

+2 −2
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ export const useCollectionAttributesStore = defineStore("collectionAttributesSto 
        return data;

    }



    const { storedItems, getItemById, isLoadingItem, hasItemLoadError } =

    const { storedItems, getItemById, isLoadingItem, getItemLoadError } =

        useKeyedCache<DatasetCollectionAttributes>(fetchAttributes);



    return {

        storedAttributes: storedItems,

        getAttributes: getItemById,

        isLoadingAttributes: isLoadingItem,

        hasItemLoadError: hasItemLoadError,

        getItemLoadError: getItemLoadError,

    };

});

client/src/stores/collectionElementsStore.ts

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore", 
        };

    });



    const hasLoadingCollectionElementsError = computed(() => {

    const getLoadingCollectionElementsError = computed(() => {

        return (collection: CollectionEntry) => {

            return loadingCollectionElementsErrors.value[getCollectionKey(collection)] ?? false;

        };
@@ -213,7 +213,7 @@ export const useCollectionElementsStore = defineStore("collectionElementsStore", 
        storedCollectionElements,

        getCollectionElements,

        isLoadingCollectionElements,

        hasLoadingCollectionElementsError,

        getLoadingCollectionElementsError,

        loadingCollectionElementsErrors,

        getCollectionById,

        fetchCollection,