-
Notifications
You must be signed in to change notification settings - Fork 470
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
Issue 13469 workflow multi lang #13509
Conversation
Jonathan seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
); | ||
|
||
private static final Map<DbType, String> addLanguageIdForeignKeySQLMap = map( | ||
DbType.POSTGRESQL, "alter table workflow_task add constraint FK_workflow_task_language foreign key (language_id) references language(id)", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
new DotConnect().setSQL("select id from Language where language_code=? and and (country_code = '' OR country_code IS NULL)") | ||
.addParam(languageCode.toLowerCase()).loadObjectResults(); | ||
|
||
return null != results && results.size() > 0? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
} | ||
|
||
new DotConnect().setSQL(this.getSelectLanguageIdColumnSQL()).loadObjectResults(); | ||
} catch (Throwable e) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
||
private static final Map<DbType, String> addLanguageIdForeignKeySQLMap = map( | ||
DbType.POSTGRESQL, "alter table workflow_task add constraint FK_workflow_task_language foreign key (language_id) references language(id)", | ||
DbType.MYSQL, "ALTER TABLE workflow_task ADD CONSTRAINT FK_workflow_task_language FOREIGN KEY (language_id) REFERENCES language(id)", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
); | ||
|
||
private static final Map<DbType, String> updateLanguageIdColumnSQLMap = map( | ||
DbType.POSTGRESQL, "UPDATE workflow_task SET language_id = ?", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
private static final Map<DbType, String> addLanguageIdForeignKeySQLMap = map( | ||
DbType.POSTGRESQL, "alter table workflow_task add constraint FK_workflow_task_language foreign key (language_id) references language(id)", | ||
DbType.MYSQL, "ALTER TABLE workflow_task ADD CONSTRAINT FK_workflow_task_language FOREIGN KEY (language_id) REFERENCES language(id)", | ||
DbType.ORACLE, "alter table workflow_task add constraint FK_workflow_task_language foreign key (language_id) references language(id)", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DbType.POSTGRESQL, "alter table workflow_task add constraint FK_workflow_task_language foreign key (language_id) references language(id)", | ||
DbType.MYSQL, "ALTER TABLE workflow_task ADD CONSTRAINT FK_workflow_task_language FOREIGN KEY (language_id) REFERENCES language(id)", | ||
DbType.ORACLE, "alter table workflow_task add constraint FK_workflow_task_language foreign key (language_id) references language(id)", | ||
DbType.MSSQL, "ALTER TABLE workflow_task ADD CONSTRAINT FK_workflow_task_language FOREIGN KEY (language_id) REFERENCES language(id)" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
||
private long getDefaultLanguageId() throws DotDataException { | ||
|
||
final String languageCode = Config.getStringProperty("DEFAULT_LANGUAGE_CODE"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
public class Task04330WorkflowTaskAddLanguageIdColumn extends AbstractJDBCStartupTask { | ||
|
||
private static final Map<DbType, String> selectLanguageIdColumnSQLMap = map( | ||
DbType.POSTGRESQL, "SELECT language_id FROM workflow_task", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
private long getDefaultLanguageId() throws DotDataException { | ||
|
||
final String languageCode = Config.getStringProperty("DEFAULT_LANGUAGE_CODE"); | ||
final String countryCode = Config.getStringProperty("DEFAULT_LANGUAGE_COUNTRY_CODE"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
); | ||
|
||
private static final Map<DbType, String> addLanguageIdIndexSQLMap = map( | ||
DbType.POSTGRESQL, "create index idx_workflow_6 on workflow_task (language_id)", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
newStep.setMyOrder(newOrder++); | ||
saveStep(newStep); | ||
IntStream.range(0, steps.size()) | ||
.filter(i -> steps.get(i).getId().equals(step.getId())) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
.filter(i -> steps.get(i).getId().equals(step.getId())) | ||
.boxed() | ||
.findFirst() | ||
.map(i -> steps.remove((int) i)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@@ -79,7 +79,7 @@ static protected WorkflowSQL getInstance() { | |||
protected static String INSERT_STEP= "insert into workflow_step (id, name, scheme_id,my_order,resolved,escalation_enable,escalation_action,escalation_time) values (?, ?, ?, ?, ?, ?, ?, ?) "; | |||
protected static String UPDATE_STEP= "update workflow_step set name=?, scheme_id=?, my_order=?, resolved = ?, escalation_enable = ?, escalation_action=?, escalation_time = ? where id = ?"; | |||
protected static String DELETE_STEP= "delete from workflow_step where id = ?"; | |||
protected static String SELECT_STEP_BY_CONTENTLET= "select workflow_task.id as workflowid, workflow_step.* from workflow_step join workflow_task on workflow_task.status = workflow_step.id where workflow_task.webasset= ?"; | |||
protected static String SELECT_STEP_BY_CONTENTLET= "select workflow_task.id as workflowid, workflow_step.* from workflow_step join workflow_task on workflow_task.status = workflow_step.id where workflow_task.webasset= ? and workflow_task.language_id = ?"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SonarQube analysis reported 18 issues Watch the comments in this conversation to review them. 2 extra issuesNote: The following issues were found on lines that were not modified in the pull request. Because these issues can't be reported as line comments, they are summarized here:
|
|
||
|
||
Logger.debug(this, "Doing reordering of step: " + stepId + ", order: " + order); | ||
this.workflowHelper.reorderStep(stepId, order); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
very good
try { | ||
|
||
if (DbConnectionFactory.isMsSql() && !DbConnectionFactory.getAutoCommit()) { | ||
DbConnectionFactory.setAutoCommit(true); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jdotcms do we need to do this for a SELECT
?
* Updating commit reference for src/main/enterprise * #13309 - Changes in the Upsert Command for Postgres -9.4 (#13403) * #13309 - Changes in the Upsert Command for Postgres -9.4 * #13309 - Changes in the Upsert Command for Postgres -9.4 * Can't save new containers in a layout (#13377) * Can't save new containers in a layout * refactoring * refactoring * merge * doing constructor public again * refactoring * refactoring * #13196 (#13405) * Wrong type #13196 (#13406) * Issue 13352 dnd on workflow (#13382) * #13352 adding drag and drop to workflow builder * #13352 cool new hover trick * #13352 we didn't need api changed * #13352 * Add message key (#13412) * #12991 Need to add action of push publish to content types * #13236 Edit contentlets in page (#13400) js changes * bring back download data/assets changes (#13422) * #13395 CopyContentlet done (#13415) * Fix more jenkins tests (#13427) * Updating commit reference for src/main/enterprise * PermissionAPITest: converted from functional to integration RoleAjax: remove unused user. Can now be tested with server down UserAPITest: fix workflow issues FolderAPITest: fix workflow issues LinkFactoryTest: fix workflow issues ContainerFactoryImpl: Reading version info from api instead of only cache. * #13410 MSSQL Task 04315 Upgrade Fix (#13423) * #13410 MSSQL Task 04315 Upgrade Fix * #13410 MSSQL Task 04315 Upgrade Fix * #13321: Clearing cache to force DB search (#13431) * Remove permission tests from alltestsuite (#13434) * Updating commit reference for src/main/enterprise * PermissionAPITest: converted from functional to integration RoleAjax: remove unused user. Can now be tested with server down UserAPITest: fix workflow issues FolderAPITest: fix workflow issues LinkFactoryTest: fix workflow issues ContainerFactoryImpl: Reading version info from api instead of only cache. * Remove ITest from AllTestSuite. * #13424 fixes the mysql lockup issue (#13426) * #13424 fixes the mysql lockup issue * #13424 closes the preparedstatement * #13241 rethrow the original exception (#13416) * Updating commit reference for src/main/enterprise * Fix TreeTransformer for Oracle. (#13439) * #13433 bring back Backup Data/Assets functionality (#13442) * Added new starter * #13321: Avoiding factory method with API find call inside (#13443) * #13429 (#13432) * Updating commit reference for src/main/enterprise * Added new starter * Clean folderapitest rename (#13456) * Fix TreeTransformer for Oracle. * Dont mess with cache in the test. FolderAPITest.rename * #13384 - Delete Template dependencies popup should display Template Title (#13455) * Workflows tests fixes (#13460) * Workflows tests fixes * Workflows tests fixes * Workflows tests - Adding missing condition (#13461) * #13196 fixing ut for oracle (#13463) * #13196 fixes for upgrade task for msssql (#13462) * Issue 12991 need to add actions push publish content types (#13444) * issue #12991 push publish content types message keys * #12991 push publish content types actions message keys * #12991 push publish content types message keys * Issue 13457 (#13465) * #13457: Remove unused logic * #13457: Add copyTemplate integration test * #13419: Prevent NPE by avoiding Layout parsing when Template not drawn (#13458) * #13419: Prevent NPE by avoiding Layout parsing when Template not drawed * #13419: Adding Will's logic from no-code branch * #12999 - Added MultiTree Transformer (#13438) * #12999 - Added MultiTree Transformer * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * Fix condition check for user api test. More Logging. (#13473) * #13474 Include lang properties changes. (#13476) * Workflows tests - Fixing permissions (#13477) * error common label (#13467) * Include working:true in es query for reindexing content after updating user. Use isInodeIndex with live=false. (#13479) * #13390 cherry-pick the email fix (#13484) * Updating commit reference for src/main/enterprise * http://#13295 set sidebar width in edit layout - Message keys (#13480) * Include more logging for FolderAPITest.delete (#13488) * Issue rest multiple binaries (#13472) * #11620 * #11613 * #13466 - Fixes in Update System Folder when System folder has been re… (#13486) * #13466 - Fixes in Update System Folder when System folder has been renamed * #13466 - Fixes in Update System Folder when System folder has been renamed * Folderapitest rename logging (#13491) * Include more logging for FolderAPITest.delete * more logging. * Adding missing validation (#13489) * Adding missing validation * Fixing Typo * Logging for FolderAPITest.delete * UserAPITest.delete:Load Identifiers from db to avoid cache race conditions. * Issue 13336 (#13487) * #13336 remove CMIS * #13336 remove commented code * #13336 changes DBSearch * #13336 revert changes DBSearch * #13336 missing assignment * Updating commit reference for src/main/enterprise * Issue 13429 missing commit tika lowercase (#13501) * #13429 * missing lowercase * ESUtils: include case for text with whitespace (#13499) ESUtilsTest: test for all special chars and whitespace * Updating commit reference for src/main/enterprise * #13375 - Folder API - Incorrect Query causing cartesian product and o… (#13493) * #13375 - Folder API - Incorrect Query causing cartesian product and out of memory or closed resultsets errors * #13375 - Folder API - Incorrect Query causing cartesian product and out of memory or closed resultsets errors * #10604 add hover options for span tags in website browser (#13490) * #12991 push publish content types - Messages keys (#13500) * Issue 13502 npe on deleted bundle (#13503) * #13429 * fixes #13502 * Use new ami (#13511) * ContentResource: Pass value of REST_API_CONTENT_ALLOW_FRONT_END_SAVIN… (#13510) * ContentResource: Pass value of REST_API_CONTENT_ALLOW_FRONT_END_SAVING to methods to find cats by key or name ContentResourceTest: Added two tests for both cases (true/false) for REST_API_CONTENT_ALLOW_FRONT_END_SAVING when saving content via REST API with anonymous user * #12150 Correct test name. * #12150 Code review changes. * Update ami jenkins (#13512) * Use new ami * New AMI for jenkins continuous tests. * Include isInodeIndexed in test. * Issue 13469 workflow multi lang (#13509) * #13469 multi language support for workflow task * #13469 Adding the multi language step/action workflows * #13469 codacy feedback * Issue 11265 create 4 eyes workflow actionlet (#13366) * #11265 : Adding initial version of the 4-Eyes actionlet. * #11265 : Adding initial version of the 4-Eyes actionlet. * #11265 : - Wrapping up changes in the 4-eyes approval actionlet class. - Adding utility class for common-use methods in actionlets. * #11265 : Adding new type of actionlet parameter that includes validation of role keys. * #11265 : Codacy and Sonar code changes. * #11265 : More Codacy and Sonar code changes. * #11265 : First draft of integration test. Fixing exception throws where the original exception was being swallowed. * #11265 : Adding more tests to the four-eye sub-action integration test. * #13333 need to add action of add to bundle to content types - Adding message keus (#13516) * Missing import * Fix TreeTransformer and ContentletTransformer (#13518) TreeTransformer: Use conversion utils instead of a class for Oracle. TransformerLocator: create only TreeTransformer ContentletTransformer: Use conversion utils to avoid classCastException in oracle * #13375 fix starting up oracle, bc join never finds inode column (#13519) * Remove invalid import. * Fixing failing Jenkins tests. (#13517) * changes to build docker image from gradle file - still need to upgrade gradle wrapper version * cosmetic commit to build.gradle * changed docker tags and added blank line at end of file * upgraded gradle wrapper to 4.4.1 * 4.4.1 gradle wrapper * added reference comment * fixes #13527
* fixes #13435 - changed so rename only happens based on ARCHIVE_IMPORTED_LICENSE_PACKS being true. Also logs failure if appropriate. (#13464) * Issue 13527 build docker image from gradle build (#13529) * Updating commit reference for src/main/enterprise * #13309 - Changes in the Upsert Command for Postgres -9.4 (#13403) * #13309 - Changes in the Upsert Command for Postgres -9.4 * #13309 - Changes in the Upsert Command for Postgres -9.4 * Can't save new containers in a layout (#13377) * Can't save new containers in a layout * refactoring * refactoring * merge * doing constructor public again * refactoring * refactoring * #13196 (#13405) * Wrong type #13196 (#13406) * Issue 13352 dnd on workflow (#13382) * #13352 adding drag and drop to workflow builder * #13352 cool new hover trick * #13352 we didn't need api changed * #13352 * Add message key (#13412) * #12991 Need to add action of push publish to content types * #13236 Edit contentlets in page (#13400) js changes * bring back download data/assets changes (#13422) * #13395 CopyContentlet done (#13415) * Fix more jenkins tests (#13427) * Updating commit reference for src/main/enterprise * PermissionAPITest: converted from functional to integration RoleAjax: remove unused user. Can now be tested with server down UserAPITest: fix workflow issues FolderAPITest: fix workflow issues LinkFactoryTest: fix workflow issues ContainerFactoryImpl: Reading version info from api instead of only cache. * #13410 MSSQL Task 04315 Upgrade Fix (#13423) * #13410 MSSQL Task 04315 Upgrade Fix * #13410 MSSQL Task 04315 Upgrade Fix * #13321: Clearing cache to force DB search (#13431) * Remove permission tests from alltestsuite (#13434) * Updating commit reference for src/main/enterprise * PermissionAPITest: converted from functional to integration RoleAjax: remove unused user. Can now be tested with server down UserAPITest: fix workflow issues FolderAPITest: fix workflow issues LinkFactoryTest: fix workflow issues ContainerFactoryImpl: Reading version info from api instead of only cache. * Remove ITest from AllTestSuite. * #13424 fixes the mysql lockup issue (#13426) * #13424 fixes the mysql lockup issue * #13424 closes the preparedstatement * #13241 rethrow the original exception (#13416) * Updating commit reference for src/main/enterprise * Fix TreeTransformer for Oracle. (#13439) * #13433 bring back Backup Data/Assets functionality (#13442) * Added new starter * #13321: Avoiding factory method with API find call inside (#13443) * #13429 (#13432) * Updating commit reference for src/main/enterprise * Added new starter * Clean folderapitest rename (#13456) * Fix TreeTransformer for Oracle. * Dont mess with cache in the test. FolderAPITest.rename * #13384 - Delete Template dependencies popup should display Template Title (#13455) * Workflows tests fixes (#13460) * Workflows tests fixes * Workflows tests fixes * Workflows tests - Adding missing condition (#13461) * #13196 fixing ut for oracle (#13463) * #13196 fixes for upgrade task for msssql (#13462) * Issue 12991 need to add actions push publish content types (#13444) * issue #12991 push publish content types message keys * #12991 push publish content types actions message keys * #12991 push publish content types message keys * Issue 13457 (#13465) * #13457: Remove unused logic * #13457: Add copyTemplate integration test * #13419: Prevent NPE by avoiding Layout parsing when Template not drawn (#13458) * #13419: Prevent NPE by avoiding Layout parsing when Template not drawed * #13419: Adding Will's logic from no-code branch * #12999 - Added MultiTree Transformer (#13438) * #12999 - Added MultiTree Transformer * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * #12999 - MultiTree Transformer test and fixes * Fix condition check for user api test. More Logging. (#13473) * #13474 Include lang properties changes. (#13476) * Workflows tests - Fixing permissions (#13477) * error common label (#13467) * Include working:true in es query for reindexing content after updating user. Use isInodeIndex with live=false. (#13479) * #13390 cherry-pick the email fix (#13484) * Updating commit reference for src/main/enterprise * http://#13295 set sidebar width in edit layout - Message keys (#13480) * Include more logging for FolderAPITest.delete (#13488) * Issue rest multiple binaries (#13472) * #11620 * #11613 * #13466 - Fixes in Update System Folder when System folder has been re… (#13486) * #13466 - Fixes in Update System Folder when System folder has been renamed * #13466 - Fixes in Update System Folder when System folder has been renamed * Folderapitest rename logging (#13491) * Include more logging for FolderAPITest.delete * more logging. * Adding missing validation (#13489) * Adding missing validation * Fixing Typo * Logging for FolderAPITest.delete * UserAPITest.delete:Load Identifiers from db to avoid cache race conditions. * Issue 13336 (#13487) * #13336 remove CMIS * #13336 remove commented code * #13336 changes DBSearch * #13336 revert changes DBSearch * #13336 missing assignment * Updating commit reference for src/main/enterprise * Issue 13429 missing commit tika lowercase (#13501) * #13429 * missing lowercase * ESUtils: include case for text with whitespace (#13499) ESUtilsTest: test for all special chars and whitespace * Updating commit reference for src/main/enterprise * #13375 - Folder API - Incorrect Query causing cartesian product and o… (#13493) * #13375 - Folder API - Incorrect Query causing cartesian product and out of memory or closed resultsets errors * #13375 - Folder API - Incorrect Query causing cartesian product and out of memory or closed resultsets errors * #10604 add hover options for span tags in website browser (#13490) * #12991 push publish content types - Messages keys (#13500) * Issue 13502 npe on deleted bundle (#13503) * #13429 * fixes #13502 * Use new ami (#13511) * ContentResource: Pass value of REST_API_CONTENT_ALLOW_FRONT_END_SAVIN… (#13510) * ContentResource: Pass value of REST_API_CONTENT_ALLOW_FRONT_END_SAVING to methods to find cats by key or name ContentResourceTest: Added two tests for both cases (true/false) for REST_API_CONTENT_ALLOW_FRONT_END_SAVING when saving content via REST API with anonymous user * #12150 Correct test name. * #12150 Code review changes. * Update ami jenkins (#13512) * Use new ami * New AMI for jenkins continuous tests. * Include isInodeIndexed in test. * Issue 13469 workflow multi lang (#13509) * #13469 multi language support for workflow task * #13469 Adding the multi language step/action workflows * #13469 codacy feedback * Issue 11265 create 4 eyes workflow actionlet (#13366) * #11265 : Adding initial version of the 4-Eyes actionlet. * #11265 : Adding initial version of the 4-Eyes actionlet. * #11265 : - Wrapping up changes in the 4-eyes approval actionlet class. - Adding utility class for common-use methods in actionlets. * #11265 : Adding new type of actionlet parameter that includes validation of role keys. * #11265 : Codacy and Sonar code changes. * #11265 : More Codacy and Sonar code changes. * #11265 : First draft of integration test. Fixing exception throws where the original exception was being swallowed. * #11265 : Adding more tests to the four-eye sub-action integration test. * #13333 need to add action of add to bundle to content types - Adding message keus (#13516) * Missing import * Fix TreeTransformer and ContentletTransformer (#13518) TreeTransformer: Use conversion utils instead of a class for Oracle. TransformerLocator: create only TreeTransformer ContentletTransformer: Use conversion utils to avoid classCastException in oracle * #13375 fix starting up oracle, bc join never finds inode column (#13519) * Remove invalid import. * Fixing failing Jenkins tests. (#13517) * changes to build docker image from gradle file - still need to upgrade gradle wrapper version * cosmetic commit to build.gradle * changed docker tags and added blank line at end of file * upgraded gradle wrapper to 4.4.1 * 4.4.1 gradle wrapper * added reference comment * fixes #13527
No description provided.