Skip to content

Commit 4f1597e

Browse files
committed
fix: update note on features
1 parent 4f81d19 commit 4f1597e

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

dashboard/src/components/EnvComponents/Features.tsx

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { Flex, Stack, Text } from '@chakra-ui/react';
2+
import { Divider, Flex, Stack, Text } from '@chakra-ui/react';
33
import InputField from '../InputField';
44
import { SwitchInputType } from '../../constants';
55

@@ -10,7 +10,7 @@ const Features = ({ variables, setVariables }: any) => {
1010
<Text fontSize="md" paddingTop="2%" fontWeight="bold" mb={5}>
1111
Disable Features
1212
</Text>
13-
<Stack spacing={6} padding="2% 0%">
13+
<Stack spacing={6}>
1414
<Flex>
1515
<Flex w="100%" justifyContent="start" alignItems="center">
1616
<Text fontSize="sm">Disable Login Page:</Text>
@@ -83,9 +83,15 @@ const Features = ({ variables, setVariables }: any) => {
8383
/>
8484
</Flex>
8585
</Flex>
86-
<Flex>
87-
<Flex w="100%" justifyContent="start" alignItems="center">
88-
<Text fontSize="sm">Disable Multi Factor Authentication:</Text>
86+
<Flex alignItems="center">
87+
<Flex w="100%" alignItems="baseline" flexDir="column">
88+
<Text fontSize="sm">
89+
Disable Multi Factor Authentication (MFA):
90+
</Text>
91+
<Text fontSize="x-small">
92+
Note: Enabling this will ignore Enforcing MFA shown below and will
93+
also ignore the user MFA setting.
94+
</Text>
8995
</Flex>
9096
<Flex justifyContent="start" mb={3}>
9197
<InputField
@@ -96,13 +102,20 @@ const Features = ({ variables, setVariables }: any) => {
96102
</Flex>
97103
</Flex>
98104
</Stack>
99-
<Text fontSize="md" paddingTop="2%" fontWeight="bold" mb={5}>
105+
<Divider paddingY={5} />
106+
<Text fontSize="md" paddingTop={5} fontWeight="bold" mb={5}>
100107
Enable Features
101108
</Text>
102-
<Stack spacing={6} padding="2% 0%">
103-
<Flex>
104-
<Flex w="100%" justifyContent="start" alignItems="center">
105-
<Text fontSize="sm">Enforce Multi Factor Authentication:</Text>
109+
<Stack spacing={6}>
110+
<Flex alignItems="center">
111+
<Flex w="100%" alignItems="baseline" flexDir="column">
112+
<Text fontSize="sm">
113+
Enforce Multi Factor Authentication (MFA):
114+
</Text>
115+
<Text fontSize="x-small">
116+
Note: If you disable enforcing after it was enabled, it will still
117+
keep MFA enabled for older users.
118+
</Text>
106119
</Flex>
107120
<Flex justifyContent="start" mb={3}>
108121
<InputField

dashboard/src/graphql/queries/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const EnvVariablesQuery = `
2020
_env{
2121
CLIENT_ID
2222
CLIENT_SECRET
23-
GOOGLE_CLIENT_ID
23+
GOOGLE_CLIENT_ID
2424
GOOGLE_CLIENT_SECRET
2525
GITHUB_CLIENT_ID
2626
GITHUB_CLIENT_SECRET

0 commit comments

Comments
 (0)