diff --git a/config/postgres/initdb/scripts/initial_credentials.dev.sql b/config/postgres/initdb/scripts/initial_credentials.dev.sql index dbedf5d47..323a2d8f0 100644 --- a/config/postgres/initdb/scripts/initial_credentials.dev.sql +++ b/config/postgres/initdb/scripts/initial_credentials.dev.sql @@ -1,2 +1,2 @@ SELECT * FROM USERS_CREATE( 'admin@email.com', 'pbkdf2:sha256:150000$c30CjWVB$d1d6d544dfffd2dee5488cfe89cc2f965a8c4cddbf9180ad206f272237a5fa1a', 'Ima Admin', 'Ima Group', true); -SELECT * FROM USERS_CREATE('user@email.com', 'pbkdf2:sha256:150000$K5efuBwy$fcaa41a3203fd8f64b5d4aee241365ffa35e0a3a1c02f605bbc20cbea701cf89', 'Ima User', 'Ima Group' , true); +SELECT * FROM USERS_CREATE('user@email.com', 'pbkdf2:sha256:150000$K5efuBwy$fcaa41a3203fd8f64b5d4aee241365ffa35e0a3a1c02f605bbc20cbea701cf89', 'Ima User', 'Ima Group' , false); diff --git a/src/backend/expungeservice/endpoints/usersview.py b/src/backend/expungeservice/endpoints/usersview.py index c96be1cf7..07ae76e93 100644 --- a/src/backend/expungeservice/endpoints/usersview.py +++ b/src/backend/expungeservice/endpoints/usersview.py @@ -107,10 +107,10 @@ def get(self, user_id): response_data: Dict[str, List[Dict[str, str]]] = {"users": []} for user_entry in user_db_data: response_data["users"].append({ - "user_id": user_entry["user_id"], + "id": user_entry["user_id"], "email": user_entry["email"], "name": user_entry["name"], - "group_name": user_entry["group_name"], + "group": user_entry["group_name"], "admin": user_entry["admin"], "timestamp": user_entry["date_created"] }) diff --git a/src/backend/tests/endpoints/test_users.py b/src/backend/tests/endpoints/test_users.py index 918914733..9fe1dad15 100644 --- a/src/backend/tests/endpoints/test_users.py +++ b/src/backend/tests/endpoints/test_users.py @@ -113,8 +113,8 @@ def test_get_users_success(self): assert data["users"][0]["admin"] in [True, False] assert data["users"][0]["timestamp"] assert data["users"][0]["name"] - assert data["users"][0]["group_name"] - assert data["users"][0]["user_id"] + assert data["users"][0]["group"] + assert data["users"][0]["id"] def test_get_users_not_admin(self): self.login(self.user_data["user1"]["email"], self.user_data["user1"]["password"]) diff --git a/src/frontend/src/components/LoadingSpinner/index.tsx b/src/frontend/src/components/LoadingSpinner/index.tsx new file mode 100644 index 000000000..582526fee --- /dev/null +++ b/src/frontend/src/components/LoadingSpinner/index.tsx @@ -0,0 +1,17 @@ +import React from 'react'; + +interface Props { + inputString: string; +} + +class LoadingSpinner extends React.Component { + render() { + return ( +

+ Loading {this.props.inputString}... +

+ ); + } +} + +export default LoadingSpinner; diff --git a/src/frontend/src/components/LogIn/index.tsx b/src/frontend/src/components/LogIn/index.tsx index 9f345c66e..a150129e0 100644 --- a/src/frontend/src/components/LogIn/index.tsx +++ b/src/frontend/src/components/LogIn/index.tsx @@ -153,7 +153,7 @@ class LogIn extends React.Component { ) : null} {this.state.invalidResponse === true ? (

- Technical difficulties try again later. + Technical difficulties, please contact system administrator.

) : null} diff --git a/src/frontend/src/components/NotAuthorized/index.tsx b/src/frontend/src/components/NotAuthorized/index.tsx new file mode 100644 index 000000000..a05449c0f --- /dev/null +++ b/src/frontend/src/components/NotAuthorized/index.tsx @@ -0,0 +1,14 @@ +import React from 'react'; + +class NotAuthorized extends React.Component { + render() { + return ( +

+ You are not authorized to view this content, please contact system + administrator. +

+ ); + } +} + +export default NotAuthorized; diff --git a/src/frontend/src/components/OeciLogin/index.tsx b/src/frontend/src/components/OeciLogin/index.tsx index dc9457986..a69b547cf 100644 --- a/src/frontend/src/components/OeciLogin/index.tsx +++ b/src/frontend/src/components/OeciLogin/index.tsx @@ -133,7 +133,7 @@ class OeciLogin extends React.Component { ) : null} {this.state.invalidResponse === true ? (

- Technical difficulties try again later. + Technical difficulties, please contact system administrator.

) : null} diff --git a/src/frontend/src/components/Spinner/index.tsx b/src/frontend/src/components/Spinner/index.tsx deleted file mode 100644 index d27c2fa07..000000000 --- a/src/frontend/src/components/Spinner/index.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from 'react'; - -export default function() { - return ( -

- Loading your search results... -

- ); -} diff --git a/src/frontend/src/components/TechnicalDifficulties/index.tsx b/src/frontend/src/components/TechnicalDifficulties/index.tsx new file mode 100644 index 000000000..8b659e946 --- /dev/null +++ b/src/frontend/src/components/TechnicalDifficulties/index.tsx @@ -0,0 +1,14 @@ +import React from 'react'; + +class TechnicalDifficulties extends React.Component { + render() { + return ( +

+ Something went wrong, please contact system administrator to report + technical difficulties. +

+ ); + } +} + +export default TechnicalDifficulties; diff --git a/src/frontend/src/components/User/index.tsx b/src/frontend/src/components/User/index.tsx index a557ec950..7679188af 100644 --- a/src/frontend/src/components/User/index.tsx +++ b/src/frontend/src/components/User/index.tsx @@ -8,14 +8,28 @@ interface Props { class User extends React.Component { public render() { return ( - - - + + + {this.props.user.name} - {this.props.user.role} - {this.props.user.group} + {this.props.user.admin ? 'Admin' : 'Search'} + {this.props.user.group} + +