Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

fix: keep permissions tabs visible while data loads (#82633)

Mahatthana (Kelvin) Nomsawadi496db401a1d6
diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
index 7085dc3ba1e..ae5ec029e6e 100644
--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx
@@ -60,19 +60,12 @@ export function DataPermissionsPage() {
: skipToken,
);
- if (
+ const isLoading =
isLoadingDatabases ||
isLoadingGroups ||
isLoadingAllUsers ||
isLoadingAdminstrators ||
- isLoadingTables
- ) {
- return (
- <Center h="100%">
- <Loader size="lg" />
- </Center>
- );
- }
+ isLoadingTables;
return (
<PermissionsPageLayout
@@ -82,9 +75,15 @@ export function DataPermissionsPage() {
diff={diff}
isDirty={isDirty}
helpContent={<DataPermissionsHelp />}
- canShowSplitPermsModal
+ canShowSplitPermsModal={!isLoading}
>
- <Outlet />
+ {isLoading ? (
+ <Center h="100%" w="100%">
+ <Loader size="lg" />
+ </Center>
+ ) : (
+ <Outlet />
+ )}
</PermissionsPageLayout>
);
}
diff --git a/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx b/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx
index 60962861259..7cd61685f64 100644
--- a/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx
+++ b/frontend/src/metabase/admin/permissions/test/DatabasesPermissionsPage/DatabasesPermissionsPage.unit.spec.tsx
@@ -7,6 +7,7 @@ import {
setupGroupsEndpoint,
setupPermissionsGraphEndpoints,
} from "__support__/server-mocks";
+import { mockSettings } from "__support__/settings";
import {
renderWithProviders,
screen,
@@ -32,7 +33,11 @@ const TEST_GROUPS = [
createMockGroup({ id: 2, name: "Administrators", magic_group_type: "admin" }),
];
-const setup = async () => {
+const setup = async ({
+ shouldWaitForLoader = true,
+ showUpdatedPermissionModal = false,
+ databaseMetadataDelay = 0,
+} = {}) => {
setupDatabasesEndpoints([TEST_DATABASE]);
setupPermissionsGraphEndpoints(TEST_GROUPS, [TEST_DATABASE]);
setupGroupsEndpoint(TEST_GROUPS);
@@ -40,6 +45,7 @@ const setup = async () => {
fetchMock.get(
`path:/api/database/${TEST_DATABASE.id}/metadata`,
TEST_DATABASE,
+ { delay: databaseMetadataDelay },
);
const mockEventListener = jest.spyOn(window, "addEventListener");
@@ -65,10 +71,17 @@ const setup = async () => {
{
withRouter: true,
initialRoute: `/admin/permissions/data/database/${TEST_DATABASE.id}`,
+ storeInitialState: {
+ settings: mockSettings({
+ "show-updated-permission-modal": showUpdatedPermissionModal,
+ }),
+ },
},
);
- await waitForLoaderToBeRemoved();
+ if (shouldWaitForLoader) {
+ await waitForLoaderToBeRemoved();
+ }
return { mockEventListener };
};
@@ -90,6 +103,35 @@ describe("DatabasesPermissionsPage", () => {
});
describe("rendering", () => {
+ it("should keep the permissions tabs visible while data is loading", async () => {
+ await setup({ shouldWaitForLoader: false });
+
+ expect(screen.getByTestId("loading-indicator")).toBeInTheDocument();
+ expect(screen.getByRole("tab", { name: "Data" })).toBeInTheDocument();
+ expect(
+ screen.getByRole("tab", { name: "Collections" }),
+ ).toBeInTheDocument();
+ });
+
+ it("should open the split permissions modal only after data has loaded", async () => {
+ await setup({
+ shouldWaitForLoader: false,
+ showUpdatedPermissionModal: true,
+ databaseMetadataDelay: 100,
+ });
+
+ await delay(0);
+ expect(screen.getByTestId("loading-indicator")).toBeInTheDocument();
+ expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
+
+ await waitForLoaderToBeRemoved();
+ expect(
+ await screen.findByRole("dialog", {
+ name: "Your data permissions may look different, but the access hasn’t changed.",
+ }),
+ ).toBeInTheDocument();
+ });
+
it("should show 'Cancel' and 'Save Changes' when user makes changes to permissions", async () => {
await setup();