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

refactor(monorepo): relocate superset-ui #17445

Merged
merged 1,866 commits into from
Nov 26, 2021

Conversation

zhaoyongjie
Copy link
Member

@zhaoyongjie zhaoyongjie commented Nov 16, 2021

SUMMARY

This PR MUST wait for monorepo-stage-2 to pass CI.
This PR MUST merged before monorepo-stage-2 .

  1. add lerna.json in superset-frontend
  2. add workspace in packages.json
  3. run command npx lerna import --flatten --dest temporary_superset_ui ../../superset-ui to import all commits into superset-frontend. commit cut to : apache-superset/superset-ui@3e16995
  4. discard workspace changing in packages.json (in order not to add new dependencies, dependencies will be added in stage-2 PR)
  5. ignore temporary_superset_ui in pre-commit-config
  6. remove *.ipynb from .gitignore
  7. in order to support merge or squash this PR so temporarily update .asf.yml

To ensure that every PR passes the CI, the monorepo-related PR is split into multiple stages.

  1. refactor(monorepo): stage 1 #17427
  2. refactor(monorepo): relocate superset-ui #17445 (this PR)
  3. refactor(monorepo): move superset-ui to superset(stage 2) #17437

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

TESTING INSTRUCTIONS

ADDITIONAL INFORMATION

  • Has associated issue:
  • Required feature flags:
  • Changes UI
  • Includes DB Migration (follow approval process in SIP-59)
    • Migration is atomic, supports rollback & is backwards-compatible
    • Confirm DB migration upgrade and downgrade tested
    • Runtime estimates and downtime expectations provided
  • Introduces new feature or API
  • Removes existing feature or API

@zhaoyongjie zhaoyongjie changed the title Monorepo relocate superset UI refactor(monorepo): relocate superset UI Nov 16, 2021
@zhaoyongjie zhaoyongjie changed the title refactor(monorepo): relocate superset UI refactor(monorepo): relocate superset-ui Nov 16, 2021
Copy link
Member

@ktmud ktmud left a comment

Choose a reason for hiding this comment

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

Thanks for working on this! This is the really large undertaking.

Just a reminder that when merging this PR, DON'T choose "Squash and merge", otherwise you'll lose all the git history.

@ktmud
Copy link
Member

ktmud commented Nov 17, 2021

Before merging this PR, we must update .asf.yml to enable "Create merge commit", otherwise it is not possible:

Xnip2021-11-16_16-19-22

@zhaoyongjie zhaoyongjie force-pushed the monorepo_relocate_superset_ui branch 4 times, most recently from 5149a63 to 7beb48a Compare November 17, 2021 09:34
@rusackas rusackas added hold! On hold hold:testing! On hold for testing risk:many-files Change has too many files labels Nov 19, 2021
@codecov
Copy link

codecov bot commented Nov 24, 2021

Codecov Report

Merging #17445 (3832bd5) into master (a304116) will increase coverage by 0.14%.
The diff coverage is n/a.

❗ Current head 3832bd5 differs from pull request most recent head 61a9517. Consider uploading reports for the commit 61a9517 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master   #17445      +/-   ##
==========================================
+ Coverage   76.81%   76.95%   +0.14%     
==========================================
  Files        1049     1049              
  Lines       56671    56671              
  Branches     7851     7851              
==========================================
+ Hits        43529    43611      +82     
+ Misses      12889    12807      -82     
  Partials      253      253              
Flag Coverage Δ
javascript 71.12% <ø> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
superset/datasets/api.py 90.13% <0.00%> (-0.90%) ⬇️
superset/constants.py 100.00% <0.00%> (ø)
superset/utils/core.py 89.76% <0.00%> (+0.11%) ⬆️
superset/connectors/sqla/models.py 87.07% <0.00%> (+0.22%) ⬆️
superset/db_engine_specs/base.py 88.54% <0.00%> (+0.38%) ⬆️
...perset-frontend/src/views/CRUD/chart/ChartList.tsx 74.21% <0.00%> (+0.62%) ⬆️
superset/db_engine_specs/presto.py 84.34% <0.00%> (+0.83%) ⬆️
...ontend/src/views/CRUD/data/dataset/DatasetList.tsx 66.29% <0.00%> (+1.12%) ⬆️
...rontend/src/views/CRUD/dashboard/DashboardList.tsx 71.14% <0.00%> (+1.34%) ⬆️
superset/views/database/mixins.py 82.75% <0.00%> (+1.72%) ⬆️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a304116...61a9517. Read the comment docs.

Copy link
Member

@geido geido left a comment

Choose a reason for hiding this comment

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

LGTM!

zhaoyongjie and others added 17 commits November 26, 2021 11:47
* change to prettier.config.js

* printWidth to 80

* format

* tweak
* feat:  remove the default Y-axis truncate in bar chart

* make all charts consistently

* fix lint
* feat(core): add support for adhoc columns

* simplify import

* revert simplification due to codecov

* fix filter column type

* fix pivot v2 groupbys

* remove redundant import

* Add new type guards

* move ColumnMeta type guards to chart-controls

* add type guard tests

* Fix typing and import errors

* Fix saved expression type guard

* Fix typing

* Remove redundant import

* Make Echarts and PivotTable handle AdhocColumns properly

* Fix lint

Co-authored-by: Kamil Gabryjelski <kamil.gabryjelski@gmail.com>
Co-authored-by: John Bodley <john.bodley@airbnb.com>
* chore: coordinate storybook with main repository

* update lock file
* chore: end of file fixer

* compress image

* lint without build

* lintrc improvment

* exporting

* update parallel-coordinates tsconfig

* add license to md file

* add license

* add eslintignore
Copy link
Member

@villebro villebro left a comment

Choose a reason for hiding this comment

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

LGTM, but let's not merge until non-squash merge is enabled

.asf.yaml Outdated Show resolved Hide resolved
Copy link
Member

@kgabryje kgabryje left a comment

Choose a reason for hiding this comment

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

LGTM

@zhaoyongjie zhaoyongjie merged commit 870d2ab into apache:master Nov 26, 2021
@yening-zy
Copy link

This is really a huge change, it's too friendly for developers, what version will be launched?

@villebro
Copy link
Member

We are just about to make a new release cut for 1.5. Finalizing the first release candidate + shipping it usually takes some time, but you should be able to start testing the new release branch within the next few weeks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hold:testing! On hold for testing hold! On hold risk:many-files Change has too many files size/XXL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet