Added labels, cleanup, bug fixes

TIER · Nov 18, 2022 · c45c1f2 · c45c1f2
1 parent 83857d0
commit c45c1f2
Show file tree

Hide file tree

Showing 23 changed files with 226 additions and 113 deletions.
diff --git a/backend/src/main/resources/dynamic-registration.schema.json b/backend/src/main/resources/dynamic-registration.schema.json
@@ -13,8 +13,8 @@
       "maxLength": 255
     },
     "redirectUris": {
-      "title": "label.redirect-uris",
-      "description": "tooltip.redirect-uris",
+      "title": "label.dynamic-registration-redirectUris",
+      "description": "tooltip.dynamic-registration-redirectUris",
       "type": "string",
       "minLength": 1,
       "maxLength": 255
@@ -30,74 +30,70 @@
       "type": "boolean"
     },
     "applicationType": {
-      "title": "label.application-type",
-      "description": "tooltip.application-type",
+      "title": "label.dynamic-registration-applicationType",
+      "description": "tooltip.dynamic-registration-applicationType",
       "type": "string"
     },
     "contacts": {
-      "title": "label.contacts",
-      "description": "tooltip.contacts",
+      "title": "label.dynamic-registration-contacts",
+      "description": "tooltip.dynamic-registration-contacts",
       "type": "string"
     },
     "grantType": {
-      "title": "label.grant-type",
-      "description": "tooltip.grant-type",
+      "title": "label.dynamic-registration-grantTypes",
+      "description": "tooltip.dynamic-registration-grantTypes",
       "type": "string",
       "minLength": 1,
-      "oneOf": [
-        {
-          "enum": ["authorization_code"],
-          "description": "value.authorization-code"
-        },
-        {
-          "enum": ["implicit"],
-          "description": "value.implicit"
-        },
-        {
-          "enum": ["refresh_token"],
-          "description": "value.refresh-token"
-        }
+      "enum": [
+        "authorization_code",
+        "implicit",
+        "refresh_token"
+      ],
+      "enumNames": [
+        "value.authorization-code",
+        "value.implicit",
+        "value.refresh-token"
       ]
     },
     "jwks": {
-      "title": "label.jwks",
-      "description": "tooltip.jwks",
+      "title": "label.dynamic-registration-jwks",
+      "description": "label.dynamic-registration-jwks",
       "type": "string"
     },
     "logoUri": {
-      "title": "label.logo-uri",
-      "description": "tooltip.logo-uri",
+      "title": "label.dynamic-registration-logo-uri",
+      "description": "tooltip.dynamic-registration-logo-uri",
       "type": "string"
     },
     "policyUri": {
-      "title": "label.policy-uri",
-      "description": "tooltip.policy-uri",
+      "title": "label.dynamic-registration-policy-uri",
+      "description": "tooltip.dynamic-registration-policy-uri",
       "type": "string"
     },
 
     "responseTypes": {
-      "title": "label.response-types",
-      "description": "tooltip.response-types",
+      "title": "label.dynamic-registration-responseTypes",
+      "description": "tooltip.dynamic-registration-responseTypes",
       "type": "string"
     },
     "scope": {
-      "title": "label.scope",
-      "description": "tooltip.scope",
+      "title": "label.dynamic-registration-scope",
+      "description": "tooltip.dynamic-registration-scope",
       "type": "string"
     },
     "subjectType": {
-      "title": "label.subject-type",
-      "description": "tooltip.subject-type",
+      "title": "label.dynamic-registration-subjectType",
+      "description": "tooltip.dynamic-registration-subjectType",
       "type": "string"
     },
     "tokenEndpointAuthMethod": {
-      "title": "label.token-endpoint-auth-method",
-      "description": "tooltip.token-endpoint-auth-method",
+      "title": "label.dynamic-registration-tokenEndpointAuthMethod",
+      "description": "tooltip.dynamic-registration-tokenEndpointAuthMethod",
       "type": "string"
     },
     "tosUri": {
-      "title": "label.tos-uri",
-      "description": "tooltip.tos-uri",
+      "title": "label.dynamic-registration-tosuri",
+      "description": "tooltip.dynamic-registration-tosuri",
       "type": "string"
     }
   }

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
@@ -962,39 +962,50 @@ tooltip.IDTokenLifetime=Lifetime of ID token issued to client
 tooltip.deniedUserInfoAttributes=Specifies IdPAttributes to omit from UserInfo token
 tooltip.resolveAttributes.oauth=Whether to run the attribute resolution/filtering step
 
-label.dynamic-registration=Dynamic Registration
+label.dynamic-registration=Dynamic registration
 label.dynamic-registration-configuration=Dynamic Registration
 action.dynamic-registrations=Dynamic registrations
 action.add-new-dynamic-registration=Add a new dynamic registration
 label.dynamic-registration-name=Name
+label.current-dynamic-registrations=Current dynamic registrations
+label.new-dynamic-registration=New dynamic registration
+label.edit-dynamic-registration=Edit dynamic registration
+message.delete-dynamic-registration-title=Delete dynamic registration?
+message.delete-dynamic-registration-body=You are requesting to delete a dynamic registration. If you complete this process the role will be removed. This cannot be undone. Do you wish to continue?
+label.enable-dynamic-registrations=Enable Dynamic Registrations
+label.approve-dynamic-registrations=Approve Dynamic Registrations
 
 label.dynamic-registration-name=Name
 tooltip.dynamic-registration-name=Name
-label.dynamic-registration-redirectUris=Redirect uris
-tooltip.dynamic-registration-redirectUris=Redirect uris
-label.dynamic-registration-responseTypes=Response types
-tooltip.dynamic-registration-responseTypes=Response types
-label.dynamic-registration-grantTypes=Grant types
-tooltip.dynamic-registration-grantTypes=Grant types
-label.dynamic-registration-applicationType=Application type
-tooltip.dynamic-registration-applicationType=Application type
+label.dynamic-registration-redirectUris=Redirect Uris
+tooltip.dynamic-registration-redirectUris=Redirect Uris
+label.dynamic-registration-responseTypes=Response Types
+tooltip.dynamic-registration-responseTypes=Response Types
+label.dynamic-registration-grantTypes=Grant Types
+tooltip.dynamic-registration-grantTypes=Grant Types
+label.dynamic-registration-applicationType=Application Type
+tooltip.dynamic-registration-applicationType=Application Type
 label.dynamic-registration-contacts=Contacts
 tooltip.dynamic-registration-contacts=Contacts
-label.dynamic-registration-subjectType=Subject type
-tooltip.dynamic-registration-subjectType=Subject type
+label.dynamic-registration-subjectType=Subject Type
+tooltip.dynamic-registration-subjectType=Subject Type
 label.dynamic-registration-jwks=Jwks
 tooltip.dynamic-registration-jwks=Jwks
-label.dynamic-registration-jwksUri=Jwks uri
-tooltip.dynamic-registration-jwksUri=Jwks uri
-label.dynamic-registration-tokenEndpointAuthMethod=Token endpoint auth method
-tooltip.dynamic-registration-tokenEndpointAuthMethod=Token endpoint auth method
-label.dynamic-registration-logo-uri=Logo uri
-tooltip.dynamic-registration-logo-uri=Logo uri
-label.dynamic-registration-policy-uri=Policy uri
-tooltip.dynamic-registration-policy-uri=Policy uri
-label.dynamic-registration-tosuri=To uri
-tooltip.dynamic-registration-tosuri=To uri
+label.dynamic-registration-jwksUri=Jwks Uri
+tooltip.dynamic-registration-jwksUri=Jwks Uri
+label.dynamic-registration-tokenEndpointAuthMethod=Token Endpoint Auth Method
+tooltip.dynamic-registration-tokenEndpointAuthMethod=Token Endpoint Auth Method
+label.dynamic-registration-logo-uri=Logo Uri
+tooltip.dynamic-registration-logo-uri=Logo Uri
+label.dynamic-registration-policy-uri=Policy Uri
+tooltip.dynamic-registration-policy-uri=Policy Uri
+label.dynamic-registration-tosuri=TOS Uri
+tooltip.dynamic-registration-tosuri=TOS Uri
 label.dynamic-registration-scope=Scope
 tooltip.dynamic-registration-scope=Scope
 label.dynamic-registration-enabled=Enabled
 tooltip.dynamic-registration-enabled=Enabled
+
+value.authorization-code=Authorization Code
+value.implicit=Implicit
+value.refresh-token=Refresh Token
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -6,6 +6,7 @@
     "dependencies": {
         "@fortawesome/fontawesome-free": "^6.1.1",
         "@fortawesome/fontawesome-svg-core": "^6.1.1",
+        "@fortawesome/free-brands-svg-icons": "^6.2.1",
         "@fortawesome/free-regular-svg-icons": "^6.1.1",
         "@fortawesome/free-solid-svg-icons": "^6.1.1",
         "@fortawesome/react-fontawesome": "^0.1.18",

diff --git a/ui/src/app/admin/component/AccessRequest.js b/ui/src/app/admin/component/AccessRequest.js
@@ -4,14 +4,13 @@ import Form from 'react-bootstrap/Form';
 import Translate from '../../i18n/components/translate';
 
 export function AccessRequest({ users, roles, onDeleteUser, onChangeUserRole }) {
-
     return (
         <>
         {(!users || !users.length) ?
         <>
             <div className="d-flex justify-content-center">
-                <div className="w-50 alert alert-info m-3">
-                    <p className="text-center">There are no new user requests at this time.</p>
+                <div className="w-50 alert alert-info m-3" id="zero-state-alert">
+                    <p className="text-center mb-0">There are no new user requests at this time.</p>
                 </div>
             </div>
         </>

diff --git a/ui/src/app/admin/container/UserActions.js b/ui/src/app/admin/container/UserActions.js
@@ -2,9 +2,9 @@ import React from 'react';
 import { AccessRequest } from '../../admin/component/AccessRequest';
 import UserManagement from '../../admin/container/UserManagement';
 
-export function UserActions({ users, reloadUsers }) {
+export function UserActions({ users }) {
     return (
-        <UserManagement users={users} reload={reloadUsers}>
+        <UserManagement users={users}>
             {(u, roles, onChangeUserRole, onChangeGroup, onDeleteUser) =>
                 <AccessRequest users={u} roles={roles} onChangeUserRole={onChangeUserRole} onDeleteUser={onDeleteUser} />}
         </UserManagement>

diff --git a/ui/src/app/core/components/Header.js b/ui/src/app/core/components/Header.js
@@ -7,7 +7,22 @@ import Dropdown from 'react-bootstrap/Dropdown';
 
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
-import { faTh, faSignOutAlt, faPlusCircle, faCube, faCubes, faUsersCog, faSpinner, faUserCircle, faCog, faBoxOpen, faTags, faIdBadge, faFileLines } from '@fortawesome/free-solid-svg-icons';
+import {
+    faTh,
+    faSignOutAlt,
+    faPlusCircle,
+    faCube,
+    faCubes,
+    faUsersCog,
+    faSpinner,
+    faUserCircle,
+    faCog,
+    faBoxOpen,
+    faTags,
+    faIdBadge,
+    faFileLines
+} from '@fortawesome/free-solid-svg-icons';
+import { faOpenid } from '@fortawesome/free-brands-svg-icons';
 
 import Translate from '../../i18n/components/translate';
 import { useTranslator } from '../../i18n/hooks';
@@ -64,7 +79,7 @@ export function Header () {
                                 <Translate value="action.add-new-provider" />
                             </Dropdown.Item> }
                             <Dropdown.Item as={Link} to="/dynamic-registration/new" className="text-primary py-2" id="metadata-nav-dropdown-dynreg">
-                                <FontAwesomeIcon icon={faCube} className="me-2" fixedWidth />
+                                <FontAwesomeIcon icon={faOpenid} className="me-2" fixedWidth />
                                 <Translate value="action.add-new-dynamic-registration" />
                             </Dropdown.Item>
                         </Dropdown.Menu>

diff --git a/ui/src/app/dashboard/view/ActionsTab.js b/ui/src/app/dashboard/view/ActionsTab.js
@@ -13,8 +13,6 @@ import Spinner from '../../core/components/Spinner';
 import Translate from '../../i18n/components/translate';
 import SourceList from '../../metadata/domain/source/component/SourceList';
 import { ProtectRoute } from '../../core/components/ProtectRoute';
-
-
 import { DynamicRegistrationList } from '../../dynamic-registration/component/DynamicRegistrationList';
 import { useGetNewUsersQuery } from '../../store/user/UserSlice';
 import { useGetDisabledSourcesQuery, useGetUnapprovedSourcesQuery } from '../../store/metadata/SourceSlice';
@@ -24,7 +22,7 @@ import {
     useGetUnapprovedRegistrationsQuery
 } from '../../store/dynamic-registration/DynamicRegistrationSlice';
 
-export function ActionsTab({ registrations }) {
+export function ActionsTab() {
 
     const { path, url } = useRouteMatch();
 

diff --git a/ui/src/app/dashboard/view/DynamicRegistrationsTab.js b/ui/src/app/dashboard/view/DynamicRegistrationsTab.js
@@ -7,6 +7,10 @@ import {
     useGetDynamicRegistrationsQuery
 } from '../../store/dynamic-registration/DynamicRegistrationSlice';
 import { DynamicRegistrationActions } from '../../dynamic-registration/hoc/DynamicRegistrationActions';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { Link } from 'react-router-dom';
+import Spinner from '../../core/components/Spinner';
+import { faOpenid } from '@fortawesome/free-brands-svg-icons';
 
 const searchProps = ['name'];
 
@@ -33,7 +37,20 @@ export function DynamicRegistrationsTab () {
                                         loading={loading}
                                         onDelete={(id) => remove({id})}
                                         onEnable={(id, enabled) => enable({id, enabled}) }
-                                        onChangeGroup={(registration, group) => changeGroup({ registration, group })}/>
+                                        onChangeGroup={(registration, group) => changeGroup({ registration, group })}>
+                                            {loading && <div className="d-flex justify-content-center text-primary"><Spinner size="4x" /></div> }
+                                            {(!searched || !searched.length) &&
+                                                <div className="d-flex justify-content-center">
+                                                    <div className="w-25 alert alert-info m-3 d-flex flex-column align-items-center">
+                                                        <p className="text-center">No Dynamic Registrations found.</p>
+                                                        <Link to="/dynamic-registration/new" className="btn btn-primary" id="dynamic-reg-create-btn">
+                                                            <FontAwesomeIcon icon={faOpenid} className="me-2" fixedWidth />
+                                                            <Translate value="action.add-new-dynamic-registration" />
+                                                        </Link>
+                                                    </div>
+                                                </div>
+                                            }
+                                    </DynamicRegistrationList>
                                     }
                                 </Search>
                             </div>

diff --git a/ui/src/app/dashboard/view/ProvidersTab.js b/ui/src/app/dashboard/view/ProvidersTab.js
@@ -9,6 +9,9 @@ import { useIsAdmin } from '../../core/user/UserContext';
 import Alert from 'react-bootstrap/Alert';
 import { MetadataActions } from '../../admin/container/MetadataActions';
 import Spinner from '../../core/components/Spinner';
+import { Link } from 'react-router-dom';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faCube } from '@fortawesome/free-solid-svg-icons';
 const searchProps = ['name', '@type', 'createdBy'];
 
 export function ProvidersTab () {
@@ -57,6 +60,17 @@ export function ProvidersTab () {
                                             onOrderUp={onOrderUp}
                                             onOrderDown={onOrderDown}>
                                                 {loading && <div className="d-flex justify-content-center text-primary"><Spinner size="4x" /></div> }
+                                                {(!searched || !searched.length) &&
+                                                <div className="d-flex justify-content-center">
+                                                    <div className="w-25 alert alert-info m-3 d-flex flex-column align-items-center">
+                                                        <p className="text-center">No Metadata Providers found.</p>
+                                                        <Link to="/metadata/provider/new" className="btn btn-primary" id="metadata-provider-create-btn">
+                                                            <FontAwesomeIcon icon={faCube} className="me-2" fixedWidth />
+                                                            <Translate value="action.add-new-provider" />
+                                                        </Link>
+                                                    </div>
+                                                </div>
+                                            }
                                             </ProviderList>
                                     }
                                 </MetadataActions>