diff --git a/lerna.json b/lerna.json index d6627b3b00..67b1bd59bc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.10.12-alpha.11", + "version": "2.10.12-alpha.12", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte index e0c653e9d7..2b7cde9201 100644 --- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte @@ -14,13 +14,14 @@ import GridManageAccessButton from "components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte" import GridRelationshipButton from "components/backend/DataTable/buttons/grid/GridRelationshipButton.svelte" import GridEditColumnModal from "components/backend/DataTable/modals/grid/GridEditColumnModal.svelte" + import GridUsersTableButton from "components/backend/DataTable/modals/grid/GridUsersTableButton.svelte" const userSchemaOverrides = { - firstName: { displayName: "First name", disabled: true }, - lastName: { displayName: "Last name", disabled: true }, - email: { displayName: "Email", disabled: true }, - roleId: { displayName: "Role", disabled: true }, - status: { displayName: "Status", disabled: true }, + firstName: { displayName: "First name" }, + lastName: { displayName: "Last name" }, + email: { displayName: "Email" }, + roleId: { displayName: "Role" }, + status: { displayName: "Status" }, } $: id = $tables.selected?._id @@ -59,22 +60,22 @@ datasource={gridDatasource} canAddRows={!isUsersTable} canDeleteRows={!isUsersTable} + canEditRows={!isUsersTable} + canEditColumns={!isUsersTable} schemaOverrides={isUsersTable ? userSchemaOverrides : null} showAvatars={false} on:updatedatasource={handleGridTableUpdate} > + {#if isUsersTable} + + {/if} - - - - - - - - + {#if !isUsersTable} + + {/if} {#if relationshipsEnabled} @@ -84,7 +85,6 @@ {:else} {/if} - {#if isUsersTable} @@ -92,6 +92,12 @@ {/if} + + + + + + diff --git a/packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte b/packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte new file mode 100644 index 0000000000..2c353943de --- /dev/null +++ b/packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte @@ -0,0 +1,54 @@ + + +
+ (open = true)} icon="Help" quiet> + Why can't I edit this table? + +
+ + +
+ The app users table is read only + + You can continue to view the users that have access to your application. + + + Manage and invite more application users using the user side panel in the + top right of your screen. + +
+ +
+
+ + + diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte index 1c264a5aaf..0cc61c69e6 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte @@ -180,7 +180,7 @@
selectTable(TableNames.USERS)}