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.

Sign up for GitHub

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

Jump to bottom

LPS-132411 As a content manager, I want to filter by Type and/or Subtype of content in the Content Dashboard #1482

Closed
wants to merge 14 commits into from
Closed

LPS-132411 As a content manager, I want to filter by Type and/or Subtype of content in the Content Dashboard #1482

wants to merge 14 commits into from

Conversation

4lejandrito
Copy link

@4lejandrito 4lejandrito commented Aug 2, 2021 •
edited by beltranrengifo
Loading

@liferay-continuous-integration
Copy link

Please only forward critical changes to Brian Chan during stabilization. Nonurgent changes should wait until the ongoing 7.4 DXP EP3 & CE GA3 release has been completed. For more details on the release timeline and status, see product-delivery.

@liferay-continuous-integration
Copy link

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.

@4lejandrito 4lejandrito mentioned this pull request Aug 2, 2021
Closed
@4lejandrito 4lejandrito changed the title LPS 132411 LPS-132411 As a content manager, I want to filter by Type and/or Subtype of content in the Content Dashboard Aug 2, 2021
@4lejandrito 4lejandrito marked this pull request as draft August 2, 2021 14:38
@beltranrengifo beltranrengifo mentioned this pull request Aug 2, 2021
Closed
@beltranrengifo beltranrengifo force-pushed the LPS-132411 branch 2 times, most recently from 9324198 to ba0aed7 Compare August 3, 2021 13:00
@4lejandrito 4lejandrito closed this Aug 3, 2021
@4lejandrito 4lejandrito reopened this Aug 3, 2021
@4lejandrito 4lejandrito force-pushed the LPS-132411 branch 2 times, most recently from bbb764f to bc54d5c Compare August 4, 2021 11:45
@beltranrengifo beltranrengifo force-pushed the LPS-132411 branch 2 times, most recently from 2fb4fce to a0e048e Compare August 5, 2021 06:31
@beltranrengifo beltranrengifo marked this pull request as ready for review August 5, 2021 07:40
sandrodw3
sandrodw3 reviewed Aug 5, 2021
View reviewed changes
Copy link

@sandrodw3 sandrodw3 left a comment

Choose a reason for hiding this comment

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

I love this PR! 😍

Great frontend work @claraizquierdo @beltranrengifo! 🌈
I only added some tiny comments, most of them related to format and my obsesion with a clean commit history 😂, sorry if I insist a lot on this.

You two make a great front team 🥰

...board/content-dashboard-web/src/main/resources/META-INF/resources/js/SelectTypeAndSubtype.js Outdated
function SelectTypeAndSubtype() {
/* Mocked values */
const namespace = "mynamespace";
const nodes = [
Copy link

Choose a reason for hiding this comment

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

It's not necessary that you commit the mocked values 😛
You can use them locally, but probably not committing them helps to have cleaner commit history, what do you think?

Copy link

Choose a reason for hiding this comment

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

I believe Clara had to commit this so I could continue with the task while the backend was in progress

Copy link

Choose a reason for hiding this comment

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

I prefer to leave the mock in this case, this way the first two commits of Clara will still work, until the props arrive later

...nt-dashboard-web/src/main/resources/META-INF/resources/view_content_dashboard_item_types.jsp Outdated Show resolved Hide resolved
.../apps/content-dashboard/content-dashboard-web/src/main/resources/content/Language.properties Show resolved Hide resolved
...board/content-dashboard-web/src/main/resources/META-INF/resources/js/SelectTypeAndSubtype.js Outdated Show resolved Hide resolved
...board/content-dashboard-web/src/main/resources/META-INF/resources/js/SelectTypeAndSubtype.js Outdated Show resolved Hide resolved
modules/apps/content-dashboard/content-dashboard-web/test/js/components/AuditBarChart.js Show resolved Hide resolved
...board/content-dashboard-web/src/main/resources/META-INF/resources/js/SelectTypeAndSubtype.js Show resolved Hide resolved
...board/content-dashboard-web/src/main/resources/META-INF/resources/js/SelectTypeAndSubtype.js Show resolved Hide resolved
@beltranrengifo beltranrengifo force-pushed the LPS-132411 branch 2 times, most recently from faf8c9d to a577a67 Compare August 6, 2021 10:12
@beltranrengifo beltranrengifo self-requested a review August 6, 2021 10:30
@beltranrengifo
Copy link

ci:forward

@liferay-continuous-integration
Copy link

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

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

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: afdfbfad3b5db500d2bd327905f157177b718653

Sender Branch:

Branch Name: LPS-132411
Branch GIT ID: a577a678899349fa360e7ed3405f8ff315d8d67e

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

@liferay-continuous-integration
Copy link

@4lejandrito
Copy link
Author

ci:forward

@liferay-continuous-integration
Copy link

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

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

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: c8ef341b433b0aaefeab46425127ec10532f60bb

Sender Branch:

Branch Name: LPS-132411
Branch GIT ID: 5daaedec10cbc8790f631682f644967ae9e0a79b

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

@liferay-continuous-integration
Copy link

@liferay-continuous-integration
Copy link

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

✔️ ci:test:relevant - 21 out of 22 jobs passed in 1 hour 37 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: c8ef341b433b0aaefeab46425127ec10532f60bb

Upstream Comparison:

Branch GIT ID: 73567dc73ac8435d9fe57cd92ffdfb091696d821
Jenkins Build URL: Acceptance Upstream DXP (master) #2201

ci:test:stable - 10 out of 10 jobs PASSED
10 Successful Jobs:
ci:test:relevant - 20 out of 22 jobs PASSED
20 Successful Jobs:
For more details click here.

This pull contains no unique failures.

Failures in common with acceptance upstream results at 73567dc:
  1. test-portal-acceptance-pullrequest-batch(master)/modules-integration-mysql57-jdk8/0
    Job Results:

    451 Tests Passed.
    1 Test Failed.

    1. AXIS_VARIABLE=1,label_exp=!master #8223
      1. com.liferay.portal.log.assertor.PortalLogAssertorTest.testScanXMLLog
        junit.framework.AssertionFailedError: 
Unable to register portal instance {mvccVersion=1, companyId=41701, accountId=41705, webId=sDETg1to, mx=sDETg1to.DsW, homeURL=, logoId=0, system=false, maxUsers=0, active=true}
com.liferay.portal.kernel.exception.SystemException: java.sql.SQLSyntaxErrorException: Table 'User__x' already exists
	at com.liferay.object.service.base.ObjectDefinitionLocalServiceBaseImpl.runSQL(ObjectDefinitionLocalServiceBaseImpl.java:556)
	at com.liferay.object.service.impl.ObjectDefinitionLocalServiceImpl._createTable(ObjectDefinitionLocalServiceImpl.java:615)
	at com.liferay.object.service.impl.ObjectDefinitionLocalServiceImpl._addObjectDefinition(ObjectDefinitionLocalServiceImpl.java:598)
	at com.liferay.object.service.impl.ObjectDefinitionLocalServiceImpl.addSystemObjectDefinition(ObjectDefinitionLocalServiceImpl.java:181)
	at com.liferay.object.service.impl.ObjectDefinitionLocalServiceImpl.addOrUpdateSystemObjectDefinition(ObjectDefinitionLocalServiceImpl.java:119)
	at com.liferay.portal.spring.aop.AopMethodInvocationImpl.proceed(AopMethodInvocationImpl.java:50)
	at com.liferay.portal.spring.transaction.TransactionInterceptor.invoke(TransactionInterceptor.java:69)
	at com.liferay.portal.spring.aop.AopMethodInvocationImpl.proceed(AopMethodInvocationImpl.java:57)
	at com.liferay.change.tracking.internal.aop.CTTransactionAdvice.invoke(CTTransactionAdvice.java:80)
	at com.liferay.portal.spring.aop.AopMethodInvocationImpl.proceed(AopMethodInvocationImpl.j...

@liferay-continuous-integration
Copy link

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

Closed
@liferay-continuous-integration
Copy link

Pull request has been successfully forwarded to brianchandotcom#105307
Console

@liferay-continuous-integration
Copy link

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sandrodw3 sandrodw3 sandrodw3 left review comments

@beltranrengifo beltranrengifo beltranrengifo left review comments

Assignees
No one assigned
Labels
ci:test:relevant - success ci:test:sf - success ci:test:stable - success
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@4lejandrito @liferay-continuous-integration @beltranrengifo @sandrodw3 @claraizquierdo