Merge pull request #2591 from appwrite/disable-buttons

Author: ItzNotABug

src/lib/components/viewSelector.svelte

@@ -21,6 +21,7 @@
         hideColumns?: boolean;
         allowNoColumns?: boolean;
         showAnyway?: boolean;
+        disableButton?: boolean;
     }
 
     let {
@@ -32,7 +33,8 @@
         hideView = false,
         hideColumns = false,
         allowNoColumns = false,
-        showAnyway = false
+        showAnyway = false,
+        disableButton = false
     }: Props = $props();
 
     let showCountBadge = $state(false);
@@ -70,7 +72,7 @@
                 icon={onlyIcon}
                 onclick={toggle}
                 variant="secondary"
-                disabled={!$columns.length && showAnyway}
+                disabled={(!$columns.length && showAnyway) || disableButton}
                 class={onlyIcon && !$isSmallViewport ? 'width-fix' : undefined}
                 badge={showCountBadge ? selectedColumnsNumber.toString() : undefined}>
                 <Icon slot="start" icon={IconViewBoards} />

src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/empty.svelte

@@ -1773,9 +1773,10 @@
         }}>
         {#if !column.custom && row}
             {@const rowData = row[column.id]}
+            {@const isActions = column.id === 'actions'}
             {@const isNullOrUndefined = rowData === null || typeof rowData === 'undefined'}
             <span class="u-trim suggestions-empty-fake-cell">
-                {#if isNullOrUndefined}
+                {#if isNullOrUndefined && !isActions}
                     <Badge variant="secondary" content="NULL" size="xs" />
                 {:else}
                     {rowData}

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

@@ -99,6 +99,8 @@
         $tableColumnSuggestions.table &&
         $tableColumnSuggestions.table.id === page.params.table;
 
+    $: disableButton = canShowSuggestionsSheet;
+
     async function onSelect(file: Models.File, localFile = false) {
         $isCsvImportInProgress = true;
 
@@ -146,7 +148,8 @@
                                 columns={tableColumns}
                                 hideView
                                 showAnyway
-                                isCustomTable />
+                                isCustomTable
+                                {disableButton} />
                         </div>
 
                         <svelte:fragment slot="tooltip">Columns</svelte:fragment>
@@ -157,7 +160,7 @@
                             onlyIcon
                             query={data.query}
                             columns={filterColumns}
-                            disabled={!(hasColumns && hasValidColumns)}
+                            disabled={!(hasColumns && hasValidColumns) || disableButton}
                             analyticsSource="database_tables" />
 
                         <svelte:fragment slot="tooltip">Filters</svelte:fragment>
@@ -176,15 +179,15 @@
                         <Button
                             secondary
                             event={Click.DatabaseImportCsv}
-                            disabled={!(hasColumns && hasValidColumns)}
+                            disabled={!(hasColumns && hasValidColumns) || disableButton}
                             on:click={() => (showImportCSV = true)}>
                             Import CSV
                         </Button>
                         {#if !$isSmallViewport}
                             <Button
                                 secondary
                                 event="create_row"
-                                disabled={!(hasColumns && hasValidColumns)}
+                                disabled={!(hasColumns && hasValidColumns) || disableButton}
                                 on:click={() => ($showRowCreateSheet.show = true)}>
                                 <Icon icon={IconPlus} slot="start" size="s" />
                                 Create row
@@ -211,7 +214,8 @@
                                     secondary
                                     disabled={isRefreshing ||
                                         !data.rows.total ||
-                                        !(hasColumns && hasValidColumns)}
+                                        !(hasColumns && hasValidColumns) ||
+                                        disableButton}
                                     class="small-button-dimensions"
                                     on:click={async () => {
                                         isRefreshing = true;
@@ -233,7 +237,7 @@
                 <Button
                     secondary
                     event="create_row"
-                    disabled={!(hasColumns && hasValidColumns)}
+                    disabled={!(hasColumns && hasValidColumns) || disableButton}
                     on:click={() => ($showRowCreateSheet.show = true)}>
                     <Icon icon={IconPlus} slot="start" size="s" />
                     Create row