Merge pull request #221 from zenml-io/revert-220-personal_details_settings

Revert "Personal details settings"

Author: talhainvenxion

global.d.ts

@@ -41,8 +41,6 @@ interface TUser {
   userName: string;
   email_opted_in: any;
   emailOptedIn: any;
-  roles?: any;
-  created?: any
 }
 
 interface TOrganization {

src/redux/reducers/rolesReducer.ts

@@ -23,7 +23,7 @@ const newState = (roles: Roles[]): State => ({
 const rolesReducer = (state: State = initialState, action: Action): State => {
   switch (action.type) {
     case rolesActionTypes.getRoles.success: {
-      const roles: Roles[] = camelCaseArray(action.payload?.items as RolesPayload);
+      const roles: Roles[] = camelCaseArray(action.payload as RolesPayload);
 
       return { ...newState(roles) };
     }

src/services/locales/zu.json

@@ -217,11 +217,11 @@
               "text": "Change the username, role and password of",
               "form": {
                 "username": {
-                  "label": "Username",
+                  "label": "username",
                   "placeholder": "username"
                 },
                 "password": {
-                  "label": "Password",
+                  "label": "password",
                   "placeholder": "password"
                 }
               },

src/ui/assets/successTick.png

@@ -10,7 +10,7 @@ import {
   Box,
   LinkBox,
   icons,
-  DropdownInput
+  DropdownInput,
 } from '..';
 import { handleUpdateNumericInput } from '../../../utils/input';
 import { iconColors } from '../../../constants/icons';
@@ -118,9 +118,8 @@ export const CopyField = (
     labelColor: any;
     placeholder: any;
     value: string;
-    showTokField: any;
   } & any,
-): any => {
+): JSX.Element => {
   const [copied, setCopied] = useState(false);
   const handleClick = () => {
     navigator.clipboard.writeText(props.value);
@@ -131,38 +130,26 @@ export const CopyField = (
   };
 
   return (
-    <FlexBox.Column fullWidth>
+    <FlexBox.Column fullWidth style={{ height: '100px' }}>
       <FlexBox alignItems="center" fullWidth style={{ position: 'relative' }}>
         <InputWithLabel
           name={props.name}
           label={props.label}
           labelColor={props.labelColor}
           InputComponent={
-            props.showTokField ?
-              <TextInput
-                {...props}
-                style={{ background: 'rgba(168, 168, 168, 0.2)', border: '1px solid #C9CBD0' }}
-                value={`${props.value.slice(0, 30)}...`}
-                placeholder={props.placeholder}
-              />
-              :
-              <TextInput
-                {...props}
-                style={{ background: 'rgba(168, 168, 168, 0.2)', border: '1px solid #C9CBD0' }}
-                value='Token'
-                placeholder={props.placeholder}
-              />
-            }
+            <TextInput
+              {...props}
+              value={`${props.value.slice(0, 60)}...`}
+              placeholder={props.placeholder}
+            />
+          }
         />
-
-        {props.showTokField && (
-          <LinkBox
-            style={{ position: 'absolute', right: '10px', top: '40px' }}
-            onClick={handleClick}
-          >
-            <icons.copy color={iconColors.grey} />
-          </LinkBox>
-        )}
+        <LinkBox
+          style={{ position: 'absolute', right: '10px', top: '30px' }}
+          onClick={handleClick}
+        >
+          <icons.copy color={iconColors.grey} />
+        </LinkBox>
       </FlexBox>
       {copied && (
         <div style={{ marginTop: '20px', textAlign: 'right' }}>
@@ -182,70 +169,6 @@ export const CopyField = (
   );
 };
 
-
-export const GenerateTokenField = (
-  props: {
-    label: string;
-    labelColor: any;
-    placeholder: any;
-    value: string;
-    handleClick: any;
-    loading: boolean;
-    hideButton: boolean;
-  } & any,
-): any => {
-  return (
-    <FlexBox.Column fullWidth>
-        <FlexBox alignItems="center" fullWidth style={{ position: 'relative' }}>
-          <InputWithLabel
-            optional={props.required}
-            name={props.name}
-            label={props.label}
-            labelColor={props.labelColor}
-            InputComponent={
-              <TextInput
-                {...props}
-                style={props.style}
-                placeholder={props.placeholder}
-                hasError={props.error?.hasError}
-                value={props.value}
-                onChangeText={props.onChange}
-              />
-            }
-          />
-        {!props.hideButton && (
-          <Box 
-            style={{ 
-              position: 'absolute', 
-              right: '0', 
-              top: '38px', 
-              display: 'flex', 
-              justifyContent: 'center', 
-              textAlign: 'center',
-            }} >
-            <Box style={{ width: '120px', borderLeft: '1px solid #C9CBD0' }}>
-              <div style={{ 
-                fontFamily: 'Rubik',
-                fontSize: '16px',
-                color: '#443E99',
-                marginTop: '3px',
-                cursor: 'pointer'
-               }} 
-               onClick={props.handleClick}
-              >
-                {props.loading ? <>Submitting...</> : <>Generate</>}
-              </div>
-            </Box>
-          </Box>
-        )}
-      </FlexBox>
-    </FlexBox.Column>
-  );
-};
-
-          
-
-
 export const EditField = (
   props: {
     label: string;

src/ui/assets/userImage.png

@@ -63,7 +63,6 @@ import { ReactComponent as ChatDots } from './assets/ChatDots.svg';
 import { ReactComponent as Run } from './assets/Run.svg';
 import { ReactComponent as ImageBuilder } from './assets/ImageBuilder.svg';
 import { ReactComponent as Pen } from './assets/Pen.svg';
-import { ReactComponent as Share } from './assets/Share.svg';
 // import { ReactComponent as Inprogress } from './assets/InProgress.svg';
 // import { ReactComponent as Cached } from './assets/Cached.svg';
 // import { ReactComponent as RightArrow } from './assets/RightArrow.svg';
@@ -201,7 +200,6 @@ const icons = {
     useStroke: true,
   }),
   pen: createIcon({ Component: Pen, useStroke: true }),
-  share: createIcon({ Component: Share, useStroke: true }),
 
   // paginations
   paginationFirst: createIcon({ Component: PaginationFirst, useStroke: true }),