Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Gitar] Cleaning up stale flag: userAccessUIEnabled with value true #1663

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions frontend/src/component/admin/users/UsersList/UsersList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import { RoleCell } from 'component/common/Table/cells/RoleCell/RoleCell';
import { useSearch } from 'hooks/useSearch';
import Download from '@mui/icons-material/Download';
import { StyledUsersLinkDiv } from '../Users.styles';
import { useUiFlag } from 'hooks/useUiFlag';
import useUiConfig from '../../../../hooks/api/getters/useUiConfig/useUiConfig';
import { useScimSettings } from 'hooks/api/getters/useScimSettings/useScimSettings';

Expand All @@ -56,7 +55,6 @@ const UsersList = () => {
}>({
open: false,
});
const userAccessUIEnabled = useUiFlag('userAccessUIEnabled');
const {
settings: { enabled: scimEnabled },
} = useScimSettings();
Expand Down Expand Up @@ -204,22 +202,16 @@ const UsersList = () => {
onEdit={() => {
navigate(`/admin/users/${user.id}/edit`);
}}
onViewAccess={
userAccessUIEnabled
? () => {
navigate(
`/admin/users/${user.id}/access`,
);
}
: undefined
}
onViewAccess={() => {
navigate(`/admin/users/${user.id}/access`);
}}
onChangePassword={openPwDialog(user)}
onResetPassword={openResetPwDialog(user)}
onDelete={openDelDialog(user)}
isScimUser={scimEnabled && Boolean(user.scimId)}
/>
),
width: userAccessUIEnabled ? 240 : 200,
width: 240,
disableSortBy: true,
},
// Always hidden -- for search
Expand All @@ -235,7 +227,7 @@ const UsersList = () => {
searchable: true,
},
],
[roles, navigate, isBillingUsers, userAccessUIEnabled],
[roles, navigate, isBillingUsers, true],
);

const initialState = useMemo(() => {
Expand Down
1 change: 0 additions & 1 deletion frontend/src/interfaces/uiConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ export type UiFlags = {
feedbackComments?: Variant;
showInactiveUsers?: boolean;
featureSearchFeedbackPosting?: boolean;
userAccessUIEnabled?: boolean;
outdatedSdksBanner?: boolean;
displayTrafficDataUsage?: boolean;
estimateTrafficDataCost?: boolean;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -248,4 +248,4 @@
]
},
"packageManager": "[email protected]"
}
}
5 changes: 0 additions & 5 deletions src/lib/types/experimental.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ export type IFlagKey =
| 'estimateTrafficDataCost'
| 'useMemoizedActiveTokens'
| 'queryMissingTokens'
| 'userAccessUIEnabled'
| 'disableUpdateMaxRevisionId'
| 'disablePublishUnannouncedEvents'
| 'outdatedSdksBanner'
Expand Down Expand Up @@ -223,10 +222,6 @@ const flags: IFlags = {
process.env.UNLEASH_EXPERIMENTAL_ESTIMATE_TRAFFIC_DATA_COST,
false,
),
userAccessUIEnabled: parseEnvVarBoolean(
process.env.UNLEASH_EXPERIMENTAL_USER_ACCESS_UI_ENABLED,
false,
),
disableUpdateMaxRevisionId: parseEnvVarBoolean(
process.env.UNLEASH_EXPERIMENTAL_DISABLE_SCHEDULED_CACHES,
false,
Expand Down
1 change: 0 additions & 1 deletion src/server-dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ process.nextTick(async () => {
stripHeadersOnAPI: true,
celebrateUnleash: true,
featureSearchFeedbackPosting: true,
userAccessUIEnabled: true,
outdatedSdksBanner: true,
disableShowContextFieldSelectionValues: false,
projectOverviewRefactorFeedback: true,
Expand Down