LPS-115485 As a developer I can inject custom CSS variables declaring an OSGi component #21

wincent · 2020-06-16T15:11:12Z

Previously: https://github.com/wincent/liferay-portal/pull/354

Moving it here and will try to get a green ci:test:relevant run out of it.

Original description follows:

This is a partial PR based on the original PoC https://github.com/jbalsas/liferay-portal/pull/2211. This implements the Frontend Infrastructure DynamicInclude part only, and provides tests for it.

Note that there's no way to test this from the GUI.

⚠️ This IMPORTANT CONVERSATION arised in the original PR, but because it is relevant I'm linking it here.

…lues All instances of ScopedCSSVariablesProvider will be queried whenever a page's HTML is rendered to gather all the ScopedCSSVariables that must be injected in the page. A ScopedCSSVariables object defines a set of CSS variable values tied to a given CSS scope (f.e: :root, body, etc...)

…viders This DynamicInclude renders all ScopedCSSVariables in the <head> tag of the page's HTML right after the theme's CSS links are injected.

wincent · 2020-06-16T15:11:20Z

ci:test:sf

liferay-continuous-integration · 2020-06-16T15:11:21Z

To conserve resources, the PR Tester does not automatically run for every pull.

If your code changes were already tested in another pull, reference that pull in this pull so the test results can be analyzed.

If your pull was never tested, comment "ci:test" to run the PR Tester for this pull.

wincent · 2020-06-16T15:11:28Z

ci:test:relevant

...ntend/css/variables/web/internal/servlet/taglib/ScopedCSSVariablesTopHeadDynamicInclude.java

liferay-continuous-integration · 2020-06-16T15:16:59Z

✔️ ci:test:sf - 1 out of 1 jobs passed in 4 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: ee8af6d3c052b2e98f267e2ca397582fa816f1a7

Sender Branch:

Branch Name: LPS-115485
Branch GIT ID: 2f9828c69c3d2041e238fde9d47f132f59e11113

1 out of 1jobs PASSED

1 Successful Jobs:

test-portal-source-format

For more details click here.

...ntend/css/variables/web/internal/servlet/taglib/ScopedCSSVariablesTopHeadDynamicInclude.java

brunobasto · 2020-06-16T15:59:21Z

@izaera Maybe the OSGi API already takes care of this with the cardinality stuff, but let me ask: Is there a way for devs to specify some kind of priority in case they want to override variables already declared by some other previously deployed ScopedCSSVariablesProvider? By default I assume the order is not guaranteed or is the deployed order, right?

liferay-continuous-integration · 2020-06-16T16:55:09Z

✔️ ci:test:stable - 20 out of 20 jobs passed

❌ ci:test:relevant - 47 out of 49 jobs passed in 1 hour 21 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: ee8af6d3c052b2e98f267e2ca397582fa816f1a7

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: 1048e471849c8076c4823cc7dd4b82abffdac7c4

ci:test:stable - 20 out of 20 jobs PASSED

20 Successful Jobs:

ci:test:relevant - 47 out of 49 jobs PASSED

2 Failed Jobs:

47 Successful Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest-batch(master)/modules-unit-jdk8

Job Results:

58 Tests Passed.
2 Tests Failed.

AXIS_VARIABLE=0,label_exp=!master #360911

ScopedCSSVariablesTopHeadDynamicIncludeTest.testIncludeWithMultipleProviders

org.junit.ComparisonFailure: expected:<...a-track="temporary" [id="liferayCssVariablesCSS" ]type="text/css">
:ro...> but was:<...a-track="temporary" []type="text/css">
:ro...>
	at org.junit.Assert.assertEquals(Assert.java:115)
	at org.junit.Assert.assertEquals(Assert.java:144)
	at com.liferay.frontend.css.variables.web.internal.servlet.taglib.ScopedCSSVariablesTopHeadDynamicIncludeTest.testIncludeWithMultipleProviders(ScopedCSSVariablesTopHeadDynamicIncludeTest.java:197)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
	at org.juni...

ScopedCSSVariablesTopHeadDynamicIncludeTest.testInclude

org.junit.ComparisonFailure: expected:<...a-track="temporary" [id="liferayCssVariablesCSS" ]type="text/css">
:ro...> but was:<...a-track="temporary" []type="text/css">
:ro...>
	at org.junit.Assert.assertEquals(Assert.java:115)
	at org.junit.Assert.assertEquals(Assert.java:144)
	at com.liferay.frontend.css.variables.web.internal.servlet.taglib.ScopedCSSVariablesTopHeadDynamicIncludeTest.testInclude(ScopedCSSVariablesTopHeadDynamicIncludeTest.java:94)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
	at org.junit.runners.ParentRunner...

For upstream results, click here.

wincent · 2020-06-16T16:58:50Z

On the other PR @john-co flagged one of the test failures as likely related, and indeed it does look that way. Assigning back to you @izaera to address.

.../com/liferay/frontend/css/variables/web/internal/servlet/taglib/liferay_css_variables_1.html

izaera · 2020-06-17T09:16:08Z

@izaera Maybe the OSGi API already takes care of this with the cardinality stuff, but let me ask: Is there a way for devs to specify some kind of priority in case they want to override variables already declared by some other previously deployed ScopedCSSVariablesProvider? By default I assume the order is not guaranteed or is the deployed order, right?

Good question. I think the service.ranking would be enough to define priority, but as it is done in this PR, there's no guaranteed order now.

Should I use service.ranking or does anyone think that we may need something more complex?

jbalsas · 2020-06-17T09:17:05Z

I think service.ranking should do the trick

liferay-continuous-integration · 2020-06-22T14:20:54Z

✔️ ci:test:stable - 20 out of 20 jobs passed

❌ ci:test:relevant - 47 out of 49 jobs passed in 3 hours 18 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: ecb3c6255b7625cad9b94acff082ae101ec34742

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: 1eb935eac6911217dfe48eb2379d11fb23dd7f33

ci:test:stable - 20 out of 20 jobs PASSED

20 Successful Jobs:

ci:test:relevant - 47 out of 49 jobs PASSED

2 Failed Jobs:

47 Successful Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest-batch(master)/modules-unit-jdk8

Job Results:

0 Tests Passed.
1 Test Failed.

AXIS_VARIABLE=0,label_exp=!master #363230

     [exec] * What went wrong:
     [exec] Execution failed for task ':apps:frontend-css:frontend-css-variables-web:compileTestJava'.
     [exec] > Compilation failed; see the compiler error output for details.
     [exec] 
     [exec] * Try:
     [exec] Run with --info or --debug option to get more log output. Run with --scan to get full insights.
     [exec] 
     [exec] * Exception is:
     [exec] org.gradle.api.tasks.TaskExecutionException: Execution failed for task ':apps:frontend-css:frontend-css-variables-web:compileTestJava'.
     [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter$3.accept(ExecuteActionsTaskExecuter.java:166)
     [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter$3.accept(ExecuteActionsTaskExecuter.java:163)
     [exec] 	at org.gradle.internal.Try$Failure.ifSuccessfulOrElse(Try.java:191)
     [exec] 	at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.execute(ExecuteActionsTaskExecuter.java:156)
     [exec] 	at org.gradle.api.internal.tasks.execution.ValidatingTaskExecuter.execute(ValidatingTaskExecuter.java:62)
     [exec] 	at org.gradle.api.internal.tasks.execution.SkipEmptySourceFilesTaskExecuter.execute(SkipEmptySourceFilesTaskExecuter.java:108)
     [exec] 	at org.gradle.api.internal.tasks.execution.ResolveBeforeExecutionOutputsTaskExecuter.execute(ResolveBeforeExecutionOutputsTaskExecuter.java:67)
     [exec] 	at org.gradle.api.internal.tasks.execution.StartSnapshotTaskInputsBuildOperationTaskExecuter.execute(StartSnapshotTaskInputsBuildOperationTaskExecuter.java:62)
     [exec] 	at org.gradle.api.internal.tasks.execution.ResolveAfterPreviousExecutionStateTaskExecuter.execute(ResolveAfterPreviousExecutionStateTaskExecuter.java:46)
     [exec] 	at org.gradle.api.internal.tasks.execution.CleanupStaleOutputsExecuter.execute(CleanupStaleOutputsExecuter.java:94)
     [exec] 	at org.gradle.api.internal.tasks.execution.FinalizePropertiesTaskExecuter.execute(FinalizePropertiesTaskExecuter.java:46)
     [exec] 	at org.gradle.api.internal.tasks.execution.ResolveTaskExecutionModeExecuter.execute(ResolveTaskExecutionModeExecuter.java:95)
     [exec] 	at org.gradle.api.internal.tasks.execution.SkipTaskWithNoActionsExecuter.execute(SkipTaskWithNoActionsExecuter.java:57)
     [exec] 	at org.gradle.api.internal.tasks.execution.SkipOnlyIfTaskExecuter.execute(SkipOnlyIfTaskExecuter.java:56)

For upstream results, click here.

jbalsas · 2020-06-22T14:25:20Z

Test still failing @izaera 😢

izaera · 2020-06-23T06:55:51Z

It doesn't compile 😭

izaera · 2020-06-23T07:51:22Z

ci:test:relevant

liferay-continuous-integration · 2020-06-23T09:21:55Z

✔️ ci:test:stable - 20 out of 20 jobs passed

✔️ ci:test:relevant - 49 out of 49 jobs passed in 1 hour 23 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: d7b659d0c9f0278aae1e7b580e59e6ce90ffb59d

Copied in Private Modules Branch:

Branch Name: master-private
Branch GIT ID: 1eb935eac6911217dfe48eb2379d11fb23dd7f33

ci:test:stable - 20 out of 20 jobs PASSED

20 Successful Jobs:

ci:test:relevant - 49 out of 49 jobs PASSED

49 Successful Jobs:

For more details click here.

izaera · 2020-06-23T09:35:38Z

Forwarding this as discussed with @jbalsas in a slack conversation.

izaera · 2020-06-23T09:35:44Z

ci:forward

liferay-continuous-integration · 2020-06-23T09:35:48Z

CI is automatically triggering the following test suites:

ci:test:relevant
ci:test:sf

The pull request will automatically be forwarded to the user brianchandotcom if the following test suites pass:

ci:test:relevant
ci:test:sf
ci:test:stable

liferay-continuous-integration · 2020-06-23T09:35:51Z

Skipping previously passed test suites:
ci:test:relevant

liferay-continuous-integration · 2020-06-23T09:39:13Z

✔️ ci:test:sf - 1 out of 1 jobs passed in 3 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: ee8af6d3c052b2e98f267e2ca397582fa816f1a7

Sender Branch:

Branch Name: LPS-115485
Branch GIT ID: 248e439a6eda313be4666ef7a416c781ad5d97a5

1 out of 1jobs PASSED

1 Successful Jobs:

test-portal-source-format

For more details click here.

liferay-continuous-integration · 2020-06-23T09:39:21Z

All required test suite(s) passed.
Forwarding pullrequest to brianchandotcom.

liferay-continuous-integration · 2020-06-23T09:39:41Z

Pull request has been successfully forwarded to brianchandotcom#90496

izaera added 4 commits June 16, 2020 10:18

LPS-115485 Create API and web projects for CSS variables support

f2b3d20

LPS-115485 Add a DynamicInclude that will query ScopedCSSVariablesPro…

66840fe

…viders This DynamicInclude renders all ScopedCSSVariables in the <head> tag of the page's HTML right after the theme's CSS links are injected.

LPS-115485 Add tests

2f9828c

liferay-continuous-integration added the ci:test:sf - pending label Jun 16, 2020

jbalsas reviewed Jun 16, 2020

View reviewed changes

...ntend/css/variables/web/internal/servlet/taglib/ScopedCSSVariablesTopHeadDynamicInclude.java Outdated Show resolved Hide resolved

jbalsas requested a review from brunobasto June 16, 2020 15:15

liferay-continuous-integration added ci:test:sf - success and removed ci:test:sf - pending labels Jun 16, 2020

liferay-continuous-integration added ci:test:relevant - pending ci:test:stable - pending labels Jun 16, 2020

brunobasto reviewed Jun 16, 2020

View reviewed changes

...ntend/css/variables/web/internal/servlet/taglib/ScopedCSSVariablesTopHeadDynamicInclude.java Show resolved Hide resolved

liferay-continuous-integration added ci:test:relevant - failure ci:test:stable - success and removed ci:test:relevant - pending ci:test:stable - pending labels Jun 16, 2020

wincent assigned izaera Jun 16, 2020

wincent mentioned this pull request Jun 16, 2020

LPS-115484 As a developer I can declare theme's customizable CSS variables #17

Closed

jbalsas reviewed Jun 17, 2020

View reviewed changes

.../com/liferay/frontend/css/variables/web/internal/servlet/taglib/liferay_css_variables_1.html Outdated Show resolved Hide resolved

izaera added 2 commits June 18, 2020 11:31

LPS-115485 Don't need to make DynamicInclude immediate

646a367

LPS-115485 Fix tests

9e991a3

liferay-continuous-integration added the ci:test:stable - success label Jun 22, 2020

jbalsas added the needs update label Jun 23, 2020

LPS-115485 Fix tests

248e439

izaera removed the needs update label Jun 23, 2020

liferay-continuous-integration added ci:test:relevant - pending ci:test:stable - pending ci:test:relevant - success ci:test:stable - success and removed ci:test:relevant - failure ci:test:stable - success ci:test:relevant - pending ci:test:stable - pending labels Jun 23, 2020

liferay-continuous-integration added ci:test:sf - pending ci:test:sf - success and removed ci:test:sf - success ci:test:sf - pending labels Jun 23, 2020

liferay-continuous-integration mentioned this pull request Jun 23, 2020

LPS-115485 As a developer I can inject custom CSS variables declaring an OSGi component brianchandotcom/liferay-portal#90496

Closed

liferay-continuous-integration closed this Jun 23, 2020

LPS-115485 As a developer I can inject custom CSS variables declaring an OSGi component #21

LPS-115485 As a developer I can inject custom CSS variables declaring an OSGi component #21

Conversation

wincent commented Jun 16, 2020 • edited by izaera Loading

wincent commented Jun 16, 2020

liferay-continuous-integration commented Jun 16, 2020

wincent commented Jun 16, 2020

liferay-continuous-integration commented Jun 16, 2020

✔️ ci:test:sf - 1 out of 1 jobs passed in 4 minutes

Base Branch:

Sender Branch:

For more details click here.

brunobasto commented Jun 16, 2020

liferay-continuous-integration commented Jun 16, 2020

✔️ ci:test:stable - 20 out of 20 jobs passed

❌ ci:test:relevant - 47 out of 49 jobs passed in 1 hour 21 minutes

Base Branch:

Copied in Private Modules Branch:

2 Failed Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest-batch(master)/modules-unit-jdk8

Job Results:

For upstream results, click here.

wincent commented Jun 16, 2020

izaera commented Jun 17, 2020

jbalsas commented Jun 17, 2020

liferay-continuous-integration commented Jun 22, 2020

✔️ ci:test:stable - 20 out of 20 jobs passed

❌ ci:test:relevant - 47 out of 49 jobs passed in 3 hours 18 minutes

Base Branch:

Copied in Private Modules Branch:

2 Failed Jobs:

For more details click here.

Failures unique to this pull:

test-portal-acceptance-pullrequest-batch(master)/modules-unit-jdk8

Job Results:

For upstream results, click here.

jbalsas commented Jun 22, 2020

izaera commented Jun 23, 2020

izaera commented Jun 23, 2020

liferay-continuous-integration commented Jun 23, 2020

✔️ ci:test:stable - 20 out of 20 jobs passed

✔️ ci:test:relevant - 49 out of 49 jobs passed in 1 hour 23 minutes

Base Branch:

Copied in Private Modules Branch:

For more details click here.

izaera commented Jun 23, 2020

izaera commented Jun 23, 2020

liferay-continuous-integration commented Jun 23, 2020

liferay-continuous-integration commented Jun 23, 2020

liferay-continuous-integration commented Jun 23, 2020

✔️ ci:test:sf - 1 out of 1 jobs passed in 3 minutes

Base Branch:

Sender Branch:

For more details click here.

liferay-continuous-integration commented Jun 23, 2020

liferay-continuous-integration commented Jun 23, 2020

wincent commented Jun 16, 2020 •

edited by izaera

Loading