fix: use useConfig in LoginAppWrapper

dhis2 · Apr 26, 2024 · 1febb1f · 1febb1f
1 parent 7d0e82a
commit 1febb1f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/adapter/src/components/LoginAppWrapper.js b/adapter/src/components/LoginAppWrapper.js
@@ -1,3 +1,4 @@
+import { useConfig } from '@dhis2/app-runtime'
 import PropTypes from 'prop-types'
 import React from 'react'
 import { useSystemDefaultLocale } from '../utils/useLocale.js'
@@ -6,8 +7,9 @@ import { ErrorBoundary } from './ErrorBoundary.js'
 import { LoadingMask } from './LoadingMask.js'
 import { styles } from './styles/AppWrapper.style.js'
 
-export const LoginAppWrapper = ({ url, children }) => {
+export const LoginAppWrapper = ({ children }) => {
     const { loading: localeLoading } = useSystemDefaultLocale()
+    const { baseUrl } = useConfig()
     // cannot check current user for a loginApp (no api/me)
 
     if (localeLoading) {
@@ -21,7 +23,7 @@ export const LoginAppWrapper = ({ url, children }) => {
                 <ErrorBoundary
                     onRetry={() => window.location.reload()}
                     loginApp={true}
-                    baseURL={url}
+                    baseURL={baseUrl}
                 >
                     {children}
                 </ErrorBoundary>
@@ -33,5 +35,4 @@ export const LoginAppWrapper = ({ url, children }) => {
 
 LoginAppWrapper.propTypes = {
     children: PropTypes.node,
-    url: PropTypes.string,
 }
diff --git a/adapter/src/components/ServerVersionProvider.js b/adapter/src/components/ServerVersionProvider.js
@@ -18,7 +18,6 @@ export const ServerVersionProvider = ({
     parentAlertsAdd,
     showAlertsInPlugin,
     loginApp,
-    setLoginBaseUrl,
     children,
 }) => {
     const offlineInterface = useOfflineInterface()
@@ -150,10 +149,6 @@ export const ServerVersionProvider = ({
         }
     }, [appName, baseUrl, loginApp])
 
-    useEffect(() => {
-        setLoginBaseUrl(baseUrl)
-    }, [setLoginBaseUrl, baseUrl])
-
     useEffect(() => {
         if (pwaEnabled) {
             offlineInterface.ready.then(() => {
@@ -215,7 +210,6 @@ ServerVersionProvider.propTypes = {
     parentAlertsAdd: PropTypes.func,
     plugin: PropTypes.bool,
     pwaEnabled: PropTypes.bool,
-    setLoginBaseUrl: PropTypes.func,
     showAlertsInPlugin: PropTypes.bool,
     url: PropTypes.string,
 }
diff --git a/adapter/src/index.js b/adapter/src/index.js
@@ -1,6 +1,6 @@
 import { checkForSWUpdateAndReload } from '@dhis2/pwa'
 import PropTypes from 'prop-types'
-import React, { useState } from 'react'
+import React from 'react'
 import { AppWrapper } from './components/AppWrapper.js'
 import { ErrorBoundary } from './components/ErrorBoundary.js'
 import { LoginAppWrapper } from './components/LoginAppWrapper.js'
@@ -23,7 +23,6 @@ const AppAdapter = ({
     loginApp,
     children,
 }) => {
-    const [loginBaseUrl, setLoginBaseUrl] = useState(url)
     if (loginApp) {
         return (
             <ErrorBoundary
@@ -43,11 +42,8 @@ const AppAdapter = ({
                     pwaEnabled={pwaEnabled}
                     loginApp={loginApp}
                     plugin={false}
-                    setLoginBaseUrl={setLoginBaseUrl}
                 >
-                    <LoginAppWrapper url={loginBaseUrl}>
-                        {children}
-                    </LoginAppWrapper>
+                    <LoginAppWrapper>{children}</LoginAppWrapper>
                 </ServerVersionProvider>
             </ErrorBoundary>
         )