Issue 16820 default wfactions #16833

jdotcms · 2019-07-10T23:20:53Z

No description provided.

#16288) * #16252 format source. Introduce format checker on build. Alter style files * #16252 remove unwanted file * #16252 remove unwanted file

…r style … (#16288)" (#16291) This reverts commit 05f9082.

dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/view_steps.jsp

dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/workflow_js.jsp

wezell

My browser is literally crashing. Let's discuss tomorrow.

wezell · 2019-08-12T17:40:04Z

dotCMS/src/integration-test/java/com/dotcms/rest/api/v1/page/PageResourceTest.java

+        final List<Contentlet> contentlets  = APILocator.getContentletAPI().search
+                (new StringBuilder("+contentType:persona +live:true +deleted:false +working:true +conhost:" + host.getIdentifier()).toString(),
+                        -1, 0, "title desc", APILocator.systemUser(), false);
+        final Optional<Contentlet> personaOpt = contentlets.stream().findFirst();


Why not a PersonaDataGen to insure that we have a persona to personalize? Otherwise, all these asserts will not be run and could be useless.

We should always create the data we need to run the tests and not rely on iffy data.

sounds good, I will

wezell · 2019-08-12T17:43:32Z

...c/integration-test/java/com/dotcms/rest/api/v1/workflow/WorkflowResourceIntegrationTest.java

@@ -1117,6 +1041,8 @@ public void Test_Find_Bulk_Actions_Then_Fire_Bulk_Actions_On_Custom_Content_Type
            final String inode = contentlet.getInode();

            try {
+
+                workflowAPI.deleteWorkflowTaskByWebAsset(contentlet.getIdentifier(), APILocator.systemUser());


I think we need to rename this method to workflowAPI.deleteWorkflowTaskByContentletId

Also, do we have one that takes a languageId?

I think I will create two method, one with the lang and another called deleteWorkflowTaskByContentletIdByAnyLanguage

Should we call the new one destroyWorkflowForContentlet ? I am asking b/c our contentletAPI has a destroy method which does the same thing - wipes out the content in all languages.

wezell · 2019-08-12T17:44:55Z

dotCMS/src/integration-test/java/com/dotmarketing/common/db/DotDatabaseMetaDataTest.java

+                ("contentlet", "structure",
+                        Arrays.asList("structure_inode"), Arrays.asList("inode"));
+
+        Assert.assertNotNull(foreignKey);


nice test 👍

wezell · 2019-08-12T17:45:34Z

dotCMS/src/integration-test/java/com/dotmarketing/common/db/DotDatabaseMetaDataTest.java

+import java.util.Set;
+
+public class DotDatabaseMetaDataTest extends BaseWorkflowIntegrationTest {
+


glad to have this test! 👍

wezell · 2019-08-12T17:49:19Z

...c/integration-test/java/com/dotmarketing/portlets/contentlet/business/ContentletAPITest.java

+
+            //4) check the contentlet is on the step unpublish
+            final WorkflowStep unpublishStep = workflowAPI.findStepByContentlet(contentlet1);
+            Assert.assertEquals (SystemWorkflowConstants.WORKFLOW_NEW_STEP_ID, unpublishStep.getId());


Did we skip the workflow and the listeners are moving this to the "Unpublished step"? Do we need a Thread.sleep() in order to give the listener a chance to fire?

wezell · 2019-08-12T21:49:27Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowFactoryImpl.java

+	}
+
+	@Override
+	public Map<String, List<Map<String, Object>>> findSystemActionsMapByContentType(final List<ContentType> contentTypes)  throws DotDataException {


And why is this a Map rather than a List? I'm confused :)

the method is receiving a list of content types, so it is returning a Map indexed by variable with the list of mappings associated to the content type

Got it! 🥇

wezell · 2019-08-12T21:59:37Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowFactoryImpl.java

+
+			if (UtilMethods.isSet(schemes)) {
+
+				final DotConnect dotConnect = new DotConnect()


Select where in () type subqueries break down when there are 100s of entries. We should iterate over smaller 100 entry partitions of the list to build the larger list to return, so our dbs do not bog down.

good, I will split the login in 100 to 100, thx for the advise!.

wezell · 2019-08-12T22:00:22Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowFactoryImpl.java

+		this.cache.removeSystemActionsByWorkflowAction(action.getId());
+	}
+
+	private String createQueryIn (final Collection list) {


partition the list you are sending to the where in clause so we don't kill the dbs.

Got it, will be fixed

wezell · 2019-08-12T22:03:38Z

dotCMS/src/main/java/com/dotmarketing/portlets/workflows/business/WorkflowAPIImpl.java

@@ -1088,6 +1131,33 @@ public void deleteWorkflowTask(final WorkflowTask task, final User user)
 				+ " has been deleted by the user: " + user.getUserId());
 	}

+	@Override
+	@WrapInTransaction
+	public void deleteWorkflowTaskByWebAsset(final String webAsset, final User user) throws DotDataException {


Should be deleteWorkflowTaskByContentletId. Also, do we need to respect the langauge Id? Maybe this should take the contentlet object that would include the language Id.

wezell · 2019-08-12T22:08:06Z

...MS/src/integration-test/java/com/dotcms/rendering/velocity/viewtools/LanguageWebAPITest.java

@@ -144,18 +146,21 @@ public static void prepare() throws Exception {
 	}

 	@AfterClass
-	public static void cleanUpData() throws DotSecurityException, DotDataException {
+	public static void cleanUpData() throws Exception {


We don't need to clean up data in our tests - we assume the data will be thrown out.

dsilvam and others added 30 commits March 26, 2019 16:24

#16252 format source. Introduce format checker on build. Alter style … (

05f9082

#16288) * #16252 format source. Introduce format checker on build. Alter style files * #16252 remove unwanted file * #16252 remove unwanted file

Updating commit reference for src/main/enterprise

652eace

try different location for checkstyle.xml

54c1e7b

Revert "#16252 format source. Introduce format checker on build. Alte…

20eb3e6

…r style … (#16288)" (#16291) This reverts commit 05f9082.

Updating commit reference for src/main/enterprise

44450a4

Merge branch 'master' of github.com:dotCMS/core

7ad328d

Merge branch 'master' of github.com:dotCMS/core

4a9e89b

Merge branch 'master' of github.com:dotCMS/core

dcf1af1

Merge branch 'master' of github.com:dotCMS/core

4fbc46f

Merge branch 'master' of github.com:dotCMS/core

fe7e591

Merge branch 'master' of github.com:dotCMS/core

5faf19b

Merge branch 'master' of github.com:dotCMS/core

2dd33c6

Merge branch 'master' of github.com:dotCMS/core

6a3d030

Merge branch 'master' of github.com:dotCMS/core

1284d3d

Merge branch 'master' of github.com:dotCMS/core

316234f

Merge branch 'master' of github.com:dotCMS/core

c755c67

Merge branch 'master' of github.com:dotCMS/core

8a21774

Merge branch 'master' of github.com:dotCMS/core

904dfd2

Merge branch 'master' of github.com:dotCMS/core

15cf074

Merge branch 'master' of github.com:dotCMS/core

4cf989c

Merge branch 'master' of github.com:dotCMS/core

b17d122

Merge branch 'master' of github.com:dotCMS/core

a1837eb

Merge branch 'master' of github.com:dotCMS/core

31ae932

Merge branch 'master' of github.com:dotCMS/core

bf2c8a4

Merge branch 'master' of github.com:dotCMS/core

29bed60

Merge branch 'master' of github.com:dotCMS/core

defdc9b

Merge branch 'master' of github.com:dotCMS/core

19396a2

Merge branch 'master' of github.com:dotCMS/core

6c19f2a

Merge branch 'master' of github.com:dotCMS/core

51cc4f2

Merge branch 'master' of github.com:dotCMS/core

24881c5

dotCMS deleted a comment Aug 7, 2019

#16820 Unit test fixing and improvements

1b30075

jdotcms marked this pull request as ready for review August 9, 2019 18:36

jgambarios requested changes Aug 12, 2019

View reviewed changes

dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/view_steps.jsp Show resolved Hide resolved

dotCMS/src/main/webapp/html/portlet/ext/workflows/schemes/workflow_js.jsp Show resolved Hide resolved

#16820 merge master done

4fda41c

jgambarios approved these changes Aug 12, 2019

View reviewed changes

wezell requested changes Aug 12, 2019

View reviewed changes

jdotcms added 2 commits August 12, 2019 23:03

#16820 part of the code review done

b002474

#16820 adding actionlet convenient methods to the workflow action class

97c1531

jgambarios merged commit 09f8214 into master Aug 14, 2019

jgambarios deleted the issue-16820-default-wfactions branch August 14, 2019 17:22

This was referenced Aug 14, 2019

Allow users to map workflow actions by content type or workflow scheme #16820

Closed

Assign Content to workflow if it is checked in and does not have a workflow step #16809

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue 16820 default wfactions #16833

Issue 16820 default wfactions #16833

jdotcms commented Jul 10, 2019

wezell left a comment

wezell Aug 12, 2019

wezell Aug 12, 2019

jdotcms Aug 13, 2019

wezell Aug 12, 2019

jdotcms Aug 13, 2019

jdotcms Aug 13, 2019

wezell Aug 13, 2019

wezell Aug 12, 2019

wezell Aug 12, 2019

wezell Aug 12, 2019

wezell Aug 12, 2019

jdotcms Aug 13, 2019

wezell Aug 13, 2019

wezell Aug 12, 2019

jdotcms Aug 13, 2019

wezell Aug 12, 2019

jdotcms Aug 13, 2019

wezell Aug 12, 2019

jdotcms Aug 13, 2019

wezell Aug 12, 2019

		import java.util.Set;

		public class DotDatabaseMetaDataTest extends BaseWorkflowIntegrationTest {


		if (UtilMethods.isSet(schemes)) {

		final DotConnect dotConnect = new DotConnect()

Issue 16820 default wfactions #16833

Issue 16820 default wfactions #16833

Conversation

jdotcms commented Jul 10, 2019

wezell left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment