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.

Sign up for GitHub

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

Jump to bottom

Feature/update cccs-main to 3.1.2 add cccs 2.1 changes #417

Merged
merged 10,000 commits into from
Apr 18, 2024
Merged

Feature/update cccs-main to 3.1.2 add cccs 2.1 changes #417

merged 10,000 commits into from
Apr 18, 2024

Conversation

cccs-RyanK
Copy link
Member

SUMMARY

Merged upstream release tag 3.1.2 into our main branch, and then added all our changes from cccs-2.1 branch. Once this is merged in I will create a cccs-3.1 branch for us to develop on and release

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

skion and others added 30 commits January 25, 2024 09:47
@skion @michael-s-molina
fix: Catch ImportErrors for Google SDKs (apache#25550)
224c3a1 
(cherry picked from commit effd73f)
@rusackas @michael-s-molina
fix: do not use lodash/memoize (apache#26709)
24567a5 
(cherry picked from commit ef4878b)
@Vitor-Avila @michael-s-molina
fix(legacy-charts): Show Time Grain control for legacy charts (apache…
51ca5fa 
…#26705)

(cherry picked from commit 3ed70d8)
@Vitor-Avila @michael-s-molina
fix(db2): Improving support for ibm db2 connections (apache#26744)
1273f72 
(cherry picked from commit 5eb4e82)
@Vitor-Avila @michael-s-molina
fix(BigQuery): Support special characters in column/metric names used…
519f770 
… in ORDER BY (apache#26461)

(cherry picked from commit 4592dd1)
@john-bodley @michael-s-molina
fix(logging): Filter out undefined columns (apache#26314)
33d8f72 
(cherry picked from commit 01fdfbe)
@mistercrunch @michael-s-molina
fix(import): only import FORMULA annotations (apache#26652)
72ad551
@dpgaspar @villebro @michael-s-molina
fix: helm chart comment on SECRET_KEY (apache#26674)
debe781 
Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
@dnskr @michael-s-molina
feat(helm): Upgrade default Superset version to 3.1.0 (apache#26707)
2f9572c
@michael-s-molina
fix: Row limit hardcoded (apache#26807)
91399b1 
(cherry picked from commit 5e633d2)
@Vitor-Avila @michael-s-molina
fix(tags): Filter system tags from the tags list (apache#26701)
84f0d74 
(cherry picked from commit 4f56f5e)
@michael-s-molina
fix(time-series table): Can't compare from the beginning of the time …
d184fd9 
…range (apache#26814)

(cherry picked from commit 1f6c270)
@justinpark @michael-s-molina
fix(sqllab): autosync fail on migrated queryEditor (apache#26922)
6cdaf47
@betodealmeida @michael-s-molina
feat(sqlparse): improve table parsing (apache#26476)
1d9cfda 
(cherry picked from commit c0b57bd)
@Mattc1221 @michael-s-molina
fix(deck.gl Multiple Layer Chart): Add Contour and Heatmap Layer as o…
1be9eb5 
…ptions (apache#25923)

(cherry picked from commit 64ba579)
@betodealmeida @michael-s-molina
fix: prevent guest user from modifying metrics (apache#26749)
ba9032e 
(cherry picked from commit fade480)
@michael-s-molina
fix: Bar charts horizontal margin adjustment error (apache#26817)
81353e2 
(cherry picked from commit 84c48d1)
@ege-st @michael-s-molina
fix(pinot): typo in the name for epoch_ms_to_dttm (apache#26906)
61b4017 
(cherry picked from commit 484901f)
@mapledan @michael-s-molina
fix: handle CRLF endings causing sqlglot failure (apache#26911)
de61591 
(cherry picked from commit f2bf9f7)
@dpgaspar @michael-s-molina
fix: dashboard import validation (apache#26887)
322812b 
(cherry picked from commit 36ce9e2)
@sbernauer @michael-s-molina
fix: Allow exporting saved queries without schema information (apache…
e8a3c5d 
…#26889)

(cherry picked from commit 4c5176e)
@Usiel @michael-s-molina
fix(cache): remove unused webserver config & handle trailing slashes (a…
86794cb 
…pache#22849)

(cherry picked from commit 56069b0)
@michael-s-molina
feat(embedded+async queries): support async queries to work with embe…
dac73fe 
…dded guest user (apache#26332)

(cherry picked from commit efdeb9d)
@kgabryje @michael-s-molina
fix(plugin-chart-table): Prevent misalignment of totals and headers w…
ab7f560 
…hen scrollbar is visible (apache#26964)

(cherry picked from commit e6d2fb6)
@betodealmeida @michael-s-molina
fix: column values with NaN (apache#26946)
e3abdd5 
(cherry picked from commit d8a9847)
@Vitor-Avila @michael-s-molina
fix(tags): Improve support for tags with colons (apache#26965)
4df40be 
(cherry picked from commit e437356)
@Vitor-Avila @michael-s-molina
fix(security manager): Users should not have access to all draft dash…
5a6109b 
…boards (apache#27015)

(cherry picked from commit 01e2f8a)
@betodealmeida @michael-s-molina
fix: safer error message in alerts (apache#27019)
c974daa 
(cherry picked from commit 686ce33)
@justinpark @michael-s-molina
fix(explore): allow free-form d3 format on custom column formatting (a…
d572af3 
…pache#27023)

(cherry picked from commit fd06ff3)
@justinpark @michael-s-molina
fix(plugins): missing currency on small number format in table chart (a…
bb44099 
…pache#27041)

(cherry picked from commit 6f40299)
nz970 and others added 22 commits April 9, 2024 15:20
@nz970 @cccs-RyanK
Implemented QA Changes 2
e9c20f2
@cccs-RyanK @dependabot
A few automatic changes to bump dependancies merged together (#397)
b3a4960 
* Bump jest-mock-console from 1.2.3 to 2.0.0 in /superset-frontend

Bumps [jest-mock-console](https://github.com/bpedersen/jest-mock-console) from 1.2.3 to 2.0.0.
- [Release notes](https://github.com/bpedersen/jest-mock-console/releases)
- [Commits](https://github.com/bpedersen/jest-mock-console/commits)

---
updated-dependencies:
- dependency-name: jest-mock-console
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump ioredis and @types/ioredis in /superset-websocket

Bumps [ioredis](https://github.com/luin/ioredis) and [@types/ioredis](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/ioredis). These dependencies needed to be updated together.

Updates `ioredis` from 4.28.0 to 5.3.2
- [Release notes](https://github.com/luin/ioredis/releases)
- [Changelog](https://github.com/luin/ioredis/blob/main/CHANGELOG.md)
- [Commits](redis/ioredis@v4.28.0...v5.3.2)

Updates `@types/ioredis` from 4.28.0 to 5.0.0
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/ioredis)

---
updated-dependencies:
- dependency-name: ioredis
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: "@types/ioredis"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump pip-compile-multi from 2.6.1 to 2.6.3 in /requirements

Bumps [pip-compile-multi](https://github.com/peterdemin/pip-compile-multi) from 2.6.1 to 2.6.3.
- [Changelog](https://github.com/peterdemin/pip-compile-multi/blob/master/HISTORY.rst)
- [Commits](peterdemin/pip-compile-multi@v2.6.1...v2.6.3)

---
updated-dependencies:
- dependency-name: pip-compile-multi
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump pre-commit from 3.0.4 to 3.3.3 in /requirements

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.0.4 to 3.3.3.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](pre-commit/pre-commit@v3.0.4...v3.3.3)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump prettier from 2.8.4 to 3.0.0 in /superset-websocket

Bumps [prettier](https://github.com/prettier/prettier) from 2.8.4 to 3.0.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@2.8.4...3.0.0)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump jsonwebtoken in /superset-websocket/utils/client-ws-app

Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) from 9.0.0 to 9.0.1.
- [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jsonwebtoken/commits)

---
updated-dependencies:
- dependency-name: jsonwebtoken
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump tox from 3.25.1 to 4.6.4 in /requirements

Bumps [tox](https://github.com/tox-dev/tox) from 3.25.1 to 4.6.4.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](tox-dev/tox@3.25.1...4.6.4)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump eslint from 8.34.0 to 8.45.0 in /superset-websocket

Bumps [eslint](https://github.com/eslint/eslint) from 8.34.0 to 8.45.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.34.0...v8.45.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump @typescript-eslint/eslint-plugin in /superset-websocket

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.52.0 to 6.2.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.2.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump @types/node from 18.13.0 to 20.4.5 in /superset-websocket

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.13.0 to 20.4.5.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* update dockerfile

* Update Dockerfile

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@cccs-RyanK
Fix/CLDN-2460 properly display dates (#396)
eb15760 
* force utc for timestamp types

* Update Dockerfile

* Update Dockerfile

* use updated ag grid plugin for dataset explorer viz

* update dockerfile

* fixed dataset explorer

* formatting

* update dockerfile

* update dockerfile
@cccs-RyanK
Update Dockerfile (#411)
6a783d7
@cccs-RyanK
bug/CLDN-2472 (#413)
81e98e9 
* fix for metrics

* Update Dockerfile

* Update Dockerfile
@cccs-RyanK
post merge fixes
7d55639
@cccs-RyanK
post merge fixes
ad89ddd
@cccs-RyanK
post merge fixes
063521b
@cccs-RyanK
mostly extra file deletions
0092f40
@cccs-RyanK
more extra files deletion
487ee1c
@cccs-RyanK
more extra files deletions
a6af346
@cccs-RyanK
post merge fixes
1be3cf5
@cccs-RyanK
adding alfred and fission apis back
88be07d
@cccs-RyanK
post merge fixes
7355d7a
@cccs-RyanK
update package lock
91bb67a
@cccs-RyanK
post merge fixes
4132401
@cccs-RyanK
small fixes
0dc3e87
@cccs-RyanK
update dockerfile
4ece44d
@cccs-RyanK
update dockerfile
c98880a
@cccs-RyanK
re-add the datahub icon
3edc5a4
@cccs-RyanK
better catch on datahub icon
983f37f
@cccs-RyanK
update dockerfile
7278866
cccs-joel
cccs-joel reviewed Apr 18, 2024
View reviewed changes
cccs-build/superset/requirements.txt
trino==0.318.0
mysql-connector-python==8.0.26
elasticsearch-dbapi==0.2.4
trino==0.328.0
Copy link

Choose a reason for hiding this comment

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

Just checking the number here.

Copy link
Member Author

Choose a reason for hiding this comment

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

@cccs-tom requested that we use this version of the python client

Copy link

Choose a reason for hiding this comment

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

Excellent!

@cccs-RyanK cccs-RyanK merged commit d7d1006 into cccs-main Apr 18, 2024
2 checks passed
@cccs-RyanK cccs-RyanK deleted the feature/update-cccs-main-to-3.1.2-add-cccs-2.1 branch April 18, 2024 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cccs-joel cccs-joel cccs-joel approved these changes

@cccs-rc cccs-rc Awaiting requested review from cccs-rc

@nz970 nz970 Awaiting requested review from nz970

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.