chore: separate yarn workspaces by schultzp2020 · Pull Request #2790 · redhat-developer/rhdh

schultzp2020 · 2025-04-22T16:35:45Z

Description

Please explain the changes you made here.

Which issue(s) does this PR fix

Fixes https://issues.redhat.com/browse/RHIDP-6987

Separate Dynamic Plugins workspace from the "Core" workspace
Update the dockerfile to reflect these changes.

PR acceptance criteria

Please make sure that the following steps are complete:

GitHub Actions are completed and successful
Unit Tests are updated and passing
E2E Tests are updated and passing
Documentation is updated if necessary (requirement for new features)
Add a screenshot if the change is UX/UI related

How to test changes / Special notes to the reviewer

github-actions · 2025-04-22T21:46:19Z

The image is available at:

packages/backend/src/modules/authResolvers.ts

github-actions · 2025-04-22T22:33:04Z

The image is available at:

Omar-AlJaljuli · 2025-04-23T15:53:22Z

/retest

github-actions · 2025-04-23T16:04:46Z

The image is available at:

github-actions · 2025-04-24T14:50:18Z

The image is available at:

github-actions · 2025-04-24T15:43:52Z

The image is available at:

github-actions · 2025-04-24T16:58:11Z

The image is available at:

github-actions · 2025-04-24T21:16:16Z

The image is available at:

04kash

lgtm, just left a comment

04kash · 2025-04-25T14:07:01Z

dynamic-plugins/package.json

+  "resolutions": {
+    "@types/react": "18.3.20",
+    "@types/react-dom": "18.3.6",
+    "@rjsf/utils": "=5.24.0",


This resolution can be removed if we switch to using @backstage-community/plugin-rbac 1.40.1

github-actions · 2025-04-25T20:05:59Z

The image is available at:

github-actions · 2025-04-25T23:26:08Z

The image is available at:

github-actions · 2025-04-26T00:52:42Z

The image is available at:

nickboldt · 2025-04-26T01:14:55Z

docker/Dockerfile

no e2e? why not?

There's no need to build the e2e package in the container.

nickboldt · 2025-04-26T01:15:08Z

docker/Dockerfile

no longer needed?

Correct, it's copied later on.

nickboldt · 2025-04-26T01:15:22Z

docker/Dockerfile

none of these package.json files are required anymore?

Correct, it's copied later on.

nickboldt · 2025-04-26T01:16:56Z

scripts/update-Dockerfile.sh

so we only need these now?

./package.json ./packages/app/package.json ./packages/backend/package.json ./plugins/dynamic-plugins-info-backend/package.json ./plugins/dynamic-plugins-info/package.json ./plugins/licensed-users-info-backend/package.json ./plugins/scalprum-backend/package.json

?

Correct, it's the bare minimum now.

nickboldt · 2025-04-26T01:18:35Z

I have questions. I think we need input from @gashcrumb and @davidfestal before making these changes for the dynamic wrappers and changing how they're included in the dockerfiles.

schultzp2020 · 2025-04-26T01:40:40Z

The dynamic plugin package.jsons are now copied here because we don't need them earlier.
The dist-types folder needs to be located under dynamic-plugins since the workspace changed.

github-actions · 2025-04-26T02:05:16Z

The image is available at:

Signed-off-by: Paul Schultz <pschultz@pobox.com> add @rjsf/utils to resolutions to fix export-dynamic issues with rbac Signed-off-by: Kashish Mittal <kmittal@redhat.com> fix build:dockerfile Signed-off-by: Paul Schultz <pschultz@pobox.com>

Signed-off-by: Paul Schultz <pschultz@pobox.com>

nickboldt

blindly adding approval so this get automerged if tests pass - livin' la vida agile woo!

/lgtm
/approve

openshift-ci · 2025-05-06T17:43:46Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nickboldt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [nickboldt]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

github-actions · 2025-05-06T17:59:48Z

The image is available at:

* separate yarn workspaces Signed-off-by: Paul Schultz <pschultz@pobox.com> add @rjsf/utils to resolutions to fix export-dynamic issues with rbac Signed-off-by: Kashish Mittal <kmittal@redhat.com> fix build:dockerfile Signed-off-by: Paul Schultz <pschultz@pobox.com> * update dockerfile Signed-off-by: Paul Schultz <pschultz@pobox.com> * update the copy plugins scipt Signed-off-by: Paul Schultz <pschultz@pobox.com> * update gh actions Signed-off-by: Paul Schultz <pschultz@pobox.com> --------- Signed-off-by: Paul Schultz <pschultz@pobox.com>

openshift-ci bot requested review from dzemanov and josephca April 22, 2025 16:35

schultzp2020 force-pushed the rhidp-6987 branch 2 times, most recently from ee3aa04 to 8fd7ce0 Compare April 22, 2025 19:48

schultzp2020 commented Apr 22, 2025

View reviewed changes

packages/backend/src/modules/authResolvers.ts Outdated Show resolved Hide resolved

schultzp2020 force-pushed the rhidp-6987 branch 2 times, most recently from 9fa4ce1 to 0bbed4b Compare April 23, 2025 15:29

JessicaJHee mentioned this pull request Apr 24, 2025

chore: add auth provider patches for yarn workspace separation #2798

Merged

5 tasks

openshift-merge-robot added the needs-rebase label Apr 24, 2025

schultzp2020 force-pushed the rhidp-6987 branch from 62beb9c to 5857a4e Compare April 24, 2025 14:15

openshift-merge-robot removed the needs-rebase label Apr 24, 2025

schultzp2020 force-pushed the rhidp-6987 branch from 5857a4e to dff8959 Compare April 24, 2025 15:06

schultzp2020 force-pushed the rhidp-6987 branch from dff8959 to 28e2d3c Compare April 24, 2025 16:21

schultzp2020 force-pushed the rhidp-6987 branch from 28e2d3c to b6869aa Compare April 24, 2025 20:38

04kash reviewed Apr 25, 2025

View reviewed changes

schultzp2020 force-pushed the rhidp-6987 branch from b6869aa to c3f5a3e Compare April 25, 2025 19:27

openshift-merge-robot added the needs-rebase label Apr 25, 2025

schultzp2020 force-pushed the rhidp-6987 branch from c3f5a3e to 1b726b5 Compare April 25, 2025 22:37

openshift-merge-robot removed the needs-rebase label Apr 25, 2025

schultzp2020 force-pushed the rhidp-6987 branch from 1b726b5 to 413ec39 Compare April 25, 2025 22:49

nickboldt reviewed Apr 26, 2025

View reviewed changes

nickboldt requested review from davidfestal and gashcrumb April 26, 2025 01:17

schultzp2020 force-pushed the rhidp-6987 branch from eb44d0f to 6f3cfe1 Compare April 26, 2025 01:28

openshift-merge-robot added the needs-rebase label Apr 30, 2025

schultzp2020 added 4 commits May 6, 2025 12:14

separate yarn workspaces

e3f2102

Signed-off-by: Paul Schultz <pschultz@pobox.com> add @rjsf/utils to resolutions to fix export-dynamic issues with rbac Signed-off-by: Kashish Mittal <kmittal@redhat.com> fix build:dockerfile Signed-off-by: Paul Schultz <pschultz@pobox.com>

update dockerfile

d743f24

Signed-off-by: Paul Schultz <pschultz@pobox.com>

update the copy plugins scipt

8ac2d70

Signed-off-by: Paul Schultz <pschultz@pobox.com>

update gh actions

7ab12b8

Signed-off-by: Paul Schultz <pschultz@pobox.com>

schultzp2020 force-pushed the rhidp-6987 branch from 6f3cfe1 to 7ab12b8 Compare May 6, 2025 17:21

openshift-merge-robot removed the needs-rebase label May 6, 2025

nickboldt approved these changes May 6, 2025

View reviewed changes

openshift-ci bot assigned nickboldt May 6, 2025

openshift-ci bot added the lgtm label May 6, 2025

openshift-ci bot added the approved label May 6, 2025

openshift-merge-bot bot merged commit 61de911 into main May 6, 2025
14 checks passed

openshift-merge-bot bot deleted the rhidp-6987 branch May 6, 2025 19:05

Conversation

schultzp2020 commented Apr 22, 2025 • edited by nickboldt Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Which issue(s) does this PR fix

PR acceptance criteria

How to test changes / Special notes to the reviewer

Uh oh!

github-actions bot commented Apr 22, 2025

Uh oh!

Uh oh!

github-actions bot commented Apr 22, 2025

Uh oh!

Omar-AlJaljuli commented Apr 23, 2025

Uh oh!

github-actions bot commented Apr 23, 2025

Uh oh!

github-actions bot commented Apr 24, 2025

Uh oh!

github-actions bot commented Apr 24, 2025

Uh oh!

github-actions bot commented Apr 24, 2025

Uh oh!

github-actions bot commented Apr 24, 2025

Uh oh!

04kash left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Apr 25, 2025

Uh oh!

github-actions bot commented Apr 25, 2025

Uh oh!

github-actions bot commented Apr 26, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nickboldt commented Apr 26, 2025

Uh oh!

schultzp2020 commented Apr 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Apr 26, 2025

Uh oh!

nickboldt left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented May 6, 2025

Uh oh!

github-actions bot commented May 6, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

schultzp2020 commented Apr 22, 2025 •

edited by nickboldt

Loading

schultzp2020 commented Apr 26, 2025 •

edited

Loading

nickboldt left a comment •

edited

Loading