From c23d5f4c167c56cd59e53055e71064a6cd344894 Mon Sep 17 00:00:00 2001
From: lxk955 <164191365+lxk955@users.noreply.github.com>
Date: Wed, 7 Oct 2026 00:12:29 +0000
Subject: [PATCH 1/2] feat(structure): remove dynamic toggle labels from table
 editor checkboxes (#8148)

---
 .../structure/TableStructureEditor.vue        | 40 ++++++++-----------
 ...ructureEditor.metadataRevalidation.spec.ts | 26 ++++++++++++
 2 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/apps/desktop/src/components/structure/TableStructureEditor.vue b/apps/desktop/src/components/structure/TableStructureEditor.vue
index 6eafe38615..a5ba062ac0 100644
--- a/apps/desktop/src/components/structure/TableStructureEditor.vue
+++ b/apps/desktop/src/components/structure/TableStructureEditor.vue
@@ -5669,7 +5669,7 @@ watch(
                         <th
                           v-for="(columnLabel, i) in colLabels"
                           :key="columnLabel.key"
-                          :class="[structureHeaderCellClass, 'bg-background select-none', { 'text-center': columnLabel.key === 'primaryKey' }]"
+                          :class="[structureHeaderCellClass, 'bg-background select-none', { 'text-center': columnLabel.key === 'primaryKey' || columnLabel.key === 'nullable' }]"
                           :data-column-selected="columnLabel.key === 'actions' ? undefined : selectedStructureColumnKeys.has(columnLabel.key)"
                           :style="{
                             width: visibleColWidths[i] + 'px',
@@ -5881,11 +5881,8 @@ watch(
                             </Select>
                           </div>
                         </td>
-                        <td v-if="columnEditorControls.nullable" :class="[structureCellClass, structureColumnSelectionClass('nullable')]">
-                          <label class="flex items-center gap-1.5">
-                            <input v-model="column.isNullable" type="checkbox" :class="structureCheckboxClass" :disabled="isColumnNullableDisabled(column)" />
-                            <span>{{ column.isNullable ? t("structureEditor.yes") : t("structureEditor.no") }}</span>
-                          </label>
+                        <td v-if="columnEditorControls.nullable" :class="[structureCellClass, 'text-center', structureColumnSelectionClass('nullable')]">
+                          <input v-model="column.isNullable" type="checkbox" :class="structureCheckboxClass" :disabled="isColumnNullableDisabled(column)" :aria-label="t('structureEditor.nullable')" />
                         </td>
                         <td v-if="columnEditorControls.primaryKey" :class="[structureCellClass, 'text-center', structureColumnSelectionClass('primaryKey')]">
                           <input
@@ -6183,7 +6180,7 @@ watch(
                   <th
                     v-for="(label, i) in indexColLabels"
                     :key="i"
-                    :class="structureHeaderCellClass"
+                    :class="[structureHeaderCellClass, { 'text-center': i === 2 || i === 7 }]"
                     :style="{
                       width: indexColWidths[i] + 'px',
                       minWidth: indexColWidths[i] + 'px',
@@ -6231,18 +6228,16 @@ watch(
                     </StructureIndexColumnPicker>
                     <span v-else class="font-mono text-[length:var(--structure-font-size)] text-muted-foreground">{{ toColumnNames(index.columns) }}</span>
                   </td>
-                  <td :class="structureCellClass">
-                    <label class="flex items-center gap-1.5">
-                      <input
-                        :checked="index.isUnique"
-                        type="checkbox"
-                        :class="structureCheckboxClass"
-                        :disabled="!canEditIndexDraft(index) || !!indexColumnsIssue(index, index.columns, index.indexType, true)"
-                        data-index-unique
-                        @change="onIndexUniqueChange(index, ($event.target as HTMLInputElement).checked)"
-                      />
-                      <span>{{ index.isUnique ? t("structureEditor.yes") : t("structureEditor.no") }}</span>
-                    </label>
+                  <td :class="[structureCellClass, 'text-center']">
+                    <input
+                      :checked="index.isUnique"
+                      type="checkbox"
+                      :class="structureCheckboxClass"
+                      :disabled="!canEditIndexDraft(index) || !!indexColumnsIssue(index, index.columns, index.indexType, true)"
+                      data-index-unique
+                      :aria-label="t('structureEditor.unique')"
+                      @change="onIndexUniqueChange(index, ($event.target as HTMLInputElement).checked)"
+                    />
                   </td>
                   <td :class="structureCellClass">
                     <Select v-if="indexTypeOptions.length > 0" :model-value="index.indexType || 'BTREE'" :disabled="!canEditIndexDraft(index)" data-index-type @update:model-value="(value: unknown) => onIndexTypeChange(index, value)">
@@ -6276,10 +6271,9 @@ watch(
                   <td :class="structureCellClass">
                     <Input v-model="index.comment" :class="[structureControlClass, indexSearchFieldClass(index, index.comment)]" :disabled="!canEditIndexComment(index)" />
                   </td>
-                  <td :class="structureCellClass">
-                    <label v-if="structureCapabilities.indexConcurrent" class="flex items-center gap-1.5" :title="concurrentIndexCellTitle(index)">
-                      <input v-model="index.concurrently" type="checkbox" :class="structureCheckboxClass" :disabled="!canEditIndexConcurrent(index)" />
-                      <span>{{ index.concurrently ? t("structureEditor.yes") : t("structureEditor.no") }}</span>
+                  <td :class="[structureCellClass, 'text-center']">
+                    <label v-if="structureCapabilities.indexConcurrent" class="inline-flex items-center justify-center" :title="concurrentIndexCellTitle(index)">
+                      <input v-model="index.concurrently" type="checkbox" :class="structureCheckboxClass" :disabled="!canEditIndexConcurrent(index)" :aria-label="t('structureEditor.concurrent')" />
                     </label>
                     <span v-else class="text-[length:var(--structure-font-size)] text-muted-foreground">—</span>
                   </td>
diff --git a/apps/desktop/src/components/structure/__tests__/TableStructureEditor.metadataRevalidation.spec.ts b/apps/desktop/src/components/structure/__tests__/TableStructureEditor.metadataRevalidation.spec.ts
index 63caf096b8..2c48b88c49 100644
--- a/apps/desktop/src/components/structure/__tests__/TableStructureEditor.metadataRevalidation.spec.ts
+++ b/apps/desktop/src/components/structure/__tests__/TableStructureEditor.metadataRevalidation.spec.ts
@@ -745,6 +745,32 @@ describe("TableStructureEditor column index actions", () => {
     await vi.waitFor(() => expect(root.textContent).toContain("structureEditor.spatialIndexNullable"));
     expect(mocks.executeBatch).not.toHaveBeenCalled();
   });
+
+  it("renders checkboxes without dynamic yes/no toggle text (#8148)", async () => {
+    loadMetadata();
+    const root = await mountStructureEditor();
+    await openSubmenu(fieldRow(root, "email"), "structureEditor.createColumnIndex");
+    menuButton("structureEditor.createNormalIndex").click();
+    await expectIndexName(root, "idx_email");
+
+    const unique = indexRow(root).querySelector<HTMLInputElement>("[data-index-unique]")!;
+    const uniqueCell = unique.closest("td")!;
+    expect(uniqueCell.textContent?.trim()).toBe("");
+
+    unique.checked = true;
+    unique.dispatchEvent(new Event("change"));
+    await settle();
+    expect(uniqueCell.textContent?.trim()).toBe("");
+
+    const nullable = fieldRow(root, "location").querySelector<HTMLInputElement>('input[aria-label="structureEditor.nullable"]')!;
+    const nullableCell = nullable.closest("td")!;
+    expect(nullableCell.textContent?.trim()).toBe("");
+
+    nullable.checked = true;
+    nullable.dispatchEvent(new Event("change"));
+    await settle();
+    expect(nullableCell.textContent?.trim()).toBe("");
+  });
 });
 
 afterEach(() => {

From bce84825666d28e395af5991b6e86cafc3f033b7 Mon Sep 17 00:00:00 2001
From: t8y2 <t8y2@users.noreply.github.com>
Date: Wed, 7 Oct 2026 10:18:18 +0800
Subject: [PATCH 2/2] fix(structure): add aria-label to primary key checkbox

---
 apps/desktop/src/components/structure/TableStructureEditor.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/desktop/src/components/structure/TableStructureEditor.vue b/apps/desktop/src/components/structure/TableStructureEditor.vue
index a5ba062ac0..62c31ec604 100644
--- a/apps/desktop/src/components/structure/TableStructureEditor.vue
+++ b/apps/desktop/src/components/structure/TableStructureEditor.vue
@@ -5890,6 +5890,7 @@ watch(
                             type="checkbox"
                             :class="structureCheckboxClass"
                             :disabled="isPrimaryKeyDisabled(column)"
+                            :aria-label="t('structureEditor.primaryKey')"
                             @change="
                               () => {
                                 if (column.isPrimaryKey) column.isNullable = false;