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

remove metabot group (#23140)

parent a38eaa05
No related branches found
No related tags found
No related merge requests found
......@@ -22,12 +22,12 @@ import {
deleteMembership,
updateMembership,
} from "../people";
import { getGroupsWithoutMetabot, getMembershipsByUser } from "../selectors";
import { getMembershipsByUser } from "../selectors";
const mapStateToProps = state => ({
currentUser: getUser(state),
isAdmin: getUserIsAdmin(state),
groups: getGroupsWithoutMetabot(state),
groups: Group.selectors.getList(state),
membershipsByUser: getMembershipsByUser(state),
});
......
......@@ -6,10 +6,9 @@ import { PLUGIN_GROUP_MANAGERS } from "metabase/plugins";
import Group from "metabase/entities/groups";
import { getUserIsAdmin } from "metabase/selectors/user";
import GroupsListing from "../components/GroupsListing";
import { getGroupsWithoutMetabot } from "../selectors";
const mapStateToProps = (state, props) => ({
groups: getGroupsWithoutMetabot(state, props),
groups: Group.selectors.getList(state, props),
isAdmin: getUserIsAdmin(state),
});
......
import { createSelector } from "reselect";
import _ from "underscore";
import { isMetaBotGroup } from "metabase/lib/groups";
import Group from "metabase/entities/groups";
export const getMemberships = state => state.admin.people.memberships;
export const getMembershipsList = createSelector(
......@@ -28,15 +24,6 @@ export const getMembershipsByUser = createSelector(
}, {}),
);
export const getGroupsWithoutMetabot = createSelector(
[Group.selectors.getList],
groups => groups.filter(group => !isMetaBotGroup(group)),
);
export const getIs = createSelector([Group.selectors.getList], groups =>
groups.filter(group => !isMetaBotGroup(group)),
);
export const getUserMemberships = createSelector(
[(_, props) => props.userId, getMemberships],
(userId, memberships) =>
......
......@@ -9,13 +9,13 @@ import LoadingSpinner from "metabase/components/LoadingSpinner";
import Modal from "metabase/components/Modal";
import { t } from "ttag";
import { PermissionsApi, SettingsApi } from "metabase/services";
import { isSpecialGroup } from "metabase/lib/groups";
import { isDefaultGroup } from "metabase/lib/groups";
import _ from "underscore";
import SettingToggle from "./SettingToggle";
const groupIsMappable = group => !isSpecialGroup(group);
const groupIsMappable = group => !isDefaultGroup(group);
export default class GroupMappingsWidget extends React.Component {
constructor(props, context) {
......
......@@ -3,7 +3,6 @@ import { t } from "ttag";
const SPECIAL_GROUP_NAMES = new Map([
["All Users", t`All Users`],
["Administrators", t`Administrators`],
["MetaBot", t`MetaBot`],
]);
export function isDefaultGroup(group) {
......@@ -14,20 +13,12 @@ export function isAdminGroup(group) {
return group.name === "Administrators";
}
export function isMetaBotGroup(group) {
return group.name === "MetaBot";
}
export function isSpecialGroup(group) {
return isDefaultGroup(group) || isMetaBotGroup(group);
}
export function canEditPermissions(group) {
return !isAdminGroup(group);
}
export function canEditMembership(group) {
return !isDefaultGroup(group) && !isMetaBotGroup(group);
return !isDefaultGroup(group);
}
export function getGroupColor(group) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment