Skip to content

Restructuring UI into /ui folder#408

Closed
dennyglee wants to merge 53 commits intounitycatalog:mainfrom
dennyglee:main
Closed

Restructuring UI into /ui folder#408
dennyglee wants to merge 53 commits intounitycatalog:mainfrom
dennyglee:main

Conversation

@dennyglee
Copy link
Contributor

PR Checklist

  • A description of the changes is added to the description of this PR.
  • If there is a related issue, make sure it is linked to this PR.
  • If you've fixed a bug or added code that should be tested, add tests!
  • If you've added or modified a feature, documentation in docs is updated

Description of changes
Per #349 with the unitycatalog-ui repo (main branch) code-base as part of unitycatalog repo (ui branch), this next set of steps is to:

  • Restructure the ui branch so that all code sits in the /ui folder ala

    | unitycatalog
    |- api
    |- ...
    |- tests
    |- ui (new)
       |- public
       |- src
       |- READMNE.md
       |- package.json
       |- ...
    
  • Remove the following files as the main already has them and would supersede this anyways

    CONTRIBUTING.md
    CODE_OF_CONDUCT.md
    LICENSE.txt
    
  • In addition, the link-checker.yaml was moved the /ui folder and placed into root and updated so that it would only check the files in the /ui folder.

Going forward, the UI and the server are in the same repo and branch thus simplifying debugging, development, and deployment.

yc-shawn and others added 30 commits July 10, 2024 10:33
* feat: ✨ Add CatalogsList page + ListWrapper

* extract format timestamp to util + add interaction to list rows
* feat: ✨ Add CatalogsList page + ListWrapper

* extract format timestamp to util + add interaction to list rows

* feat: ✨ Add details layout + catalog-details hook
* feat: ✨ Add CatalogsList page + ListWrapper

* extract format timestamp to util + add interaction to list rows

* add sidebar layout + catalog sidebar
* feat: ✨ Add SchemaDetails Page + getSchema hook
* feat: ✨ Add schema tabs for functions tables and volumes
* feat: ✨ Add FunctionDetails page + sidebar with details

* add breadcrumbs

* add icon

* add code block for function def

* lint
* feat: ✨ Add TableDetails page + Table Sidebar details + fix metadata labels

* add volume icon to details header
* feat: ✨ Create catalog flow

* prefer invalidate queries for refetching all catalogs
* Update README.md

* Update README.md
xx-db and others added 16 commits August 1, 2024 15:41
* Add Code of Conduct link to CONTRIBUTING.md

* removed unnecessary indentation

* Update CONTRIBUTING.md with governance and communication guidelines

Add a new CODE_OF_CONDUCT.md
* delete schema functionality

* prettier
* Add ability to edit catalog description

edit modal is made to support more fields in the future if we want to edit more than just description

* lint

* feedback

Co-authored-by: Shawn Chen <[email protected]>

---------

Co-authored-by: Shawn Chen <[email protected]>
* start of login page

* env and google auth button

* merge with main, remove params reference

* start of okta auth

* initial commit for handling auth token (#67)

* start of login with keycloak

* handle google sign in with token

* more google auth

* profile dropdown

* merge with main

* merge with main

* convert to axios

* start of readme instructions

* get current user endpoint (#70)

clean up some other endpoints

* commenting out UI until repositories are merged

* clean up current user (#74)

* yarn lock file

* remove keycloak for now, node version error in jwt-decode dependency

* commit yarn lock

* remove state as useEffect dependency, comment out currentUser call for now

---------

Co-authored-by: Xiang Xu <[email protected]>
@dennyglee dennyglee requested a review from creechy September 4, 2024 15:50
Copy link
Collaborator

@jamieknight-db jamieknight-db left a comment

Choose a reason for hiding this comment

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

LGTM thank you @dennyglee

Copy link
Collaborator

@creechy creechy left a comment

Choose a reason for hiding this comment

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

all contained in ui/ makes sense.

@robertgv
Copy link
Contributor

robertgv commented Sep 4, 2024

Nice work @dennyglee! 😄

@robertgv
Copy link
Contributor

robertgv commented Sep 4, 2024

Just make sure you don't squash the PR and only merge it so that the commit history is preserved.

@dennyglee
Copy link
Contributor Author

Just make sure you don't squash the PR and only merge it so that the commit history is preserved.

@robertgv are you concerned that if we do a "squash and merge" that all 53 commits will be combined into one commit in the base branch?

@robertgv
Copy link
Contributor

robertgv commented Sep 4, 2024

Just make sure you don't squash the PR and only merge it so that the commit history is preserved.

@robertgv are you concerned that if we do a "squash and merge" that all 53 commits will be combined into one commit in the base branch?

@dennyglee Correct. If we squash and merge, it will combine all the commits into a single commit on the base branch. If that's the goal, perfect. But if you want to keep track of all the commits from the UI repo on the base branch, don't do the squash.

@dennyglee
Copy link
Contributor Author

Just make sure you don't squash the PR and only merge it so that the commit history is preserved.

@robertgv are you concerned that if we do a "squash and merge" that all 53 commits will be combined into one commit in the base branch?

@dennyglee Correct. If we squash and merge, it will combine all the commits into a single commit on the base branch. If that's the goal, perfect. But if you want to keep track of all the commits from the UI repo on the base branch, don't do the squash.

@robertgv Ah got it, okay, let me redo this then.

@dennyglee dennyglee closed this Sep 4, 2024
dennyglee added a commit that referenced this pull request Sep 6, 2024
This pull request supersedes #408 and makes some of the same changes
except it provides a clean linear git history which can be rebased on
top of this repositories history.

Steps I followed were basically:

* Make the history of unitycatalog-ui linear by performing an
interactive rebase on the first commit
* Use [git-filter-repo](https://github.com/newren/git-filter-repo) to
rewrite its history such that everything moved to `ui/` in that repo
* Merge that history into unitycatalog.git with
`--allow-unrelated-histories`
* Rebase against `main` to remove the merge commit
* Clean up redundant files in the new tree structure


**PR Checklist**

- [X] A description of the changes is added to the description of this
PR.
- [X] If there is a related issue, make sure it is linked to this PR.
- [ ] If you've fixed a bug or added code that should be tested, add
tests!
- [ ] If you've added or modified a feature, documentation in `docs` is
updated

---------

Co-authored-by: Shawn Chen <[email protected]>
Co-authored-by: Robert Martinez <[email protected]>
Co-authored-by: Jamie Knight <[email protected]>
Co-authored-by: Robert Garcia Ventura <[email protected]>
Co-authored-by: Juan Diaz <[email protected]>
Co-authored-by: Xiang Xu <[email protected]>
Co-authored-by: Juan Diaz <[email protected]>
Co-authored-by: Shawn Chen <[email protected]>
Co-authored-by: Vikas Sharma <[email protected]>
Co-authored-by: Denny Lee <[email protected]>
vksx added a commit to vksx/unitycatalog that referenced this pull request Oct 7, 2024
This pull request supersedes unitycatalog#408 and makes some of the same changes
except it provides a clean linear git history which can be rebased on
top of this repositories history.

Steps I followed were basically:

* Make the history of unitycatalog-ui linear by performing an
interactive rebase on the first commit
* Use [git-filter-repo](https://github.com/newren/git-filter-repo) to
rewrite its history such that everything moved to `ui/` in that repo
* Merge that history into unitycatalog.git with
`--allow-unrelated-histories`
* Rebase against `main` to remove the merge commit
* Clean up redundant files in the new tree structure

**PR Checklist**

- [X] A description of the changes is added to the description of this
PR.
- [X] If there is a related issue, make sure it is linked to this PR.
- [ ] If you've fixed a bug or added code that should be tested, add
tests!
- [ ] If you've added or modified a feature, documentation in `docs` is
updated

---------

Co-authored-by: Shawn Chen <[email protected]>
Co-authored-by: Robert Martinez <[email protected]>
Co-authored-by: Jamie Knight <[email protected]>
Co-authored-by: Robert Garcia Ventura <[email protected]>
Co-authored-by: Juan Diaz <[email protected]>
Co-authored-by: Xiang Xu <[email protected]>
Co-authored-by: Juan Diaz <[email protected]>
Co-authored-by: Shawn Chen <[email protected]>
Co-authored-by: Vikas Sharma <[email protected]>
Co-authored-by: Denny Lee <[email protected]>
Signed-off-by: Vikas Sharma <[email protected]>
kevinzwang pushed a commit to kevinzwang/unitycatalog that referenced this pull request Oct 10, 2024
This pull request supersedes unitycatalog#408 and makes some of the same changes
except it provides a clean linear git history which can be rebased on
top of this repositories history.

Steps I followed were basically:

* Make the history of unitycatalog-ui linear by performing an
interactive rebase on the first commit
* Use [git-filter-repo](https://github.com/newren/git-filter-repo) to
rewrite its history such that everything moved to `ui/` in that repo
* Merge that history into unitycatalog.git with
`--allow-unrelated-histories`
* Rebase against `main` to remove the merge commit
* Clean up redundant files in the new tree structure

**PR Checklist**

- [X] A description of the changes is added to the description of this
PR.
- [X] If there is a related issue, make sure it is linked to this PR.
- [ ] If you've fixed a bug or added code that should be tested, add
tests!
- [ ] If you've added or modified a feature, documentation in `docs` is
updated

---------

Co-authored-by: Shawn Chen <[email protected]>
Co-authored-by: Robert Martinez <[email protected]>
Co-authored-by: Jamie Knight <[email protected]>
Co-authored-by: Robert Garcia Ventura <[email protected]>
Co-authored-by: Juan Diaz <[email protected]>
Co-authored-by: Xiang Xu <[email protected]>
Co-authored-by: Juan Diaz <[email protected]>
Co-authored-by: Shawn Chen <[email protected]>
Co-authored-by: Vikas Sharma <[email protected]>
Co-authored-by: Denny Lee <[email protected]>
Signed-off-by: Kevin Wang <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants