feat(webpack): setup relative path redux

GluuFederation · May 10, 2022 · b4eaba1 · b4eaba1
1 parent c22b691
commit b4eaba1
Show file tree

Hide file tree

Showing 72 changed files with 333 additions and 340 deletions.
diff --git a/admin-ui/app/components/App/AppMain.js b/admin-ui/app/components/App/AppMain.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { BrowserRouter as Router } from 'react-router-dom'
 import { Provider } from 'react-redux'
-import { configureStore } from '../../redux/store'
+import { configureStore } from 'Redux/store'
 import { PersistGate } from 'redux-persist/integration/react'
 import AuthenticatedRouteSelector from './AuthenticatedRouteSelector'
 const basePath = process.env.BASE_PATH || '/admin'

diff --git a/admin-ui/app/redux/reducers/LicenseDetailsReducer.js b/admin-ui/app/redux/reducers/LicenseDetailsReducer.js
@@ -1,5 +1,5 @@
 import { GET_LICENSE_DETAILS, GET_LICENSE_DETAILS_RESPONSE, UPDATE_LICENSE_DETAILS, UPDATE_LICENSE_DETAILS_RESPONSE } from '../actions/types'
-import reducerRegistry from '../../redux/reducers/ReducerRegistry'
+import reducerRegistry from 'Redux/reducers/ReducerRegistry'
 const INIT_STATE = {
   item: {},
   loading: true,

diff --git a/admin-ui/app/redux/sagas/LicenseDetailsSaga.js b/admin-ui/app/redux/sagas/LicenseDetailsSaga.js
@@ -4,16 +4,13 @@ import {
   getLicenseDetailsResponse,
   updateLicenseDetailsResponse,
 } from '../actions/LicenseDetailsActions'
-import { getClient } from '../../redux/api/base'
+import { getClient } from 'Redux/api/base'
 import LicenseDetailsApi from '../api/LicenseDetailsApi'
 const JansConfigApi = require('jans_config_api')
-import { initAudit } from '../../redux/sagas/SagaUtils'
-import { postUserAction } from '../../redux/api/backend-api'
-import {
-  isFourZeroOneError,
-  addAdditionalData,
-} from '../../utils/TokenController'
-import { getAPIAccessToken } from '../../redux/actions/AuthActions'
+import { initAudit } from 'Redux/sagas/SagaUtils'
+import { postUserAction } from 'Redux/api/backend-api'
+import { isFourZeroOneError } from '../../utils/TokenController'
+import { getAPIAccessToken } from 'Redux/actions/AuthActions'
 
 function* newFunction() {
   const token = yield select((state) => state.authReducer.token.access_token)

diff --git a/admin-ui/app/routes/Apps/Configuration/Fido2Page.js b/admin-ui/app/routes/Apps/Configuration/Fido2Page.js
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { hasPermission, FIDO_WRITE } from '../../../utils/PermChecker'
+import { hasPermission, FIDO_WRITE } from 'Utils/PermChecker'
 import {
   Form,
   FormGroup,
@@ -21,7 +21,7 @@ import { Formik } from 'formik'
 import {
   getFidoConfig,
   editFidoConfig,
-} from '../../../redux/actions/FidoActions'
+} from 'Redux/actions/FidoActions'
 import GluuNameValuesProperty from '../Gluu/GluuNameValuesProperty'
 
 function Fido2Page({ fido, permissions, dispatch }) {

diff --git a/admin-ui/app/routes/Dashboards/DashboardPage.js b/admin-ui/app/routes/Dashboards/DashboardPage.js
@@ -7,8 +7,8 @@ import DatePicker from 'react-datepicker'
 import 'react-datepicker/dist/react-datepicker.css'
 import GluuLoader from '../Apps/Gluu/GluuLoader'
 import GluuViewWrapper from '../Apps/Gluu/GluuViewWrapper'
-import { getMau } from '../../redux/actions/MauActions'
-import { getClients } from '../../redux/actions/InitActions'
+import { getMau } from 'Redux/actions/MauActions'
+import { getClients } from 'Redux/actions/InitActions'
 import applicationstyle from '../Apps/Gluu/styles/applicationstyle'
 import GluuLabel from '../Apps/Gluu/GluuLabel'
 import GluuRibbon from '../Apps/Gluu/GluuRibbon'
@@ -20,13 +20,13 @@ import {
   FormGroup,
   Col,
   Row,
-} from '../../../app/components'
+} from 'Components'
 import {
   hasBoth,
   buildPayload,
   STAT_READ,
   STAT_JANS_READ,
-} from '../../utils/PermChecker'
+} from 'Utils/PermChecker'
 import { useTranslation } from 'react-i18next'
 import { connect } from 'react-redux'
 

diff --git a/admin-ui/app/routes/Dashboards/Reports/Reports.js b/admin-ui/app/routes/Dashboards/Reports/Reports.js
@@ -7,7 +7,7 @@ import {
   getScripts,
   getScopes,
   getClients,
-} from '../../../redux/actions/InitActions'
+} from 'Redux/actions/InitActions'
 import ReportCard from './ReportCard'
 import { useTranslation } from 'react-i18next'
 

diff --git a/admin-ui/app/routes/Pages/ByeBye.js b/admin-ui/app/routes/Pages/ByeBye.js
@@ -1,8 +1,8 @@
 import React, { useEffect } from 'react'
 import { connect } from 'react-redux'
-import { uuidv4 } from '../../utils/Util'
-import { EmptyLayout, Label } from '../../../app/components'
-import { logoutUser } from '../../redux/actions/LogoutActions'
+import { uuidv4 } from 'Utils/Util'
+import { EmptyLayout, Label } from 'Components'
+import { logoutUser } from 'Redux/actions/LogoutActions'
 import { useTranslation } from 'react-i18next'
 
 function ByeBye({ config, dispatch }) {

diff --git a/admin-ui/app/utils/LicenseScreens/ApiKey.js b/admin-ui/app/utils/LicenseScreens/ApiKey.js
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { checkUserApi, checkUserLicenceKey } from '../../redux/actions'
+import { checkUserApi, checkUserLicenceKey } from 'Redux/actions'
 import logo from 'Images/logos/logo192.png'
 import { useDispatch, useSelector } from 'react-redux'
 import './style.css'

diff --git a/admin-ui/plugins/PluginReducersResolver.js b/admin-ui/plugins/PluginReducersResolver.js
@@ -1,9 +1,9 @@
 import plugins from '../plugins.config'
-import reducerRegistry from '../app/redux/reducers/ReducerRegistry'
+import reducerRegistry from 'Redux/reducers/ReducerRegistry'
 
 async function process() {
   const metadataFilePath = plugins
-  .map((item) => item.metadataFile)
+    .map((item) => item.metadataFile)
   let pluginReducers = []
   await metadataFilePath.forEach(async (path) => {
     pluginReducers = await [

diff --git a/admin-ui/plugins/admin/components/CustomScripts/CustomScriptAddPage.js b/admin-ui/plugins/admin/components/CustomScripts/CustomScriptAddPage.js
@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react'
 import { connect } from 'react-redux'
 import { useHistory } from 'react-router-dom'
-import { Container, CardBody, Card } from '../../../../app/components'
+import { Container, CardBody, Card } from 'Components'
 import CustomScriptForm from './CustomScriptForm'
-import { addCustomScript } from '../../redux/actions/CustomScriptActions'
-import { buildPayload } from '../../../../app/utils/PermChecker'
-import GluuAlert from '../../../../app/routes/Apps/Gluu/GluuAlert'
+import { addCustomScript } from 'Plugins/admin/redux/actions/CustomScriptActions'
+import { buildPayload } from 'Utils/PermChecker'
+import GluuAlert from 'Routes/Apps/Gluu/GluuAlert'
 import { useTranslation } from 'react-i18next'
 
 function CustomScriptAddPage({ scripts, dispatch, saveOperationFlag, errorInSaveOperationFlag }) {
@@ -18,10 +18,9 @@ function CustomScriptAddPage({ scripts, dispatch, saveOperationFlag, errorInSave
       history.push('/adm/scripts')
   }, [saveOperationFlag])
 
-
   function handleSubmit(data) {
     if (data) {
-      let message = data.customScript.action_message
+      const message = data.customScript.action_message
       delete data.customScript.action_message
       buildPayload(userAction, message, data)
       dispatch(addCustomScript(userAction))

diff --git a/admin-ui/plugins/admin/components/CustomScripts/CustomScriptEditPage.js b/admin-ui/plugins/admin/components/CustomScripts/CustomScriptEditPage.js
@@ -1,12 +1,12 @@
 import React, { useEffect } from 'react'
 import { connect } from 'react-redux'
 import { useHistory } from 'react-router-dom'
-import { CardBody, Card } from '../../../../app/components'
-import GluuLoader from '../../../../app/routes/Apps/Gluu/GluuLoader'
+import { CardBody, Card } from 'Components'
+import GluuLoader from 'Routes/Apps/Gluu/GluuLoader'
 import CustomScriptForm from './CustomScriptForm'
-import { editCustomScript } from '../../redux/actions/CustomScriptActions'
-import { buildPayload } from '../../../../app/utils/PermChecker'
-import GluuAlert from '../../../../app/routes/Apps/Gluu/GluuAlert'
+import { editCustomScript } from 'Plugins/admin/redux/actions/CustomScriptActions'
+import { buildPayload } from 'Utils/PermChecker'
+import GluuAlert from 'Routes/Apps/Gluu/GluuAlert'
 import { useTranslation } from 'react-i18next'
 
 function CustomScriptEditPage({ item, scripts, loading, dispatch, saveOperationFlag, errorInSaveOperationFlag }) {

diff --git a/admin-ui/plugins/admin/components/CustomScripts/ScriptListPage.js b/admin-ui/plugins/admin/components/CustomScripts/ScriptListPage.js
@@ -5,26 +5,26 @@ import { useHistory } from 'react-router-dom'
 import { Paper } from '@material-ui/core'
 import { Badge } from 'reactstrap'
 import { connect } from 'react-redux'
-import GluuDialog from '../../../../app/routes/Apps/Gluu/GluuDialog'
-import { Card, CardBody, FormGroup } from '../../../../app/components'
-import GluuRibbon from '../../../../app/routes/Apps/Gluu/GluuRibbon'
+import GluuDialog from 'Routes/Apps/Gluu/GluuDialog'
+import { Card, CardBody, FormGroup } from 'Components'
+import GluuRibbon from 'Routes/Apps/Gluu/GluuRibbon'
 import CustomScriptDetailPage from './CustomScriptDetailPage'
-import GluuCustomScriptSearch from '../../../../app/routes/Apps/Gluu/GluuCustomScriptSearch'
-import GluuViewWrapper from '../../../../app/routes/Apps/Gluu/GluuViewWrapper'
-import applicationStyle from '../../../../app/routes/Apps/Gluu/styles/applicationstyle'
+import GluuCustomScriptSearch from 'Routes/Apps/Gluu/GluuCustomScriptSearch'
+import GluuViewWrapper from 'Routes/Apps/Gluu/GluuViewWrapper'
+import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
 import {
   deleteCustomScript,
   getCustomScriptByType,
   setCurrentItem,
   getCustomScripts,
-} from '../../redux/actions/CustomScriptActions'
+} from 'Plugins/admin/redux/actions/CustomScriptActions'
 import {
   hasPermission,
   buildPayload,
   SCRIPT_READ,
   SCRIPT_WRITE,
   SCRIPT_DELETE,
-} from '../../../../app/utils/PermChecker'
+} from 'Utils/PermChecker'
 import {
   LIMIT_ID,
   LIMIT,

diff --git a/admin-ui/plugins/admin/components/MAU/MauGraph.js b/admin-ui/plugins/admin/components/MAU/MauGraph.js
@@ -1,17 +1,16 @@
 import React, { useState, useEffect } from 'react'
 import { subMonths } from 'date-fns'
 import moment from 'moment'
-import CustomPieGraph from '../../../../app/routes/Dashboards/Grapths/CustomPieGraph'
-import ActiveUsersGraph from '../../../../app/routes/Dashboards/Grapths/ActiveUsersGraph'
+import ActiveUsersGraph from 'Routes/Dashboards/Grapths/ActiveUsersGraph'
 import DatePicker from 'react-datepicker'
 import 'react-datepicker/dist/react-datepicker.css'
-import GluuLoader from '../../../../app/routes/Apps/Gluu/GluuLoader'
-import GluuViewWrapper from '../../../../app/routes/Apps/Gluu/GluuViewWrapper'
-import { getMau } from '../../../../app/redux/actions/MauActions'
-import { getClients } from '../../../../app/redux/actions/InitActions'
-import applicationstyle from '../../../../app/routes/Apps/Gluu/styles/applicationstyle'
-import GluuLabel from '../../../../app/routes/Apps/Gluu/GluuLabel'
-import GluuRibbon from '../../../../app/routes/Apps/Gluu/GluuRibbon'
+import GluuLoader from 'Routes/Apps/Gluu/GluuLoader'
+import GluuViewWrapper from 'Routes/Apps/Gluu/GluuViewWrapper'
+import { getMau } from 'Redux/actions/MauActions'
+import { getClients } from 'Redux/actions/InitActions'
+import applicationstyle from 'Routes/Apps/Gluu/styles/applicationstyle'
+import GluuLabel from 'Routes/Apps/Gluu/GluuLabel'
+import GluuRibbon from 'Routes/Apps/Gluu/GluuRibbon'
 import {
   Button,
   Card,

diff --git a/admin-ui/plugins/admin/components/Mapping/MappingItem.js b/admin-ui/plugins/admin/components/Mapping/MappingItem.js
@@ -7,7 +7,7 @@ import {
   FormGroup,
   Accordion,
   Form,
-} from '../../../../app/components'
+} from 'Components'
 import { useDispatch, useSelector } from 'react-redux'
 import { DeleteOutlined } from '@material-ui/icons'
 import {
@@ -16,9 +16,9 @@ import {
   updatePermissionsToServer,
   updatePermissionsServerResponse,
   deleteMapping,
-} from '../../redux/actions/MappingActions'
-import GluuTypeAhead from '../../../../app/routes/Apps/Gluu/GluuTypeAhead'
-import applicationStyle from '../../../../app/routes/Apps/Gluu/styles/applicationstyle'
+} from 'Plugins/admin/redux/actions/MappingActions'
+import GluuTypeAhead from 'Routes/Apps/Gluu/GluuTypeAhead'
+import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
 
 import { Formik } from 'formik'
 

diff --git a/admin-ui/plugins/admin/components/Mapping/MappingPage.js b/admin-ui/plugins/admin/components/Mapping/MappingPage.js
@@ -1,30 +1,30 @@
 import React, { useEffect, useState } from 'react'
 import { connect } from 'react-redux'
 import { useTranslation } from 'react-i18next'
-import applicationStyle from '../../../../app/routes/Apps/Gluu/styles/applicationstyle'
+import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
 import MappingAddDialogForm from './MappingAddDialogForm'
 import {
   Card,
   Col,
   CardBody,
   FormGroup,
   Button,
-} from '../../../../app/components'
-import GluuViewWrapper from '../../../../app/routes/Apps/Gluu/GluuViewWrapper'
-import GluuRibbon from '../../../../app/routes/Apps/Gluu/GluuRibbon'
-import GluuLoader from '../../../../app/routes/Apps/Gluu/GluuLoader'
+} from 'Components'
+import GluuViewWrapper from 'Routes/Apps/Gluu/GluuViewWrapper'
+import GluuRibbon from 'Routes/Apps/Gluu/GluuRibbon'
+import GluuLoader from 'Routes/Apps/Gluu/GluuLoader'
 import {
   getMapping,
   addNewRolePermissions,
-} from '../../redux/actions/MappingActions'
-import { getRoles } from '../../redux/actions/ApiRoleActions'
-import { getPermissions } from '../../redux/actions/ApiPermissionActions'
+} from 'Plugins/admin/redux/actions/MappingActions'
+import { getRoles } from 'Plugins/admin/redux/actions/ApiRoleActions'
+import { getPermissions } from 'Plugins/admin/redux/actions/ApiPermissionActions'
 import MappingItem from './MappingItem'
 import {
   hasPermission,
   buildPayload,
   ROLE_READ,
-} from '../../../../app/utils/PermChecker'
+} from 'Utils/PermChecker'
 
 function MappingPage({
   mapping,

diff --git a/admin-ui/plugins/admin/components/Permissions/UiPermListPage.js b/admin-ui/plugins/admin/components/Permissions/UiPermListPage.js
@@ -4,24 +4,24 @@ import { Paper } from '@material-ui/core'
 import UiPermDetailPage from './UiPermDetailPage'
 import { Badge } from 'reactstrap'
 import { connect } from 'react-redux'
-import { Card, CardBody, FormGroup } from '../../../../app/components'
+import { Card, CardBody, FormGroup } from 'Components'
 import { useTranslation } from 'react-i18next'
-import GluuViewWrapper from '../../../../app/routes/Apps/Gluu/GluuViewWrapper'
-import GluuRibbon from '../../../../app/routes/Apps/Gluu/GluuRibbon'
-import applicationStyle from '../../../../app/routes/Apps/Gluu/styles/applicationstyle'
+import GluuViewWrapper from 'Routes/Apps/Gluu/GluuViewWrapper'
+import GluuRibbon from 'Routes/Apps/Gluu/GluuRibbon'
+import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
 import PermissionAddDialogForm from './PermissionAddDialogForm'
 import {
   getPermissions,
   deletePermission,
   editPermission,
   addPermission,
-} from '../../redux/actions/ApiPermissionActions'
+} from 'Plugins/admin/redux/actions/ApiPermissionActions'
 import {
   hasPermission,
   buildPayload,
   PERMISSION_READ,
   PERMISSION_WRITE,
-} from '../../../../app/utils/PermChecker'
+} from 'Utils/PermChecker'
 
 function UiPermListPage({ apiPerms, permissions, loading, dispatch }) {
   const { t } = useTranslation()

diff --git a/admin-ui/plugins/admin/components/Roles/UiRoleListPage.js b/admin-ui/plugins/admin/components/Roles/UiRoleListPage.js
@@ -5,23 +5,23 @@ import UiRoleDetailPage from './UiRoleDetailPage'
 import RoleAddDialogForm from './RoleAddDialogForm'
 import { Badge } from 'reactstrap'
 import { connect } from 'react-redux'
-import { Card, CardBody, FormGroup } from '../../../../app/components'
+import { Card, CardBody, FormGroup } from 'Components'
 import { useTranslation } from 'react-i18next'
-import GluuViewWrapper from '../../../../app/routes/Apps/Gluu/GluuViewWrapper'
-import GluuRibbon from '../../../../app/routes/Apps/Gluu/GluuRibbon'
-import applicationStyle from '../../../../app/routes/Apps/Gluu/styles/applicationstyle'
+import GluuViewWrapper from 'Routes/Apps/Gluu/GluuViewWrapper'
+import GluuRibbon from 'Routes/Apps/Gluu/GluuRibbon'
+import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
 import {
   getRoles,
   addRole,
   editRole,
   deleteRole,
-} from '../../redux/actions/ApiRoleActions'
+} from 'Plugins/admin/redux/actions/ApiRoleActions'
 import {
   hasPermission,
   buildPayload,
   ROLE_READ,
   ROLE_WRITE,
-} from '../../../../app/utils/PermChecker'
+} from 'Utils/PermChecker'
 
 function UiRoleListPage({ apiRoles, permissions, loading, dispatch }) {
   const { t } = useTranslation()

diff --git a/admin-ui/plugins/admin/redux/reducers/ApiPermissionReducer.js b/admin-ui/plugins/admin/redux/reducers/ApiPermissionReducer.js
@@ -12,7 +12,7 @@ import {
   SET_PERMISSION_ITEM,
   RESET,
 } from '../actions/types'
-import reducerRegistry from '../../../../app/redux/reducers/ReducerRegistry'
+import reducerRegistry from 'Redux/reducers/ReducerRegistry'
 const INIT_STATE = {
   items: [],
   loading: true,

diff --git a/admin-ui/plugins/admin/redux/reducers/ApiRoleReducer.js b/admin-ui/plugins/admin/redux/reducers/ApiRoleReducer.js
@@ -12,7 +12,7 @@ import {
   SET_ROLE_ITEM,
   RESET,
 } from '../actions/types'
-import reducerRegistry from '../../../../app/redux/reducers/ReducerRegistry'
+import reducerRegistry from 'Redux/reducers/ReducerRegistry'
 
 const INIT_STATE = {
   items: [],

diff --git a/admin-ui/plugins/admin/redux/reducers/CustomScriptReducer.js b/admin-ui/plugins/admin/redux/reducers/CustomScriptReducer.js
@@ -12,7 +12,7 @@ import {
   DELETE_CUSTOM_SCRIPT_RESPONSE,
   RESET,
 } from '../actions/types'
-import reducerRegistry from '../../../../app/redux/reducers/ReducerRegistry'
+import reducerRegistry from 'Redux/reducers/ReducerRegistry'
 const INIT_STATE = {
   items: [],
   loading: true,

diff --git a/admin-ui/plugins/admin/redux/reducers/MappingReducer.js b/admin-ui/plugins/admin/redux/reducers/MappingReducer.js
@@ -7,7 +7,7 @@ import {
   RESET,
   UPDATE_PERMISSIONS_SERVER_RESPONSE,
 } from '../actions/types'
-import reducerRegistry from '../../../../app/redux/reducers/ReducerRegistry'
+import reducerRegistry from 'Redux/reducers/ReducerRegistry'
 
 const INIT_STATE = {
   items: [],