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

Rename ui-cra -> ui and move package.json to root #3263

Merged
merged 7 commits into from
Sep 5, 2023
Merged

Rename ui-cra -> ui and move package.json to root #3263

merged 7 commits into from
Sep 5, 2023

Conversation

foot
Copy link
Collaborator

@foot foot commented Aug 29, 2023

Fixes #3250

What changed?

  • ui-cra -> ui
  • ui/package.json -> ./package.json

Why was this change made?

Don't have to cd ui-cra before running yarn

How was this change implemented?

How did you validate the change?

  • yarn start
  • yarn build
  • yarn preview
  • tilt up
  • NATIVE_BUILD=1 tilt up build ui and golang locally
  • SKIP_UI_BUILD NATIVE_BUILD=1 tilt up skip ui build and golang locally
  • SKIP_UI_BUILD tilt up skip ui and build golang in container
  • yarn test
  • make proto
  • cd cmd/clusters-service && make generate

Release notes

Documentation Changes

Other follow ups

@foot foot changed the title ui-cra to ui Rename ui-cra -> ui and move package.json to root Aug 30, 2023
@foot foot added the exclude from release notes Use this label to exclude a PR from the release notes label Aug 30, 2023
@foot foot marked this pull request as ready for review August 30, 2023 08:35
@foot foot requested a review from jpellizzari as a code owner August 30, 2023 08:35
@foot
Copy link
Collaborator Author

foot commented Aug 30, 2023

@jpellizzari I had to eject in this PR too as CRA is a bit strict about the location of public/index.html relative to package.json

Happy to still land this before or after any other ejection PRs

@jpellizzari
Copy link
Contributor

@foot Go ahead and merge this at your leisure. My package.json diff should take care of it when I rebase 👍 .

Copy link
Contributor

@jpellizzari jpellizzari left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@foot
Copy link
Collaborator Author

foot commented Aug 31, 2023

Cool, will fix and merge tomorrow after the release

@AlinaGoaga
Copy link
Contributor

This looks good, thanks @foot! I ran the commands also, all worked bar the NATIVE_BUILD ones for me (Build Failed: ImageBuild: failed to compute cache key: failed to calculate checksum of ref 835066b6-ca6a-4609-9152-a27e02f73f2e::v5nr7wka4hu8k161kdwbd0y4m: "/build": not found). Not sure if I am missing something, already installed gcc .

foot added 7 commits September 5, 2023 10:04
- and move package.json to root
- The dev Dockerfile for the UI in that case was being eval'd in the wrong path
- It wasn't finding the ./build folder (which moved from ./ui-cra/build to ./build)
@foot foot merged commit 3cfd1ec into main Sep 5, 2023
@foot foot deleted the ui-cra-to-ui branch September 5, 2023 09:01
AsmaaNabilBakr pushed a commit that referenced this pull request Sep 6, 2023
* Search replace all the ui-cra to ui
* and move package.json to root
* run eject
AsmaaNabilBakr added a commit that referenced this pull request Sep 6, 2023
* fix button spaces

* remove unused imports

* update snaps

* remove unused styled components

* Rename ui-cra -> ui and move package.json to root (#3263)

* Search replace all the ui-cra to ui
* and move package.json to root
* run eject

* Update fields in cluster-service API to be snake_case (#3237)

* Update fields in cluster-service API to be snake_case
* Make sure all network requests in the UI use the protobuf types
* And remove all a lot of unused code in the FE too


---------

Co-authored-by: Simon Howe <[email protected]>
Co-authored-by: Simon <[email protected]>

* Bump @adobe/css-tools from 4.2.0 to 4.3.1 (#3284)

Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.2.0 to 4.3.1.
- [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
- [Commits](https://github.com/adobe/css-tools/commits)

---
updated-dependencies:
- dependency-name: "@adobe/css-tools"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Simon <[email protected]>

* Bump async from 2.6.3 to 2.6.4 (#3285)

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](caolan/async@v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Simon <[email protected]>

* Explorer extending - gitopssets (#3267)

* Add gitopsset kind to supported objects in explorer query

* add gitopssets to rbac rules

* Add gitopssets to ToFluxObject

* Add gitopssets to getKindRoute fn in ui

* Add gitopssets query server testcase to server integration tests

* Use allowGitOpsSetsAnyOnDefaultNamespace for gitopsset support query server test

* Add gitopssets crd to query suite test

* changed category gitopsset (#3290)

---------

Co-authored-by: Eneko Fernández <[email protected]>

* update snaps

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Simon <[email protected]>
Co-authored-by: Sara Elzayat <[email protected]>
Co-authored-by: Simon Howe <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rana Tarek Hassan <[email protected]>
Co-authored-by: Eneko Fernández <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
exclude from release notes Use this label to exclude a PR from the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

EE Rename ui-cra -> ui and move package.json to root
4 participants