Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function getClientEnvironment(publicUrl) {
CLIENT_SECRET: process.env.CLIENT_SECRET || 'appbuilder_secret',
KEYCLOAK_ENABLED: process.env.KEYCLOAK_ENABLED === 'true',
APP_BUILDER_VERSION: process.env.npm_package_version || '',
ENTANDO_VIRTUAL_CONTEXTS: process.env.ENTANDO_VIRTUAL_CONTEXTS || '',
AB_ENTANDO_VIRTUAL_CONTEXTS: process.env.AB_ENTANDO_VIRTUAL_CONTEXTS || '',
DOMAIN_CM: process.env.DOMAIN_CM || '',
},
);
Expand Down
2 changes: 1 addition & 1 deletion docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV_JSON='{'
[ -n "${DOMAIN:-""}" ] && ENV_JSON+='"DOMAIN":"'"$DOMAIN"'", '
[ -n "${DOMAIN_CM:-""}" ] && ENV_JSON+='"DOMAIN_CM":"'"$DOMAIN_CM"'", '
[ -n "${KEYCLOAK_JSON:-""}" ] && ENV_JSON+='"KEYCLOAK_JSON":"'"$KEYCLOAK_JSON"'", '
[ -n "${ENTANDO_VIRTUAL_CONTEXTS:-""}" ] && ENV_JSON+='"ENTANDO_VIRTUAL_CONTEXTS":"'"$ENTANDO_VIRTUAL_CONTEXTS"'"'
[ -n "${AB_ENTANDO_VIRTUAL_CONTEXTS:-""}" ] && ENV_JSON+='"AB_ENTANDO_VIRTUAL_CONTEXTS":"'"$AB_ENTANDO_VIRTUAL_CONTEXTS"'"'
ENV_JSON+='}'

ESCAPED_ENV_JSON=$(echo $ENV_JSON | sed 's/\"/\\\"/g' | sed 's/\//\\\//g' | tr -d '\n' | tr -d '[[:blank:]]')
Expand Down
4 changes: 2 additions & 2 deletions src/helpers/contextUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const getContextFromURL = (pathname) => {
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(',');
const { AB_ENTANDO_VIRTUAL_CONTEXTS } = getRuntimeEnv();
const virtualContexts = AB_ENTANDO_VIRTUAL_CONTEXTS.split(',');
if (virtualContexts.includes(context)) return context;
return '';
};
Expand Down
4 changes: 2 additions & 2 deletions src/helpers/getRuntimeEnv.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const getContextFromURL = (pathname, entVirtualContexts) => {
};

const validateDomain = (domain) => {
const virtualContext = getContextFromURL(window.location.pathname, getEnvVar('ENTANDO_VIRTUAL_CONTEXTS'));
const virtualContext = getContextFromURL(window.location.pathname, getEnvVar('AB_ENTANDO_VIRTUAL_CONTEXTS'));
if (domain) {
const isValidURL = isURL(domain, {
allow_protocol_relative_urls: true,
Expand Down Expand Up @@ -54,6 +54,6 @@ export default () => ({
COMPONENT_REPOSITORY_UI_ENABLED: getBooleanEnvVar('COMPONENT_REPOSITORY_UI_ENABLED'),
DOMAIN: validateDomain(getEnvVar('DOMAIN')),
KEYCLOAK_JSON: getEnvVar('KEYCLOAK_JSON') || `${validateDomain(getEnvVar('DOMAIN'))}/keycloak.json`,
ENTANDO_VIRTUAL_CONTEXTS: getEnvVar('ENTANDO_VIRTUAL_CONTEXTS'),
AB_ENTANDO_VIRTUAL_CONTEXTS: getEnvVar('AB_ENTANDO_VIRTUAL_CONTEXTS'),
DOMAIN_CM: getEnvVar('DOMAIN_CM'),
});
4 changes: 2 additions & 2 deletions src/ui/internal-page/ContextSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { injectIntl, intlShape } from 'react-intl';
import getRuntimeEnv from 'helpers/getRuntimeEnv';
import { determineBestLandingUrl, getContextFromURL } from 'helpers/contextUtils';

const { ENTANDO_VIRTUAL_CONTEXTS } = getRuntimeEnv();
const { AB_ENTANDO_VIRTUAL_CONTEXTS } = getRuntimeEnv();

const ContextSelect = ({ intl }) => (
<li className="ContextSelect">
Expand All @@ -21,7 +21,7 @@ const ContextSelect = ({ intl }) => (
}}
>
{
ENTANDO_VIRTUAL_CONTEXTS.split(',').map(ctx => (
AB_ENTANDO_VIRTUAL_CONTEXTS.split(',').map(ctx => (
ctx === 'ROOT' ?
<option value={ctx} key={ctx} className="ContextSelect__option">
{intl.formatMessage({ id: 'contextSelect.ROOT' })}
Expand Down
4 changes: 2 additions & 2 deletions src/ui/internal-page/VerticalMenuContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ const renderCmsMenuItems = (intl, userPermissions, systemReport, currSysConfigAd
// iconClass="fa fa-cart-plus"
// title={intl.formatMessage({ id: 'componentRepository.menuButton.title' })}
// />) : '');
const { ENTANDO_VIRTUAL_CONTEXTS } = getRuntimeEnv();
const { AB_ENTANDO_VIRTUAL_CONTEXTS } = getRuntimeEnv();
const getHeader = (onStartTutorial, intl, userPermissions) => (
<Masthead>
<Brand
Expand All @@ -191,7 +191,7 @@ const getHeader = (onStartTutorial, intl, userPermissions) => (
/>
<VerticalNav.IconBar collapse>
{hasAccess(SUPERUSER_PERMISSION, userPermissions || [])
&& ENTANDO_VIRTUAL_CONTEXTS && <ContextSelect intl={intl} />}
&& AB_ENTANDO_VIRTUAL_CONTEXTS && <ContextSelect intl={intl} />}
<LanguageSelectContainer key="LanguageSelect" />
<HomePageLinkContainer key="projectLink" />
<InfoMenu key="InfoMenu" onStartTutorial={onStartTutorial} />
Expand Down
Loading