Skip to content

Commit 7f2458d

Browse files
authored
Merge pull request #2855 from appwrite/fix-dateime-format
fix format issue
2 parents dd37695 + 8d465c9 commit 7f2458d

File tree

2 files changed

+12
-8
lines changed
  • src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]

2 files changed

+12
-8
lines changed

src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,11 @@
227227
size="s"
228228
secondary
229229
class="small-button-dimensions"
230-
disabled={!(hasColumns && hasValidColumns && data.rows.total) ||
231-
disableButton}
230+
disabled={!(
231+
hasColumns &&
232+
hasValidColumns &&
233+
data.rows?.total
234+
) || disableButton}
232235
on:click={() => {
233236
trackEvent(Click.DatabaseExportCsv);
234237
goto(getTableExportUrl());
@@ -239,13 +242,13 @@
239242
<svelte:fragment slot="tooltip">Export CSV</svelte:fragment>
240243
</Tooltip>
241244

242-
<Tooltip disabled={isRefreshing || !data.rows.total} placement="top">
245+
<Tooltip disabled={isRefreshing || !data.rows?.total} placement="top">
243246
<Button
244247
icon
245248
size="s"
246249
secondary
247250
disabled={isRefreshing ||
248-
!data.rows.total ||
251+
!data.rows?.total ||
249252
!(hasColumns && hasValidColumns) ||
250253
disableButton}
251254
class="small-button-dimensions"
@@ -299,7 +302,7 @@
299302

300303
<div class="databases-spreadsheet">
301304
{#if hasColumns && hasValidColumns && $tableColumnSuggestions.force !== true}
302-
{#if data.rows.total}
305+
{#if data.rows?.total}
303306
<Divider />
304307
<SpreadSheet {data} bind:showRowCreateSheet={$showRowCreateSheet} />
305308
{:else if $hasPageQueries}
@@ -347,7 +350,7 @@
347350
</EmptySheet>
348351
{/if}
349352
{:else if isCloud && canShowSuggestionsSheet}
350-
<SuggestionsEmptySheet userColumns={$tableColumns} userDataRows={data.rows.rows} />
353+
<SuggestionsEmptySheet userColumns={$tableColumns} userDataRows={data.rows?.rows} />
351354
{:else}
352355
<EmptySheet mode="rows" showActions={$canWriteTables} title="You have no columns yet">
353356
{#snippet subtitle()}

src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/+page.svelte

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,8 @@
396396
{@const option = columnOptions.find(
397397
(option) =>
398398
option.type === column.type &&
399-
option.format === ('format' in column ? column.format : undefined)
399+
option.format ===
400+
('format' in column && column.format ? column.format : undefined)
400401
)}
401402
{@const isSelectable =
402403
column['system'] || column.type === 'relationship' ? 'disabled' : true}
@@ -425,7 +426,7 @@
425426
{:else if column.key === '$id'}
426427
<Icon icon={IconFingerPrint} size="s" />
427428
{:else}
428-
<Icon icon={option.icon} size="s" />
429+
<Icon icon={option?.icon ?? IconViewList} size="s" />
429430
{/if}
430431

431432
<Layout.Stack

0 commit comments

Comments
 (0)