runlify 0.0.672 → 0.0.673

package/build/projectsGeneration/generators/fileTemplates/ui/environment/src/App.js

@@ -6,9 +6,9 @@ var utils_1 = require("../../../../../utils");
 var uiAppTmpl = function (_a, options) {
     var defaultLanguage = _a.system.defaultLanguage;
     if (options === void 0) { options = types_1.defaultBootstrapEntityOptions; }
-    return "import * as React from 'react';\nimport {useEffect, useRef, useState} from 'react';\nimport {Admin, AuthProvider, CustomRoutes, DataProvider, localStorageStore, useTranslate} from 'react-admin';\nimport {ApolloClient, ApolloProvider, NormalizedCacheObject} from '@apollo/client';\nimport Keycloak, {KeycloakConfig, KeycloakError, KeycloakInitOptions, KeycloakTokenParsed} from 'keycloak-js';\nimport './App.css';\nimport Layout from './layout/Layout';\nimport Login from './layout/Login';\nimport dataProviderFactory from './dataProvider';\nimport getConfig from './config/config';\nimport {getResources} from './adm/resources';\nimport Dashboard from './adm/Dashboard';\nimport {DebugProvider} from './contexts/DebugContext';\nimport getAuthProvider from './authProvider/getAuthProvider';\nimport {onStart} from './systemHooks';\nimport getApollo, {updateApolloLinks} from './apollo/getApollo';\nimport Loader from './shared/Loader';\nimport {lightTheme".concat(options.themesEnabled ? ', darkTheme' : '', "} from './layout/themes';\nimport {routes} from './adm/routes';\nimport i18nProvider from './i18nProvider';\nimport log from './utils/log';\nimport {BrowserRouter} from 'react-router-dom';\n").concat(options.skipWarningThisIsGenerated
+    return "import * as React from 'react';\nimport {useEffect, useRef, useState} from 'react';\nimport {Admin, AuthProvider, CustomRoutes, DataProvider, localStorageStore, useTranslate} from 'react-admin';\nimport {ApolloClient, ApolloProvider, NormalizedCacheObject} from '@apollo/client';\nimport './App.css';\nimport Layout from './layout/Layout';\nimport Login from './layout/Login';\nimport dataProviderFactory from './dataProvider';\nimport getConfig from './config/config';\nimport {getResources} from './adm/resources';\nimport Dashboard from './adm/Dashboard';\nimport {DebugProvider} from './contexts/DebugContext';\nimport getAuthProvider from './authProvider/getAuthProvider';\nimport {onStart} from './systemHooks';\nimport getApollo, {updateApolloLinks} from './apollo/getApollo';\nimport Loader from './shared/Loader';\nimport {lightTheme".concat(options.themesEnabled ? ', darkTheme' : '', "} from './layout/themes';\nimport {routes} from './adm/routes';\nimport i18nProvider from './i18nProvider';\nimport {BrowserRouter} from 'react-router-dom';\nimport {LogoutType} from './authProvider/types';\n").concat(options.skipWarningThisIsGenerated
         ? ''
-        : "\n// ".concat(utils_1.generatedWarning, "\n"), "\nonStart();\n\nconst getPermissions = (decoded: KeycloakTokenParsed) => {\n  const roles = decoded?.realm_access?.roles;\n  if (!roles) {\n    return false;\n  }\n\n  if (roles.includes('admin')) {\n    return 'admin';\n  }\n\n  if (roles.includes('user')) {\n    return 'user';\n  }\n\n  return false;\n};\n\nconst App = () => {\n  const dataProvider = useRef<DataProvider | undefined>(undefined);\n  const authProvider = useRef<AuthProvider | undefined>(undefined);\n  // const client = useRef<ApolloClient<NormalizedCacheObject> | undefined>(undefined);\n  const [client, setClient] = useState<ApolloClient<NormalizedCacheObject> | null>(null);\n  const [keycloak, setKeycloak] = useState<Keycloak | undefined>(undefined);\n  const translate = useTranslate();\n\n  useEffect(() => {\n    const fetchDataProvider = async () => {\n      const config = await getConfig();\n\n      const keycloakConfig: KeycloakConfig = {\n        url: config.oidcAdmUrl,\n        realm: config.oidcAdmRealm,\n        clientId: config.oidcAdmClientId,\n      };\n\n      const keycloakClient = new Keycloak(keycloakConfig);\n\n      const keycloakInitOptions: KeycloakInitOptions = {\n        onLoad: 'login-required',\n        checkLoginIframe: Boolean(config.checkLoginIframe),\n      };\n\n      keycloakClient.onAuthError =\n        (errorData: KeycloakError) => log.info(`onAuthError. error: ${errorData?.error}, description: ${errorData?.error_description}`);\n\n      keycloakClient.onAuthRefreshError = () => log.info('onAuthRefreshError');\n      keycloakClient.onActionUpdate = (status: string) => log.info(`onActionUpdate. status: ${status}`);\n      keycloakClient.onAuthLogout = () => log.info('onAuthLogout');\n      keycloakClient.onAuthRefreshSuccess = () => log.info('onAuthRefreshSuccess');\n      keycloakClient.onAuthSuccess = () => log.info('onAuthSuccess');\n      keycloakClient.onReady = (authenticated?: boolean) => log.info(`onReady. authenticated: ${authenticated}`);\n\n      const refresh = async () => {\n        const ok = await keycloakClient.updateToken(3000);\n        if (ok) {\n          const {endpoint} = await getConfig();\n          updateApolloLinks(endpoint, keycloakClient);\n        }\n      };\n\n      // eslint-disable-next-line require-atomic-updates\n      keycloakClient.onTokenExpired = () => {\n        refresh().catch(log.warn);\n        log.info('onTokenExpired');\n      };\n\n      keycloakClient.onAuthRefreshError = () => log.info('onAuthRefreshError');\n\n      await keycloakClient.init(keycloakInitOptions);\n\n      log.info(`token: ${keycloakClient.token}`);\n\n      authProvider.current = getAuthProvider(\n        config.endpoint,\n        keycloakClient,\n        {\n          onPermissions: getPermissions,\n        },\n      );\n\n      const client = getApollo(config.endpoint, keycloakClient);\n      setClient(client);\n\n      dataProvider.current = await dataProviderFactory(client);\n\n      updateApolloLinks(config.endpoint, keycloakClient);\n\n      setKeycloak(keycloakClient);\n    };\n\n    if (!keycloak) {\n      fetchDataProvider();\n    }\n  }, [keycloak]);\n\n  if (!dataProvider.current || !client || !authProvider.current) {\n    return (\n      <Loader />\n    );\n  }\n\n  return (\n    <React.StrictMode>\n      <BrowserRouter>\n        <ApolloProvider client={client}>\n          <DebugProvider>\n            <Admin\n              dashboard={Dashboard}\n              dataProvider={dataProvider.current}\n              i18nProvider={i18nProvider}\n              layout={Layout}\n              loading={Loader}\n              loginPage={Login}\n              authProvider={authProvider.current}\n              title=''\n              theme={lightTheme}\n              store={localStorageStore('3')}\n              lightTheme={lightTheme}").concat(options.themesEnabled ? "\n              darkTheme={darkTheme}" : '', "\n            >\n              {permissions => [\n                (\n                  <CustomRoutes key='customRoutes'>\n                    {routes}\n                  </CustomRoutes>\n                ),\n                ...getResources(translate, permissions),\n              ]}\n            </Admin>\n          </DebugProvider>\n        </ApolloProvider>\n      </BrowserRouter>\n    </React.StrictMode>\n  );\n};\n\nexport default App;\n");
+        : "\n// ".concat(utils_1.generatedWarning, "\n"), "\nonStart();\n\nconst App = () => {\n  const dataProvider = useRef<DataProvider | undefined>(undefined);\n  const authProvider = useRef<AuthProvider | undefined>(undefined);\n  const [client, setClient] = useState<ApolloClient<NormalizedCacheObject> | null>(null);\n  const translate = useTranslate();\n\n  useEffect(() => {\n    const fetchDataProvider = async () => {\n      const config = await getConfig();\n\n      authProvider.current = getAuthProvider({\n        backEndpoint: config.endpoint,\n        issuer: config.oidcAdmIssuer,\n        clientId: config.oidcAdmClientId,\n        loginRedirectUri: `${window.location.origin}/auth-callback`,\n        logoutRedirectUri: `${window.location.origin}/login`,\n        logout: config.oidcAdmLogoutType as LogoutType,\n      });\n\n      const userFromAuthProvider = await authProvider.current.getUser();\n\n      const client = getApollo(config.endpoint, userFromAuthProvider?.access_token ?? '');\n      setClient(client);\n\n      dataProvider.current = await dataProviderFactory(client);\n\n      updateApolloLinks(config.endpoint, userFromAuthProvider?.access_token ?? '');\n    };\n\n    fetchDataProvider();\n  }, []);\n\n  if (!dataProvider.current || !client || !authProvider.current) {\n    return (\n      <Loader />\n    );\n  }\n\n  return (\n    <React.StrictMode>\n      <BrowserRouter>\n        <ApolloProvider client={client}>\n          <DebugProvider>\n            <Admin\n              dashboard={Dashboard}\n              dataProvider={dataProvider.current}\n              i18nProvider={i18nProvider}\n              layout={Layout}\n              loading={Loader}\n              loginPage={Login}\n              authProvider={authProvider.current}\n              title=''\n              theme={lightTheme}\n              store={localStorageStore('3')}\n              lightTheme={lightTheme}").concat(options.themesEnabled ? "\n              darkTheme={darkTheme}" : '', "\n            >\n              {permissions => [\n                (\n                  <CustomRoutes key='customRoutes'>\n                    {routes}\n                  </CustomRoutes>\n                ),\n                ...getResources(translate, permissions),\n              ]}\n            </Admin>\n          </DebugProvider>\n        </ApolloProvider>\n      </BrowserRouter>\n    </React.StrictMode>\n  );\n};\n\nexport default App;\n");
 };
 exports.uiAppTmpl = uiAppTmpl;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb2plY3RzR2VuZXJhdGlvbi9nZW5lcmF0b3JzL2ZpbGVUZW1wbGF0ZXMvdWkvZW52aXJvbm1lbnQvc3JjL0FwcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSw4Q0FHNkI7QUFDN0IsOENBQXVEO0FBRWhELElBQU0sU0FBUyxHQUFHLFVBQ3ZCLEVBQTBELEVBQzFELE9BQStEO1FBRG5ELGVBQWUsNEJBQUE7SUFDM0Isd0JBQUEsRUFBQSxVQUFrQyxxQ0FBNkI7SUFDNUQsT0FBQSxvOEJBaUJlLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLGFBQWEsQ0FBQSxDQUFDLENBQUMsRUFBRSwyTUFNM0QsT0FBTyxDQUFDLDBCQUEwQjtRQUNoQyxDQUFDLENBQUMsRUFBRTtRQUNKLENBQUMsQ0FBQyxlQUNELHdCQUFnQixPQUNwQixpdkhBeUhzQyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyx1Q0FDM0IsQ0FBQSxDQUFDLENBQUMsRUFBRSwrYkFtQnZDO0FBeEtJLENBd0tKLENBQUE7QUEzS1ksUUFBQSxTQUFTLGFBMktyQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb2plY3RzR2VuZXJhdGlvbi9nZW5lcmF0b3JzL2ZpbGVUZW1wbGF0ZXMvdWkvZW52aXJvbm1lbnQvc3JjL0FwcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSw4Q0FHNkI7QUFDN0IsOENBQXVEO0FBRWhELElBQU0sU0FBUyxHQUFHLFVBQ3ZCLEVBQTBELEVBQzFELE9BQStEO1FBRG5ELGVBQWUsNEJBQUE7SUFDM0Isd0JBQUEsRUFBQSxVQUFrQyxxQ0FBNkI7SUFDNUQsT0FBQSxvMUJBZ0JlLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLGFBQWEsQ0FBQSxDQUFDLENBQUMsRUFBRSw2TkFNM0QsT0FBTyxDQUFDLDBCQUEwQjtRQUNoQyxDQUFDLENBQUMsRUFBRTtRQUNKLENBQUMsQ0FBQyxlQUNELHdCQUFnQixPQUNwQix1MURBMERzQyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyx1Q0FDM0IsQ0FBQSxDQUFDLENBQUMsRUFBRSwrYkFtQnZDO0FBeEdJLENBd0dKLENBQUE7QUEzR1ksUUFBQSxTQUFTLGFBMkdyQiJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runlify",
-  "version": "0.0.672",
+  "version": "0.0.673",
   "description": "runlify CLI",
   "private": false,
   "main": "build/index.js",