Merge branch 'master' of https://github.com/centerofci/mathesar into …

…boolean_type
mathesar-foundation · Mar 24, 2022 · 3794a14 · 3794a14
2 parents 475a31e + 119c60f
commit 3794a14
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/mathesar/tests/imports/test_csv.py b/mathesar/tests/imports/test_csv.py
@@ -31,7 +31,7 @@ def headerless_data_file(headerless_csv_filename):
 def schema(engine, test_db_model):
     create_schema(TEST_SCHEMA, engine)
     schema_oid = get_schema_oid_from_name(TEST_SCHEMA, engine)
-    yield Schema.objects.create(oid=schema_oid, database=test_db_model)
+    yield Schema.current_objects.create(oid=schema_oid, database=test_db_model)
     with engine.begin() as conn:
         conn.execute(text(f'DROP SCHEMA "{TEST_SCHEMA}" CASCADE;'))
 

diff --git a/mathesar_ui/src/component-library/pagination/Pagination.svelte b/mathesar_ui/src/component-library/pagination/Pagination.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { createEventDispatcher } from 'svelte';
+  import { tick, createEventDispatcher } from 'svelte';
   import {
     faAngleDoubleLeft,
     faAngleDoubleRight,
@@ -46,14 +46,17 @@
   $: pageCount = Math.ceil(total / pageSize);
   $: pageInfo = calculatePages(currentPage, pageCount);
 
-  function setPage(e: Event, _page: number) {
+  async function setPage(e: Event, _page: number) {
     if (_page > 0 && _page <= pageCount && currentPage !== _page) {
       currentPage = _page;
       dispatch('change', {
         currentPage,
         originalEvent: e,
       });
     }
+    await tick();
+    const pagebutton = document.querySelector(`[data-page="${currentPage}"]`);
+    (pagebutton as HTMLElement)?.focus();
   }
 </script>
 
@@ -125,6 +128,7 @@
               : `Goto Page ${_page}`}
             aria-selected={currentPage === _page}
             on:click={(e) => setPage(e, _page)}
+            data-page={_page}
             data-tinro-ignore
           >
             {_page}
@@ -138,6 +142,7 @@
               : `Goto Page ${_page}`}
             class="page"
             on:click={(e) => setPage(e, _page)}
+            data-page={_page}
             aria-selected={currentPage === _page}
           >
             {_page}

diff --git a/mathesar_ui/src/sections/import-data/preview/PreviewColumn.svelte b/mathesar_ui/src/sections/import-data/preview/PreviewColumn.svelte
@@ -4,12 +4,22 @@
   import type { PreviewColumn } from '@mathesar/stores/fileImports';
 
   const dispatch = createEventDispatcher();
+
   export let column: PreviewColumn;
 
-  const options = column.valid_target_types?.map((type) => ({
-    id: type,
-    label: type,
-  }));
+  function getOptions(_column: PreviewColumn) {
+    if (_column.valid_target_types === null) {
+      return [{ id: _column.type, label: _column.type }];
+    }
+    return _column.valid_target_types.map((type) => ({
+      id: type,
+      label: type,
+    }));
+  }
+
+  $: options = getOptions(column);
+  $: disabled = !column.isEditable;
+
   let selectedOption = {
     id: column.type,
     label: column.type,
@@ -23,13 +33,14 @@
   }
 </script>
 
-<th class:disabled={!column.isEditable}>
+<th class:disabled>
   <div class="name">
-    <Checkbox disabled={!column.isEditable} bind:checked={column.isSelected} />
-    <TextInput disabled={!column.isEditable} bind:value={column.displayName} />
+    <Checkbox {disabled} bind:checked={column.isSelected} />
+    <TextInput {disabled} bind:value={column.displayName} />
   </div>
   <div class="type">
     <Select
+      {disabled}
       {options}
       triggerAppearance="plain"
       bind:value={selectedOption}

diff --git a/mathesar_ui/src/stores/fileImports.ts b/mathesar_ui/src/stores/fileImports.ts
@@ -24,7 +24,7 @@ export interface PreviewColumn {
   isSelected?: boolean;
   isEditable?: boolean;
   primary_key?: boolean;
-  valid_target_types: string[];
+  valid_target_types: string[] | null;
 }
 
 export type PreviewRow = Record<string, string>;