From 821916a681921e7a4e583009b10aee75c0a4ec73 Mon Sep 17 00:00:00 2001 From: John Bodley <4567245+john-bodley@users.noreply.github.com> Date: Sun, 2 Aug 2020 14:32:17 -0700 Subject: [PATCH] chore: pre-commit run --all-files (#10500) Co-authored-by: John Bodley <john.bodley@airbnb.com> --- .github/workflows/license-check.yml | 4 +-- .github/workflows/prefer_typescript.yml | 2 +- .pre-commit-config.yaml | 1 + CONTRIBUTING.md | 2 +- DISCLAIMER | 2 +- INTHEWILD.md | 33 +++++++++--------- LICENSE.txt | 2 +- docker/README.md | 8 ++--- docs/import_export_datasources.rst | 1 - docs/security.rst | 32 ++++++++--------- helm/superset/requirements.yaml | 2 +- .../templates/secret-superset-config.yaml | 2 +- requirements-dev.txt | 1 - scripts/permissions_cleanup.py | 6 ++-- superset-frontend/.storybook/main.js | 2 +- superset-frontend/.storybook/preview.jsx | 2 +- .../fonts/FiraCode/specimen.less | 2 +- superset-frontend/images/icons/cancel-x.svg | Bin 2219 -> 2218 bytes .../images/icons/checkbox-half.svg | Bin 1030 -> 1028 bytes .../images/icons/checkbox-off.svg | Bin 1247 -> 1245 bytes .../images/icons/checkbox-on.svg | Bin 1490 -> 1488 bytes superset-frontend/images/icons/compass.svg | Bin 2171 -> 2169 bytes .../images/icons/dataset_physical.svg | Bin 1319 -> 1317 bytes .../images/icons/dataset_virtual.svg | Bin 1374 -> 1372 bytes superset-frontend/images/icons/error.svg | Bin 1723 -> 1721 bytes superset-frontend/images/icons/pencil.svg | Bin 1639 -> 1637 bytes superset-frontend/images/icons/search.svg | Bin 2398 -> 2397 bytes superset-frontend/images/icons/sort-asc.svg | Bin 1447 -> 1445 bytes superset-frontend/images/icons/sort-desc.svg | Bin 1447 -> 1445 bytes superset-frontend/images/icons/sort.svg | Bin 1363 -> 1361 bytes superset-frontend/images/icons/trash.svg | Bin 1705 -> 1703 bytes superset-frontend/images/icons/warning.svg | Bin 1814 -> 1812 bytes .../src/views/CRUD/dataset/DatasetList.tsx | 8 ++--- superset/bin/superset | 2 +- superset/dashboards/schemas.py | 1 - superset/migrations/README | 2 +- .../21e88bc06c02_annotation_migration.py | 15 ++++---- superset/queries/schemas.py | 1 - superset/templates/appbuilder/baselayout.html | 1 - .../appbuilder/general/model/list.html | 2 +- superset/templates/email/role_extended.txt | 2 +- superset/templates/email/role_granted.txt | 2 +- superset/templates/superset/basic.html | 6 ++-- .../templates/superset/export_dashboards.html | 2 +- .../fab_overrides/list_with_checkboxes.html | 1 - .../form_view/csv_to_database_view/edit.html | 2 +- .../excel_to_database_view/edit.html | 2 +- superset/templates/superset/paper-theme.html | 2 +- 48 files changed, 74 insertions(+), 81 deletions(-) diff --git a/.github/workflows/license-check.yml b/.github/workflows/license-check.yml index 5494dec8fd..3c56903197 100644 --- a/.github/workflows/license-check.yml +++ b/.github/workflows/license-check.yml @@ -19,7 +19,7 @@ jobs: FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }} run: | set -eo pipefail - if [[ "${{github.event_name}}" != "pull_request" ]]; then + if [[ "${{github.event_name}}" != "pull_request" ]]; then ./scripts/fossa.sh exit 0 fi @@ -30,7 +30,7 @@ jobs: cat<<EOF CHANGED FILES: $FILES - + EOF if [[ "${FILES}" =~ (.*package*\.json|requirements.*\.txt|setup\.py) ]]; then diff --git a/.github/workflows/prefer_typescript.yml b/.github/workflows/prefer_typescript.yml index 2572ef3b15..d2fff6e456 100644 --- a/.github/workflows/prefer_typescript.yml +++ b/.github/workflows/prefer_typescript.yml @@ -35,7 +35,7 @@ jobs: with: msg: | ### WARNING: Prefer TypeScript - + Looks like your PR contains new `.js` or `.jsx` files: ``` diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 22a6a0c1e6..39b74e05b0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,4 +39,5 @@ repos: - id: check-docstring-first - id: check-added-large-files - id: check-yaml + exclude: ^helm/superset/templates/ - id: debug-statements diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0640aecffc..bd0e1ea539 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -705,7 +705,7 @@ See [`superset-frontend/cypress_build.sh`](https://github.com/apache/incubator-s ### Storybook -Superset includes a [Storybook](https://storybook.js.org/) to preview the layout/styling of various Superset components, and variations thereof. To open and view the Storybook: +Superset includes a [Storybook](https://storybook.js.org/) to preview the layout/styling of various Superset components, and variations thereof. To open and view the Storybook: ```bash cd superset-frontend diff --git a/DISCLAIMER b/DISCLAIMER index 3cf9282c3c..10a3408f67 100644 --- a/DISCLAIMER +++ b/DISCLAIMER @@ -8,4 +8,4 @@ have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully -endorsed by the ASF. \ No newline at end of file +endorsed by the ASF. diff --git a/INTHEWILD.md b/INTHEWILD.md index c716221a3b..7ffa19464f 100644 --- a/INTHEWILD.md +++ b/INTHEWILD.md @@ -27,7 +27,7 @@ Join our growing community! ### Sharing Economy -- [Airbnb](https://github.com/airbnb) +- [Airbnb](https://github.com/airbnb) - [Faasos](http://faasos.com/) [@shashanksingh] - [Hostnfly](https://www.hostnfly.com/) [@alexisrosuel] - [Lime](https://www.limebike.com/) [@cxmcc] @@ -37,11 +37,11 @@ Join our growing community! - [Aktia Bank plc](https://www.aktia.com) [@villebro] - [American Express](https://www.americanexpress.com) [@TheLastSultan] - [Capital Service S.A.](http://capitalservice.pl) [@pkonarzewski] -- [Clark.de](http://clark.de/) +- [Clark.de](http://clark.de/) ### Gaming - [Digit Game Studios](https://www.digitgaming.com/) -- [Popoko VM Games Studio](https://popoko.live) +- [Popoko VM Games Studio](https://popoko.live) ### E-Commerce - [AiHello](https://www.aihello.com) [@ganeshkrishnan1] @@ -52,7 +52,7 @@ Join our growing community! - [HuiShouBao](http://www.huishoubao.com/) [@Yukinoshita-Yukino] - [Now](https://www.now.vn/) [@davidkohcw] - [Qunar](https://www.qunar.com/) [@flametest] -- [Rakuten Viki](https://www.viki.com) +- [Rakuten Viki](https://www.viki.com) - [Shopee](https://shopee.sg) [@xiaohanyu] - [Shopkick](https://www.shopkick.com) [@LAlbertalli] - [Tails.com](https://tails.com) [@alanmcruickshank] @@ -66,25 +66,25 @@ Join our growing community! - [Cloudsmith](https://cloudsmith.io) [@alancarson] - [CnOvit](http://www.cnovit.com/) [@xieshaohu] - [Deepomatic](https://deepomatic.com/) [@Zanoellia] -- [Dial Once](https://www.dial-once.com/) +- [Dial Once](https://www.dial-once.com/) - [Dremio](https://dremio.com) [@narendrans] - [ELMO Cloud HR & Payroll](https://elmosoftware.com.au/) - [Endress+Hauser](http://www.endress.com/) [@rumbin] -- [FBK - ICT center](http://ict.fbk.eu) +- [FBK - ICT center](http://ict.fbk.eu) - [GfK Data Lab](http://datalab.gfk.com) [@mherr] - [GrowthSimple](https://growthsimple.ai/) - [Intercom](https://www.intercom.com/) [@kate-gallo] -- [jampp](https://jampp.com/) +- [jampp](https://jampp.com/) - [KonfĂo](http://konfio.mx) [@uis-rodriguez] - [Myra Labs](http://www.myralabs.com/) [@viksit] - [Nielsen](http://www.nielsen.com/) [@amitNielsen] - [Ona](https://ona.io) [@pld] - [Peak AI](https://www.peak.ai/) [@azhar22k] - [PeopleDoc](https://www.people-doc.com) [@rodo] -- [Preset, Inc.](https://preset.io) +- [Preset, Inc.](https://preset.io) - [Pronto Tools](http://www.prontotools.io) [@zkan] - [PubNub](https://pubnub.com) [@jzucker2] -- [Reward Gateway](https://www.rewardgateway.com) +- [Reward Gateway](https://www.rewardgateway.com) - [ScopeAI](https://www.getscopeai.com) [@iloveluce] - [Showmax](https://tech.showmax.com) [@bobek] - [source{d}](https://www.sourced.tech) [@marnovo] @@ -102,11 +102,11 @@ Join our growing community! - [Douban](https://www.douban.com/) [@luchuan] - [Kuaishou](https://www.kuaishou.com/) [@zhaoyu89730105] - [Netflix](https://www.netflix.com/) -- [TME QQMUSIC/WESING](https://www.tencentmusic.com/) +- [TME QQMUSIC/WESING](https://www.tencentmusic.com/) - [Zaihang](http://www.zaih.com/) ### Education -- [Brilliant.org](https://brilliant.org/) +- [Brilliant.org](https://brilliant.org/) - [Udemy](https://www.udemy.com/) [@sungjuly] - [VIPKID](https://www.vipkid.com.cn/) [@illpanda] @@ -120,14 +120,13 @@ Join our growing community! - [Amino](https://amino.com) [@shkr] - [Living Goods](https://www.livinggoods.org) [@chelule] - [Maieutical Labs](https://maieuticallabs.it) [@xrmx] -- [QPID Health](http://www.qpidhealth.com/) +- [QPID Health](http://www.qpidhealth.com/) - [TrustMedis](https://trustmedis.com) [@famasya] - [WeSure](https://www.wesure.cn/) ### Others - - [Grassroot](https://www.grassrootinstitute.org/) + - [Grassroot](https://www.grassrootinstitute.org/) - [komoot](https://www.komoot.com/) [@christophlingg] - - [Let's Roam](https://www.letsroam.com/) - - [Twitter](https://twitter.com/) - - [Yahoo!](https://yahoo.com/) - + - [Let's Roam](https://www.letsroam.com/) + - [Twitter](https://twitter.com/) + - [Yahoo!](https://yahoo.com/) diff --git a/LICENSE.txt b/LICENSE.txt index bc58fdc9dd..56313ab5a5 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -213,4 +213,4 @@ Third party SIL Open Font License v1.1 (OFL-1.1) ======================================================================== (SIL OPEN FONT LICENSE Version 1.1) The Inter font family (https://github.com/rsms/inter) -(SIL OPEN FONT LICENSE Version 1.1) The Fira Code font family (https://github.com/tonsky/FiraCode) \ No newline at end of file +(SIL OPEN FONT LICENSE Version 1.1) The Fira Code font family (https://github.com/tonsky/FiraCode) diff --git a/docker/README.md b/docker/README.md index caed1a7b03..0579f10513 100644 --- a/docker/README.md +++ b/docker/README.md @@ -19,7 +19,7 @@ under the License. # Getting Started with Superset using Docker -Docker is an easy way to get started with Superset. +Docker is an easy way to get started with Superset. ## Prerequisites @@ -28,8 +28,8 @@ Docker is an easy way to get started with Superset. ## Configuration -The `/app/pythonpath` folder is mounted from [./docker/pythonpath_dev](./docker/pythonpath_dev) -which contains a base configuration [./docker/pythonpath/superset_config.py](./docker/pythonpath/superset_config.py) +The `/app/pythonpath` folder is mounted from [./docker/pythonpath_dev](./docker/pythonpath_dev) +which contains a base configuration [./docker/pythonpath/superset_config.py](./docker/pythonpath/superset_config.py) intended for use with local development. ### Local overrides @@ -62,7 +62,7 @@ To run the container, simply run: docker-compose up ``` -After several minutes for superset initialization to finish, you can open a browser and view [`http://localhost:8088`](http://localhost:8088) +After several minutes for superset initialization to finish, you can open a browser and view [`http://localhost:8088`](http://localhost:8088) to start your journey. ## Developing diff --git a/docs/import_export_datasources.rst b/docs/import_export_datasources.rst index 9c786cef80..29ebff6ccd 100644 --- a/docs/import_export_datasources.rst +++ b/docs/import_export_datasources.rst @@ -122,4 +122,3 @@ by saving the following YAML to file and then running the ``import_datasources`` columns: - column_name: ds verbose_name: datetime - diff --git a/docs/security.rst b/docs/security.rst index 29afdce5fe..ca99457b0f 100644 --- a/docs/security.rst +++ b/docs/security.rst @@ -159,21 +159,21 @@ permissions that were attributed. Restricting access to a subset of a particular table """""""""""""""""""""""""""""""""""""""""""""""""""" -Using ``Row level security filters`` (under the ``Security`` menu) you can create -filters that are assigned to a particular table, as well as a set of roles. -Say people in your finance department should only have access to rows where -``department = "finance"``. You could create a ``Row level security filter`` -with that clause, and assign it to your ``Finance`` role, as well as the +Using ``Row level security filters`` (under the ``Security`` menu) you can create +filters that are assigned to a particular table, as well as a set of roles. +Say people in your finance department should only have access to rows where +``department = "finance"``. You could create a ``Row level security filter`` +with that clause, and assign it to your ``Finance`` role, as well as the applicable table. -The ``clause`` field can contain arbitrary text which is then added to the generated -SQL statement's ``WHERE`` clause. So you could even do something like create a -filter for the last 30 days and apply it to a specific role, with a clause like -``date_field > DATE_SUB(NOW(), INTERVAL 30 DAY)``. It can also support multiple -conditions: ``client_id = 6 AND advertiser="foo"``, etc. - -All relevant ``Row level security filters`` will be ANDed together, so it's -possible to create a situation where two roles conflict in such a way as to -limit a table subset to empty. For example, the filters ``client_id=4`` and -and ``client_id=5``, applied to a role, will result in users of that role having -``client_id=4 AND client_id=5`` added to their query, which can never be true. \ No newline at end of file +The ``clause`` field can contain arbitrary text which is then added to the generated +SQL statement's ``WHERE`` clause. So you could even do something like create a +filter for the last 30 days and apply it to a specific role, with a clause like +``date_field > DATE_SUB(NOW(), INTERVAL 30 DAY)``. It can also support multiple +conditions: ``client_id = 6 AND advertiser="foo"``, etc. + +All relevant ``Row level security filters`` will be ANDed together, so it's +possible to create a situation where two roles conflict in such a way as to +limit a table subset to empty. For example, the filters ``client_id=4`` and +and ``client_id=5``, applied to a role, will result in users of that role having +``client_id=4 AND client_id=5`` added to their query, which can never be true. diff --git a/helm/superset/requirements.yaml b/helm/superset/requirements.yaml index 1f47d5a082..60bcc42b50 100644 --- a/helm/superset/requirements.yaml +++ b/helm/superset/requirements.yaml @@ -22,4 +22,4 @@ dependencies: - name: redis version: 10.3.4 repository: https://kubernetes-charts.storage.googleapis.com/ - condition: redis.enabled \ No newline at end of file + condition: redis.enabled diff --git a/helm/superset/templates/secret-superset-config.yaml b/helm/superset/templates/secret-superset-config.yaml index 604bb20012..281ad9cf03 100644 --- a/helm/superset/templates/secret-superset-config.yaml +++ b/helm/superset/templates/secret-superset-config.yaml @@ -24,7 +24,7 @@ metadata: release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" type: Opaque -data: +data: superset_config.py: {{ include "superset-config" . | b64enc }} superset_init.sh: {{ tpl .Values.init.initscript . | b64enc }} superset_bootstrap.sh: {{ include "superset-bootstrap" . | b64enc }} diff --git a/requirements-dev.txt b/requirements-dev.txt index aaf6a99e9f..d68a17b010 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -39,4 +39,3 @@ tox==3.11.1 pillow==7.0.0 openpyxl==3.0.3 # Pandas use openpyxl to write excel format(using in unittes) xlrd==1.2.0 - diff --git a/scripts/permissions_cleanup.py b/scripts/permissions_cleanup.py index 8c50cd0078..c37d124456 100644 --- a/scripts/permissions_cleanup.py +++ b/scripts/permissions_cleanup.py @@ -22,7 +22,7 @@ from superset import sm def cleanup_permissions(): # 1. Clean up duplicates. pvms = sm.get_session.query(sm.permissionview_model).all() - print('# of permission view menues is: {}'.format(len(pvms))) + print("# of permission view menues is: {}".format(len(pvms))) pvms_dict = defaultdict(list) for pvm in pvms: pvms_dict[(pvm.permission, pvm.view_menu)].append(pvm) @@ -39,7 +39,7 @@ def cleanup_permissions(): sm.get_session.commit() pvms = sm.get_session.query(sm.permissionview_model).all() - print('STage 1: # of permission view menues is: {}'.format(len(pvms))) + print("STage 1: # of permission view menues is: {}".format(len(pvms))) # 2. Clean up None permissions or view menues pvms = sm.get_session.query(sm.permissionview_model).all() @@ -49,7 +49,7 @@ def cleanup_permissions(): sm.get_session.commit() pvms = sm.get_session.query(sm.permissionview_model).all() - print('Stage 2: # of permission view menues is: {}'.format(len(pvms))) + print("Stage 2: # of permission view menues is: {}".format(len(pvms))) # 3. Delete empty permission view menues from roles roles = sm.get_session.query(sm.role_model).all() diff --git a/superset-frontend/.storybook/main.js b/superset-frontend/.storybook/main.js index bb950c4355..cf65d312db 100644 --- a/superset-frontend/.storybook/main.js +++ b/superset-frontend/.storybook/main.js @@ -38,4 +38,4 @@ module.exports = { }, plugins: [...config.plugins, ...customConfig.plugins], }), -}; \ No newline at end of file +}; diff --git a/superset-frontend/.storybook/preview.jsx b/superset-frontend/.storybook/preview.jsx index ac0f4f8f60..ee86557f14 100644 --- a/superset-frontend/.storybook/preview.jsx +++ b/superset-frontend/.storybook/preview.jsx @@ -29,4 +29,4 @@ const themeDecorator = storyFn => ( ); addDecorator(jsxDecorator); -addDecorator(themeDecorator); \ No newline at end of file +addDecorator(themeDecorator); diff --git a/superset-frontend/fonts/FiraCode/specimen.less b/superset-frontend/fonts/FiraCode/specimen.less index 03d7b8989b..126496f81d 100644 --- a/superset-frontend/fonts/FiraCode/specimen.less +++ b/superset-frontend/fonts/FiraCode/specimen.less @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ - + @font-face { font-family: 'Fira Code'; src: url('woff2/FiraCode-Light.woff2') format('woff2'), diff --git a/superset-frontend/images/icons/cancel-x.svg b/superset-frontend/images/icons/cancel-x.svg index a1070fa51d14525760da2ccacb12e5014d74a960..0f1e3376863d4929957b60487a6bb8b69c2a370e 100644 GIT binary patch delta 18 acmZ22xJq!t62{3(84WgHW4y}7$OQmKga)Pn delta 20 ccmZ1_xLR<-5=KUa$x9dw7!@{OVZ6!)07-}j+5i9m diff --git a/superset-frontend/images/icons/checkbox-half.svg b/superset-frontend/images/icons/checkbox-half.svg index dd25b2b2ee33e17bf3ffc60b96f44d08d2610b8d..50411b421591fb6d73745295ea59e39a4a8f89f5 100644 GIT binary patch delta 16 XcmZqUXyMqfgmLmxMuW}Q7!8;JGL!|C delta 20 bcmZqSXye$hgppBU@)AY^Mup8+7!8;JL1YEg diff --git a/superset-frontend/images/icons/checkbox-off.svg b/superset-frontend/images/icons/checkbox-off.svg index f537e642a5df3572392c83a4bd59b1abfdc6fe57..5835c1893dca8bbb67f972fd9ec31b0b36df8593 100644 GIT binary patch delta 16 Ycmcc5d6#p;62{3(84WgHW8`E806ftKBLDyZ delta 20 ccmcc1d7pE`5=KUa$x9dw7!@{OVdP{608ViRVgLXD diff --git a/superset-frontend/images/icons/checkbox-on.svg b/superset-frontend/images/icons/checkbox-on.svg index 1033e3ab493cbe3e11999097f977b560a5db2404..25e82d5e2a4e5eb9c29c1c25db374a8240755a52 100644 GIT binary patch delta 16 Ycmcb_eSv$!62{3(84WgHWBkJm06l3300000 delta 20 ccmcb>eTjR+5=KUa$x9dw7!@{OVf@1k08X(7KL7v# diff --git a/superset-frontend/images/icons/compass.svg b/superset-frontend/images/icons/compass.svg index 3c0c7dc81188af55e0516970d861a4608e2fce17..7775d9b73b981546a172317b3e9fd16f91a21fac 100644 GIT binary patch delta 16 Ycmew@@Ka#J62{3(84WgHV_eDx074iC2mk;8 delta 20 ccmew<@LOQR5=KUa$x9dw7!@{OVO+`v094QiM*si- diff --git a/superset-frontend/images/icons/dataset_physical.svg b/superset-frontend/images/icons/dataset_physical.svg index 72040e8159920d04b4c136d75fbb79a92f2dbc39..28f46bb4ca91e3db88e5365b13c656d88f764359 100644 GIT binary patch delta 16 YcmZ3^wUlea62{3(84WgHV+>>l05<If{Qv*} delta 20 ccmZ3=wVZ3i5=KUa$x9dw7!@{OVGLvj07lgYJOBUy diff --git a/superset-frontend/images/icons/dataset_virtual.svg b/superset-frontend/images/icons/dataset_virtual.svg index 51f136caaa1147f0aa2fe37f9e5c462271d1ef0b..ca15dcb63d5e96d1fe3526929a825a90324e3cab 100644 GIT binary patch delta 16 Ycmcb|b%$%i62{3(84WgHW9(oC06onHq5uE@ delta 20 ccmcb^b&qSq5=KUa$x9dw7!@{OVeDWA08ecO;Q#;t diff --git a/superset-frontend/images/icons/error.svg b/superset-frontend/images/icons/error.svg index 03c19629e8061a7aca6183ec1413ef3fc9d4ca7f..b619c4876c8f8afaad874cfa0ac2387222b37fc3 100644 GIT binary patch delta 16 YcmdnZyOVdr62{3(84WgHV|>a206M}3zyJUM delta 20 ccmdnVyPJ2z5=KUa$x9dw7!@{OVSLI0083&9{{R30 diff --git a/superset-frontend/images/icons/pencil.svg b/superset-frontend/images/icons/pencil.svg index 6d1cbcb895f473be29380fc69174019d78c02baa..0cf5c9280adb653d64679c036ffeb348f964d930 100644 GIT binary patch delta 16 YcmaFP^OR@962{3(84WgHW1PqW06!)M!T<mO delta 20 ccmaFL^PFeH5=KUa$x9dw7!@{OVVuYU08t(X0RR91 diff --git a/superset-frontend/images/icons/search.svg b/superset-frontend/images/icons/search.svg index 2f2b0c5b9e13318e50792982450b263c9899cb68..5b86f13859f66d01f8f7c99288a097560da9193a 100644 GIT binary patch delta 18 acmca7bXRD@62{3(84WgHW9(pO<N^RpIR?T2 delta 20 ccmcaBbWdo*5=KUa$x9dw7!@{OVeDWB08pg{_5c6? diff --git a/superset-frontend/images/icons/sort-asc.svg b/superset-frontend/images/icons/sort-asc.svg index a6bd9d5aa01165bad8b8e97a8c6965c0f3451981..8981b6cff24175f3adf9d7fe301742b80e63af17 100644 GIT binary patch delta 16 YcmZ3^y_9>y62{3(84WgHW4y==05}N-e*gdg delta 20 ccmZ3=y_|c)5=KUa$x9dw7!@{OVZ6u;07v--z5oCK diff --git a/superset-frontend/images/icons/sort-desc.svg b/superset-frontend/images/icons/sort-desc.svg index f56b7b29c6055db12962c5d7b2c893d73dd68694..70dd0fa391337a98f35835721c2e06d4002c6132 100644 GIT binary patch delta 16 YcmZ3^y_9>y62{3(84WgHW4y==05}N-e*gdg delta 20 ccmZ3=y_|c)5=KUa$x9dw7!@{OVZ6u;07v--z5oCK diff --git a/superset-frontend/images/icons/sort.svg b/superset-frontend/images/icons/sort.svg index 534cffc6de29b1877a8d52ea6c93938ce3ec2a61..119ca02999049fe68f60645c81a72bbcea6b6c1e 100644 GIT binary patch delta 16 Ycmcc2b&+es62{3(84WgHW2|Kc06c95fdBvi delta 20 ccmcb}b(w3!5=KUa$x9dw7!@{OVXS2a08O<9zyJUM diff --git a/superset-frontend/images/icons/trash.svg b/superset-frontend/images/icons/trash.svg index a80e19104bcf9adadc87c04c638ae9122b123f53..870af73b93e10c0622ac485b3ac4629ab58e734f 100644 GIT binary patch delta 16 YcmZ3<yPS8!62{3(84WgHW4z1)062mMiU0rr delta 20 ccmZ3^yOMXq5=KUa$x9dw7!@{OVZ6)&07#Ms$p8QV diff --git a/superset-frontend/images/icons/warning.svg b/superset-frontend/images/icons/warning.svg index 9375f58deda1427a4d9126f1ea67c6b6e07273ac..df7fc6d117d6913883ab8fd51b2e0fa2c74999ac 100644 GIT binary patch delta 16 YcmbQnH-&G*62{3(84WgHV{~8z05v}a)Bpeg delta 20 ccmbQjH;r$@5=KUa$x9dw7!@{OVRT>x07SnA6951J diff --git a/superset-frontend/src/views/CRUD/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/dataset/DatasetList.tsx index 0964a00970..a9bebd7f3f 100644 --- a/superset-frontend/src/views/CRUD/dataset/DatasetList.tsx +++ b/superset-frontend/src/views/CRUD/dataset/DatasetList.tsx @@ -623,10 +623,10 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({ {datasetCurrentlyDeleting && ( <DeleteModal description={t( - `The dataset ${datasetCurrentlyDeleting.table_name} is linked to - ${datasetCurrentlyDeleting.chart_count} charts that appear on - ${datasetCurrentlyDeleting.dashboard_count} dashboards. - Are you sure you want to continue? Deleting the dataset will break + `The dataset ${datasetCurrentlyDeleting.table_name} is linked to + ${datasetCurrentlyDeleting.chart_count} charts that appear on + ${datasetCurrentlyDeleting.dashboard_count} dashboards. + Are you sure you want to continue? Deleting the dataset will break those objects.`, )} onConfirm={() => diff --git a/superset/bin/superset b/superset/bin/superset index 4b37e8339b..e7b8de6846 100755 --- a/superset/bin/superset +++ b/superset/bin/superset @@ -17,5 +17,5 @@ # under the License. from superset.cli import superset -if __name__ == '__main__': +if __name__ == "__main__": superset() diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py index 2587705866..ca9c25c1e0 100644 --- a/superset/dashboards/schemas.py +++ b/superset/dashboards/schemas.py @@ -75,7 +75,6 @@ openapi_spec_methods_override = { "get": {"description": "Get a list of all possible owners for a dashboard."} }, } -""" Overrides GET methods OpenApi descriptions """ def validate_json(value: Union[bytes, bytearray, str]) -> None: diff --git a/superset/migrations/README b/superset/migrations/README index 98e4f9c44e..2500aa1bcf 100755 --- a/superset/migrations/README +++ b/superset/migrations/README @@ -1 +1 @@ -Generic single-database configuration. \ No newline at end of file +Generic single-database configuration. diff --git a/superset/migrations/versions/21e88bc06c02_annotation_migration.py b/superset/migrations/versions/21e88bc06c02_annotation_migration.py index 919d047b91..5593af0eb6 100644 --- a/superset/migrations/versions/21e88bc06c02_annotation_migration.py +++ b/superset/migrations/versions/21e88bc06c02_annotation_migration.py @@ -14,14 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -import json - -from alembic import op -from sqlalchemy import Column, Integer, or_, String, Text -from sqlalchemy.ext.declarative import declarative_base - -from superset import db - """migrate_old_annotation_layers Revision ID: 21e88bc06c02 @@ -29,6 +21,13 @@ Revises: 67a6ac9b727b Create Date: 2017-12-17 11:06:30.180267 """ +import json + +from alembic import op +from sqlalchemy import Column, Integer, or_, String, Text +from sqlalchemy.ext.declarative import declarative_base + +from superset import db # revision identifiers, used by Alembic. revision = "21e88bc06c02" diff --git a/superset/queries/schemas.py b/superset/queries/schemas.py index 04c003e104..daca322c63 100644 --- a/superset/queries/schemas.py +++ b/superset/queries/schemas.py @@ -25,4 +25,3 @@ openapi_spec_methods_override = { } }, } -""" Overrides GET methods OpenApi descriptions """ diff --git a/superset/templates/appbuilder/baselayout.html b/superset/templates/appbuilder/baselayout.html index 1199ab1226..a08a052e5f 100644 --- a/superset/templates/appbuilder/baselayout.html +++ b/superset/templates/appbuilder/baselayout.html @@ -55,4 +55,3 @@ </footer> {% endblock %} {% endblock %} - diff --git a/superset/templates/appbuilder/general/model/list.html b/superset/templates/appbuilder/general/model/list.html index 49f08d02c7..866051dd1f 100644 --- a/superset/templates/appbuilder/general/model/list.html +++ b/superset/templates/appbuilder/general/model/list.html @@ -33,4 +33,4 @@ </div> {{ lib.panel_end() }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/superset/templates/email/role_extended.txt b/superset/templates/email/role_extended.txt index 72eb337aae..89ba1b0f72 100644 --- a/superset/templates/email/role_extended.txt +++ b/superset/templates/email/role_extended.txt @@ -29,4 +29,4 @@ To see all your permissions please visit your profile page</a>. <br> <br> -Regards, Superset Admin. \ No newline at end of file +Regards, Superset Admin. diff --git a/superset/templates/email/role_granted.txt b/superset/templates/email/role_granted.txt index a6ca9ebc85..8027f41ac4 100644 --- a/superset/templates/email/role_granted.txt +++ b/superset/templates/email/role_granted.txt @@ -33,4 +33,4 @@ To see all your permissions please visit your profile page</a>. <br> <br> -Regards, Superset Admin. \ No newline at end of file +Regards, Superset Admin. diff --git a/superset/templates/superset/basic.html b/superset/templates/superset/basic.html index a31574696e..163d9480e9 100644 --- a/superset/templates/superset/basic.html +++ b/superset/templates/superset/basic.html @@ -36,10 +36,10 @@ {% block head_meta %}{% endblock %} {% block head_css %} {% for favicon in favicons %} - <link + <link rel="{{favicon.rel if favicon.rel else "icon"}}" - type="{{favicon.type if favicon.type else "image/png"}}" - {% if favicon.sizes %}sizes={{favicon.sizes}}{% endif %} + type="{{favicon.type if favicon.type else "image/png"}}" + {% if favicon.sizes %}sizes={{favicon.sizes}}{% endif %} href="{{favicon.href}}" > {% endfor %} diff --git a/superset/templates/superset/export_dashboards.html b/superset/templates/superset/export_dashboards.html index 5ec6ff1643..9744424b67 100644 --- a/superset/templates/superset/export_dashboards.html +++ b/superset/templates/superset/export_dashboards.html @@ -27,7 +27,7 @@ a.click(); document.body.removeChild(a); - window.location = '{{ dashboards_url }}'; + window.location = '{{ dashboards_url }}'; }; </script> diff --git a/superset/templates/superset/fab_overrides/list_with_checkboxes.html b/superset/templates/superset/fab_overrides/list_with_checkboxes.html index 3d5fbaf77c..2cea53022f 100644 --- a/superset/templates/superset/fab_overrides/list_with_checkboxes.html +++ b/superset/templates/superset/fab_overrides/list_with_checkboxes.html @@ -97,4 +97,3 @@ </table> </div> {% endblock %} - diff --git a/superset/templates/superset/form_view/csv_to_database_view/edit.html b/superset/templates/superset/form_view/csv_to_database_view/edit.html index 9e6e542e26..ab647d4c26 100644 --- a/superset/templates/superset/form_view/csv_to_database_view/edit.html +++ b/superset/templates/superset/form_view/csv_to_database_view/edit.html @@ -61,4 +61,4 @@ } } </script> -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/superset/templates/superset/form_view/excel_to_database_view/edit.html b/superset/templates/superset/form_view/excel_to_database_view/edit.html index dcfd6d2ce6..fb7c432231 100644 --- a/superset/templates/superset/form_view/excel_to_database_view/edit.html +++ b/superset/templates/superset/form_view/excel_to_database_view/edit.html @@ -61,4 +61,4 @@ } } </script> -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/superset/templates/superset/paper-theme.html b/superset/templates/superset/paper-theme.html index edf50137cb..c4221be13f 100644 --- a/superset/templates/superset/paper-theme.html +++ b/superset/templates/superset/paper-theme.html @@ -431,7 +431,7 @@ <h1>Alerts</h1> </div> <div class="alert alert-success" role="alert"> - <strong>Well done!</strong> You successfully read this important alert message. With a <a href="#">link</a>. + <strong>Well done!</strong> You successfully read this important alert message. With a <a href="#">link</a>. </div> <div class="alert alert-info" role="alert"> <strong>Heads up!</strong> This alert needs your attention, but it's not super important. -- GitLab