Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Flag for 8.1.0.0 release #294

Merged
merged 7 commits into from
Jul 31, 2023
Merged
Show file tree
Hide file tree
Changes from 6 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
1 change: 1 addition & 0 deletions dev.bat
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ echo.
echo VERSION = %VERSION%
echo INPUT_FOLDER = %INPUT_FOLDER%
echo OUTPUT_FOLDER= %OUTPUT_FOLDER%
echo CURAM_VERSION= %CURAM_VERSION%
echo.

call docker-compose rm -f -s -v
Expand Down
1 change: 1 addition & 0 deletions dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ echo
echo VERSION = $VERSION
echo INPUT_FOLDER = $INPUT_FOLDER
echo OUTPUT_FOLDER = $OUTPUT_FOLDER
echo CURAM_VERSION= $CURAM_VERSION
echo

docker-compose rm -f -s -v
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ services:
volumes:
- ${INPUT_FOLDER}:/home/workspace/input
- ${OUTPUT_FOLDER}:/home/workspace/output
environment:
- CURAM_VERSION=${CURAM_VERSION}
beanparser:
build:
context: packages/window-size-tool/parser
Expand Down
1,406 changes: 1,406 additions & 0 deletions packages/css-rules-tool/rulesCds/configuration-cluster.json

Large diffs are not rendered by default.

44 changes: 44 additions & 0 deletions packages/css-rules-tool/rulesCds/configuration-input.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"SelectorRemove": [
{ "value": ".input.text" },
{ "value": ".soria input" },
{ "value": "input.password" },
{ "value": "input.password-confirm" },
{ "value": "input.password-field" },
{ "value": "#Curam_WCSAClaimEst_create div.cluster table tbody td.field input.password" },
{ "value": ".rtl input.text" },
{ "value": ".rtl input.password" },
{ "value": ".soria input.text::-ms-clear" },
{ "value": ".soria input.password::-ms-clear" },
{ "value": "body.curam.soria .calendar input" },
{ "value": ".search-input-controls input.text" },
{ "value": "body.mobile.curam.soria input.text" },
{ "value": ".soria div.list td.field input.text" },
{ "value": "body#Curam_frequency-editor input.text" },
{ "value": "body.curam.soria .calendar input:hover" },
{ "value": "body.curam.soria .calendar input:focus" },
{ "value": "body.curam.soria div.list table td.codetable input" },
{ "value": "body.curam.soria div.cluster table td.codetable input" },
{ "value": ".rtl .soria div.list td.field input.text" },
{ "value": "body.curam.soria .calendar input:disabled" },
{ "value": "body#Curam_frequency-editor td input.text" },
{ "value": ".rtl body#Curam_frequency-editor input.text" },
{ "value": ".soria div.list td.field input.text.disabled" },
{ "value": "body.curam#Curam_frequency-editor td input.text" },
{ "value": "body.soria div.list table tbody td.field input.text" },
{ "value": "body.rtl.curam#Curam_frequency-editor td input.text" },
{ "value": "body.curam#Curam_frequency-editor td input.text:hover" },
{ "value": "body.curam#Curam_frequency-editor td input.text:focus" },
{ "value": "body.curam.soria div.list table tbody td.field input.text" },
{ "value": "body.curam.soria div.list table tbody td.field input.text:hover" },
{ "value": "body.curam.soria div.list table tbody td.field input.text:focus" },
{ "value": "body.curam.soria div.list table tbody td.field input.text:disabled" },
{ "value": "body.curam.soria.rtl div.list table tbody td.field input.text:focus" }
],
"SelectorReplace": [
{
"value": "body#Curam_user-prefs-editor input.non-radio",
"newValue": "body#Curam_user-prefs-editor input.non-radio"
}
]
}
184 changes: 184 additions & 0 deletions packages/css-rules-tool/rulesCds/configuration-modal.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
{
"SelectorRemove": [
{ "value": "body.curam.soria .cluster .calendar td.current-month" },
{ "value": "body.curam.soria .dijitDialogUnderlay" },
{ "value": "body.curam.soria .dijitDialogUnderlayWrapper" },
{ "value": "body.curam.soria div.modalDialog" },
{ "value": "body.curam.modal div.action-exists" },
{ "value": "body.curam.modal div.actions-panel" },
{ "value": "body.curam.soria div.dijitDialogTitleBar" },
{ "value": "body.curam.soria div.modalDialog div.dijitDialogTitleBar span.dijitDialogTitle" },
{ "value": "html.dj_chrome body.curam.soria div.modalDialog div.dijitDialogTitleBar span.dijitDialogTitle" },
{ "value": "html.dj_chrome body.rtl.curam.soria div.modalDialog div.dijitDialogTitleBar span.dijitDialogTitle" },
{ "value": "body.rtl.curam.soria div.modalDialog div.dijitDialogTitleBar span.dijitDialogTitle" },
{ "value": "body.curam.soria div.modalDialog div.dijitDialogPaneContent" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogHelpIcon" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon" },
{ "value": "body.curam.soria div.modalDialog span.dijitDialogHelpIcon" },
{ "value": "body.rtl.curam.soria div.modalDialog span.dijitDialogHelpIcon" },
{ "value": "body.curam.soria div.modalDialog span.dijitDialogHelpIcon:hover" },
{ "value": "body.curam.soria div.modalDialog span.dijitDialogHelpIcon:focus" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon" },
{ "value": "body.rtl.curam.soria div.modalDialog .dijitDialogCloseIcon" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon:hover" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon:focus" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon .button-close-icon-default" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon .button-close-icon-hover" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogHelpIcon .button-help-icon-default" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogHelpIcon .button-help-icon-hover" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon .button-close-icon-default" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon:hover .button-close-icon-hover" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon:focus .button-close-icon-hover" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogHelpIcon .button-help-icon-default" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogHelpIcon:hover .button-help-icon-hover" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogHelpIcon:focus .button-help-icon-hover" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon:hover .button-close-icon-default" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon:focus .button-close-icon-default" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogCloseIcon .button-close-icon-hover" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogHelpIcon:hover .button-help-icon-default" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogHelpIcon:focus .button-help-icon-default" },
{ "value": "body.curam.soria div.modalDialog .dijitDialogHelpIcon .button-help-icon-hover" },
{ "value": "body.curam.modal.soria.basic div#content" },
{ "value": "body.rtl.curam.modal.soria.basic div#content" },
{ "value": "body.curam.modal.basic div.actions-panel" },
{ "value": "body.curam.modal.basic div.actions-panel div.action-set" },
{ "value": "body.curam.modal.basic div.actions-panel div.action-set.left" },
{ "value": "body.curam.modal.basic div.actions-panel div.action-set.right" },
{ "value": "body.curam.modal.basic div.action-set span.filler" },
{ "value": "body.curam.modal div.actions-panel div.action-set a" },
{ "value": "body.curam.modal div.actions-panel" },
{ "value": "body.modal.curam .action-set a span.left-corner" },
{ "value": "body.modal.curam .action-set a span.right-corner" },
{ "value": "body.modal.curam .action-set a span.middle" },
{ "value": "body.modal.curam .action-set a:hover span.left-corner" },
{ "value": "body.modal.curam .action-set a:hover span.right-corner" },
{ "value": "body.modal.curam .action-set a:hover span.middle" },
{ "value": "body.modal.curam .action-set a:hover input.submit" },
{ "value": "body.modal.curam .action-set a span.left-corner" },
{ "value": "body.modal.curam .action-set a span.right-corner" },
{ "value": "body.modal.curam .action-set a span.middle" },
{ "value": "body.modal.curam .action-set a input.submit" },
{ "value": "body.modal.curam .action-set a.ac" },
{ "value": "body.modal.curam .action-set a.ac span.right-corner" },
{ "value": "body.modal.curam .action-set a.ac:hover" },
{ "value": "body.modal.curam .action-set a.ac:focus" },
{ "value": "body.modal.curam .action-set a.ac .submit" },
{ "value": "::-webkit-scrollbar" },
{ "value": "::-webkit-scrollbar-thumb" },
{ "value": "::-webkit-scrollbar-button" },
{ "value": "::-webkit-scrollbar-button:vertical:increment" },
{ "value": "::-webkit-scrollbar-button:vertical:decrement" },
{ "value": "::-webkit-scrollbar-button:horizontal:increment" },
{ "value": "::-webkit-scrollbar-button:horizontal:decrement" },
{ "value": "::-webkit-scrollbar-corner" },
{ "value": ".soria .dijitDialog span.dijitDialogTitle" },
{ "value": ".soria span.dijitDialogCloseIcon" },
{ "value": ".soria span.dijitDialogCloseIcon.dijitDialogCloseIcon-hover" },
{ "value": ".soria .dojoMoveItem span.dijitDialogCloseIcon.dijitDialogCloseIcon-hover" },
{ "value": ".soria .dijitDialogTitleBar .dijitDialogHelpIcon" },
{ "value": ".soria .dijitDialogTitleBar .dijitDialogHelpIcon-hover" },
{ "value": ".soria .dojoMoveItem .dijitDialogTitleBar .dijitDialogHelpIcon-hover" },
{ "value": ".soria div.dijitDialogTitleBar" },
{ "value": ".soria .dijitDialogUnderlay" },
{ "value": "body.rtl.curam.soria .dijitDialogCloseIcon" },
{ "value": "body.soria .dijitDialog .dijitDialogPaneContent" },
{ "value": ".soria .dijitDialog span.dijitDialogTitle" },
{ "value": ".soria span.dijitDialogCloseIcon" },
{ "value": ".soria span.dijitDialogCloseIcon.dijitDialogCloseIcon-hover" },
{ "value": ".soria .dojoMoveItem span.dijitDialogCloseIcon.dijitDialogCloseIcon-hover" },
{ "value": ".soria .dijitDialogTitleBar .dijitDialogHelpIcon" },
{ "value": ".soria .dijitDialogTitleBar .dijitDialogHelpIcon-hover" },
{ "value": ".soria .dojoMoveItem .dijitDialogTitleBar .dijitDialogHelpIcon-hover" },
{ "value": ".soria div.dijitDialogTitleBar" },
{ "value": ".soria .dijitDialogUnderlay" },
{ "value": "body.wizard-controls div.actions-panel div.action-set a" },
{ "value": "body.wizard-controls div.actions-panel a.ac" },
{ "value": "body.wizard-controls div.actions-panel span" },
{ "value": "body.wizard-controls div.actions-panel div.action-set" },
{ "value": "body.wizard-controls div.actions-panel div.action-set div.center" },
{ "value": "body.wizard-controls div.actions-panel div.action-set div.center span.filler" },
{ "value": "body.wizard-controls div.actions-panel div.action-set div.left" },
{ "value": "body.wizard-controls div.actions-panel div.action-set div.right" },
{ "value": "body.wizard-controls div.actions-panel" },
{ "value": "body.wizard-controls div.actions-panel div.action-set div.left.disabled" },
{ "value": "body.wizard-controls div.actions-panel div.action-set div.left.disabled div.right" },
{ "value": "body.wizard-controls div.actions-panel div.action-set div.left.disabled div.center" },
{ "value": "body.wizard-controls div.actions-panel div.action-set div.left.disabled span" },
{ "value": ".dijitDialog iframe" },
{ "value": ".soria .dijitDialog.modalDialog.dojoMoveItem .dijitDialogPaneContent" },
{ "value": ".soria .dijitDialog.modalDialog.dojoMoveItem iframe" },
{ "value": "body.modal .action-set a" },
{ "value": "body.modal .action-set" },
{ "value": "body.modal .action-set .left-corner" },
{ "value": "body.modal .action-set .right-corner" },
{ "value": "body.modal .action-set .middle" },
{ "value": "body.modal .action-set a:hover .left-corner" },
{ "value": "body.modal .action-set a:hover .right-corner" },
{ "value": "body.modal .action-set a:hover .middle" },
{ "value": "body.modal div.action-set a.selected-button .left-corner" },
{ "value": "body.modal div.action-set a.selected-button .right-corner" },
{ "value": "body.modal div.action-set a.selected-button .middle" },
{ "value": "body.modal .action-set" },
{ "value": "body.modal .action-set" },
{ "value": ".wizard-controls-panel" },
{ "value": "body.modal .action-set .disabled-button .left-corner" },
{ "value": "body.soria div.dijitBorderContainer div.actions-panel" },
{ "value": "body.modal div.content-panel div#page-action-set-top" },
{ "value": "body.modal div.content-panel div#page-action-set-bottom" },
{ "value": ".dijitDialog span.dijitDialogTitle" },
{ "value": "body.basic div#modal-actions-panel .action-set .left-corner-disabled" },
{ "value": "body.basic div#modal-actions-panel .action-set .right-corner-disabled" },
{ "value": "body.basic div#modal-actions-panel .action-set .middle-disabled" },
{ "value": "body.soria .dijitDialog .closeText" },
{ "value": ".soria .dijitDialog span.dijitDialogTitle" },
{ "value": "body.modal .actions-panel .action-set a" },
{ "value": ".rtl .soria .dijitDialog span.dijitDialogTitle" },
{ "value": ".rtl .soria span.dijitDialogCloseIcon" },
{ "value": ".rtl .soria .dijitDialogTitleBar .dijitDialogHelpIcon" },
{ "value": "[lang|=\"ar\"] .rtl .soria .dijitDialogTitleBar .dijitDialogHelpIcon" },
{ "value": "body.rtl.wizard-controls div.actions-panel div.action-set" },
{ "value": "body.rtl.wizard-controls div.actions-panel div.action-set div.left" },
{ "value": "body.rtl.wizard-controls div.actions-panel div.action-set div.right" },
{ "value": "body.rtl.wizard-controls div.actions-panel div.action-set" },
{ "value": "body.rtl.wizard-controls div.actions-panel div.action-set div.left" },
{ "value": "body.rtl.wizard-controls div.actions-panel div.action-set div.right" }
],
"SelectorReplace": [
{
"value": "body.curam .modalDialog .in-page-nav-tabContainer",
"newValue": "body.curam .cds--modal-content .in-page-nav-tabContainer"
},
{
"value": "body.curam .modalDialog .in-page-nav-tabContainer .dijitTabContainerTop-tabs",
"newValue": "body.curam .cds--modal-content .in-page-nav-tabContainer .dijitTabContainerTop-tabs"
},
{
"value": "body.curam .modalDialog .in-page-nav-tabContainer .dijitTabContainerTop-tabs .dijitTab",
"newValue": "body.curam .cds--modal-content .in-page-nav-tabContainer .dijitTabContainerTop-tabs .dijitTab"
},
{
"value": "body.curam .modalDialog .in-page-nav-tabContainer.dijitTabContainerTop .dijitTabListWrapper",
"newValue": "body.curam .cds--modal-content .in-page-nav-tabContainer.dijitTabContainerTop .dijitTabListWrapper"
},
{
"value": "body.curam .modalDialog .in-page-nav-tabContainer .dijitTabHover .tabLabel",
"newValue": "body.curam .cds--modal-content .in-page-nav-tabContainer .dijitTabHover .tabLabel"
},
{
"value": "body.curam .modalDialog .in-page-nav-tabContainer .dijitTabChecked.dijitTabHover .tabLabel",
"newValue": "body.curam .cds--modal-content .in-page-nav-tabContainer .dijitTabChecked.dijitTabHover .tabLabel"
},
{
"value": "body.curam .modalDialog .in-page-nav-tabContainer .dijitTabChecked .dijitTabInnerDiv .dijitTabContent",
"newValue": "body.curam .cds--modal-content .in-page-nav-tabContainer .dijitTabChecked .dijitTabInnerDiv"
},
{
"value": "body.curam .modalDialog .in-page-nav-tabContainer .dijitTabChecked .dijitTabInnerDiv",
"newValue": "body.curam .cds--modal-content .in-page-nav-tabContainer .dijitTabChecked .dijitTabInnerDiv"
},
{
"value": "body.curam .modalDialog .uimController .ipnTabController",
"newValue": "body.curam .cds--modal-content .uimController .ipnTabController"
}
]
}
1 change: 1 addition & 0 deletions packages/shared-utils/src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const loadConfig = (overrides = {}) => {
cssRulesTool: {
// Folder where CSS rules are located
rulesFolder: "../css-rules-tool/rules",
rulesFolderCds:"../css-rules-tool/rulesCds"
},
// icon-replacer-tool options
iconReplacerTool: {
Expand Down
4 changes: 4 additions & 0 deletions packages/shared-utils/src/config.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ test('config test with defaults', () => {
logLevel: "normal",
cssRulesTool: {
rulesFolder: "../css-rules-tool/rules",
rulesFolderCds: "../css-rules-tool/rulesCds",
},
iconReplacerTool: {
exclude: ["zip", "class", "jpg", "jpeg", "gif", "png"],
Expand Down Expand Up @@ -37,6 +38,7 @@ test('config test with all overrides', () => {
logLevel: "quiet",
cssRulesTool: {
rulesFolder: "ccc",
rulesFolderCds: "cccddd",
},
iconReplacerTool: {
exclude: "ggg",
Expand Down Expand Up @@ -68,6 +70,7 @@ test('config test with some overrides', () => {
logLevel: "quiet",
cssRulesTool: {
rulesFolder: "../some-rules-folder",
rulesFolderCds: "../some-rules-folderCds",
},
internal: {
ignorePatternsFile: "eee",
Expand All @@ -79,6 +82,7 @@ test('config test with some overrides', () => {
logLevel: "quiet",
cssRulesTool: {
rulesFolder: "../some-rules-folder",
rulesFolderCds: "../some-rules-folderCds"
},
iconReplacerTool: {
exclude: ["zip", "class", "jpg", "jpeg", "gif", "png"],
Expand Down
10 changes: 9 additions & 1 deletion packages/shared-utils/src/rulesUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,15 @@ const filesAndFolders = require("./filesAndFolders");
*/
const loadRules = config => {
const rulesJson = [];
const rulesFiles = filesAndFolders.glob(`${config.cssRulesTool.rulesFolder}/*.json`);
const curamVersion = process.env.CURAM_VERSION;
const regex = new RegExp("[8].[1-9].[0-9].[0-9]");
Copy link
Collaborator

@bdjos1 bdjos1 Jul 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder will this Regex satisfy an IFix too? e.g 8.1.0.0_iFix1. As it is it might satisfy an iFix condition too or you might have to add a "." e.g new RegExp("[8].[1-9].[0-9].[0-9]."

const newVersion=regex.test(curamVersion);

if(newVersion == true){
rulesFiles = filesAndFolders.glob(`${config.cssRulesTool.rulesFolderCds}/*.json`);
}else{
rulesFiles = filesAndFolders.glob(`${config.cssRulesTool.rulesFolder}/*.json`);
}
rulesFiles.forEach(file => rulesJson.push(readRulesFile(file)));
return mergeAndSortRules(rulesJson);
}
Expand Down
3 changes: 2 additions & 1 deletion packages/shared-utils/src/rulesUtils.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const { loadRules } = require("./rulesUtils");
let info = console.info;
beforeEach(() => {
console.info = () => {};
process.env.CURAM_VERSION="8.0.1.0";
});

afterEach(() => {
Expand All @@ -12,7 +13,7 @@ afterEach(() => {

test('ruleUtils test', () => {
const overrides = {
cssRulesTool: {
cssRulesTool: {
rulesFolder: "./src/test-data/rulesUtils/rulesFolder",
},
logLevel: "quiet",
Expand Down
5 changes: 5 additions & 0 deletions packages/window-size-tool/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,8 @@ dist
/input/
/output/
/test/

# Jars
/lib/
*.jar
*.cpgz
3 changes: 2 additions & 1 deletion spm-ui-upgrade-helper.bat
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ if "%DETACH%" == "true" (
set DETACH_CMD=
)


echo Starting spm-ui-upgrade-helper
echo.
echo VERSION = %VERSION%
echo INPUT_FOLDER = %INPUT_FOLDER%
echo OUTPUT_FOLDER = %OUTPUT_FOLDER%
echo DETACH_CMD = %DETACH_CMD%
echo CURAM_VERSION = %CURAM_VERSION%
echo.

call docker-compose rm -v -s -f
Expand Down
1 change: 1 addition & 0 deletions spm-ui-upgrade-helper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ echo VERSION = $VERSION
echo INPUT_FOLDER = $INPUT_FOLDER
echo OUTPUT_FOLDER = $OUTPUT_FOLDER
echo DETACH_CMD = $DETACH_CMD
echo CURAM_VERSION = $CURAM_VERSION
echo

docker-compose rm -v -s -f
Expand Down