LPD-48899 Add CX and Fragment types to app table #6237

CalebJamesH · 2025-02-26T12:22:41Z

https://liferay.atlassian.net/browse/LPD-48899

liferay-continuous-integration · 2025-02-26T12:22:45Z

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.

CalebJamesH · 2025-02-26T13:01:24Z

ci:forward

liferay-continuous-integration · 2025-02-26T13:01:30Z

CI is automatically triggering the following test suites:

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

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 · 2025-02-26T13:05:18Z

✔️ 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: 26ff042a7230aca438731909c0ff739a4ecaa938

Sender Branch:

Branch Name: LPD-48899-resend-3
Branch GIT ID: 099984c63fc0d3257c9cb2ca70d7c58e4907299d

1 out of 1jobs PASSED

1 Successful Jobs:

test-portal-source-format

For more details click here.

liferay-continuous-integration · 2025-02-26T13:07:06Z

Jenkins Build:test-portal-source-format#8020

Jenkins Report:jenkins-report.html

Jenkins Suite:sf

Pull Request:is-solutions-delivery#6237

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:sf - CalebJamesH > is-solutions-delivery - PR#6237 - 2025-02-26[05:01:36]

Testray Build ID:151370926

Testray Importer:publish-testray-report#30403

kevenleone · 2025-02-26T13:43:36Z

ci:stop

liferay-continuous-integration · 2025-02-26T13:46:07Z

						<h1>Unable to generate test report.</h1><p>Jenkins encountered the following error while generating test report:</p><pre><code>Sourced file: inline evaluation of: `` 						 							import com.liferay.jenkins.results.parser.Build; 							import co . . . '' : TargetError : at Line: 72 : in file: inline evaluation of: `` 						 							import com.liferay.jenkins.results.parser.Build; 							import co . . . '' : throw e ;

Target exception: java.lang.NullPointerException: Cannot invoke "String.equals(Object)" because "stableJobResult" is null

Base Branch:

Branch Name: master

Branch GIT ID: 26ff042a7230aca438731909c0ff739a4ecaa938

Job Summary:

Job Link: test-portal-acceptance-pullrequest(master)

For more details click here.

...arketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/enums/Order.ts

...tensions/liferay-marketplace-custom-element/src/pages/CustomerDashboard/pages/Apps/index.tsx

...t-extensions/liferay-marketplace-site-initializer/site-initializer/commerce-order-types.json

liferay-continuous-integration · 2025-02-26T13:52:01Z

Jenkins Build:test-portal-acceptance-pullrequest(master)#13256

Jenkins Report:jenkins-report.html

Jenkins Suite:relevant

Pull Request:is-solutions-delivery#6237

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:relevant - CalebJamesH > is-solutions-delivery - PR#6237 - 2025-02-26[05:01:37]

Testray Build ID:151413263

Testray Importer:publish-testray-report#28793

kevenleone · 2025-02-27T03:20:01Z

Just starting reviewing :)

...arketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/enums/Order.ts

...tplace-workspace/client-extensions/liferay-marketplace-custom-element/src/enums/OrderType.ts

...ray-marketplace-custom-element/src/pages/CustomerDashboard/components/PurchasedAppsTable.tsx

CalebJamesH · 2025-02-28T15:34:34Z

ci:test:sf

CalebJamesH · 2025-02-28T15:34:40Z

ci:test:relevant

CalebJamesH · 2025-02-28T15:34:49Z

ci:test:stable

liferay-continuous-integration · 2025-02-28T15:42:15Z

❌ ci:test:sf - 0 out of 1 jobs passed in 6 minutes

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 55d8c2f17994f074d988d0d80d66c6adc55a5949

Sender Branch:

Branch Name: LPD-48899-resend-3
Branch GIT ID: 0d81aea48d99350f4eb67a5bcc7385880c34cae7

0 out of 1jobs PASSED

1 Failed Jobs:

~~test-portal-source-format~~

For more details click here.

     [exec] > Task :packageRunCheckFormat
     [exec] yarn run v1.13.0
     [exec] \$ node-scripts check:ci
     [exec] 
     [exec] ?????? Running preflight checks...
     [exec] 
     [exec] ?????? Checking outdated tsconfig.json files ...
     [exec] 
     [exec] ?????? Running TypeScript checks on modified files...
     [exec] ?????? A total of 8 CPUs were detected: launching tsc using 8 workers
     [exec] 
     [exec] ?????? Running format checks on modified files...
     [exec] Warning: React version was set to "detect" in eslint-plugin-react settings, but the "react" package is not installed. Assuming latest React version for linting.
     [exec]    /opt/dev/projects/github/liferay-portal/workspaces/liferay-marketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/pages/CustomerDashboard/pages/Apps/App/Licenses/Licenses.tsx
     [exec]      1:1  error  File has format errors.  (format check)
     [exec]    
     [exec]    ??? 1 problem (1 error, 0 warnings)
     [exec]    
     [exec]    
     [exec] ??? CI checks failed.
     [exec] error Command failed with exit code 1.
     [exec] info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
     [exec] 
     [exec] > Task :packageRunCheckFormat FAILED
     [exec] Gradle build finished at 2025-02-28 15:41:51.695.
     [exec] 
     [exec] 
     [exec] FAILURE: Build failed with an exception.
     [exec] 
     [exec] * What went wrong:
     [exec] Execution failed for task ':packageRunCheckFormat'.
     [exec] > Process 'command '/opt/dev/projects/github/liferay-portal/build/node/bin/node'' finished with non-zero exit value 1
     [exec] 
     [exec] * Try:
     [exec] > Run with --info or --debug option to get more log output.
     [exec] > Run with --scan to get full insights.
     [exec] > Get more help at https://help.gradle.org.
     [exec] 
     [exec] * Exception is:
     [exec] org.gradle.api.tasks.TaskExecutionException: Execution failed for task ':packageRunCheckFormat'.
     [exec]   at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.lambda\$executeIfValid\$1(ExecuteActionsTaskExecuter.java:148)
     [exec]   at org.gradle.internal.Try\$Failure.ifSuccessfulOrElse(Try.java:282)
     [exec]   at org.gradle.api.internal.tasks.execution.ExecuteActionsTaskExecuter.executeIfValid(ExecuteActionsTaskExecuter.java:146)

liferay-continuous-integration · 2025-02-28T15:45:41Z

Jenkins Build:test-portal-source-format#5943

Jenkins Report:jenkins-report.html

Jenkins Suite:sf

Pull Request:is-solutions-delivery#6237

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:sf - CalebJamesH > is-solutions-delivery - PR#6237 - 2025-02-28[07:36:22]

Testray Build ID:153297971

Testray Importer:publish-testray-report#6668

CalebJamesH · 2025-02-28T15:51:35Z

ci:test:sf

CalebJamesH · 2025-02-28T15:52:00Z

ci:test:stable

CalebJamesH · 2025-02-28T15:55:10Z

ci:test:relevant

liferay-continuous-integration · 2025-02-28T15:58:09Z

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

Click here for more details.

Base Branch:

Branch Name: master
Branch GIT ID: 55d8c2f17994f074d988d0d80d66c6adc55a5949

Sender Branch:

Branch Name: LPD-48899-resend-3
Branch GIT ID: 5fbc137a4c9c8fa85c8718ea1c15d1f9155d19c6

1 out of 1jobs PASSED

1 Successful Jobs:

test-portal-source-format

For more details click here.

liferay-continuous-integration · 2025-02-28T16:02:43Z

Jenkins Build:test-portal-source-format#7797

Jenkins Report:jenkins-report.html

Jenkins Suite:sf

Pull Request:is-solutions-delivery#6237

Testray Routine:EE Pull Request

Testray Build:[master] ci:test:sf - CalebJamesH > is-solutions-delivery - PR#6237 - 2025-02-28[07:52:17]

Testray Build ID:153304640

Testray Importer:publish-testray-report#5543

kevenleone

@CalebJamesH looks really nice, I left a comment to update some types

kevenleone · 2025-02-28T16:53:33Z

...arketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/enums/Order.ts

 	SOLUTIONS7 = 'SOLUTIONS7',
 	SOLUTIONS30 = 'SOLUTIONS30',
 }

+export const ORDER_TYPES_LABELS: {[key: string]: string} = {


No need to add the type since is automatically inferred here, what could be done is to add the as const to add the real keys and values as type

Suggested change

export const ORDER_TYPES_LABELS: {[key: string]: string} = {

export const ORDER_TYPES_LABELS = {

kevenleone · 2025-02-28T16:53:51Z

...arketplace-workspace/client-extensions/liferay-marketplace-custom-element/src/enums/Order.ts

+	[ORDER_TYPES.FRAGMENT]: 'Fragment',
+	[ORDER_TYPES.SOLUTIONS7]: 'Solutions 7',
+	[ORDER_TYPES.SOLUTIONS30]: 'Solutions 30',
+};


Probably the best option

Suggested change

};

} as const;

kevenleone · 2025-02-28T16:54:25Z

...lace-workspace/client-extensions/liferay-marketplace-custom-element/src/enums/ProductType.ts

+export const ProductTypeLabels: {[key: string]: string} = {
+	[ProductType.CLIENT_EXTENSION]: 'Client Extension',
+	[ProductType.CLOUD]: 'Cloud',
+	[ProductType.DXP]: 'DXP',
+	[ProductType.FRAGMENT]: 'Fragment',
+};


Suggested change

export const ProductTypeLabels: {[key: string]: string} = {

[ProductType.CLIENT_EXTENSION]: 'Client Extension',

[ProductType.CLOUD]: 'Cloud',

[ProductType.DXP]: 'DXP',

[ProductType.FRAGMENT]: 'Fragment',

};

export const ProductTypeLabels = {

[ProductType.CLIENT_EXTENSION]: 'Client Extension',

[ProductType.CLOUD]: 'Cloud',

[ProductType.DXP]: 'DXP',

[ProductType.FRAGMENT]: 'Fragment',

} as const;

kevenleone · 2025-02-28T16:56:50Z

...extensions/liferay-marketplace-custom-element/src/pages/GetApp/utils/getProductOrderTypes.ts

+const productTypeERC: {[key: string]: {}} = {
+	[ProductType.CLIENT_EXTENSION]: {externalReferenceCode: 'CLIENT_EXTENSION'},
+	[ProductType.CLOUD]: {externalReferenceCode: 'CLOUDAPP'},
+	[ProductType.DXP]: {externalReferenceCode: 'DXPAPP'},
+	[ProductType.FRAGMENT]: {externalReferenceCode: 'FRAGMENT'},
+};
+


Prevent redundancy

Suggested change

const productTypeERC: {[key: string]: {}} = {

[ProductType.CLIENT_EXTENSION]: {externalReferenceCode: 'CLIENT_EXTENSION'},

[ProductType.CLOUD]: {externalReferenceCode: 'CLOUDAPP'},

[ProductType.DXP]: {externalReferenceCode: 'DXPAPP'},

[ProductType.FRAGMENT]: {externalReferenceCode: 'FRAGMENT'},

};

const productTypeERC = {

[ProductType.CLIENT_EXTENSION]: 'CLIENT_EXTENSION',

[ProductType.CLOUD]: 'CLOUDAPP',

[ProductType.DXP]: 'DXPAPP',

[ProductType.FRAGMENT]: 'FRAGMENT',

} as const;

kevenleone · 2025-02-28T16:57:46Z

...extensions/liferay-marketplace-custom-element/src/pages/GetApp/utils/getProductOrderTypes.ts

+	return (
+		(productTypeERC[productSpecification] as OrderType) ||
+		({externalReferenceCode: 'NOTYPE'} as OrderType)
+	);


Suggested change

return (

(productTypeERC[productSpecification] as OrderType) ||

({externalReferenceCode: 'NOTYPE'} as OrderType)

);

return {externalReferenceCode: productTypeERC[productSpecification] || 'NOTYPE'}));

CalebJamesH changed the title ~~LPD-48899~~ LPD-48899 Add CX and Fragment types to app table Feb 26, 2025

CalebJamesH force-pushed the LPD-48899-resend-3 branch from 625f385 to 099984c Compare February 26, 2025 12:31

liferay-continuous-integration added ci:test:sf - pending ci:test:relevant - pending ci:test:stable - pending ci:test:sf - success and removed ci:test:sf - pending labels Feb 26, 2025

welitonpe assigned CalebJamesH Feb 26, 2025

welitonpe added the Marketplace label Feb 26, 2025

liferay-continuous-integration added ci:test:relevant - failure and removed ci:test:relevant - pending labels Feb 26, 2025

kevenleone requested changes Feb 26, 2025

View reviewed changes

CalebJamesH added the Frontend Indicates the PRs made by Solutions' frontend team label Feb 26, 2025

CalebJamesH force-pushed the LPD-48899-resend-3 branch from 099984c to 8e912a6 Compare February 26, 2025 14:22

CalebJamesH requested review from kevenleone, welitonpe and eduardo-diniz February 26, 2025 15:02

kevenleone requested changes Feb 27, 2025

View reviewed changes

CalebJamesH force-pushed the LPD-48899-resend-3 branch 3 times, most recently from b054cd3 to 66a8b63 Compare February 28, 2025 14:08

CalebJamesH force-pushed the LPD-48899-resend-3 branch 2 times, most recently from 86ab2f3 to 0d81aea Compare February 28, 2025 14:48

CalebJamesH requested a review from kevenleone February 28, 2025 15:34

liferay-continuous-integration added ci:test:sf - pending ci:test:sf - failure and removed ci:test:sf - success ci:test:sf - pending labels Feb 28, 2025

CalebJamesH force-pushed the LPD-48899-resend-3 branch from 0d81aea to 5fbc137 Compare February 28, 2025 15:50

liferay-continuous-integration added ci:test:sf - pending and removed ci:test:sf - failure labels Feb 28, 2025

liferay-continuous-integration added ci:test:sf - success and removed ci:test:sf - pending labels Feb 28, 2025

CalebJamesH force-pushed the LPD-48899-resend-3 branch from 5fbc137 to e31a400 Compare February 28, 2025 16:05

LPD-48899 Add CX and Fragment types to app table

a80b667

CalebJamesH force-pushed the LPD-48899-resend-3 branch from e31a400 to a80b667 Compare February 28, 2025 16:54

kevenleone requested changes Feb 28, 2025

View reviewed changes

	export const ORDER_TYPES_LABELS: {[key: string]: string} = {
	export const ORDER_TYPES_LABELS = {

-const productTypeERC: {[key: string]: {}} = {
-	[ProductType.CLIENT_EXTENSION]: {externalReferenceCode: 'CLIENT_EXTENSION'},
-	[ProductType.CLOUD]: {externalReferenceCode: 'CLOUDAPP'},
-	[ProductType.DXP]: {externalReferenceCode: 'DXPAPP'},
-	[ProductType.FRAGMENT]: {externalReferenceCode: 'FRAGMENT'},
-};
+const productTypeERC = {
+	[ProductType.CLIENT_EXTENSION]: 'CLIENT_EXTENSION',
+	[ProductType.CLOUD]: 'CLOUDAPP',
+	[ProductType.DXP]: 'DXPAPP',
+	[ProductType.FRAGMENT]:  'FRAGMENT',
+} as const;

LPD-48899 Add CX and Fragment types to app table #6237

Are you sure you want to change the base?

LPD-48899 Add CX and Fragment types to app table #6237

Conversation

CalebJamesH commented Feb 26, 2025 • edited Loading

liferay-continuous-integration commented Feb 26, 2025

CalebJamesH commented Feb 26, 2025

liferay-continuous-integration commented Feb 26, 2025

liferay-continuous-integration commented Feb 26, 2025

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

Base Branch:

Sender Branch:

For more details click here.

liferay-continuous-integration commented Feb 26, 2025

kevenleone commented Feb 26, 2025

liferay-continuous-integration commented Feb 26, 2025

Base Branch:

Job Summary:

liferay-continuous-integration commented Feb 26, 2025

kevenleone commented Feb 27, 2025

CalebJamesH commented Feb 28, 2025

CalebJamesH commented Feb 28, 2025

CalebJamesH commented Feb 28, 2025

liferay-continuous-integration commented Feb 28, 2025

❌ ci:test:sf - 0 out of 1 jobs passed in 6 minutes

Base Branch:

Sender Branch:

1 Failed Jobs:

For more details click here.

liferay-continuous-integration commented Feb 28, 2025

CalebJamesH commented Feb 28, 2025

CalebJamesH commented Feb 28, 2025

CalebJamesH commented Feb 28, 2025

liferay-continuous-integration commented Feb 28, 2025

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

Base Branch:

Sender Branch:

For more details click here.

liferay-continuous-integration commented Feb 28, 2025

kevenleone left a comment

Choose a reason for hiding this comment

kevenleone Feb 28, 2025

Choose a reason for hiding this comment

kevenleone Feb 28, 2025

Choose a reason for hiding this comment

kevenleone Feb 28, 2025

Choose a reason for hiding this comment

kevenleone Feb 28, 2025

Choose a reason for hiding this comment

kevenleone Feb 28, 2025

Choose a reason for hiding this comment

CalebJamesH commented Feb 26, 2025 •

edited

Loading