Skip to content

Commit 5ead24b

Browse files
committed
Fixed dataset type issues
1 parent 465128a commit 5ead24b

File tree

2 files changed

+9
-17
lines changed

2 files changed

+9
-17
lines changed

src/lib/components/projects/CreateUpdateDatasetModal.svelte

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@
9191
originalDataset = dataset;
9292
datasetId = dataset.id;
9393
datasetName = dataset.name;
94-
if (datasetTypes.indexOf(dataset.type) !== -1) {
94+
if (!dataset.type || datasetTypes.indexOf(dataset.type) !== -1) {
9595
datasetTypeOption = 'standard';
96-
datasetType = dataset.type;
96+
datasetType = dataset.type || "";
9797
customDatasetType = '';
9898
} else {
9999
datasetTypeOption = 'custom';
100100
datasetType = '';
101-
customDatasetType = dataset.type;
101+
customDatasetType = dataset.type || "";
102102
}
103103
readonly = dataset.readonly;
104104
resources = dataset.resource_list.map((r) => {
@@ -154,7 +154,7 @@
154154
headers,
155155
body: JSON.stringify({
156156
name: datasetName,
157-
type: datasetType,
157+
type: getDatasetType(),
158158
read_only: readonly,
159159
meta: {}
160160
})
@@ -177,7 +177,7 @@
177177
headers,
178178
body: JSON.stringify({
179179
name: datasetName,
180-
type: datasetTypeOption === 'standard' ? datasetType : customDatasetType,
180+
type: getDatasetType(),
181181
read_only: readonly,
182182
meta: {}
183183
})
@@ -365,14 +365,14 @@
365365
return false;
366366
}
367367
}
368-
return datasetName && getDatasetType();
368+
return datasetName;
369369
}
370370
371371
function getDatasetType() {
372372
if (datasetTypeOption === 'custom') {
373-
return customDatasetType;
373+
return customDatasetType || undefined;
374374
}
375-
return datasetType;
375+
return datasetType || undefined;
376376
}
377377
378378
function handleResourceKeyDown(/** @type {KeyboardEvent} */ event, /** @type {number} */ index) {
@@ -442,28 +442,20 @@
442442
id="datasetType"
443443
bind:value={datasetType}
444444
class="form-control"
445-
class:is-invalid={submitted && !datasetType}
446445
>
447446
<option value="">Select...</option>
448447
{#each datasetTypes as allowedType}
449448
<option>{allowedType}</option>
450449
{/each}
451450
</select>
452-
{#if submitted && !datasetType}
453-
<div class="invalid-feedback">Required field</div>
454-
{/if}
455451
{:else}
456452
<input
457453
id="customDatasetType"
458454
type="text"
459455
bind:value={customDatasetType}
460456
class="form-control"
461-
class:is-invalid={submitted && !customDatasetType}
462457
placeholder="Your custom type"
463458
/>
464-
{#if submitted && !customDatasetType}
465-
<div class="invalid-feedback">Required field</div>
466-
{/if}
467459
{/if}
468460
</div>
469461
</div>

src/lib/types.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export type Resource = {
3434

3535
export type Dataset = {
3636
name: string
37-
type: string
37+
type?: string
3838
meta: object
3939
readonly: boolean
4040
id: number

0 commit comments

Comments
 (0)