Skip to content

Commit 297d732

Browse files
authored
Merge pull request #2152 from appwrite/revert-2143-1.8.x
Revert "1.8.x"
2 parents 40770a7 + f955a53 commit 297d732

File tree

128 files changed

+1561
-1640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+1561
-1640
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"dependencies": {
2424
"@ai-sdk/svelte": "^1.1.24",
25-
"@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@935b30f",
25+
"@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@8836b0c",
2626
"@appwrite.io/pink-icons": "0.25.0",
2727
"@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
2828
"@appwrite.io/pink-legacy": "^1.0.3",

pnpm-lock.yaml

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/lib/actions/analytics.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ export enum Click {
148148
ConnectRepositoryClick = 'click_connect_repository',
149149
CreditsRedeemClick = 'click_credits_redeem',
150150
CloudSignupClick = 'click_cloud_signup',
151-
DatabaseColumnDelete = 'click_column_delete',
151+
DatabaseAttributeDelete = 'click_attribute_delete',
152152
DatabaseIndexDelete = 'click_index_delete',
153-
DatabaseTableDelete = 'click_table_delete',
153+
DatabaseCollectionDelete = 'click_collection_delete',
154154
DatabaseDatabaseDelete = 'click_database_delete',
155155
DatabaseImportCsv = 'click_database_import_csv',
156156
DomainCreateClick = 'click_domain_create',
@@ -273,22 +273,22 @@ export enum Submit {
273273
DatabaseDelete = 'submit_database_delete',
274274
DatabaseUpdateName = 'submit_database_update_name',
275275
DatabaseImportCsv = 'submit_database_import_csv',
276-
ColumnCreate = 'submit_column_create',
277-
ColumnUpdate = 'submit_column_update',
278-
ColumnDelete = 'submit_column_delete',
279-
RowCreate = 'submit_row_create',
280-
RowDelete = 'submit_row_delete',
281-
RowUpdate = 'submit_row_update',
282-
RowUpdatePermissions = 'submit_row_update_permissions',
276+
AttributeCreate = 'submit_attribute_create',
277+
AttributeUpdate = 'submit_attribute_update',
278+
AttributeDelete = 'submit_attribute_delete',
279+
DocumentCreate = 'submit_document_create',
280+
DocumentDelete = 'submit_document_delete',
281+
DocumentUpdate = 'submit_document_update',
282+
DocumentUpdatePermissions = 'submit_document_update_permissions',
283283
IndexCreate = 'submit_index_create',
284284
IndexDelete = 'submit_index_delete',
285-
TableCreate = 'submit_row_create',
286-
TableDelete = 'submit_row_delete',
287-
TableUpdateName = 'submit_row_update_name',
288-
TableUpdatePermissions = 'submit_row_update_permissions',
289-
TableUpdateSecurity = 'submit_row_update_security',
290-
TableUpdateEnabled = 'submit_row_update_enabled',
291-
TableUpdateDisplayNames = 'submit_row_update_display_names',
285+
CollectionCreate = 'submit_collection_create',
286+
CollectionDelete = 'submit_collection_delete',
287+
CollectionUpdateName = 'submit_collection_update_name',
288+
CollectionUpdatePermissions = 'submit_collection_update_permissions',
289+
CollectionUpdateSecurity = 'submit_collection_update_security',
290+
CollectionUpdateEnabled = 'submit_collection_update_enabled',
291+
CollectionUpdateDisplayNames = 'submit_collection_update_display_names',
292292
FunctionCreate = 'submit_function_create',
293293
FunctionDelete = 'submit_function_delete',
294294
FunctionUpdateName = 'submit_function_update_name',

src/lib/commandCenter/commands.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ const groups = [
2828
'integrations',
2929
'migrations',
3030
'users',
31-
'tables',
32-
'columns',
31+
'collections',
32+
'attributes',
3333
'indexes',
34-
'rows',
34+
'documents',
3535
'teams',
3636
'security',
3737
'buckets',

src/lib/commandCenter/panels/ai.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
const examples = [
2828
'How to add platform in the console?',
2929
'How can I manage users, permissions, and access control in Appwrite?',
30-
'How can I set up database tables and rows in Appwrite?',
30+
'How can I set up database collections and documents in Appwrite?',
3131
'How do I configure and manage server-side functions in Appwrite?',
3232
'How to add custom domain in the console?'
3333
];
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<script lang="ts">
22
import { initSearcher } from '../commands';
3-
import { tablesSearcher } from '../searchers';
3+
import { collectionsSearcher } from '../searchers';
44
import Template from './template.svelte';
55
6-
const { search, results } = initSearcher(tablesSearcher);
6+
const { search, results } = initSearcher(collectionsSearcher);
77
</script>
88

99
<Template options={$results} bind:search={$search} />

src/lib/commandCenter/panels/createColumn.svelte renamed to src/lib/commandCenter/panels/createAttribute.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<script lang="ts">
2-
import { initCreateColumn } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte';
3-
import { columnOptions } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/store';
2+
import { initCreateAttribute } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+layout.svelte';
3+
import { attributeOptions } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/store';
44
import Template from './template.svelte';
55
66
let search = '';
77
8-
let options = columnOptions.map((option) => {
8+
let options = attributeOptions.map((option) => {
99
return {
1010
label: option.name,
1111
icon: option.icon,
1212
callback() {
13-
initCreateColumn(option.name);
13+
initCreateAttribute(option.name);
1414
}
1515
};
1616
});

src/lib/commandCenter/panels/index.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ export const DatabasesPanel: SubPanel = {
3737
component: Databases
3838
};
3939

40-
import Tables from './tables.svelte';
41-
export const TablesPanel: SubPanel = {
42-
name: 'Tables',
43-
component: Tables
40+
import Collections from './collections.svelte';
41+
export const CollectionsPanel: SubPanel = {
42+
name: 'Collections',
43+
component: Collections
4444
};
4545

46-
import CreateColumn from './createColumn.svelte';
47-
export const CreateColumnPanel: SubPanel = {
48-
name: 'Create Column',
49-
component: CreateColumn
46+
import CreateAttribute from './createAttribute.svelte';
47+
export const CreateAttributePanel: SubPanel = {
48+
name: 'Create Attribute',
49+
component: CreateAttribute
5050
};
5151

5252
import Users from './users.svelte';
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import { goto } from '$app/navigation';
2+
import { database } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/store';
3+
import { get } from 'svelte/store';
4+
import type { Searcher } from '../commands';
5+
import { sdk } from '$lib/stores/sdk';
6+
import { base } from '$app/paths';
7+
import { page } from '$app/state';
8+
9+
export const collectionsSearcher = (async (query: string) => {
10+
const databaseId = get(database).$id;
11+
const { collections } = await sdk
12+
.forProject(page.params.region, page.params.project)
13+
.databases.listCollections(databaseId);
14+
15+
return collections
16+
.filter((col) => col.name.toLowerCase().includes(query.toLowerCase()))
17+
.map(
18+
(col) =>
19+
({
20+
group: 'collections',
21+
label: col.name,
22+
callback: () => {
23+
goto(
24+
`${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${col.$id}`
25+
);
26+
}
27+
}) as const
28+
);
29+
}) satisfies Searcher;

src/lib/commandCenter/searchers/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export * from './databases';
22
export * from './users';
33
export * from './organizations';
4-
export * from './tables';
4+
export * from './collections';
55
export * from './projects';
66
export * from './teams';
77
export * from './functions';

0 commit comments

Comments
 (0)