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/07/29 07:34:46 UTC
[GitHub] [incubator-superset] nytai opened a new pull request #10442: fix(dataset listview): use related endpoint for database filter values
nytai opened a new pull request #10442:
URL: https://github.com/apache/incubator-superset/pull/10442
### SUMMARY
<!--- Describe the change below, including rationale and design decisions -->
### BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF
<!--- Skip this if not applicable -->
### TEST PLAN
<!--- What steps should be taken to verify the changes -->
### ADDITIONAL INFORMATION
<!--- Check any relevant boxes with "x" -->
<!--- HINT: Include "Fixes #nnn" if you are fixing an existing issue -->
- [ ] Has associated issue:
- [ ] Changes UI
- [ ] Requires DB Migration.
- [ ] Confirm DB Migration upgrade and downgrade tested.
- [ ] Introduces new feature or API
- [ ] Removes existing feature or API
----------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] codecov-commenter commented on pull request #10442: fix(dataset listview): use related endpoint for database filter values
Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on pull request #10442:
URL: https://github.com/apache/incubator-superset/pull/10442#issuecomment-664658522
# [Codecov](https://codecov.io/gh/apache/incubator-superset/pull/10442?src=pr&el=h1) Report
> Merging [#10442](https://codecov.io/gh/apache/incubator-superset/pull/10442?src=pr&el=desc) into [master](https://codecov.io/gh/apache/incubator-superset/commit/6f56cd5e9d18ab8c89f282551b349ccf8da99dc1&el=desc) will **increase** coverage by `0.02%`.
> The diff coverage is `0.00%`.
[](https://codecov.io/gh/apache/incubator-superset/pull/10442?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #10442 +/- ##
==========================================
+ Coverage 70.25% 70.27% +0.02%
==========================================
Files 605 605
Lines 32377 32364 -13
Branches 3271 3265 -6
==========================================
- Hits 22745 22744 -1
+ Misses 9522 9510 -12
Partials 110 110
```
| Flag | Coverage Δ | |
|---|---|---|
| #cypress | `54.58% <ø> (+<0.01%)` | :arrow_up: |
| #javascript | `59.12% <0.00%> (+0.05%)` | :arrow_up: |
| #python | `69.82% <ø> (ø)` | |
Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags#carryforward-flags-in-the-pull-request-comment) to find out more.
| [Impacted Files](https://codecov.io/gh/apache/incubator-superset/pull/10442?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [...et-frontend/src/views/CRUD/dataset/DatasetList.tsx](https://codecov.io/gh/apache/incubator-superset/pull/10442/diff?src=pr&el=tree#diff-c3VwZXJzZXQtZnJvbnRlbmQvc3JjL3ZpZXdzL0NSVUQvZGF0YXNldC9EYXRhc2V0TGlzdC50c3g=) | `71.33% <0.00%> (+4.86%)` | :arrow_up: |
| [superset-frontend/src/views/CRUD/utils.tsx](https://codecov.io/gh/apache/incubator-superset/pull/10442/diff?src=pr&el=tree#diff-c3VwZXJzZXQtZnJvbnRlbmQvc3JjL3ZpZXdzL0NSVUQvdXRpbHMudHN4) | `33.33% <0.00%> (ø)` | |
| [...perset-frontend/src/messageToasts/actions/index.js](https://codecov.io/gh/apache/incubator-superset/pull/10442/diff?src=pr&el=tree#diff-c3VwZXJzZXQtZnJvbnRlbmQvc3JjL21lc3NhZ2VUb2FzdHMvYWN0aW9ucy9pbmRleC5qcw==) | `91.66% <0.00%> (-8.34%)` | :arrow_down: |
| [...et-frontend/src/messageToasts/components/Toast.tsx](https://codecov.io/gh/apache/incubator-superset/pull/10442/diff?src=pr&el=tree#diff-c3VwZXJzZXQtZnJvbnRlbmQvc3JjL21lc3NhZ2VUb2FzdHMvY29tcG9uZW50cy9Ub2FzdC50c3g=) | `96.96% <0.00%> (-3.04%)` | :arrow_down: |
| [...rontend/src/SqlLab/components/QueryAutoRefresh.jsx](https://codecov.io/gh/apache/incubator-superset/pull/10442/diff?src=pr&el=tree#diff-c3VwZXJzZXQtZnJvbnRlbmQvc3JjL1NxbExhYi9jb21wb25lbnRzL1F1ZXJ5QXV0b1JlZnJlc2guanN4) | `72.72% <0.00%> (+6.81%)` | :arrow_up: |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-superset/pull/10442?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/10442?src=pr&el=footer). Last update [6f56cd5...e610bda](https://codecov.io/gh/apache/incubator-superset/pull/10442?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
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] nytai commented on a change in pull request #10442: refactor(listviews): use correct filter endpoints for charts and datasets
Posted by GitBox <gi...@apache.org>.
nytai commented on a change in pull request #10442:
URL: https://github.com/apache/incubator-superset/pull/10442#discussion_r461737272
##########
File path: superset-frontend/src/views/CRUD/dataset/DatasetList.tsx
##########
@@ -66,78 +66,40 @@ interface DatasetListProps {
addDangerToast: (msg: string) => void;
addSuccessToast: (msg: string) => void;
}
-interface Database {
- allow_csv_upload: boolean;
- allow_ctas: boolean;
- allow_cvas: null | boolean;
- allow_dml: boolean;
- allow_multi_schema_metadata_fetch: boolean;
- allow_run_async: boolean;
- allows_cost_estimate: boolean;
- allows_subquery: boolean;
- allows_virtual_table_explore: boolean;
- backend: string;
- database_name: string;
- explore_database_id: number;
- expose_in_sqllab: boolean;
- force_ctas_schema: null | boolean;
- function_names: string[];
- id: number;
-}
-
-const createFetchDatabases = (handleError: (err: Response) => void) => async (
- filterValue = '',
- pageIndex?: number,
- pageSize?: number,
-) => {
- try {
- const queryParams = rison.encode({
- columns: ['database_name', 'id'],
- keys: ['none'],
- ...(pageIndex ? { page: pageIndex } : {}),
- ...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
- });
- const { json = {} } = await SupersetClient.get({
- endpoint: `/api/v1/database/?q=${queryParams}`,
- });
-
- return json?.result?.map(
- ({ database_name: label, id: value }: Database) => ({
- label,
- value,
- }),
- );
- } catch (e) {
- handleError(e);
- }
- return [];
-};
export const createFetchSchemas = (
handleError: (error: Response) => void,
) => async (filterValue = '', pageIndex?: number, pageSize?: number) => {
+ // add filters if filterValue
+ const filters = filterValue
+ ? { filters: [{ col: 'schema', opr: 'sw', value: filterValue }] }
+ : {};
try {
const queryParams = rison.encode({
+ columns: ['schema'],
+ keys: ['none'],
...(pageIndex ? { page: pageIndex } : {}),
...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
+ ...filters,
Review comment:
good point!
##########
File path: superset-frontend/src/views/CRUD/dataset/DatasetList.tsx
##########
@@ -66,78 +66,40 @@ interface DatasetListProps {
addDangerToast: (msg: string) => void;
addSuccessToast: (msg: string) => void;
}
-interface Database {
- allow_csv_upload: boolean;
- allow_ctas: boolean;
- allow_cvas: null | boolean;
- allow_dml: boolean;
- allow_multi_schema_metadata_fetch: boolean;
- allow_run_async: boolean;
- allows_cost_estimate: boolean;
- allows_subquery: boolean;
- allows_virtual_table_explore: boolean;
- backend: string;
- database_name: string;
- explore_database_id: number;
- expose_in_sqllab: boolean;
- force_ctas_schema: null | boolean;
- function_names: string[];
- id: number;
-}
-
-const createFetchDatabases = (handleError: (err: Response) => void) => async (
- filterValue = '',
- pageIndex?: number,
- pageSize?: number,
-) => {
- try {
- const queryParams = rison.encode({
- columns: ['database_name', 'id'],
- keys: ['none'],
- ...(pageIndex ? { page: pageIndex } : {}),
- ...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
- });
- const { json = {} } = await SupersetClient.get({
- endpoint: `/api/v1/database/?q=${queryParams}`,
- });
-
- return json?.result?.map(
- ({ database_name: label, id: value }: Database) => ({
- label,
- value,
- }),
- );
- } catch (e) {
- handleError(e);
- }
- return [];
-};
export const createFetchSchemas = (
handleError: (error: Response) => void,
) => async (filterValue = '', pageIndex?: number, pageSize?: number) => {
+ // add filters if filterValue
+ const filters = filterValue
+ ? { filters: [{ col: 'schema', opr: 'sw', value: filterValue }] }
+ : {};
try {
const queryParams = rison.encode({
+ columns: ['schema'],
+ keys: ['none'],
...(pageIndex ? { page: pageIndex } : {}),
...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
+ ...filters,
});
const { json = {} } = await SupersetClient.get({
- endpoint: `/api/v1/database/schemas/?q=${queryParams}`,
+ endpoint: `/api/v1/dataset/?q=${queryParams}`,
});
- return json?.result?.map(
- ({ text: label, value }: { text: string; value: any }) => ({
- label,
- value,
- }),
+ const schemas: string[] = json?.result?.map(
+ ({ schema }: { schema: string }) => schema,
);
+
+ // uniqueify schema values and create options
Review comment:
Building a api route that supports filtering and pagination is a little more involved. Longer term we should definitely do this, but I'm looking for quick fixes in this PR. @dpgaspar do you think it would make sense to add another method for retrieving unique values from some resource, similar to `/api/v1/{resource}/related/{relation}` we could have `/api/v1/{resource}/unique_values/{column}`?
##########
File path: superset-frontend/src/views/CRUD/dataset/AddDatasetModal.tsx
##########
@@ -97,8 +97,13 @@ const DatasetModal: FunctionComponent<DatasetModalProps> = ({
onHide();
})
.catch(
- createErrorHandler(errMsg =>
- addDangerToast(t('Error while saving dataset: %s', errMsg)),
+ createErrorHandler((errMsg: unknown) =>
+ addDangerToast(
+ t(
+ 'Error while saving dataset: %s',
+ (errMsg as { table_name?: string }).table_name,
Review comment:
the error types are currently wrong. Error message can be either a string or an object, in this case the error message is scope to the input. Errors are most likely to occur in table_name field.
Longer terms we should add error messages to the form so the errors appear next to the input that failed.
----------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] nytai merged pull request #10442: refactor(listviews): use correct filter endpoints for charts and datasets
Posted by GitBox <gi...@apache.org>.
nytai merged pull request #10442:
URL: https://github.com/apache/incubator-superset/pull/10442
----------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] codecov-commenter edited a comment on pull request #10442: fix(dataset listview): use related endpoint for database filter values
Posted by GitBox <gi...@apache.org>.
codecov-commenter edited a comment on pull request #10442:
URL: https://github.com/apache/incubator-superset/pull/10442#issuecomment-664658522
----------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] dpgaspar commented on a change in pull request #10442: refactor(listviews): use correct filter endpoints for charts and datasets
Posted by GitBox <gi...@apache.org>.
dpgaspar commented on a change in pull request #10442:
URL: https://github.com/apache/incubator-superset/pull/10442#discussion_r462167421
##########
File path: superset-frontend/src/views/CRUD/dataset/AddDatasetModal.tsx
##########
@@ -97,8 +97,13 @@ const DatasetModal: FunctionComponent<DatasetModalProps> = ({
onHide();
})
.catch(
- createErrorHandler(errMsg =>
- addDangerToast(t('Error while saving dataset: %s', errMsg)),
+ createErrorHandler((errMsg: unknown) =>
+ addDangerToast(
+ t(
+ 'Error while saving dataset: %s',
+ (errMsg as { table_name?: string }).table_name,
Review comment:
Exactly!
##########
File path: superset-frontend/src/views/CRUD/dataset/DatasetList.tsx
##########
@@ -66,78 +66,40 @@ interface DatasetListProps {
addDangerToast: (msg: string) => void;
addSuccessToast: (msg: string) => void;
}
-interface Database {
- allow_csv_upload: boolean;
- allow_ctas: boolean;
- allow_cvas: null | boolean;
- allow_dml: boolean;
- allow_multi_schema_metadata_fetch: boolean;
- allow_run_async: boolean;
- allows_cost_estimate: boolean;
- allows_subquery: boolean;
- allows_virtual_table_explore: boolean;
- backend: string;
- database_name: string;
- explore_database_id: number;
- expose_in_sqllab: boolean;
- force_ctas_schema: null | boolean;
- function_names: string[];
- id: number;
-}
-
-const createFetchDatabases = (handleError: (err: Response) => void) => async (
- filterValue = '',
- pageIndex?: number,
- pageSize?: number,
-) => {
- try {
- const queryParams = rison.encode({
- columns: ['database_name', 'id'],
- keys: ['none'],
- ...(pageIndex ? { page: pageIndex } : {}),
- ...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
- });
- const { json = {} } = await SupersetClient.get({
- endpoint: `/api/v1/database/?q=${queryParams}`,
- });
-
- return json?.result?.map(
- ({ database_name: label, id: value }: Database) => ({
- label,
- value,
- }),
- );
- } catch (e) {
- handleError(e);
- }
- return [];
-};
export const createFetchSchemas = (
handleError: (error: Response) => void,
) => async (filterValue = '', pageIndex?: number, pageSize?: number) => {
+ // add filters if filterValue
+ const filters = filterValue
+ ? { filters: [{ col: 'schema', opr: 'sw', value: filterValue }] }
+ : {};
try {
const queryParams = rison.encode({
+ columns: ['schema'],
+ keys: ['none'],
...(pageIndex ? { page: pageIndex } : {}),
...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
+ ...filters,
});
const { json = {} } = await SupersetClient.get({
- endpoint: `/api/v1/database/schemas/?q=${queryParams}`,
+ endpoint: `/api/v1/dataset/?q=${queryParams}`,
});
- return json?.result?.map(
- ({ text: label, value }: { text: string; value: any }) => ({
- label,
- value,
- }),
+ const schemas: string[] = json?.result?.map(
+ ({ schema }: { schema: string }) => schema,
);
+
+ // uniqueify schema values and create options
Review comment:
yes, good point we probably need to do it
----------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] dpgaspar commented on a change in pull request #10442: refactor(listviews): use correct filter endpoints for charts and datasets
Posted by GitBox <gi...@apache.org>.
dpgaspar commented on a change in pull request #10442:
URL: https://github.com/apache/incubator-superset/pull/10442#discussion_r461563504
##########
File path: superset-frontend/src/views/CRUD/chart/ChartList.tsx
##########
@@ -50,18 +55,36 @@ interface State {
// In future it would be better to have a unified Chart entity.
sliceCurrentlyEditing: Slice | null;
}
-const createFetchDatasets = (
- handleError: (err: Response) => void,
-) => async () => {
+const createFetchDatasets = (handleError: (err: Response) => void) => async (
+ filterValue = '',
+ pageIndex?: number,
+ pageSize?: number,
+) => {
+ // add filters if filterValue
+ const filters = filterValue
+ ? { filters: [{ col: 'table_name', opr: 'sw', value: filterValue }] }
+ : {};
try {
+ const queryParams = rison.encode({
+ columns: ['table_name', 'id'],
+ keys: ['none'],
+ ...(pageIndex ? { page: pageIndex } : {}),
+ ...(pageSize ? { page_size: pageSize } : {}),
+ ...filters,
Review comment:
sort the table_name's also ?
##########
File path: superset-frontend/src/views/CRUD/dataset/DatasetList.tsx
##########
@@ -66,78 +66,40 @@ interface DatasetListProps {
addDangerToast: (msg: string) => void;
addSuccessToast: (msg: string) => void;
}
-interface Database {
- allow_csv_upload: boolean;
- allow_ctas: boolean;
- allow_cvas: null | boolean;
- allow_dml: boolean;
- allow_multi_schema_metadata_fetch: boolean;
- allow_run_async: boolean;
- allows_cost_estimate: boolean;
- allows_subquery: boolean;
- allows_virtual_table_explore: boolean;
- backend: string;
- database_name: string;
- explore_database_id: number;
- expose_in_sqllab: boolean;
- force_ctas_schema: null | boolean;
- function_names: string[];
- id: number;
-}
-
-const createFetchDatabases = (handleError: (err: Response) => void) => async (
- filterValue = '',
- pageIndex?: number,
- pageSize?: number,
-) => {
- try {
- const queryParams = rison.encode({
- columns: ['database_name', 'id'],
- keys: ['none'],
- ...(pageIndex ? { page: pageIndex } : {}),
- ...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
- });
- const { json = {} } = await SupersetClient.get({
- endpoint: `/api/v1/database/?q=${queryParams}`,
- });
-
- return json?.result?.map(
- ({ database_name: label, id: value }: Database) => ({
- label,
- value,
- }),
- );
- } catch (e) {
- handleError(e);
- }
- return [];
-};
export const createFetchSchemas = (
handleError: (error: Response) => void,
) => async (filterValue = '', pageIndex?: number, pageSize?: number) => {
+ // add filters if filterValue
+ const filters = filterValue
+ ? { filters: [{ col: 'schema', opr: 'sw', value: filterValue }] }
+ : {};
try {
const queryParams = rison.encode({
+ columns: ['schema'],
+ keys: ['none'],
...(pageIndex ? { page: pageIndex } : {}),
...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
+ ...filters,
Review comment:
Would be nice to fetch a sorted schema list
##########
File path: superset/charts/api.py
##########
@@ -693,42 +692,3 @@ def thumbnail(
return Response(
FileWrapper(screenshot), mimetype="image/png", direct_passthrough=True
)
Review comment:
let's remove `datasources` from `include_route_methods` and `method_permission_name`
##########
File path: superset/databases/api.py
##########
@@ -280,70 +269,3 @@ def select_star(
return self.response(404, message="Table not found on the database")
self.incr_stats("success", self.select_star.__name__)
return self.response(200, result=result)
-
Review comment:
Remove `schemas` from `include_route_methods` and `method_permission_name`
----------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org
[GitHub] [incubator-superset] bkyryliuk commented on a change in pull request #10442: refactor(listviews): use correct filter endpoints for charts and datasets
Posted by GitBox <gi...@apache.org>.
bkyryliuk commented on a change in pull request #10442:
URL: https://github.com/apache/incubator-superset/pull/10442#discussion_r461720772
##########
File path: superset-frontend/src/views/CRUD/dataset/DatasetList.tsx
##########
@@ -66,78 +66,40 @@ interface DatasetListProps {
addDangerToast: (msg: string) => void;
addSuccessToast: (msg: string) => void;
}
-interface Database {
- allow_csv_upload: boolean;
- allow_ctas: boolean;
- allow_cvas: null | boolean;
- allow_dml: boolean;
- allow_multi_schema_metadata_fetch: boolean;
- allow_run_async: boolean;
- allows_cost_estimate: boolean;
- allows_subquery: boolean;
- allows_virtual_table_explore: boolean;
- backend: string;
- database_name: string;
- explore_database_id: number;
- expose_in_sqllab: boolean;
- force_ctas_schema: null | boolean;
- function_names: string[];
- id: number;
-}
-
-const createFetchDatabases = (handleError: (err: Response) => void) => async (
- filterValue = '',
- pageIndex?: number,
- pageSize?: number,
-) => {
- try {
- const queryParams = rison.encode({
- columns: ['database_name', 'id'],
- keys: ['none'],
- ...(pageIndex ? { page: pageIndex } : {}),
- ...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
- });
- const { json = {} } = await SupersetClient.get({
- endpoint: `/api/v1/database/?q=${queryParams}`,
- });
-
- return json?.result?.map(
- ({ database_name: label, id: value }: Database) => ({
- label,
- value,
- }),
- );
- } catch (e) {
- handleError(e);
- }
- return [];
-};
export const createFetchSchemas = (
handleError: (error: Response) => void,
) => async (filterValue = '', pageIndex?: number, pageSize?: number) => {
+ // add filters if filterValue
+ const filters = filterValue
+ ? { filters: [{ col: 'schema', opr: 'sw', value: filterValue }] }
+ : {};
try {
const queryParams = rison.encode({
+ columns: ['schema'],
+ keys: ['none'],
...(pageIndex ? { page: pageIndex } : {}),
...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
+ ...filters,
Review comment:
+1
##########
File path: superset-frontend/src/views/CRUD/dataset/DatasetList.tsx
##########
@@ -66,78 +66,40 @@ interface DatasetListProps {
addDangerToast: (msg: string) => void;
addSuccessToast: (msg: string) => void;
}
-interface Database {
- allow_csv_upload: boolean;
- allow_ctas: boolean;
- allow_cvas: null | boolean;
- allow_dml: boolean;
- allow_multi_schema_metadata_fetch: boolean;
- allow_run_async: boolean;
- allows_cost_estimate: boolean;
- allows_subquery: boolean;
- allows_virtual_table_explore: boolean;
- backend: string;
- database_name: string;
- explore_database_id: number;
- expose_in_sqllab: boolean;
- force_ctas_schema: null | boolean;
- function_names: string[];
- id: number;
-}
-
-const createFetchDatabases = (handleError: (err: Response) => void) => async (
- filterValue = '',
- pageIndex?: number,
- pageSize?: number,
-) => {
- try {
- const queryParams = rison.encode({
- columns: ['database_name', 'id'],
- keys: ['none'],
- ...(pageIndex ? { page: pageIndex } : {}),
- ...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
- });
- const { json = {} } = await SupersetClient.get({
- endpoint: `/api/v1/database/?q=${queryParams}`,
- });
-
- return json?.result?.map(
- ({ database_name: label, id: value }: Database) => ({
- label,
- value,
- }),
- );
- } catch (e) {
- handleError(e);
- }
- return [];
-};
export const createFetchSchemas = (
handleError: (error: Response) => void,
) => async (filterValue = '', pageIndex?: number, pageSize?: number) => {
+ // add filters if filterValue
+ const filters = filterValue
+ ? { filters: [{ col: 'schema', opr: 'sw', value: filterValue }] }
+ : {};
try {
const queryParams = rison.encode({
+ columns: ['schema'],
+ keys: ['none'],
...(pageIndex ? { page: pageIndex } : {}),
...(pageSize ? { page_size: pageSize } : {}),
- ...(filterValue ? { filter: filterValue } : {}),
+ ...filters,
});
const { json = {} } = await SupersetClient.get({
- endpoint: `/api/v1/database/schemas/?q=${queryParams}`,
+ endpoint: `/api/v1/dataset/?q=${queryParams}`,
});
- return json?.result?.map(
- ({ text: label, value }: { text: string; value: any }) => ({
- label,
- value,
- }),
+ const schemas: string[] = json?.result?.map(
+ ({ schema }: { schema: string }) => schema,
);
+
+ // uniqueify schema values and create options
Review comment:
It seems to me that it could be done more efficiently on the server side e.g. select distinct schema sql query
----------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org