You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@superset.apache.org by GitBox <gi...@apache.org> on 2020/02/10 18:36:38 UTC
[GitHub] [incubator-superset] graceguo-supercat opened a new pull request
#9109: [migration] metadata for dashboard filters
graceguo-supercat opened a new pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109
### CATEGORY
Choose one
- [ ] Bug Fix
- [ ] Enhancement (new features, refinement)
- [ ] Refactor
- [ ] Add tests
- [ ] Build / Development Environment
- [ ] Documentation
### SUMMARY
Migrate `filter_immune_slices` and `filter_immune_filter_fields` since we enabled dashboard scoped filter metadata `filter_scopes`.
### TEST PLAN
We will not copy old `filter_immune_slices` and `filter_immune_filter_fields` metadata. If upgrade failed, users will lost filter immune settings in their dashboard. When system admin upgrade, please backup `dashboards` table.
### ADDITIONAL INFORMATION
<!--- Check any relevant boxes with "x" -->
<!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue -->
- [ ] Has associated issue:
- [ ] Changes UI
- [x] Requires DB Migration.
- [x] Confirm DB Migration upgrade and downgrade tested.
- [ ] Introduces new feature or API
- [ ] Removes existing feature or API
### REVIEWERS
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377935248
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
Review comment:
a found a few places in our code base that use variable (instead of class) for relationship table.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] john-bodley commented on a change in pull
request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
john-bodley commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r379555209
##########
File path: superset/utils/dashboard_filter_scopes_converter.py
##########
@@ -0,0 +1,72 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+import json
+import logging
+from collections import defaultdict
+from typing import Dict, List
+
+from superset.models.slice import Slice
+
+logger = logging.getLogger(__name__)
+
+
+def convert_filter_scopes(json_metadata: Dict, filters: List[Slice]):
+ filter_scopes = {}
+ immuned_by_id: List[int] = json_metadata.get("filter_immune_slices") or []
+ immuned_by_column: Dict = defaultdict(list)
+ for slice_id, columns in json_metadata.get(
+ "filter_immune_slice_fields", {}
+ ).items():
+ for column in columns:
+ immuned_by_column[column].append(int(slice_id))
+
+ def add_filter_scope(filter_field, filter_id):
+ # in case filter field is invalid
+ if isinstance(filter_field, str):
+ current_filter_immune = list(
+ set(immuned_by_id + immuned_by_column.get(filter_field, []))
+ )
+ filter_fields[filter_field] = {
+ "scope": ["ROOT_ID"],
+ "immune": current_filter_immune,
+ }
+ else:
+ logging.info(f"slice [{filter_id}] has invalid field: {filter_field}")
+
+ for filter_slice in filters:
+ filter_fields: Dict = {}
+ filter_id = filter_slice.id
+ slice_params = json.loads(filter_slice.params or "{}")
+ configs = slice_params.get("filter_configs") or []
+
+ if slice_params.get("date_filter"):
Review comment:
How do we know this is the exhaustive list of slice parameters?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] codecov-io edited a comment on issue #9109:
[WIP][migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #9109: [WIP][migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#issuecomment-584293503
# [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=h1) Report
> Merging [#9109](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-superset/commit/291306392443a5a0d0e2ee0cc4a95d37c56d4589?src=pr&el=desc) will **not change** coverage.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #9109 +/- ##
======================================
Coverage 59.1% 59.1%
======================================
Files 372 372
Lines 11920 11920
Branches 2917 2917
======================================
Hits 7045 7045
Misses 4693 4693
Partials 182 182
```
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=footer). Last update [2913063...24206ab](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] codecov-io edited a comment on issue #9109:
[migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#issuecomment-584293503
# [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=h1) Report
> Merging [#9109](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-superset/commit/291306392443a5a0d0e2ee0cc4a95d37c56d4589?src=pr&el=desc) will **not change** coverage.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #9109 +/- ##
======================================
Coverage 59.1% 59.1%
======================================
Files 372 372
Lines 11920 11920
Branches 2917 2917
======================================
Hits 7045 7045
Misses 4693 4693
Partials 182 182
```
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=footer). Last update [2913063...9331512](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] john-bodley commented on a change in pull
request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
john-bodley commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r378003118
##########
File path: superset/utils/dashboard_filter_scopes_converter.py
##########
@@ -0,0 +1,73 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+import json
+import logging
+from typing import Dict, List
+
+from superset.models.slice import Slice
+
+logger = logging.getLogger(__name__)
+
+
+def convert_filter_scopes(json_metadata: Dict, filters: List[Slice]):
+ filter_scopes = {}
+ immuned_by_id: List[int] = json_metadata.get("filter_immune_slices") or []
+ immuned_by_column: Dict = {}
+ for slice_id, columns in json_metadata.get(
+ "filter_immune_slice_fields", {}
+ ).items():
+ for column in columns:
+ if immuned_by_column.get(column, None) is None:
Review comment:
Lets use a `collections.defaultdict` here.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] codecov-io edited a comment on issue #9109:
[WIP][migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #9109: [WIP][migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#issuecomment-584293503
# [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=h1) Report
> Merging [#9109](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-superset/commit/291306392443a5a0d0e2ee0cc4a95d37c56d4589?src=pr&el=desc) will **not change** coverage.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #9109 +/- ##
======================================
Coverage 59.1% 59.1%
======================================
Files 372 372
Lines 11920 11920
Branches 2917 2917
======================================
Hits 7045 7045
Misses 4693 4693
Partials 182 182
```
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=footer). Last update [2913063...8e4147f](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] codecov-io edited a comment on issue #9109:
[migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#issuecomment-584293503
# [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=h1) Report
> Merging [#9109](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-superset/commit/291306392443a5a0d0e2ee0cc4a95d37c56d4589?src=pr&el=desc) will **not change** coverage.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #9109 +/- ##
======================================
Coverage 59.1% 59.1%
======================================
Files 372 372
Lines 11920 11920
Branches 2917 2917
======================================
Hits 7045 7045
Misses 4693 4693
Partials 182 182
```
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=footer). Last update [2913063...e29866a](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] codecov-io edited a comment on issue #9109:
[migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#issuecomment-584293503
# [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=h1) Report
> Merging [#9109](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-superset/commit/291306392443a5a0d0e2ee0cc4a95d37c56d4589?src=pr&el=desc) will **decrease** coverage by `<.01%`.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #9109 +/- ##
=========================================
- Coverage 59.1% 59.1% -0.01%
=========================================
Files 372 372
Lines 11920 11922 +2
Branches 2917 2919 +2
=========================================
+ Hits 7045 7046 +1
- Misses 4693 4694 +1
Partials 182 182
```
| [Impacted Files](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [superset-frontend/src/chart/chartAction.js](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQtZnJvbnRlbmQvc3JjL2NoYXJ0L2NoYXJ0QWN0aW9uLmpz) | `43.33% <0%> (+0.09%)` | :arrow_up: |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=footer). Last update [2913063...1fece27](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r378418055
##########
File path: superset/utils/dashboard_filter_scopes_converter.py
##########
@@ -0,0 +1,73 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+import json
+import logging
+from typing import Dict, List
+
+from superset.models.slice import Slice
+
+logger = logging.getLogger(__name__)
+
+
+def convert_filter_scopes(json_metadata: Dict, filters: List[Slice]):
+ filter_scopes = {}
+ immuned_by_id: List[int] = json_metadata.get("filter_immune_slices") or []
+ immuned_by_column: Dict = {}
+ for slice_id, columns in json_metadata.get(
+ "filter_immune_slice_fields", {}
+ ).items():
+ for column in columns:
+ if immuned_by_column.get(column, None) is None:
Review comment:
fixed.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] serenajiang commented on a change in pull
request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
serenajiang commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377462655
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
Review comment:
Just for consistency, can you make this the same format as `Slice` and `Dashboard`?
```python
class DashboardSlices(Base):
__tablename__ = "dashboard_slices"
id = Column(Integer, primary_key = True)
...and so on
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] serenajiang commented on a change in pull
request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
serenajiang commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377468825
##########
File path: superset/utils/dashboard_filter_scopes_converter.py
##########
@@ -0,0 +1,72 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+import logging
+from typing import Dict, List
+
+from superset.models.slice import Slice
+
+logger = logging.getLogger(__name__)
+
+
+def convert_filter_scopes(json_metadata: Dict, filters: List[Slice]):
+ filter_scopes = {}
+ immuned_by_id: List[int] = json_metadata.get("filter_immune_slices") or []
+ immuned_by_column: Dict = {}
+ for slice_id, columns in json_metadata.get(
+ "filter_immune_slice_fields", {}
+ ).items():
+ for column in columns:
+ if immuned_by_column.get(column, None) is None:
+ immuned_by_column[column] = []
+ immuned_by_column[column].append(int(slice_id))
+
+ def add_filter_scope(filter_field, filter_id):
+ # in case filter field is invalid
+ if isinstance(filter_field, str):
+ current_filter_immune = list(
+ set(immuned_by_id + immuned_by_column.get(filter_field, []))
+ )
+ filter_fields[filter_field] = {
+ "scope": ["ROOT_ID"],
+ "immune": current_filter_immune,
+ }
+ else:
+ logging.info(f"slice [{filter_id}] has invalid field: {filter_field}")
+
+ for filter_slice in filters:
+ filter_fields: Dict = {}
+ filter_id = filter_slice.id
+ slice_params = filter_slice.params or {}
+ configs = slice_params.get("filter_configs") or []
+
+ if slice_params.get("date_filter", False):
Review comment:
```suggestion
if slice_params.get("date_filter"):
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] codecov-io edited a comment on issue #9109:
[migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#issuecomment-584293503
# [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=h1) Report
> Merging [#9109](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-superset/commit/291306392443a5a0d0e2ee0cc4a95d37c56d4589?src=pr&el=desc) will **decrease** coverage by `<.01%`.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #9109 +/- ##
=========================================
- Coverage 59.1% 59.1% -0.01%
=========================================
Files 372 372
Lines 11920 11922 +2
Branches 2917 2919 +2
=========================================
+ Hits 7045 7046 +1
- Misses 4693 4694 +1
Partials 182 182
```
| [Impacted Files](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [superset-frontend/src/chart/chartAction.js](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQtZnJvbnRlbmQvc3JjL2NoYXJ0L2NoYXJ0QWN0aW9uLmpz) | `43.33% <0%> (+0.09%)` | :arrow_up: |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=footer). Last update [2913063...1a048c3](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r379584994
##########
File path: superset/utils/dashboard_filter_scopes_converter.py
##########
@@ -0,0 +1,72 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+import json
+import logging
+from collections import defaultdict
+from typing import Dict, List
+
+from superset.models.slice import Slice
+
+logger = logging.getLogger(__name__)
+
+
+def convert_filter_scopes(json_metadata: Dict, filters: List[Slice]):
+ filter_scopes = {}
+ immuned_by_id: List[int] = json_metadata.get("filter_immune_slices") or []
+ immuned_by_column: Dict = defaultdict(list)
+ for slice_id, columns in json_metadata.get(
+ "filter_immune_slice_fields", {}
+ ).items():
+ for column in columns:
+ immuned_by_column[column].append(int(slice_id))
+
+ def add_filter_scope(filter_field, filter_id):
+ # in case filter field is invalid
+ if isinstance(filter_field, str):
+ current_filter_immune = list(
+ set(immuned_by_id + immuned_by_column.get(filter_field, []))
+ )
+ filter_fields[filter_field] = {
+ "scope": ["ROOT_ID"],
+ "immune": current_filter_immune,
+ }
+ else:
+ logging.info(f"slice [{filter_id}] has invalid field: {filter_field}")
+
+ for filter_slice in filters:
+ filter_fields: Dict = {}
+ filter_id = filter_slice.id
+ slice_params = json.loads(filter_slice.params or "{}")
+ configs = slice_params.get("filter_configs") or []
+
+ if slice_params.get("date_filter"):
Review comment:
I was thinking about to add an iteration for all the possible date filter related keys. But think this function will be used by:
- db migration, only run once,
- dashboard import, to convert `filter_immune` metadata in old dashboard to use new `filter_scopes`
Given the usage is kind of backward compatible not future compatible, I feel enumeration probably is good enough?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] codecov-io edited a comment on issue #9109:
[migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#issuecomment-584293503
# [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=h1) Report
> Merging [#9109](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-superset/commit/291306392443a5a0d0e2ee0cc4a95d37c56d4589?src=pr&el=desc) will **not change** coverage.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #9109 +/- ##
======================================
Coverage 59.1% 59.1%
======================================
Files 372 372
Lines 11920 11920
Branches 2917 2917
======================================
Hits 7045 7045
Misses 4693 4693
Partials 182 182
```
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=footer). Last update [2913063...159164a](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377935325
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards)))
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ slice_ids = [slice.id for slice in dashboard.slices]
+ filters = (
+ session.query(Slice)
+ .filter(and_(Slice.id.in_(slice_ids), Slice.viz_type == "filter_box"))
+ .all()
+ )
Review comment:
it works! thank you.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377936119
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards)))
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ slice_ids = [slice.id for slice in dashboard.slices]
+ filters = (
+ session.query(Slice)
+ .filter(and_(Slice.id.in_(slice_ids), Slice.viz_type == "filter_box"))
+ .all()
+ )
+
+ # if dashboard has filter_box
+ if len(filters):
+ filter_scopes = convert_filter_scopes(json_metadata, filters)
+
+ json_metadata.pop("filter_immune_slices", None)
+ json_metadata.pop("filter_immune_slice_fields", None)
+ if filter_scopes:
+ json_metadata["filter_scopes"] = filter_scopes
+ logging.info(
+ f"Adding filter_scopes for dashboard {dashboard.id}: {json.dumps(filter_scopes)}"
+ )
+ if json_metadata:
+ dashboard.json_metadata = json.dumps(
+ json_metadata, indent=None, separators=(",", ":"), sort_keys=True
+ )
+
+ session.merge(dashboard)
+ except Exception as e:
+ logging.exception(f"dashboard {dashboard.id} has error: {e}")
Review comment:
i mean to catch any user data caused null pointer exception. for example, user may have added invalid `json_metada` that I can't parse ? but should be very rare.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] codecov-io commented on issue #9109:
[migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
codecov-io commented on issue #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#issuecomment-584293503
# [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=h1) Report
> Merging [#9109](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-superset/commit/4f06236bc4220de771465c10372b421e870ed3e8?src=pr&el=desc) will **not change** coverage.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #9109 +/- ##
======================================
Coverage 59.1% 59.1%
======================================
Files 372 372
Lines 11920 11920
Branches 2918 2917 -1
======================================
Hits 7045 7045
Misses 4693 4693
Partials 182 182
```
| [Impacted Files](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [superset/assets/src/components/Checkbox.jsx](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQvYXNzZXRzL3NyYy9jb21wb25lbnRzL0NoZWNrYm94LmpzeA==) | | |
| [.../assets/src/dashboard/reducers/dashboardFilters.js](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQvYXNzZXRzL3NyYy9kYXNoYm9hcmQvcmVkdWNlcnMvZGFzaGJvYXJkRmlsdGVycy5qcw==) | | |
| [...ets/src/dashboard/components/dnd/DragDroppable.jsx](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQvYXNzZXRzL3NyYy9kYXNoYm9hcmQvY29tcG9uZW50cy9kbmQvRHJhZ0Ryb3BwYWJsZS5qc3g=) | | |
| [...assets/src/components/ListView/TableCollection.tsx](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQvYXNzZXRzL3NyYy9jb21wb25lbnRzL0xpc3RWaWV3L1RhYmxlQ29sbGVjdGlvbi50c3g=) | | |
| [superset/assets/src/components/EditableTitle.jsx](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQvYXNzZXRzL3NyYy9jb21wb25lbnRzL0VkaXRhYmxlVGl0bGUuanN4) | | |
| [...src/explore/components/controls/VizTypeControl.jsx](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQvYXNzZXRzL3NyYy9leHBsb3JlL2NvbXBvbmVudHMvY29udHJvbHMvVml6VHlwZUNvbnRyb2wuanN4) | | |
| [...set/assets/src/dashboard/util/setPeriodicRunner.js](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQvYXNzZXRzL3NyYy9kYXNoYm9hcmQvdXRpbC9zZXRQZXJpb2RpY1J1bm5lci5qcw==) | | |
| [...t/assets/src/components/InfoTooltipWithTrigger.jsx](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQvYXNzZXRzL3NyYy9jb21wb25lbnRzL0luZm9Ub29sdGlwV2l0aFRyaWdnZXIuanN4) | | |
| [.../src/dashboard/components/UndoRedoKeylisteners.jsx](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQvYXNzZXRzL3NyYy9kYXNoYm9hcmQvY29tcG9uZW50cy9VbmRvUmVkb0tleWxpc3RlbmVycy5qc3g=) | | |
| [...ts/src/explore/components/ExploreActionButtons.jsx](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQvYXNzZXRzL3NyYy9leHBsb3JlL2NvbXBvbmVudHMvRXhwbG9yZUFjdGlvbkJ1dHRvbnMuanN4) | | |
| ... and [734 more](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree-more) | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=footer). Last update [4f06236...4af3163](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] serenajiang commented on a change in pull
request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
serenajiang commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377465658
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards)))
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ slice_ids = [slice.id for slice in dashboard.slices]
+ filters = (
+ session.query(Slice)
+ .filter(and_(Slice.id.in_(slice_ids), Slice.viz_type == "filter_box"))
+ .all()
+ )
+
+ # if dashboard has filter_box
+ if len(filters):
Review comment:
I slightly prefer
```python
if filters:
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] serenajiang commented on a change in pull
request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
serenajiang commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377913756
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print(f"scanning dashboard ({i + 1}/{len(dashboards)}) >>>>")
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ slice_ids = [slice.id for slice in dashboard.slices]
+ filters = [
+ slice
+ for slice in dashboard.slices
+ if slice.id.in_(slice_ids) and slice.viz_type == "filter_box"
+ ]
Review comment:
Don't need the extra slice_ids step - can just do.
```python
filters = [slice for slice in dashboard.slices if slice.viz_type == "filter_box"]
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat merged pull request #9109:
[migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat merged pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r378417495
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,111 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print(f"scanning dashboard ({i + 1}/{len(dashboards)}) >>>>")
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ filters = [
+ slice for slice in dashboard.slices if slice.viz_type == "filter_box"
+ ]
+
+ # if dashboard has filter_box
+ if filters:
+ filter_scopes = convert_filter_scopes(json_metadata, filters)
+
+ json_metadata.pop("filter_immune_slices", None)
+ json_metadata.pop("filter_immune_slice_fields", None)
+ if filter_scopes:
+ json_metadata["filter_scopes"] = filter_scopes
+ logging.info(
+ f"Adding filter_scopes for dashboard {dashboard.id}: {json.dumps(filter_scopes)}"
+ )
+ if json_metadata:
Review comment:
correct! I fixed it.
some old dashboards have no json_metadata. so after this migration i want to keep their json_metadata attribute be `None` instead of `{}`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377958235
##########
File path: superset/utils/dashboard_filter_scopes_converter.py
##########
@@ -0,0 +1,72 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+import logging
+from typing import Dict, List
+
+from superset.models.slice import Slice
+
+logger = logging.getLogger(__name__)
+
+
+def convert_filter_scopes(json_metadata: Dict, filters: List[Slice]):
+ filter_scopes = {}
+ immuned_by_id: List[int] = json_metadata.get("filter_immune_slices") or []
+ immuned_by_column: Dict = {}
+ for slice_id, columns in json_metadata.get(
+ "filter_immune_slice_fields", {}
+ ).items():
+ for column in columns:
+ if immuned_by_column.get(column, None) is None:
+ immuned_by_column[column] = []
+ immuned_by_column[column].append(int(slice_id))
+
+ def add_filter_scope(filter_field, filter_id):
+ # in case filter field is invalid
+ if isinstance(filter_field, str):
+ current_filter_immune = list(
+ set(immuned_by_id + immuned_by_column.get(filter_field, []))
+ )
+ filter_fields[filter_field] = {
+ "scope": ["ROOT_ID"],
+ "immune": current_filter_immune,
+ }
+ else:
+ logging.info(f"slice [{filter_id}] has invalid field: {filter_field}")
+
+ for filter_slice in filters:
+ filter_fields: Dict = {}
+ filter_id = filter_slice.id
+ slice_params = filter_slice.params or {}
+ configs = slice_params.get("filter_configs") or []
+
+ if slice_params.get("date_filter", False):
Review comment:
fixed
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] serenajiang commented on a change in pull
request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
serenajiang commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377465441
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards)))
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ slice_ids = [slice.id for slice in dashboard.slices]
+ filters = (
+ session.query(Slice)
+ .filter(and_(Slice.id.in_(slice_ids), Slice.viz_type == "filter_box"))
+ .all()
+ )
Review comment:
I don't think the query for filters is necessary, since the slices shouuuld have all the info loaded, so you could just do something like:
```
filters = [slice for slice in dashboard.slices if slice.viz_type == "filter_box"]
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377936119
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards)))
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ slice_ids = [slice.id for slice in dashboard.slices]
+ filters = (
+ session.query(Slice)
+ .filter(and_(Slice.id.in_(slice_ids), Slice.viz_type == "filter_box"))
+ .all()
+ )
+
+ # if dashboard has filter_box
+ if len(filters):
+ filter_scopes = convert_filter_scopes(json_metadata, filters)
+
+ json_metadata.pop("filter_immune_slices", None)
+ json_metadata.pop("filter_immune_slice_fields", None)
+ if filter_scopes:
+ json_metadata["filter_scopes"] = filter_scopes
+ logging.info(
+ f"Adding filter_scopes for dashboard {dashboard.id}: {json.dumps(filter_scopes)}"
+ )
+ if json_metadata:
+ dashboard.json_metadata = json.dumps(
+ json_metadata, indent=None, separators=(",", ":"), sort_keys=True
+ )
+
+ session.merge(dashboard)
+ except Exception as e:
+ logging.exception(f"dashboard {dashboard.id} has error: {e}")
Review comment:
i mean to catch any user data caused null pointer exception. for example, user may add invalid `json_metada` that I can't parse ? but should be very rare.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] codecov-io edited a comment on issue #9109:
[migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#issuecomment-584293503
# [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=h1) Report
> Merging [#9109](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-superset/commit/291306392443a5a0d0e2ee0cc4a95d37c56d4589?src=pr&el=desc) will **decrease** coverage by `<.01%`.
> The diff coverage is `n/a`.
[](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #9109 +/- ##
=========================================
- Coverage 59.1% 59.1% -0.01%
=========================================
Files 372 372
Lines 11920 11922 +2
Branches 2917 2919 +2
=========================================
+ Hits 7045 7046 +1
- Misses 4693 4694 +1
Partials 182 182
```
| [Impacted Files](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [superset-frontend/src/chart/chartAction.js](https://codecov.io/gh/apache/incubator-superset/pull/9109/diff?src=pr&el=tree#diff-c3VwZXJzZXQtZnJvbnRlbmQvc3JjL2NoYXJ0L2NoYXJ0QWN0aW9uLmpz) | `43.33% <0%> (+0.09%)` | :arrow_up: |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=footer). Last update [2913063...008ce3f](https://codecov.io/gh/apache/incubator-superset/pull/9109?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377935365
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards)))
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ slice_ids = [slice.id for slice in dashboard.slices]
+ filters = (
+ session.query(Slice)
+ .filter(and_(Slice.id.in_(slice_ids), Slice.viz_type == "filter_box"))
+ .all()
+ )
+
+ # if dashboard has filter_box
+ if len(filters):
Review comment:
fixed.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] john-bodley commented on a change in pull
request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
john-bodley commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r378002763
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,111 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print(f"scanning dashboard ({i + 1}/{len(dashboards)}) >>>>")
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ filters = [
+ slice for slice in dashboard.slices if slice.viz_type == "filter_box"
+ ]
+
+ # if dashboard has filter_box
+ if filters:
+ filter_scopes = convert_filter_scopes(json_metadata, filters)
+
+ json_metadata.pop("filter_immune_slices", None)
+ json_metadata.pop("filter_immune_slice_fields", None)
+ if filter_scopes:
+ json_metadata["filter_scopes"] = filter_scopes
+ logging.info(
+ f"Adding filter_scopes for dashboard {dashboard.id}: {json.dumps(filter_scopes)}"
+ )
+ if json_metadata:
Review comment:
Don’t we also need to update the JSON metadata of the record if it’s falsey?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] serenajiang commented on a change in pull
request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
serenajiang commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377466798
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards)))
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ slice_ids = [slice.id for slice in dashboard.slices]
+ filters = (
+ session.query(Slice)
+ .filter(and_(Slice.id.in_(slice_ids), Slice.viz_type == "filter_box"))
+ .all()
+ )
+
+ # if dashboard has filter_box
+ if len(filters):
+ filter_scopes = convert_filter_scopes(json_metadata, filters)
+
+ json_metadata.pop("filter_immune_slices", None)
+ json_metadata.pop("filter_immune_slice_fields", None)
+ if filter_scopes:
+ json_metadata["filter_scopes"] = filter_scopes
+ logging.info(
+ f"Adding filter_scopes for dashboard {dashboard.id}: {json.dumps(filter_scopes)}"
+ )
+ if json_metadata:
+ dashboard.json_metadata = json.dumps(
+ json_metadata, indent=None, separators=(",", ":"), sort_keys=True
+ )
+
+ session.merge(dashboard)
+ except Exception as e:
+ logging.exception(f"dashboard {dashboard.id} has error: {e}")
Review comment:
When you tested this, were there ever any errors? I'm curious what kind of errors might occur.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] serenajiang commented on a change in pull
request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
serenajiang commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377466527
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards)))
Review comment:
Hmm, I don't have a strong preference for which, but we should probably either stick to `print` or `logging.info` and not do both.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377959082
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards)))
Review comment:
this `print` some progress in the console so that we can see how much work is done.
the logging.info is used to save a record (can't see it from console).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377959082
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards)))
Review comment:
in my test, scanning 11000 records takes ~4 minutes.
this `print` some progress in the console so that during deployment we can see how much work is done. Otherwise it will look like db upgrade is hanging there.
the logging.info is used to save a record (can't see it from console).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377935248
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,114 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
Review comment:
I found a few places in our code base that use variable (instead of class) for relationship table.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] john-bodley commented on a change in pull
request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
john-bodley commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r378002297
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,111 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print(f"scanning dashboard ({i + 1}/{len(dashboards)}) >>>>")
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ filters = [
+ slice for slice in dashboard.slices if slice.viz_type == "filter_box"
+ ]
+
+ # if dashboard has filter_box
+ if filters:
+ filter_scopes = convert_filter_scopes(json_metadata, filters)
+
+ json_metadata.pop("filter_immune_slices", None)
+ json_metadata.pop("filter_immune_slice_fields", None)
+ if filter_scopes:
Review comment:
It seems this logic can be put within the `if filters:` block.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on issue #9109:
[migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on issue #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#issuecomment-585541741
ping @john-bodley
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] graceguo-supercat commented on a change in
pull request #9109: [migration] metadata for dashboard filters
Posted by GitBox <gi...@apache.org>.
graceguo-supercat commented on a change in pull request #9109: [migration] metadata for dashboard filters
URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r378417974
##########
File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py
##########
@@ -0,0 +1,111 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""empty message
+
+Revision ID: 3325d4caccc8
+Revises: e96dbf2cfef0
+Create Date: 2020-02-07 14:13:51.714678
+
+"""
+
+# revision identifiers, used by Alembic.
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship
+
+from superset import db
+from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes
+
+revision = "3325d4caccc8"
+down_revision = "e96dbf2cfef0"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+ """Declarative class to do query in upgrade"""
+
+ __tablename__ = "slices"
+ id = Column(Integer, primary_key=True)
+ slice_name = Column(String(250))
+ params = Column(Text)
+ viz_type = Column(String(250))
+
+
+dashboard_slices = Table(
+ "dashboard_slices",
+ Base.metadata,
+ Column("id", Integer, primary_key=True),
+ Column("dashboard_id", Integer, ForeignKey("dashboards.id")),
+ Column("slice_id", Integer, ForeignKey("slices.id")),
+)
+
+
+class Dashboard(Base):
+ __tablename__ = "dashboards"
+ id = Column(Integer, primary_key=True)
+ json_metadata = Column(Text)
+ slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards")
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ dashboards = session.query(Dashboard).all()
+ for i, dashboard in enumerate(dashboards):
+ print(f"scanning dashboard ({i + 1}/{len(dashboards)}) >>>>")
+ try:
+ json_metadata = json.loads(dashboard.json_metadata or "{}")
+ if "filter_scopes" in json_metadata:
+ continue
+
+ filter_scopes = {}
+ filters = [
+ slice for slice in dashboard.slices if slice.viz_type == "filter_box"
+ ]
+
+ # if dashboard has filter_box
+ if filters:
+ filter_scopes = convert_filter_scopes(json_metadata, filters)
+
+ json_metadata.pop("filter_immune_slices", None)
+ json_metadata.pop("filter_immune_slice_fields", None)
+ if filter_scopes:
Review comment:
fixed.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org