Adjust some naming

mathesar-foundation · Sep 30, 2024 · 2c39ff9 · 2c39ff9
1 parent 2a2bb6e
commit 2c39ff9
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 26 deletions.
diff --git a/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte b/mathesar_ui/src/pages/database/DatabasePageWrapper.svelte
@@ -34,7 +34,7 @@
 
   const databaseRouteContext = DatabaseRouteContext.get();
   $: ({ database, underlyingDatabase } = $databaseRouteContext);
-  $: void underlyingDatabase.runOptimally({ database_id: database.id });
+  $: void underlyingDatabase.runConservatively({ database_id: database.id });
 
   const commonData = preloadCommonData();
 

diff --git a/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte b/mathesar_ui/src/pages/database/schemas/SchemasSection.svelte
@@ -29,7 +29,7 @@
   const databaseRouteContext = DatabaseRouteContext.get();
 
   $: ({ database, underlyingDatabase } = $databaseRouteContext);
-  $: void underlyingDatabase.runOptimally({ database_id: database.id });
+  $: void underlyingDatabase.runConservatively({ database_id: database.id });
   $: schemasMap = $schemasStore.data;
   $: schemasRequestStatus = $schemasStore.requestStatus;
   $: isLoading =

diff --git a/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte b/mathesar_ui/src/pages/database/settings/collaborators/CollaboratorRow.svelte
@@ -12,8 +12,8 @@
   import { Button, SpinnerButton } from '@mathesar-component-library';
 
   export let collaborator: Collaborator;
-  export let editRoleForCollaborator: (collaborator: Collaborator) => void;
-  export let checkAndHandleSideEffects: (collaboror: Collaborator) => void;
+  export let onClickEditRole: (collaborator: Collaborator) => void;
+  export let onDelete: (collaborator: Collaborator) => void;
 
   const routeContext = DatabaseSettingsRouteContext.get();
   $: ({ configuredRoles, users } = $routeContext);
@@ -28,7 +28,7 @@
 
   async function deleteCollaborator() {
     await $routeContext.deleteCollaborator(collaborator);
-    checkAndHandleSideEffects(collaborator);
+    onDelete(collaborator);
     toast.success($_('collaborator_removed_successfully'));
   }
 </script>
@@ -55,7 +55,7 @@
     <div class="actions">
       <Button
         appearance="secondary"
-        on:click={() => editRoleForCollaborator(collaborator)}
+        on:click={() => onClickEditRole(collaborator)}
         disabled={!isMathesarAdmin}
       >
         <Icon {...iconEdit} size="0.8em" />

diff --git a/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte b/mathesar_ui/src/pages/database/settings/collaborators/Collaborators.svelte
@@ -43,7 +43,7 @@
     collaborators.batchRunner({ database_id: database.id }),
     configuredRoles.batchRunner({ server_id: database.server.id }),
   ]);
-  $: void users.runOptimally();
+  $: void users.runConservatively();
   $: isLoading =
     $collaborators.isLoading || $configuredRoles.isLoading || $users.isLoading;
   $: isSuccess = $collaborators.isOk && $configuredRoles.isOk && $users.isOk;
@@ -105,8 +105,8 @@
         {#each [...($collaborators.resolvedValue?.values() ?? [])] as collaborator (collaborator.id)}
           <CollaboratorRow
             {collaborator}
-            {editRoleForCollaborator}
-            {checkAndHandleSideEffects}
+            onClickEditRole={editRoleForCollaborator}
+            onDelete={checkAndHandleSideEffects}
           />
         {/each}
       </GridTable>
@@ -131,7 +131,7 @@
     usersMap={$users.resolvedValue}
     controller={editCollaboratorRoleModal}
     configuredRolesMap={$configuredRoles.resolvedValue}
-    {checkAndHandleSideEffects}
+    onUpdateRole={checkAndHandleSideEffects}
   />
 {/if}
 

diff --git a/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte b/mathesar_ui/src/pages/database/settings/collaborators/EditRoleForCollaboratorModal.svelte
@@ -23,7 +23,7 @@
   export let collaborator: Collaborator;
   export let configuredRolesMap: ImmutableMap<number, ConfiguredRole>;
   export let usersMap: ImmutableMap<number, User>;
-  export let checkAndHandleSideEffects: (collaboror: Collaborator) => void;
+  export let onUpdateRole: (collaborator: Collaborator) => void;
 
   $: savedConfiguredRoleId = collaborator.configuredRoleId;
   $: configuredRoleId = requiredField<number>($savedConfiguredRoleId);
@@ -34,7 +34,7 @@
 
   async function updateRoleForCollaborator() {
     await collaborator.setConfiguredRole($configuredRoleId);
-    checkAndHandleSideEffects(collaborator);
+    onUpdateRole(collaborator);
     controller.close();
     toast.success($_('collaborator_role_updated_successfully'));
   }

diff --git a/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte b/mathesar_ui/src/pages/database/settings/roles/ModifyRoleMembers.svelte
@@ -26,7 +26,7 @@
   export let controller: ModalController;
   export let parentRole: Role;
   export let rolesMap: ImmutableMap<number, Role>;
-  export let handleRoleChangeSideEffects: (role: Role) => void;
+  export let onSave: (props: { parentRole: Role }) => void;
 
   $: savedMembers = parentRole.members;
   $: savedMemberOids = new Set([...$savedMembers.keys()]);
@@ -52,7 +52,7 @@
 
   async function saveMembers() {
     await parentRole.setMembers(new Set($memberOids));
-    handleRoleChangeSideEffects(parentRole);
+    onSave({ parentRole });
     controller.close();
     toast.success($_('child_roles_saved_successfully'));
   }

diff --git a/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte b/mathesar_ui/src/pages/database/settings/roles/RoleRow.svelte
@@ -20,15 +20,15 @@
 
   export let role: Role;
   export let rolesMap: ImmutableMap<number, Role>;
-  export let modifyMembersForRole: (role: Role) => void;
-  export let handleRoleChangeSideEffects: (role: Role) => void;
+  export let onClickEditMembers: (role: Role) => void;
+  export let onDrop: (role: Role) => void;
 
   $: members = role.members;
 
   async function dropRole() {
     try {
       await $routeContext.databaseRouteContext.deleteRole(role);
-      handleRoleChangeSideEffects(role);
+      onDrop(role);
       toast.success($_('role_dropped_successfully'));
     } catch (err) {
       toast.error(getErrorMessage(err));
@@ -52,10 +52,7 @@
       {/each}
     </div>
     <div class="actions">
-      <Button
-        appearance="secondary"
-        on:click={() => modifyMembersForRole(role)}
-      >
+      <Button appearance="secondary" on:click={() => onClickEditMembers(role)}>
         <Icon {...iconEdit} size="0.8em" />
       </Button>
     </div>

diff --git a/mathesar_ui/src/pages/database/settings/roles/Roles.svelte b/mathesar_ui/src/pages/database/settings/roles/Roles.svelte
@@ -27,7 +27,7 @@
   $: ({ database, roles, underlyingDatabase, currentRole } =
     databaseRouteContext);
 
-  $: void roles.runOptimally({ database_id: database.id });
+  $: void roles.runConservatively({ database_id: database.id });
   $: roleList = [...($roles.resolvedValue?.values() ?? [])];
 
   let targetRole: Role | undefined = undefined;
@@ -93,8 +93,8 @@
           <RoleRow
             {role}
             rolesMap={$roles.resolvedValue}
-            {modifyMembersForRole}
-            {handleRoleChangeSideEffects}
+            onClickEditMembers={modifyMembersForRole}
+            onDrop={handleRoleChangeSideEffects}
           />
         {/each}
       </GridTable>
@@ -113,7 +113,7 @@
     parentRole={targetRole}
     rolesMap={$roles.resolvedValue}
     controller={modifyRoleMembersModalController}
-    {handleRoleChangeSideEffects}
+    onSave={({ parentRole }) => handleRoleChangeSideEffects(parentRole)}
   />
 {/if}
 

diff --git a/mathesar_ui/src/stores/AsyncStore.ts b/mathesar_ui/src/stores/AsyncStore.ts
@@ -158,7 +158,7 @@ export default class AsyncStore<Props = void, T = unknown>
    * - rejected
    * - not loading
    */
-  async runOptimally(props: Props): Promise<AsyncStoreValue<T, string>> {
+  async runConservatively(props: Props): Promise<AsyncStoreValue<T, string>> {
     const value = get(this.value);
     if (value.isLoading || value.isOk) {
       return value;