Skip to content

Import a linear history of unitycatalog-ui into ui/#413

Merged
dennyglee merged 47 commits intounitycatalog:mainfrom
rtyler:ui-synergy
Sep 6, 2024
Merged

Import a linear history of unitycatalog-ui into ui/#413
dennyglee merged 47 commits intounitycatalog:mainfrom
rtyler:ui-synergy

Conversation

@rtyler
Copy link
Contributor

@rtyler rtyler commented Sep 5, 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 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

  • 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

@dennyglee
Copy link
Contributor

Thakns @rtyler - this looks great! Could you modify the links (e.g. #73) to point back to the unitycatalog-ui#73? And perhaps add the prefix [UI]? Thanks! cc @tdas

@tdas
Copy link
Contributor

tdas commented Sep 5, 2024

hahaha. @rtyler, i did this exact thing as well - #412
its funny to see 3 back to back PRs on attempting to do this 😆
image

Thanks for tackling this, great minds think alike! I like Denny's suggestions.

yc-shawn and others added 28 commits September 6, 2024 12:53
…atalog-ui#5)

* feat: ✨ Add CatalogsList page + ListWrapper

* extract format timestamp to util + add interaction to list rows
…tycatalog-ui#6)

* feat: ✨ Add CatalogsList page + ListWrapper

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

* feat: ✨ Add details layout + catalog-details hook
…catalog-ui#7)

* feat: ✨ Add CatalogsList page + ListWrapper

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

* add sidebar layout + catalog sidebar
…talog/unitycatalog-ui#16)

* feat: ✨ Add FunctionDetails page + sidebar with details

* add breadcrumbs

* add icon

* add code block for function def

* lint
…tycatalog-ui#14)

* 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
jamieknight-db and others added 18 commits September 6, 2024 12:58
* delete table feature

* handle onSuccess callback, navigate, display notification

* PR feedback

* More pr feedback

* change button type

* tableFullName prop

* memoize
* Add CONTRIBUTING.md with contribution guidelines

closes unitycatalog#26

* Fix indentation
* Add code style check

add style check workflow

* move prettier to devDependencies
…atalog-ui#60)

* 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
…og-ui#63)

* 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 (unitycatalog#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 (unitycatalog/unitycatalog-ui#70)

clean up some other endpoints

* commenting out UI until repositories are merged

* clean up current user (unitycatalog/unitycatalog-ui#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]>
Updating readme.md to reflect archival process.
@rtyler rtyler marked this pull request as ready for review September 6, 2024 13:01
@dennyglee
Copy link
Contributor

Thanks very much @rtyler - really appreciate you tackling this so quickly!

@dennyglee dennyglee merged commit e613521 into unitycatalog:main Sep 6, 2024
dennyglee added a commit that referenced this pull request Sep 6, 2024
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]>
vksx pushed a commit to vksx/unitycatalog that referenced this pull request Oct 7, 2024
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]>
kevinzwang pushed a commit to kevinzwang/unitycatalog that referenced this pull request Oct 10, 2024
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.

10 participants