-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve usage of config and i18n #7972
- Loading branch information
1 parent
eb539a0
commit 65cd7eb
Showing
10 changed files
with
96 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
modules/app/src/main/resources/admin/widgets/settings/settings.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
<widget id="widget-settings"> | ||
<script src="{{assetsUri}}" data-config-service-url="{{configServiceUrl}}" data-widget-id="widget-settings"></script> | ||
<script type="application/json" id="{{configScriptId}}">{{{configAsJson}}}</script> | ||
<script src="{{assetsUri}}" data-config-script-id="{{configScriptId}}" data-widget-id="widget-settings"></script> | ||
</widget> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
/*global app, resolve*/ | ||
|
||
const admin = require('/lib/xp/admin'); | ||
const portal = require('/lib/xp/portal'); | ||
const contextLib = require('/lib/xp/context'); | ||
|
||
function getConfig() { | ||
const context = contextLib.get(); | ||
const branch = context.branch; | ||
const allowContentUpdate = app.config['publishingWizard.allowContentUpdate'] !== 'false'; | ||
const excludeDependencies = app.config['publishingWizard.excludeDependencies'] === 'true' || false; | ||
const allowPathTransliteration = app.config['contentWizard.allowPathTransliteration'] !== 'false'; | ||
const enableCollaboration = app.config['contentWizard.enableCollaboration'] !== 'false'; | ||
const defaultPublishFromTime = parseTime(app.config['publishingWizard.defaultPublishFromTime']); | ||
const toolUri = admin.getToolUrl( | ||
app.name, | ||
'main' | ||
); | ||
return { | ||
allowContentUpdate, | ||
excludeDependencies, | ||
allowPathTransliteration, | ||
adminUrl: admin.getBaseUri(), | ||
assetsUri: portal.assetUrl({ | ||
path: '' | ||
}), | ||
toolUri: toolUri, | ||
appId: app.name, | ||
appVersion: app.version, | ||
branch, | ||
enableCollaboration, | ||
defaultPublishFromTime, | ||
locale: admin.getLocale(), | ||
services: { | ||
contentUrl: portal.apiUrl({ | ||
api: 'content', | ||
}), | ||
i18nUrl: portal.apiUrl({ | ||
api: 'i18n', | ||
}), | ||
licenseUrl: portal.apiUrl({ | ||
api: 'license', | ||
}), | ||
stylesUrl: portal.apiUrl({ | ||
api: 'styles', | ||
}), | ||
collaborationUrl: portal.apiUrl({ | ||
api: 'collaboration', | ||
}), | ||
exportServiceUrl: portal.apiUrl({ | ||
api: 'export', | ||
}), | ||
}, | ||
theme: 'light', | ||
/* Remove in CS/lib-admin-ui 5.0 */ | ||
launcher: { | ||
theme: 'light' | ||
}, | ||
widgetApiUrl: portal.apiUrl({ | ||
application: 'admin', | ||
api: 'widget', | ||
}), | ||
}; | ||
} | ||
|
||
function parseTime(value) { | ||
const timeRegex = /^(0[0-9]|1[0-9]|2[0-3]):([0-5][0-9])$/; | ||
return timeRegex.test(value) ? value : null; | ||
} | ||
|
||
function generateScriptConfigId() { | ||
return Math.random().toString(36).substring(2, 15); | ||
} | ||
|
||
exports.getConfig = getConfig; | ||
exports.generateScriptConfigId = generateScriptConfigId; |