Skip to content

Commit 203265f

Browse files
committed
Fix more errors
1 parent d48f4a6 commit 203265f

3 files changed

Lines changed: 27 additions & 27 deletions

File tree

src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/indexes/create.svelte

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<script module lang="ts">
2-
import { DatabasesIndexType, OrderBy } from '@appwrite.io/console';
2+
import { TablesDBIndexType, OrderBy } from '@appwrite.io/console';
33
export type CreateIndexesCallbackType = {
44
key: string;
5-
type: DatabasesIndexType;
5+
type: TablesDBIndexType;
66
fields: string[];
77
lengths: (number | null)[];
88
orders: OrderBy[];
@@ -40,14 +40,14 @@
4040
4141
let key = $state('');
4242
let initializedForOpen = $state(false);
43-
let selectedType = $state<DatabasesIndexType>(DatabasesIndexType.Key);
43+
let selectedType = $state<TablesDBIndexType>(TablesDBIndexType.Key);
4444
4545
const { dependencies, terminology } = getTerminologies();
4646
4747
const fieldOptions = $derived(
4848
entity.fields
4949
.filter((field) => {
50-
if (selectedType === DatabasesIndexType.Spatial) {
50+
if (selectedType === TablesDBIndexType.Spatial) {
5151
// keep only spatial
5252
return isSpatialType(field);
5353
}
@@ -69,13 +69,13 @@
6969
7070
const types = $derived(
7171
[
72-
{ value: DatabasesIndexType.Key, label: 'Key' },
73-
{ value: DatabasesIndexType.Unique, label: 'Unique' },
74-
{ value: DatabasesIndexType.Fulltext, label: 'Fulltext' },
75-
{ value: DatabasesIndexType.Spatial, label: 'Spatial' }
72+
{ value: TablesDBIndexType.Key, label: 'Key' },
73+
{ value: TablesDBIndexType.Unique, label: 'Unique' },
74+
{ value: TablesDBIndexType.Fulltext, label: 'Fulltext' },
75+
{ value: TablesDBIndexType.Spatial, label: 'Spatial' }
7676
].filter((type) => {
7777
if (
78-
type.value === DatabasesIndexType.Spatial &&
78+
type.value === TablesDBIndexType.Spatial &&
7979
!$regionalConsoleVariables?.supportForSpatials
8080
)
8181
return false;
@@ -85,7 +85,7 @@
8585
8686
// order options derived from selected type
8787
let orderOptions = $derived.by(() =>
88-
selectedType === DatabasesIndexType.Spatial
88+
selectedType === TablesDBIndexType.Spatial
8989
? [
9090
{ value: OrderBy.Asc, label: 'ASC' },
9191
{ value: OrderBy.Desc, label: 'DESC' },
@@ -102,7 +102,7 @@
102102
$effect(() => {
103103
const firstField = entity.fields.find((field) => field.key === fieldList.at(0)?.value);
104104
if (
105-
selectedType === DatabasesIndexType.Spatial &&
105+
selectedType === TablesDBIndexType.Spatial &&
106106
firstField &&
107107
!isSpatialType(firstField)
108108
) {
@@ -126,7 +126,7 @@
126126
const isSpatial = field.length && isSpatialType(field[0]);
127127
const order = isSpatial ? null : OrderBy.Asc;
128128
129-
selectedType = isSpatial ? DatabasesIndexType.Spatial : DatabasesIndexType.Key;
129+
selectedType = isSpatial ? TablesDBIndexType.Spatial : TablesDBIndexType.Key;
130130
131131
fieldList = externalFieldKey
132132
? [{ value: externalFieldKey, order, length: null }]
@@ -136,7 +136,7 @@
136136
}
137137
138138
const addFieldDisabled = $derived(
139-
selectedType === DatabasesIndexType.Spatial ||
139+
selectedType === TablesDBIndexType.Spatial ||
140140
!fieldList.at(-1)?.value ||
141141
(!fieldList.at(-1)?.order && fieldList.at(-1)?.order !== null)
142142
);
@@ -170,7 +170,7 @@
170170
if (
171171
!key ||
172172
!selectedType ||
173-
(selectedType !== DatabasesIndexType.Spatial && addFieldDisabled)
173+
(selectedType !== TablesDBIndexType.Spatial && addFieldDisabled)
174174
) {
175175
addNotification({
176176
type: 'error',
@@ -250,7 +250,7 @@
250250
required
251251
options={[
252252
// allow system fields only for non-spatial index types
253-
...(selectedType === DatabasesIndexType.Spatial
253+
...(selectedType === TablesDBIndexType.Spatial
254254
? []
255255
: [
256256
{ value: '$id', label: '$id', leadingIcon: IconFingerPrint },
@@ -280,7 +280,7 @@
280280
bind:value={field.order}
281281
placeholder="Select order" />
282282

283-
{#if selectedType === DatabasesIndexType.Key}
283+
{#if selectedType === TablesDBIndexType.Key}
284284
<InputNumber
285285
id={`length-${index}`}
286286
label={index === 0 ? 'Length' : undefined}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { Modal } from '$lib/components';
77
import { type Entity, SideSheet } from '$database/(entity)';
88
import { isSmallViewport } from '$lib/stores/viewport';
9-
import { DatabasesIndexType, OrderBy } from '@appwrite.io/console';
9+
import { TablesDBIndexType, OrderBy } from '@appwrite.io/console';
1010
import { capitalize } from '$lib/helpers/string';
1111
import { type Columns } from '../table-[table]/store';
1212
import { isRelationship } from '../table-[table]/rows/store';
@@ -68,7 +68,7 @@
6868
6969
indexes = mockSuggestions.columns.slice(0, 3).map((column, index) => ({
7070
key: column.name,
71-
type: DatabasesIndexType.Key,
71+
type: TablesDBIndexType.Key,
7272
fields: [column.name],
7373
orders: index === 2 ? OrderBy.Desc : OrderBy.Asc,
7474
lengths: []
@@ -85,7 +85,7 @@
8585
indexes = suggestions.indexes.map((index) => {
8686
return {
8787
key: index.columns[0],
88-
type: index.type as DatabasesIndexType,
88+
type: index.type as TablesDBIndexType,
8989
orders: (index.orders?.[0] as OrderBy) || OrderBy.Asc,
9090
fields: index.columns,
9191
lengths: index.lengths ?? []
@@ -113,7 +113,7 @@
113113
if (indexes.length < MAX_INDEXES) {
114114
indexes.push({
115115
key: '',
116-
type: DatabasesIndexType.Key,
116+
type: TablesDBIndexType.Key,
117117
orders: OrderBy.Asc,
118118
fields: [],
119119
lengths: null
@@ -134,9 +134,9 @@
134134
}
135135
}
136136
137-
function getOrderOptions(selectedType: DatabasesIndexType) {
137+
function getOrderOptions(selectedType: TablesDBIndexType) {
138138
const base = [OrderBy.Asc, OrderBy.Desc];
139-
const values = selectedType === DatabasesIndexType.Spatial ? [...base, null] : base;
139+
const values = selectedType === TablesDBIndexType.Spatial ? [...base, null] : base;
140140
141141
return values.map((order) => ({
142142
label: order ? capitalize(String(order)) : 'None',
@@ -166,7 +166,7 @@
166166
167167
// prepare lengths array
168168
let lengths: (number | null)[];
169-
if (index.type === DatabasesIndexType.Key) {
169+
if (index.type === TablesDBIndexType.Key) {
170170
// only validate if it's a key index
171171
lengths = index.fields.map((columnKey, i) => {
172172
const maxSize = columnMap.get(columnKey);
@@ -293,10 +293,10 @@
293293
}
294294
295295
const typeOptions = $derived(
296-
Object.values(DatabasesIndexType)
296+
Object.values(TablesDBIndexType)
297297
.filter((type) => {
298298
if (
299-
type === DatabasesIndexType.Spatial &&
299+
type === TablesDBIndexType.Spatial &&
300300
!$regionalConsoleVariables?.supportForSpatials
301301
)
302302
return false;

src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/store.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { writable } from 'svelte/store';
2-
import { DatabasesIndexType, OrderBy } from '@appwrite.io/console';
2+
import { TablesDBIndexType, OrderBy } from '@appwrite.io/console';
33
import { columnOptions } from '../table-[table]/columns/store';
44

55
export type TableColumnSuggestions = {
@@ -34,7 +34,7 @@ export type IndexOrder = OrderBy | null;
3434

3535
export type SuggestedIndexSchema = {
3636
key: string;
37-
type: DatabasesIndexType;
37+
type: TablesDBIndexType;
3838
orders: IndexOrder;
3939
fields: string[];
4040
lengths?: number[] | undefined;

0 commit comments

Comments
 (0)