Merge pull request #24 from overture-stack/ego-ui-enum-changes

Ego ui enum changes
overture-stack · Mar 14, 2019 · 01f34e4 · 01f34e4
2 parents b1f6d5a + 65c9230
commit 01f34e4
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 114 deletions.
diff --git a/src/common/RESOURCE_MAP.tsx b/src/common/RESOURCE_MAP.tsx
@@ -47,7 +47,7 @@ const RESOURCE_MAP: { [key in TResourceType]: IResource } = {
       },
       { key: 'email', fieldName: 'Email', sortable: true, required: true },
       {
-        key: 'userType',
+        key: 'type',
         fieldName: 'User Type',
         sortable: true,
         required: true,
@@ -66,7 +66,7 @@ const RESOURCE_MAP: { [key in TResourceType]: IResource } = {
         key: 'preferredLanguage',
         fieldName: 'Preferred Language',
         fieldType: 'dropdown',
-        options: ['English', 'Spanish'],
+        options: ['ENGLISH', 'FRENCH', 'SPANISH'],
       },
     ],
     noDelete: true,
@@ -162,7 +162,7 @@ const RESOURCE_MAP: { [key in TResourceType]: IResource } = {
         options: STATUSES,
       },
       {
-        key: 'applicationType',
+        key: 'type',
         fieldName: 'Application Type',
         sortable: true,
         fieldType: 'dropdown',

diff --git a/src/common/injectGlobals.ts b/src/common/injectGlobals.ts
@@ -7,7 +7,7 @@ localStorage.setItem('debug', process.env.REACT_APP_DEBUG || ''); // manually se
 const debug = require('debug') as Function;
 global.log = debug('app');
 
-export const STATUSES = ['Disabled', 'Approved', 'Pending'];
+export const STATUSES = ['DISABLED', 'APPROVED', 'PENDING', 'REJECTED'];
 export const apiRoot = process.env.REACT_APP_API;
 export const egoClientId = process.env.REACT_APP_EGO_CLIENT_ID;
 export const useDummyData = process.env.REACT_APP_DUMMY;
diff --git a/src/common/typedefs/Application.d.ts b/src/common/typedefs/Application.d.ts
@@ -3,7 +3,7 @@ export interface Application {
   name: string;
   description: string;
   status: string;
-  applicationType: string;
+  type: string;
   clientId?: string;
   redirectUri?: string;
 }
diff --git a/src/common/typedefs/User.d.ts b/src/common/typedefs/User.d.ts
@@ -2,7 +2,7 @@ export interface User {
   id: string;
   userName: string;
   email: string;
-  userType: string;
+  type: string;
   status: string;
   firstName: string;
   lastName: string;

diff --git a/src/components/ListItem.tsx b/src/components/ListItem.tsx
@@ -68,15 +68,15 @@ export const ApplicationListItem = ({ item, sortField, className = '', style, ..
 };
 
 export const UserListItem = ({ item, sortField, className = '', style, ...props }) => {
-  const { firstName, lastName, userType } = item;
+  const { firstName, lastName, type } = item;
   const secondaryField = sortField === 'lastName' ? 'email' : sortField;
   return (
     <Ripple
       className={`UserListItem ${className}`}
       style={{ ...styles.container, ...style }}
       {...props}
     >
-      <UserDisplayName firstName={firstName} lastName={lastName} userType={userType} />
+      <UserDisplayName firstName={firstName} lastName={lastName} type={type} />
       <div className={`secondary-field ${css(styles.secondaryField)}`}>{item[secondaryField]}</div>
     </Ripple>
   );

diff --git a/src/components/Login.tsx b/src/components/Login.tsx
@@ -94,7 +94,7 @@ class Component extends React.Component<any, any> {
         await this.props.effects.setUser(user);
         await this.props.effects.setToken(jwt);
 
-        if (user.userType === 'ADMIN') {
+        if (user.type === 'ADMIN') {
           if (this.props.location.pathname === '/') {
             this.props.history.push('/users');
           }

diff --git a/src/components/NoAccess.tsx b/src/components/NoAccess.tsx
@@ -18,7 +18,7 @@ const styles = {
 
 export default () => (
   <div className={`${css(styles.container)}`}>
-    Your account does not have an administrator userType.
+    Your account does not have an administrator user type.
     <Logout />
   </div>
 );
diff --git a/src/components/UserDisplayName.tsx b/src/components/UserDisplayName.tsx
@@ -44,9 +44,9 @@ const FormatName = ({ firstName = '', lastName = '' }) => (
   </span>
 );
 
-export default ({ firstName, lastName, userType, style }: any) => (
+export default ({ firstName, lastName, type, style }: any) => (
   <div className={`DisplayName ${css(styles.container, style)}`}>
     <FormatName firstName={firstName} lastName={lastName} />
-    {userType === 'ADMIN' && <div className={`${css(styles.userAdmin)}`}>ADMIN</div>}
+    {type === 'ADMIN' && <div className={`${css(styles.userAdmin)}`}>ADMIN</div>}
   </div>
 );