feat(admin-ui): reviewed previously updated dependencies #416

.github/workflows/releaseplease.yml

@@ -30,7 +30,7 @@ jobs:
         git config user.email "54212639+mo-auto@users.noreply.github.com"
         git config --global user.signingkey "${{ steps.import_gpg.outputs.keyid }}"
 
-    - uses: google-github-actions/release-please-action@v3.4
+    - uses: google-github-actions/release-please-action@v3.5
       id: release-please
       with:
          path: ${{ matrix.maven }}
@@ -67,7 +67,7 @@ jobs:
         git config user.email "54212639+mo-auto@users.noreply.github.com"
         git config --global user.signingkey "${{ steps.import_gpg.outputs.keyid }}"
 
-    - uses: google-github-actions/release-please-action@v3.4
+    - uses: google-github-actions/release-please-action@v3.5
       id: release-please
       with:
          path: ${{ matrix.simple }}
@@ -105,7 +105,7 @@ jobs:
         git config user.email "54212639+mo-auto@users.noreply.github.com"
         git config --global user.signingkey "${{ steps.import_gpg.outputs.keyid }}"
 
-    - uses: google-github-actions/release-please-action@v3.4
+    - uses: google-github-actions/release-please-action@v3.5
       id: release-please
       with:
          path: ${{ matrix.python-projects }}
@@ -143,7 +143,7 @@ jobs:
         git config user.email "54212639+mo-auto@users.noreply.github.com"
         git config --global user.signingkey "${{ steps.import_gpg.outputs.keyid }}"
 
-    - uses: google-github-actions/release-please-action@v3.4
+    - uses: google-github-actions/release-please-action@v3.5
       id: release-please
       with:
          path: ${{ matrix.node-projects }}
@@ -176,7 +176,7 @@ jobs:
         git config --global user.signingkey "${{ steps.import_gpg.outputs.keyid }}"
 
 
-    - uses: google-github-actions/release-please-action@v3.4
+    - uses: google-github-actions/release-please-action@v3.5
       id: release-please
       with:
          token: ${{ secrets.MOWORKFLOWTOKEN }}

.gitignore

@@ -112,3 +112,4 @@ docs/setup.log
 
 # generated by guizipapp builder
 include
+admin-ui/configApiSpecs.yaml

admin-ui/.env

@@ -1,5 +1,5 @@
 BASE_PATH=/
-CONFIG_API_BASE_URL=http://localhost:8080
+CONFIG_API_BASE_URL=http://localhost:8080/jans-config-api
 API_BASE_URL=http://localhost:8080/jans-config-api/admin-ui
 NPM_TOKEN=
 SESSION_TIMEOUT_IN_MINUTES=30

admin-ui/.env.adminuitest

@@ -1,5 +1,5 @@
 BASE_PATH=/admin
-CONFIG_API_BASE_URL=https://admin-ui-test.gluu.org
+CONFIG_API_BASE_URL=https://admin-ui-test.gluu.org/jans-config-api
 API_BASE_URL=https://admin-ui-test.gluu.org/jans-config-api/admin-ui
 NPM_TOKEN=
 SESSION_TIMEOUT_IN_MINUTES=30

admin-ui/.env.jans-ui

@@ -1,5 +1,5 @@
 BASE_PATH=/admin
-CONFIG_API_BASE_URL=https://jans-ui.jans.io
+CONFIG_API_BASE_URL=https://jans-ui.jans.io/jans-config-api
 API_BASE_URL=https://jans-ui.jans.io/jans-config-api/admin-ui
 NPM_TOKEN=
 SESSION_TIMEOUT_IN_MINUTES=30

admin-ui/.env.tmp

@@ -1,5 +1,5 @@
 BASE_PATH=/admin
-CONFIG_API_BASE_URL=https://%(hostname)s
+CONFIG_API_BASE_URL=https://%(hostname)s/jans-config-api
 API_BASE_URL=https://%(hostname)s/jans-config-api/admin-ui
 NPM_TOKEN=
 SESSION_TIMEOUT_IN_MINUTES=30

admin-ui/app/components/Layout/Layout.js

@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom'
 import PropTypes from 'prop-types'
 import classNames from 'classnames'
 import { Helmet } from 'react-helmet'
-import { withRouter } from 'react-router-dom'
+import { useWithRouter as withRouter } from 'Utils/WithRouter'
 import {
   filter,
   forOwn,

admin-ui/app/components/SidebarMenu/RoutesRecursiveWrapper.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Route } from 'react-router'
+import { Route } from 'react-router-dom'
 
 export const RoutesRecursiveWrapper = ({ item }) => {
 
@@ -11,7 +11,7 @@ export const RoutesRecursiveWrapper = ({ item }) => {
       children.map((child, i) => (<RoutesRecursiveWrapper key={i} item={child} />))
 
     ) : (!!path &&
-    <Route component={component} path={path} />
+    <Route element={<component />} path={path} />
     )
   )
 

admin-ui/app/components/SidebarMenu/SidebarMenu.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { withRouter } from 'react-router-dom'
+import { useWithRouter as withRouter } from 'Utils/WithRouter'
 import find from 'lodash/find'
 import includes from 'lodash/includes'
 import mapValues from 'lodash/mapValues'

admin-ui/app/components/ThemeSetting/ThemeSettings.js

@@ -1,4 +1,4 @@
-import React, { useContext, useEffect } from 'react'
+import React, { useContext } from 'react'
 import clsx from 'clsx'
 import Drawer from '@material-ui/core/Drawer'
 import Button from '@material-ui/core/Button'

admin-ui/app/context/theme/themeContext.js

@@ -8,7 +8,6 @@ const initialState = {
 
 const themeReducer = (state, action) => {
   if (action.type) {
-    window.localStorage.setItem('initTheme', action.type)
     return { theme: action.type }
   }
 

admin-ui/app/locales/en/translation.json

@@ -3,6 +3,7 @@
     "accept": "Accept",
     "add": "Add",
     "add_ldap_configuration": "Add LDAP Configuration",
+    "add_mapping":"Add Mapping",
     "add_property": "Add property",
     "apply": "Apply",
     "back_home": "Back Home",
@@ -18,12 +19,14 @@
     "search": "Search",
     "submit": "Submit",
     "remove": "Remove",
+    "revert": "revert",
     "test": "Test",
     "view": "View",
     "yes": "Yes",
     "change_password": "Change Password",
     "close": "Close",
-    "delete": "Delete"
+    "delete": "Delete",
+    "revoke": "Revoke"
   },
   "dashboard": {
     "summary_title": "Actives Users & Access Token Stats",
@@ -55,6 +58,7 @@
     "attributes": "Attributes",
     "attribute_edit_type": "Attribute Edit Type",
     "attribute_view_type": "Attribute View Type",
+    "auth_time": "Auth Time",
     "authentication_method": "Authentication method for the Token Endpoint",
     "authorization_code_access_token": "Authorization Code Access Token",
     "average_of_mau": "Average of MAU",
@@ -69,14 +73,17 @@
     "client_credentials_access_token": "Client Credentials Access Token",
     "client_expiration_date": "Client Expiration Date",
     "client_id": "Client Id",
+    "client_id_used": "Client Id Used",
     "client_name": "Client name",
     "client_secret": "Client secret",
     "computation_pool_size": "Computation Pool Size",
+    "config_api_url": "Config API URL",
     "configuration_id": "Configuration Id",
     "connection_factory_type": "Connection Factory Type",
     "connection_timeout": "Connection Timeout",
     "consent_gathering_scripts": "OAuth Consent",
     "custom_properties": "Custom Properties (key/values)",
+    "dark_mode": "Dark Mode",
     "data_type": "Data Type",
     "default_acr": "Default Authentication Method (ACR)",
     "default_bucket": "Default Bucket",
@@ -97,23 +104,21 @@
     "enabled_oAuth_audit_logging": "Enable Oauth Audit Logging?",
     "enter_the_attribute_inum": "Enter the attribute inum",
     "grant_types": "Grants",
-    "redirect_regex": "Redirect Regex",
     "host_name": "Host Name",
     "hide_on_discovery": "Hide On Discovery?",
     "http_logging_enabled": "Enable HTTP Logging",
     "id": "id",
     "id_token_encrypted_response_alg": "JWS alg for encryption",
     "id_token_encrypted_response_enc": "JWS enc for encryption",
     "id_token_signed_response_alg": "JWS alg for signing",
-    "spontaneousScopes": "Spontaneous scopes",
-    "spontaneousScopesREGEX": "Spontaneous scope validation regex",
     "inactive": "InActive",
     "include_in_scim_extension": "Include In SCIM Extension?",
     "in_memory_configuration": "inMemoryConfiguration",
     "internal": "Internal",
     "introspection_scripts": "Introspection",
     "ropcScripts": "Password Grant",
     "inum": "inum",
+    "ip_address": "IP Address",
     "is_active": "Active",
     "is_expirable_client": "Is Expirable Client?",
     "is_trusted_client": "Supress authorization",
@@ -123,6 +128,7 @@
     "authorizationSignedResponseAlg": "JWS alg for signing",
     "authorizationEncryptedResponseAlg": "JWS alg for encryption",
     "authorizationEncryptedResponseEnc": "JWS enc for encryption",
+    "list_paging_size": "List paging size",
     "location_type": "Location Type",
     "log_level": "Log level",
     "log_layout": "Log layout",
@@ -157,6 +163,7 @@
     "pre_authorization": "Pre-Authorization",
     "primary_key": "Primary Key",
     "programming_language": "Programming Language",
+    "redirect_regex": "Redirect Regex",
     "redirect_uris": "Redirect URIs",
     "redirectUrisRegex": "Redirect Regex",
     "redis_configuration": "redisConfiguration",
@@ -187,6 +194,8 @@
     "sentinel_master_group_name": "sentinelMasterGroupName",
     "servers": "Server Details",
     "show_in_configuration_endpoint": "Show in configuration endpoint",
+    "s_id": "Session ID",
+    "session_expired": "Session Expired",
     "smtp_server_port": "SMTP server port",
     "smtp_test_status": "Smtp Test Status",
     "smtp_user_name": "SMTP User Name",
@@ -196,11 +205,14 @@
     "spontaneous_client_id": "Spontaneous Client Id",
     "spontaneous_scope_script_dns": "Spontaneous Scope Script Dns",
     "spontaneous_scopes": "Spontaneous Scopes",
+    "spontaneousScopes": "Spontaneous scopes",
+    "spontaneousScopesREGEX": "Spontaneous scope validation regex",
     "updateTokenScriptDns": "Update Token",
     "ssl_trust_store_file": "SSL Trust Store File",
     "ssl_trust_store_file_path": "sslTrustStoreFilePath",
     "ssl_trust_store_format": "SSL Trust Store Format",
     "ssl_trust_store_pin": "SSL Trust Store Pin",
+    "state": "State",
     "status": "Status",
     "scopes": "Scopes",
     "subject_type": "id_token subject type",
@@ -283,13 +295,14 @@
     "givenName": "Given Name",
     "resources": "Resources",
     "resourceId": "Resource id",
-    "iconUrl": "Icon URL",
     "scopeSelection": "Scope Selection",
     "scopeOrExpression": "Scope (or Expression)",
     "associatedClient": "Associated Client",
     "creationTime": "Creation Time",
+    "select_date_range":"Select a date range",
     "scope": "Scope",
-    "scopeExpression": "Scope Expression"
+    "scopeExpression": "Scope Expression",
+    "selectUserRevoke": "Select the user to revoke"
   },
   "languages": {
     "french": "French",
@@ -330,6 +343,7 @@
     "scopes": "Scopes",
     "scripts": "Scripts",
     "services": "Services",
+    "sessions": "Sessions",
     "settings": "Settings",
     "signout": "Sign out",
     "user_management": "User Management",
@@ -380,7 +394,10 @@
     "refresh_data": "Refresh Data",
     "view_attribute": "View attribute",
     "edit_sql": "Edit SQL",
-    "add_sql": "Add SQL"
+    "add_sql": "Add SQL",
+    "client_credentials_access_token_count": "Client credentials access token count",
+    "authz_code_access_token_count": "Authz code access token count",
+    "authz_code_idtoken_count": "Authz code idtoken count"
   },
   "placeholders": {
     "id": "Enter id",