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

LPS-152935 Use always trash icon and "delete" label for removal action regardless of having recycle bin or not #3011

Conversation

victorg1991
Copy link

Hello good people of Lima 👋 😄

There is an initiative from design to normalize the use of "delete" action regardless of the presence of recycle bin or not :)

This PR changes all the labels to "delete" and all the icons to "trash"

Any questions/comments are welcome : D

@adolfopa
Copy link
Collaborator

adolfopa commented May 5, 2022

ci:test:sf

@adolfopa
Copy link
Collaborator

adolfopa commented May 5, 2022

ci:test:relevant

@liferay-continuous-integration
Copy link
Collaborator

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.

@liferay-continuous-integration
Copy link
Collaborator

✔️ 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: 01d4982452d19b5f2d4fd89568fe14f98d2e9fe9

Sender Branch:

Branch Name: LPS-152935_trash
Branch GIT ID: 166335a06fa0e636476e4579c7ac7dd0230e39a5

1 out of 1jobs PASSED
1 Successful Jobs:
For more details click here.

@liferay-continuous-integration
Copy link
Collaborator

@liferay-continuous-integration
Copy link
Collaborator

❌ ci:test:stable - 26 out of 27 jobs passed

❌ ci:test:relevant - 188 out of 222 jobs passed in 2 hours 9 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 01d4982452d19b5f2d4fd89568fe14f98d2e9fe9

Upstream Comparison:

Branch GIT ID: 01d4982452d19b5f2d4fd89568fe14f98d2e9fe9
Jenkins Build URL: Acceptance Upstream DXP (master) #3230

ci:test:stable - 26 out of 27 jobs PASSED

1 Failed Jobs:

26 Successful Jobs:
ci:test:relevant - 188 out of 222 jobs PASSED

34 Failed Jobs:

188 Successful Jobs:
For more details click here.

Failures unique to this pull:

  1. ...

@liferay-continuous-integration
Copy link
Collaborator

@victorg1991
Copy link
Author

ci:test:relevant

@liferay-continuous-integration
Copy link
Collaborator

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

❌ ci:test:relevant - 237 out of 243 jobs passed in 2 hours 24 minutes

Click here for more details.

This pull is eligible for reevaluation. When this upstream build has completed, using the following CI command will compare this pull request result against a more recent upstream result:

ci:reevaluate:1297401_2813

Base Branch:

Branch Name: master
Branch GIT ID: c0ba27f4d484b69fa6726cf8755a431e2865f394

Upstream Comparison:

Branch GIT ID: 01b37701b9829fe55622dc7858b4bd1ba9096ea2
Jenkins Build URL: Acceptance Upstream DXP (master) #3231

ci:test:stable - 27 out of 27 jobs PASSED
27 Successful Jobs:
ci:test:relevant - 237 out of 243 jobs PASSED
237 Successful Jobs:
For more details click here.

Failures unique to this pull:


Failures in common with acceptance upstream results at 01b3770:
  1. modules-integration-mysql57-jdk8/0/10
    1. com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanXMLLog
      junit.framework.AssertionFailedError: 
      JSON storage adapter is deprecated, using default storage adapter
        at com.liferay.portal.log.assertor.PortalLogAssertorTest.scanXMLLogFile(PortalLogAssertorTest.java:171)
        at com.liferay.portal.log.assertor.PortalLogAssertorTest$1.visitFile(PortalLogAssertorTest.java:98)
        at com.liferay.portal.log.assertor.PortalLogAssertorTest$1.visitFile(PortalLogAssertorTest.java:88)
        at java.nio.file.Files.walkFileTree(Files.java:2670)
        at java.nio.file.Files.walkFileTree(Files.java:2742)
        at com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanXMLLog(PortalLogAssertorTest.java:86)
      
  2. modules-integration-mysql57-jdk8/0/11
    1. com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanXMLLog
      junit.framework.AssertionFailedError: 
      null
      com.liferay.document.library.kernel.exception.NoSuchFileException: {companyId=20100, repositoryId=44538, fileName=318, cause=java.io.FileNotFoundException: /opt/dev/projects/github/liferay-portal/bundles/data/document_library/20100/44538/318/1.0 (No such file or directory)}
        at com.liferay.portal.store.file.system.FileSystemStore.getFileAsStream(FileSystemStore.java:140)
        at com.liferay.portal.store.file.system.safe.file.name.SafeFileNameStore.getFileAsStream(SafeFileNameStore.java:93)
        at com.liferay.change.tracking.store.internal.CTStore.getFileAsStream(CTStore.java:139)
        at com.liferay.portlet.documentlibrary.store.DLStoreImpl.getFileAsStream(DLStoreImpl.java:373)
        at com.liferay.document.library.kernel.store.DLStoreUtil.getFileAsStream(DLStoreUtil.java:339)
        at com.liferay.portlet.documentlibrary.service.impl.DLFileEntryLocalServiceImpl.getFileAsStream(DLFileEntryLocalServiceImpl.java:1135)
        at com.liferay.portlet.documentlibrary.service.impl.DLFileEntryLocalServiceImpl.getFileAsStream(DLFileEntryLocalServiceImpl.java:1110)
        at com.liferay.portal.kernel.bean.ClassLoaderBeanHandler.invoke(ClassLoaderBeanHandler.java:66)
        at com.sun.proxy.$Proxy957.getFileAsStream(Unknown Source)
        at com.liferay.document.library.kernel.service.DLFileEntryLocalServiceWrapper.getFileAsStream(DLFileEntryLocalServiceWrapper.java:675)
        at com.liferay.portal.kernel.bean.ClassLoaderBeanHandler.invoke(ClassLoaderBeanHandler.java:66)
        at com.sun.proxy.$...
  3. modules-integration-mysql57-jdk8/0/18
    1. com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanXMLLog
      junit.framework.AssertionFailedError: 
      failure in bulk execution:
      [0]: index [liferay-61712-workflow-metrics-instances], type [WorkflowMetricsInstanceType], id [WorkflowMetricsInstancee28ac6e8458e997adc296db8e659e437140df640d24ad524bd237106e8343478], message [[liferay-61712-workflow-metrics-instances] ElasticsearchException[Elasticsearch exception [type=index_not_found_exception, reason=no such index [liferay-61712-workflow-metrics-instances] and [action.auto_create_index] is [false]]]]
      [1]: index [liferay-61712-workflow-metrics-sla-instance-results], type [WorkflowMetricsSLAInstanceResultType], id [WorkflowMetricsSLAInstanceResult6ea188ecf3b9957dc5d34c43a1e6052948d9496164669ea8f3a00716ddab66c4], message [[liferay-61712-workflow-metrics-sla-instance-results] ElasticsearchException[Elasticsearch exception [type=index_not_found_exception, reason=no such index [liferay-61712-workflow-metrics-sla-instance-results] and [action.auto_create_index] is [false]]]]
      [2]: index [liferay-61712-workflow-metrics-processes], type [WorkflowMetricsProcessType], id [WorkflowMetricsProcesse28ac6e8458e997adc296db8e659e437140df640d24ad524bd237106e8343478], message [[liferay-61712-workflow-metrics-processes] ElasticsearchException[Elasticsearch exception [type=index_not_found_exception, reason=no such index [liferay-61712-workflow-metrics-processes] and [action.auto_create_index] is [false]]]]
        at com.liferay.portal.log.assertor.PortalLogAssertorTest.scanXMLLogFile(PortalLogAssertorTest.java:171)...

@liferay-continuous-integration
Copy link
Collaborator

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

✔️ ci:test:relevant - 235 out of 239 jobs passed in 1 hour 48 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 7008b458c98cefda48c3d8c99528183e322d8491

Upstream Comparison:

Branch GIT ID: 7008b458c98cefda48c3d8c99528183e322d8491
Jenkins Build URL: Acceptance Upstream DXP (master) #3242

ci:test:stable - 27 out of 27 jobs PASSED
27 Successful Jobs:
ci:test:relevant - 234 out of 239 jobs PASSED
234 Successful Jobs:
For more details click here.

This pull contains no unique failures.


Failures in common with acceptance upstream results at 7008b45:
  1. modules-integration-mysql57-jdk8/0/1
    1. com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanXMLLog
      junit.framework.AssertionFailedError: 
      failure in bulk execution:
      [0]: index [liferay-44015-workflow-metrics-instances], type [WorkflowMetricsInstanceType], id [WorkflowMetricsInstance8bf2cb4cbfe992d854bc1c757cee735d71c63f433ab635a14f400560748e229c], message [[liferay-44015-workflow-metrics-instances] ElasticsearchException[Elasticsearch exception [type=index_not_found_exception, reason=no such index [liferay-44015-workflow-metrics-instances] and [action.auto_create_index] is [false]]]]
      [1]: index [liferay-44015-workflow-metrics-sla-instance-results], type [WorkflowMetricsSLAInstanceResultType], id [WorkflowMetricsSLAInstanceResultce05854faf0f8a35b8e5cbba3f80dcf42adc3763e980a1b1476fcef74ee6be6c], message [[liferay-44015-workflow-metrics-sla-instance-results] ElasticsearchException[Elasticsearch exception [type=index_not_found_exception, reason=no such index [liferay-44015-workflow-metrics-sla-instance-results] and [action.auto_create_index] is [false]]]]
      [2]: index [liferay-44015-workflow-metrics-processes], type [WorkflowMetricsProcessType], id [WorkflowMetricsProcess8bf2cb4cbfe992d854bc1c757cee735d71c63f433ab635a14f400560748e229c], message [[liferay-44015-workflow-metrics-processes] ElasticsearchException[Elasticsearch exception [type=index_not_found_exception, reason=no such index [liferay-44015-workflow-metrics-processes] and [action.auto_create_index] is [false]]]]
        at com.liferay.portal.log.assertor.PortalLogAssertorTest.scanXMLLogFile(PortalLogAssertorTest.java:171)...
  2. modules-integration-mysql57-jdk8/0/10
    1. com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanXMLLog
      junit.framework.AssertionFailedError: 
      null
      java.net.URISyntaxException: Illegal character in path at index 67: http://localhost:8080/webdav/guest/document_library/WebDAVTest/Word Work File D_1.tmp
        at java.net.URI$Parser.fail(URI.java:2848)
        at java.net.URI$Parser.checkChars(URI.java:3021)
        at java.net.URI$Parser.parseHierarchical(URI.java:3105)
        at java.net.URI$Parser.parse(URI.java:3053)
        at java.net.URI.<init>(URI.java:588)
        at com.liferay.portal.kernel.util.HttpComponentsUtil.getURI(HttpComponentsUtil.java:455)
        at com.liferay.portal.kernel.util.HttpComponentsUtil.getProtocol(HttpComponentsUtil.java:387)
        at com.liferay.portal.kernel.util.HttpComponentsUtil.isSecure(HttpComponentsUtil.java:491)
        at com.liferay.portal.kernel.util.SubscriptionSender.initialize(SubscriptionSender.java:327)
        at com.liferay.portal.kernel.util.SubscriptionSender.flushNotifications(SubscriptionSender.java:145)
        at com.liferay.subscription.internal.messaging.SubscriptionSenderMessageListener.doReceive(SubscriptionSenderMessageListener.java:56)
        at com.liferay.portal.kernel.messaging.BaseMessageListener.doReceive(BaseMessageListener.java:48)
        at com.liferay.portal.kernel.messaging.BaseMessageListener.receive(BaseMessageListener.java:34)
        at com.liferay.portal.kernel.messaging.InvokerMessageListener.receive(InvokerMessageListener.java:74)
        at com.liferay.portal.kernel.test.rule.SynchronousDestinationTestRule$TestSynchronousDestination.send(SynchronousDestinationTestRule.java:436)
        at com.lifera...
  3. modules-integration-mysql57-jdk8/0/11
    1. com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanXMLLog
      junit.framework.AssertionFailedError: 
      null
      com.liferay.document.library.kernel.exception.NoSuchFileException: {companyId=20099, repositoryId=44916, fileName=421, cause=java.io.FileNotFoundException: /opt/dev/projects/github/liferay-portal/bundles/data/document_library/20099/44916/421/1.0 (No such file or directory)}
        at com.liferay.portal.store.file.system.FileSystemStore.getFileAsStream(FileSystemStore.java:140)
        at com.liferay.portal.store.file.system.safe.file.name.SafeFileNameStore.getFileAsStream(SafeFileNameStore.java:93)
        at com.liferay.change.tracking.store.internal.CTStore.getFileAsStream(CTStore.java:139)
        at com.liferay.portlet.documentlibrary.store.DLStoreImpl.getFileAsStream(DLStoreImpl.java:373)
        at com.liferay.document.library.kernel.store.DLStoreUtil.getFileAsStream(DLStoreUtil.java:339)
        at com.liferay.portlet.documentlibrary.service.impl.DLFileEntryLocalServiceImpl.getFileAsStream(DLFileEntryLocalServiceImpl.java:1135)
        at com.liferay.portlet.documentlibrary.service.impl.DLFileEntryLocalServiceImpl.getFileAsStream(DLFileEntryLocalServiceImpl.java:1110)
        at com.liferay.portal.kernel.bean.ClassLoaderBeanHandler.invoke(ClassLoaderBeanHandler.java:66)
        at com.sun.proxy.$Proxy932.getFileAsStream(Unknown Source)
        at com.liferay.document.library.kernel.service.DLFileEntryLocalServiceWrapper.getFileAsStream(DLFileEntryLocalServiceWrapper.java:675)
        at com.liferay.portal.kernel.bean.ClassLoaderBeanHandler.invoke(ClassLoaderBeanHandler.java:66)
        at com.sun.proxy.$...
  4. modules-integration-mysql57-jdk8/0/12
    1. com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest.testClientSerDesToDTO
      java.lang.NullPointerException
        at com.liferay.portal.kernel.util.StringUtil._read(StringUtil.java:4884)
        at com.liferay.portal.kernel.util.StringUtil.read(StringUtil.java:2220)
        at com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest._read(StructuredContentResourceTest.java:1011)
        at com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest._addDDMStructure(StructuredContentResourceTest.java:639)
        at com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest.setUp(StructuredContentResourceTest.java:144)
        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:59)
        at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
        at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)
        at org.junit.internal.runners.statements.RunBefores.invokeMethod(RunBefores.java:33)
        at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
        at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
        at com.liferay.portal.kernel.test.rule.AbstractTestRule$2.evaluate(AbstractTestRule.java:99)
        at com.liferay.portal.ke...
    2. com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest.testClientSerDesToJSON
      java.lang.NullPointerException
        at com.liferay.portal.kernel.util.StringUtil._read(StringUtil.java:4884)
        at com.liferay.portal.kernel.util.StringUtil.read(StringUtil.java:2220)
        at com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest._read(StructuredContentResourceTest.java:1011)
        at com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest._addDDMStructure(StructuredContentResourceTest.java:639)
        at com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest.setUp(StructuredContentResourceTest.java:144)
        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:59)
        at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
        at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)
        at org.junit.internal.runners.statements.RunBefores.invokeMethod(RunBefores.java:33)
        at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
        at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
        at com.liferay.portal.kernel.test.rule.AbstractTestRule$2.evaluate(AbstractTestRule.java:99)
        at com.liferay.portal.ke...
    3. com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest.testDeleteSiteStructuredContentByExternalReferenceCode
      java.lang.NullPointerException
        at com.liferay.portal.kernel.util.StringUtil._read(StringUtil.java:4884)
        at com.liferay.portal.kernel.util.StringUtil.read(StringUtil.java:2220)
        at com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest._read(StructuredContentResourceTest.java:1011)
        at com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest._addDDMStructure(StructuredContentResourceTest.java:639)
        at com.liferay.headless.delivery.resource.v1_0.test.StructuredContentResourceTest.setUp(StructuredContentResourceTest.java:144)
        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:59)
        at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
        at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:56)
        at org.junit.internal.runners.statements.RunBefores.invokeMethod(RunBefores.java:33)
        at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
        at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
        at com.liferay.portal.kernel.test.rule.AbstractTestRule$2.evaluate(AbstractTestRule.java:99)
        at com.liferay.portal.ke...
    4. ...

@liferay-continuous-integration
Copy link
Collaborator

@boton boton self-requested a review May 9, 2022 08:01
@@ -701,7 +701,7 @@ public void addMoveToTheRecycleBinToolbarItem(
_addJavaScriptUIItem(
new JavaScriptToolbarItem(), toolbarItems,
DLUIItemKeys.MOVE_TO_THE_RECYCLE_BIN,
LanguageUtil.get(_resourceBundle, "move-to-recycle-bin"),
LanguageUtil.get(_resourceBundle, "delete"),
Copy link
Collaborator

Choose a reason for hiding this comment

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

Here we may also want to rename the method ( addMoveToTheRecycleBinToolbarItem to addDeleteToolbarItem).

Copy link
Author

Choose a reason for hiding this comment

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

I believe the meaning is the same, we are only changing the label. This is still the Move to the recycle bin action, isn't it?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ok, I see your point. Then we can leave the method name as it is... thanks!

@adolfopa
Copy link
Collaborator

adolfopa commented May 9, 2022

ci:forward

@liferay-continuous-integration
Copy link
Collaborator

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
Copy link
Collaborator

Skipping previously passed test suites:
ci:test:relevant

@liferay-continuous-integration
Copy link
Collaborator

✔️ 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: 7008b458c98cefda48c3d8c99528183e322d8491

Sender Branch:

Branch Name: LPS-152935_trash
Branch GIT ID: 1ced4d196139d75db243cab37c1b428bc8c7474a

1 out of 1jobs PASSED
1 Successful Jobs:
For more details click here.

@liferay-continuous-integration
Copy link
Collaborator

All required test suite(s) passed.
Forwarding pull request to brianchandotcom.
Console

@liferay-continuous-integration
Copy link
Collaborator

Pull request has been successfully forwarded to brianchandotcom#117114
Console

@liferay-continuous-integration
Copy link
Collaborator

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants