Skip to content
Snippets Groups Projects
Unverified Commit b220f902 authored by Alexander Polyankin's avatar Alexander Polyankin Committed by GitHub
Browse files

Fix crash in admin settings in a non-default locale (#33133)

parent ecf4b623
No related branches found
No related tags found
No related merge requests found
import { restore } from "e2e/support/helpers";
import { SAMPLE_DB_ID } from "e2e/support/cypress_data";
describe("issue 33035", () => {
beforeEach(() => {
restore();
cy.signInAsAdmin();
cy.request("GET", "/api/user/current").then(({ body: { id: user_id } }) => {
cy.request("PUT", `/api/user/${user_id}`, { locale: "de" });
});
});
it("databases page should work in a non-default locale (metabase#33035)", () => {
cy.visit(`/admin/permissions/data/database/${SAMPLE_DB_ID}`);
cy.findByRole("main").findByText("Orders").should("be.visible");
});
});
......@@ -3,6 +3,7 @@ import { t } from "ttag";
import { State } from "metabase-types/store";
import { Group } from "metabase-types/api";
import { getGroupNameLocalized } from "metabase/lib/groups";
import { RawGroupRouteParams } from "../../types";
import { getOrderedGroups } from "./groups";
......@@ -28,11 +29,13 @@ export const getGroupsSidebar = createSelector(
const pinnedGroupItems = pinnedGroups.map(group => ({
...group,
name: getGroupNameLocalized(group),
icon: "bolt",
}));
const unpinnedGroupItems = unpinnedGroups.map(group => ({
...group,
name: getGroupNameLocalized(group),
icon: "group",
}));
......
import { createSelector } from "@reduxjs/toolkit";
import _ from "underscore";
import { assoc } from "icepick";
import Groups from "metabase/entities/groups";
import { Group } from "metabase-types/api";
import {
getGroupNameLocalized,
isAdminGroup,
isDefaultGroup,
} from "metabase/lib/groups";
import { isAdminGroup, isDefaultGroup } from "metabase/lib/groups";
const isPinnedGroup = (group: Group) =>
isAdminGroup(group) || isDefaultGroup(group);
......@@ -16,10 +11,7 @@ const isPinnedGroup = (group: Group) =>
export const getOrderedGroups = createSelector(
Groups.selectors.getList,
(groups: Group[]) => {
const translatedGroups = groups.map(group =>
assoc(group, "name", getGroupNameLocalized(group)),
);
return _.partition(translatedGroups, isPinnedGroup);
return _.partition(groups, isPinnedGroup);
},
);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment