Skip to content
This repository has been archived by the owner on Oct 27, 2022. It is now read-only.

Commit

Permalink
refactor: remove UI bootstrap endpoint (#1212)
Browse files Browse the repository at this point in the history
  • Loading branch information
olav committed Aug 9, 2022
1 parent f9f6152 commit da30d6a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 48 deletions.
6 changes: 3 additions & 3 deletions src/component/admin/users/UserForm/UserForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import React from 'react';
import { useUsers } from 'hooks/api/getters/useUsers/useUsers';
import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
import { EDIT } from 'constants/misc';
import useUiBootstrap from 'hooks/api/getters/useUiBootstrap/useUiBootstrap';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';

interface IUserForm {
email: string;
Expand Down Expand Up @@ -49,7 +49,7 @@ const UserForm: React.FC<IUserForm> = ({
}) => {
const { classes: styles } = useStyles();
const { roles } = useUsers();
const { bootstrap } = useUiBootstrap();
const { uiConfig } = useUiConfig();

// @ts-expect-error
const sortRoles = (a, b) => {
Expand Down Expand Up @@ -127,7 +127,7 @@ const UserForm: React.FC<IUserForm> = ({
</RadioGroup>
</FormControl>
<ConditionallyRender
condition={mode !== EDIT && bootstrap?.email}
condition={mode !== EDIT && Boolean(uiConfig?.emailEnabled)}
show={
<FormControl>
<Typography
Expand Down
8 changes: 4 additions & 4 deletions src/component/admin/users/hooks/useAddUserForm.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { useEffect, useState } from 'react';
import useUiBootstrap from 'hooks/api/getters/useUiBootstrap/useUiBootstrap';
import { useUsers } from 'hooks/api/getters/useUsers/useUsers';
import useUiConfig from 'hooks/api/getters/useUiConfig/useUiConfig';

const useCreateUserForm = (
initialName = '',
initialEmail = '',
initialRootRole = 1
) => {
const { bootstrap } = useUiBootstrap();
const { uiConfig } = useUiConfig();
const [name, setName] = useState(initialName);
const [email, setEmail] = useState(initialEmail);
const [sendEmail, setSendEmail] = useState(false);
Expand All @@ -25,8 +25,8 @@ const useCreateUserForm = (
}, [initialEmail]);

useEffect(() => {
setSendEmail(bootstrap?.email || false);
}, [bootstrap?.email]);
setSendEmail(uiConfig?.emailEnabled || false);
}, [uiConfig?.emailEnabled]);

useEffect(() => {
setRootRole(initialRootRole);
Expand Down
41 changes: 0 additions & 41 deletions src/hooks/api/getters/useUiBootstrap/useUiBootstrap.ts

This file was deleted.

1 change: 1 addition & 0 deletions src/interfaces/uiConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface IUiConfig {
versionInfo?: IVersionInfo;
links: ILinks[];
disablePasswordAuth?: boolean;
emailEnabled?: boolean;
toast?: IProclamationToast;
segmentValuesLimit?: number;
strategySegmentsLimit?: number;
Expand Down

0 comments on commit da30d6a

Please sign in to comment.