remove unused logs

src/api/component-repository/categories.js

@@ -1,9 +1,7 @@
 import { LIST_ECR_CATEGORIES_OK } from 'test/mocks/component-repository/categories';
 import { makeRequest, METHODS } from '@entando/apimanager';
 import { composeCMApiDomain } from 'helpers/apiDomainComposer';
-// import { getEntandoVirtualContextFromCookies } from 'helpers/cookies';
-import { getContextFromURL } from 'app-init/contextProvider';
-
+import { getContextFromURL } from 'helpers/contextUtils';
 // eslint-disable-next-line import/prefer-default-export
 export const getECRCategories = () => (
   makeRequest({

src/api/component-repository/componentRepositories.js

@@ -1,9 +1,7 @@
 import { LIST_COMPONENT_REPOSITORIES_OK } from 'test/mocks/component-repository/componentRepositories';
 import { makeRequest, METHODS } from '@entando/apimanager';
 import { composeCMApiDomain } from 'helpers/apiDomainComposer';
-// import { getEntandoVirtualContextFromCookies } from 'helpers/cookies';
-import { getContextFromURL } from 'app-init/contextProvider';
-
+import { getContextFromURL } from 'helpers/contextUtils';
 // eslint-disable-next-line import/prefer-default-export
 export const getComponentRepositories = (page = { page: 1, pageSize: 10 }, params = '') => (
   makeRequest(

src/api/component-repository/components.js

@@ -14,8 +14,7 @@ import {
 } from 'test/mocks/component-repository/components';
 import { makeRequest, METHODS } from '@entando/apimanager';
 import { composeCMApiDomain } from 'helpers/apiDomainComposer';
-// import { getEntandoVirtualContextFromCookies } from 'helpers/cookies';
-import { getContextFromURL } from 'app-init/contextProvider';
+import { getContextFromURL } from 'helpers/contextUtils';
 
 export const getECRComponent = base64EncodedUrl => (
   makeRequest({

src/api/component-repository/hub.js

@@ -6,8 +6,7 @@ import {
 } from 'test/mocks/component-repository/hub';
 import { makeRequest, METHODS } from '@entando/apimanager';
 import { composeCMApiDomain } from 'helpers/apiDomainComposer';
-// import { getEntandoVirtualContextFromCookies } from 'helpers/cookies';
-import { getContextFromURL } from 'app-init/contextProvider';
+import { getContextFromURL } from 'helpers/contextUtils';
 
 export const NO_PAGE = { page: 1, pageSize: 0 };
 

src/api/mfe.js

@@ -1,9 +1,7 @@
 import { makeRequest, METHODS } from '@entando/apimanager';
 import { LIST_MFE_RESPONSE_OK } from 'test/mocks/mfe';
 import { composeCMApiDomain } from 'helpers/apiDomainComposer';
-// import { getEntandoVirtualContextFromCookies } from 'helpers/cookies';
-import { getContextFromURL } from 'app-init/contextProvider';
-
+import { getContextFromURL } from 'helpers/contextUtils';
 // eslint-disable-next-line import/prefer-default-export
 export const getMfeConfigList = (params = '') => (
   makeRequest({

src/app-init/apiManager.js

@@ -14,7 +14,7 @@ import pluginsArray from 'entando-plugins';
 import withAuth from 'auth/withAuth';
 import getRuntimeEnv from 'helpers/getRuntimeEnv';
 import { keycloak } from 'auth/keycloak/KeycloakProviderContainer';
-import { getBaseUrlWithVirtualContext } from './contextProvider';
+import { getBaseUrlWithVirtualContext } from 'helpers/contextUtils';
 
 const ApiManager = ({
   auth,
@@ -28,7 +28,6 @@ const ApiManager = ({
       store.dispatch(clearAppTourProgress());
       if (keycloak) {
         const { origin } = window.location;
-        console.log('origin', origin);
         keycloak.redirectUri = `${origin}${process.env.PUBLIC_URL || ''}${ROUTE_DASHBOARD}`;
       }
       auth.logout(status);
@@ -49,11 +48,9 @@ const ApiManager = ({
         return;
       }
       const route = pathname ? pathname.replace(getBaseUrlWithVirtualContext(process.env.PUBLIC_URL), '') : null;
-      console.log('route', route);
       const goto = auth.enabled && route && route !== ROUTE_HOME
         ? route
         : ROUTE_DASHBOARD;
-      console.log('goto', goto);
       history.push(goto);
     }
   };

src/app-init/router.js

@@ -1,5 +1,5 @@
 import { createBrowserHistory } from 'history';
-import { getBaseUrlWithVirtualContext } from './contextProvider';
+import { getBaseUrlWithVirtualContext } from 'helpers/contextUtils';
 
 export const history = createBrowserHistory({
   basename: getBaseUrlWithVirtualContext(process.env.PUBLIC_URL),

src/helpers/contextUtils.js

@@ -0,0 +1,20 @@
+import getRuntimeEnv from 'helpers/getRuntimeEnv';
+
+const getContextFromURL = (pathname) => {
+  const pathFragments = pathname.split('/');
+  const publicUrlIndex = pathFragments.findIndex(el => el === process.env.PUBLIC_URL.replace('/', ''));
+  const context = pathFragments[publicUrlIndex + 1];
+
+  const { ENTANDO_VIRTUAL_CONTEXTS } = getRuntimeEnv();
+  const virtualContexts = ENTANDO_VIRTUAL_CONTEXTS.split(',');
+  if (virtualContexts.includes(context)) return context;
+  return '';
+};
+
+
+const getBaseUrlWithVirtualContext = (baseUrl) => {
+  const virtualContext = getContextFromURL(window.location.pathname);
+  return virtualContext ? `${baseUrl}/${virtualContext}` : baseUrl;
+};
+
+export { getBaseUrlWithVirtualContext, getContextFromURL };

src/helpers/getRuntimeEnv.js

@@ -26,7 +26,6 @@ const getContextFromURL = (pathname, entVirtualContexts) => {
 };
 
 const validateDomain = (domain) => {
-  console.log('ENTANDO_VIRTUAL_CONTEXTS', getEnvVar('ENTANDO_VIRTUAL_CONTEXTS'));
   const virtualContext = getContextFromURL(window.location.pathname, getEnvVar('ENTANDO_VIRTUAL_CONTEXTS'));
   if (domain) {
     const isValidURL = isURL(domain, {
@@ -38,22 +37,17 @@ const validateDomain = (domain) => {
     if (!isValidURL) {
       throw new Error('The DOMAIN env variable is invalid.');
     }
-    console.log('domain', domain);
     let domainWithContext = domain;
     if (virtualContext) {
       if (domain === '/') domainWithContext = `/${virtualContext}`;
       else domainWithContext = `${domain}/${virtualContext}`;
-      console.log('domainWithContext', domainWithContext);
     }
-    console.log('Questo è il domain finale', domainWithContext.replace(/\/+$/, ''));
     return domainWithContext.replace(/\/+$/, '');
   }
   if (virtualContext) {
-    console.log('Questo è domain finale 2', virtualContext);
     return `/${virtualContext}`;
   }
 
-  console.log('Questo è domain vuoto');
   return '';
 };
 

src/index.js

@@ -29,7 +29,6 @@ import '@entando/pagetreeselector/dist/css/index.css';
 import '@entando/datatable/dist/css/index.css';
 
 import 'index.scss';
-import { ContextProvider } from 'app-init/contextProvider';
 
 // init namespace for the shell
 if (!window.entando) window.entando = {};
@@ -49,19 +48,17 @@ const AppRoot = (
 // exporting for tests
 export default ReactDOM.render(
   <Provider store={store}>
-    <ContextProvider>
-      <AuthProvider store={store}>
-        <IntlProviderContainer>
-          <ApiManager store={store}>
-            {process.env.USE_MFE ? (
-              <MfeDownloadManager>
-                {AppRoot}
-              </MfeDownloadManager>
-          ) : AppRoot}
-          </ApiManager>
-        </IntlProviderContainer>
-      </AuthProvider>
-    </ContextProvider>
+    <AuthProvider store={store}>
+      <IntlProviderContainer>
+        <ApiManager store={store}>
+          {process.env.USE_MFE ? (
+            <MfeDownloadManager>
+              {AppRoot}
+            </MfeDownloadManager>
+        ) : AppRoot}
+        </ApiManager>
+      </IntlProviderContainer>
+    </AuthProvider>
   </Provider>,
   document.getElementById('root'),
 );

src/ui/internal-page/ContextSelect.js

@@ -1,8 +1,7 @@
 import React from 'react';
-// import { setEntandoVirtualContextInCookies } from 'helpers/cookies';
 import { injectIntl, intlShape } from 'react-intl';
 import getRuntimeEnv from 'helpers/getRuntimeEnv';
-import { getContextFromURL } from 'app-init/contextProvider';
+import { getContextFromURL } from 'helpers/contextUtils';
 
 
 const { ENTANDO_VIRTUAL_CONTEXTS } = getRuntimeEnv();

src/ui/internal-page/VerticalMenuContainer.js

@@ -46,7 +46,7 @@ import MfeContainer from 'ui/app/MfeContainer';
 import { getAppTourlastStep } from 'state/app-tour/selectors';
 // import { selectIsPrimaryTenant } from 'state/multi-tenancy/selectors';
 import { selectCurrSystemConfigAdvancedSearch } from 'state/current-system-configuration/selectors';
-import { getBaseUrlWithVirtualContext } from 'app-init/contextProvider';
+import { getBaseUrlWithVirtualContext } from 'helpers/contextUtils';
 import getRuntimeEnv from 'helpers/getRuntimeEnv';
 import ContextSelect from './ContextSelect';