Skip to content

Commit 3d1f055

Browse files
committed
Minor fix on images table visibility
1 parent 67d6378 commit 3d1f055

File tree

3 files changed

+29
-18
lines changed

3 files changed

+29
-18
lines changed

src/lib/components/v2/projects/datasets/DatasetImagesTable.svelte

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
/** @type {(dataset: import('fractal-components/types/api').DatasetV2) => void} */
3232
export let onDatasetsUpdated = () => {};
3333
34-
let showTable = imagePage.total_count > 0;
34+
let showTable = false;
35+
let firstLoad = true;
3536
3637
/** @type {Tooltip|undefined} */
3738
let currentSelectionTooltip;
@@ -43,7 +44,7 @@
4344
let resetting = false;
4445
let savingDatasetFilters = false;
4546
46-
let reloading = false;
47+
let loading = false;
4748
/** @type {{ [key: string]: Array<string | number | boolean> | null}} */
4849
let attributeFilters = {};
4950
@@ -149,8 +150,8 @@
149150
resetting = false;
150151
}
151152
152-
export async function reload() {
153-
reloading = true;
153+
export async function load() {
154+
loading = true;
154155
currentSelectionTooltip?.setEnabled(!useDatasetFilters);
155156
if (useDatasetFilters) {
156157
attributeFilters = deepCopy(dataset.attribute_filters);
@@ -161,7 +162,7 @@
161162
}
162163
await tick();
163164
await searchImages();
164-
reloading = false;
165+
loading = false;
165166
}
166167
167168
onDestroy(() => {
@@ -384,7 +385,12 @@
384385
body: JSON.stringify(params)
385386
}
386387
);
387-
showTable = true;
388+
if (firstLoad) {
389+
showTable = imagePage.total_count > 0;
390+
firstLoad = false;
391+
} else {
392+
showTable = true;
393+
}
388394
if (response.ok) {
389395
imagePage = await response.json();
390396
await tick();
@@ -490,7 +496,6 @@
490496
}
491497
492498
$: if (attributeFilters && typeFilters) {
493-
//console.log(dataset.attribute_filters, removeNullValues(attributeFilters))
494499
datasetFiltersChanged =
495500
!applyBtnActive &&
496501
(attributesChanged(dataset.attribute_filters, removeNullValues(attributeFilters)) ||
@@ -753,8 +758,8 @@
753758
autocomplete="off"
754759
value={false}
755760
bind:group={useDatasetFilters}
756-
on:change={reload}
757-
disabled={reloading || searching || resetting}
761+
on:change={load}
762+
disabled={loading || searching || resetting}
758763
/>
759764
<label class="btn btn-white btn-outline-primary" for="all-images">All images</label>
760765
<Tooltip
@@ -771,14 +776,14 @@
771776
autocomplete="off"
772777
value={true}
773778
bind:group={useDatasetFilters}
774-
on:change={reload}
775-
disabled={reloading || searching || resetting}
779+
on:change={load}
780+
disabled={loading || searching || resetting}
776781
/>
777782
<label class="btn btn-white btn-outline-primary" for="current-selection">
778783
Current selection
779784
</label>
780785
</Tooltip>
781-
{#if reloading}
786+
{#if loading}
782787
<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true" />
783788
{/if}
784789
{/if}

src/lib/components/v2/workflow/RunWorkflowModal.svelte

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
5757
/** @type {import('fractal-components/types/api').ImagePage|null} */
5858
let imagePage = null;
59+
let hasImages = false;
5960
/** @type {{ attribute_filters: { [key: string]: Array<string | number | boolean> | null }, type_filters: { [key: string]: boolean | null }} | null} */
6061
let initialFilterValues = null;
6162
@@ -290,18 +291,23 @@
290291
body: JSON.stringify(initialFilterValues)
291292
}
292293
);
293-
if (response.ok) {
294-
imagePage = await response.json();
294+
if (!response.ok) {
295+
modal.displayErrorAlert(await getAlertErrorFromResponse(response));
296+
datasetImagesLoading = false;
297+
return;
295298
}
299+
imagePage = await response.json();
300+
hasImages =
301+
/** @type {import('fractal-components/types/api').ImagePage} */ (imagePage).total_count > 0;
296302
datasetImagesLoading = false;
297303
await tick();
298-
datasetImagesTable?.reload();
304+
datasetImagesTable?.load();
299305
}
300306
301307
async function cancel() {
302308
checkingConfiguration = false;
303309
await tick();
304-
datasetImagesTable?.reload();
310+
datasetImagesTable?.load();
305311
}
306312
307313
onMount(async () => {
@@ -490,7 +496,7 @@
490496
</div>
491497
</div>
492498
</div>
493-
{#if selectedDataset && imagePage && imagePage.images.length > 0 && firstTaskIndex !== undefined && mode !== 'restart'}
499+
{#if selectedDataset && imagePage && hasImages && firstTaskIndex !== undefined && mode !== 'restart'}
494500
<div class="accordion-item">
495501
<h2 class="accordion-header">
496502
<button

src/routes/v2/projects/[projectId]/datasets/[datasetId]/+page.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
}
127127
128128
onMount(() => {
129-
imagesTable.reload();
129+
imagesTable.load();
130130
});
131131
</script>
132132

0 commit comments

Comments
 (0)