Merge branch 'main' into admin-ui-issue-2270

Signed-off-by: Faisal Siddique <71010439+faisalsiddique4400@users.noreply.github.com>

Author: faisalsiddique4400

.github/workflows/update_janssen_helm_chart.yml

@@ -71,5 +71,5 @@ jobs:
           LABELS="area-CI,comp-charts-jans"
           echo "${{ secrets.MOAUTO4_WORKFLOW_TOKEN }}" > token.txt
           gh auth login --with-token < token.txt
-          PR=$(gh pr create --assignee "${ASSIGNEES}" --base "v1.12.0" --body "${BODY}" --label "${LABELS}" --reviewer "${ASSIGNEES}" --title "${MESSAGE}")        
+          PR=$(gh pr create --assignee "${ASSIGNEES}" --base "v0.0.0-nightly" --body "${BODY}" --label "${LABELS}" --reviewer "${ASSIGNEES}" --title "${MESSAGE}")        
           gh pr merge --squash --auto "${PR}"

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

@@ -532,14 +532,15 @@
     "issuer": "Issuer",
     "base_endpoint": "Base Endpoint",
     "clean_service_interval": "Clean Service Interval",
+    "clean_batch_chunk_size": "Clean Batch Chunk Size",
     "clean_service_batch_chunk": "Clean Service Batch Chunk",
     "use_local_cache": "Use Local Cache",
     "logging_level": "Logging Level",
     "logging_layout": "Logging Layout",
     "external_logger_configuration": "External Logger Configuration",
     "metric_reporter_interval": "Metric Reporter Interval",
     "metric_reporter_keep_data_days": "Metric Reporter Keep Data Days",
-    "metric_reporter_enabled": "Metric Reporter Enabled",
+    "metric_reporter_enabled": "Enable Metric Reporter",
     "person_custom_object_classes": "Person Custom Object Classes",
     "enable_super_gluu": "Enable Super Gluu",
     "authenticator_certificates_folder": "Authenticator Certificates Folder",

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

@@ -532,14 +532,15 @@
     "issuer": "Emisor",
     "base_endpoint": "Endpoint Base",
     "clean_service_interval": "Intervalo del Servicio de Limpieza",
+    "clean_batch_chunk_size": "Tamaño de Lote de Limpieza",
     "clean_service_batch_chunk": "Bloque por Lotes del Servicio de Limpieza",
     "use_local_cache": "Usar Caché Local",
     "logging_level": "Nivel de Registro",
     "logging_layout": "Formato de Registro",
     "external_logger_configuration": "Configuración de Logger Externo",
     "metric_reporter_interval": "Intervalo del Informe de Métricas",
     "metric_reporter_keep_data_days": "Días para Mantener Datos del Informe de Métricas",
-    "metric_reporter_enabled": "Informe de Métricas Habilitado",
+    "metric_reporter_enabled": "Habilitar Informe de Métricas",
     "person_custom_object_classes": "Clases de Objeto Personalizado de Persona",
     "enable_super_gluu": "Habilitar Super Gluu",
     "authenticator_certificates_folder": "Carpeta de Certificados del Autenticador",

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

@@ -292,14 +292,15 @@
     "base_endpoint": "Point d'Accès de Base",
     "use_search_limit": "Charger les données sources avec une recherche limitée",
     "clean_service_interval": "Intervalle de Nettoyage du Service",
+    "clean_batch_chunk_size": "Taille du Lot de Nettoyage",
     "clean_service_batch_chunk": "Lot de Nettoyage du Service",
     "use_local_cache": "Utiliser le Cache Local",
     "logging_level": "Niveau de Journalisation",
     "logging_layout": "Disposition de la Journalisation",
     "external_logger_configuration": "Configuration du Journal Externe",
     "metric_reporter_interval": "Intervalle du Rapporteur de Métriques",
     "metric_reporter_keep_data_days": "Durée de Conservation des Données du Rapporteur de Métriques",
-    "metric_reporter_enabled": "Rapporteur de Métriques Activé",
+    "metric_reporter_enabled": "Activer le Rapporteur de Métriques",
     "person_custom_object_classes": "Classes d'Objets Personnalisés",
     "enable_super_gluu": "Activer Super Gluu",
     "authenticator_certificates_folder": "Dossier des Certificats de l'Authentificateur",

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

@@ -287,6 +287,7 @@
     "trustedIdpDn": "DN do IDP confiável",
     "base_endpoint": "Endpoint Base",
     "clean_service_interval": "Intervalo de Limpeza do Serviço",
+    "clean_batch_chunk_size": "Tamanho do Lote de Limpeza",
     "use_search_limit": "Carregar dados de origem com pesquisa limitada",
     "clean_service_batch_chunk": "Lote de Limpeza do Serviço",
     "use_local_cache": "Usar Cache Local",
@@ -295,7 +296,7 @@
     "external_logger_configuration": "Configuração de Registo Externo",
     "metric_reporter_interval": "Intervalo do Relatório de Métricas",
     "metric_reporter_keep_data_days": "Dias de Manutenção de Dados do Relatório de Métricas",
-    "metric_reporter_enabled": "Relatório de Métricas Ativado",
+    "metric_reporter_enabled": "Ativar Relatório de Métricas",
     "person_custom_object_classes": "Classes de Objeto Personalizado de Pessoa",
     "enable_super_gluu": "Ativar Super Gluu",
     "authenticator_certificates_folder": "Pasta de Certificados de Autenticador",

admin-ui/app/redux/features/authSlice.ts

@@ -1,6 +1,6 @@
 import reducerRegistry from 'Redux/reducers/ReducerRegistry'
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
-import type { BackendStatus, Token, UserInfo, Config, Location, AuthState } from './types/authTypes'
+import type { BackendStatus, UserInfo, Config, Location, AuthState } from './types/authTypes'
 
 const initialState: AuthState = {
   isAuthenticated: false,
@@ -24,6 +24,7 @@ const initialState: AuthState = {
   idToken: null,
   JwtToken: null,
   userInum: null,
+  isUserInfoFetched: false,
 }
 
 const authSlice = createSlice({
@@ -58,13 +59,15 @@ const authSlice = createSlice({
         userinfo?: UserInfo
         idToken?: string
         JwtToken?: string
+        isUserInfoFetched?: boolean
       }>,
     ) => {
       if (action.payload?.ujwt) {
         state.JwtToken = action.payload.JwtToken ?? null
         state.userinfo = action.payload.userinfo ?? null
         state.userinfo_jwt = action.payload.ujwt
         state.idToken = action.payload.idToken ?? null
+        state.isUserInfoFetched = action.payload.isUserInfoFetched ?? false
         state.isAuthenticated = true
         state.userInum = action.payload?.userinfo?.inum ?? null
       } else {

admin-ui/app/redux/features/types/authTypes.ts

@@ -41,4 +41,5 @@ export interface AuthState {
   loadingConfig: boolean
   authState?: any
   userInum?: string | null
+  isUserInfoFetched: boolean
 }