-
Notifications
You must be signed in to change notification settings - Fork 13.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: Add database search in available charts on dashboard. #19244
Changes from 2 commits
930a600
44e68a7
db1e822
def0b32
c3474a1
622528a
2ba3b0d
008f163
1b2e8f4
1bd4105
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,92 +39,154 @@ export function fetchAllSlicesFailed(error) { | |
return { type: FETCH_ALL_SLICES_FAILED, payload: { error } }; | ||
} | ||
|
||
function fetchSlices( | ||
userId, | ||
excludeFilterBox, | ||
dispatch, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. you could transform this to an action creator function (like the ones below) to avoid passing this param around |
||
filter_value, | ||
sortColumn = 'changed_on_delta_humanized', | ||
slices = {} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do you need the current slices? aren't we fetching here and need to replace the existing ones? |
||
) { | ||
const additional_filters = filter_value ? [ | ||
{ col: 'slice_name', opr: 'sw', value: filter_value }, | ||
{ col: 'viz_type', opr: 'sw', value: filter_value }, | ||
{ col: 'datasource_name', opr: 'sw', value: filter_value }, | ||
] : []; | ||
|
||
return SupersetClient.get({ | ||
endpoint: `/api/v1/chart/?q=${rison.encode({ | ||
columns: [ | ||
'changed_on_delta_humanized', | ||
'changed_on_utc', | ||
'datasource_id', | ||
'datasource_type', | ||
'datasource_url', | ||
'datasource_name_text', | ||
'description_markeddown', | ||
'description', | ||
'id', | ||
'params', | ||
'slice_name', | ||
'url', | ||
'viz_type', | ||
], | ||
filters: [ | ||
{ col: 'owners', opr: 'rel_m_m', value: userId }, | ||
...additional_filters | ||
], | ||
page_size: FETCH_SLICES_PAGE_SIZE, | ||
order_column: sortColumn == 'changed_on' ? 'changed_on_delta_humanized' : sortColumn, | ||
order_direction: sortColumn == 'changed_on' ? 'desc' : 'asc', | ||
})}`, | ||
}) | ||
.then(({ json }) => { | ||
let { result } = json; | ||
// disable add filter_box viz to dashboard | ||
if (excludeFilterBox) { | ||
result = result.filter(slice => slice.viz_type !== 'filter_box'); | ||
} | ||
result.forEach(slice => { | ||
let form_data = JSON.parse(slice.params); | ||
form_data = { | ||
...form_data, | ||
// force using datasource stored in relational table prop | ||
datasource: | ||
getDatasourceParameter( | ||
slice.datasource_id, | ||
slice.datasource_type, | ||
) || form_data.datasource, | ||
}; | ||
slices[slice.id] = { | ||
slice_id: slice.id, | ||
slice_url: slice.url, | ||
slice_name: slice.slice_name, | ||
form_data, | ||
datasource_name: slice.datasource_name_text, | ||
datasource_url: slice.datasource_url, | ||
datasource_id: slice.datasource_id, | ||
datasource_type: slice.datasource_type, | ||
changed_on: new Date(slice.changed_on_utc).getTime(), | ||
description: slice.description, | ||
description_markdown: slice.description_markeddown, | ||
viz_type: slice.viz_type, | ||
modified: slice.changed_on_delta_humanized, | ||
changed_on_humanized: slice.changed_on_delta_humanized, | ||
}; | ||
}); | ||
|
||
return dispatch(setAllSlices(slices)); | ||
}) | ||
.catch( | ||
errorResponse => | ||
console.log(errorResponse) || | ||
getClientErrorObject(errorResponse).then(({ error }) => { | ||
dispatch( | ||
fetchAllSlicesFailed( | ||
error || t('Could not fetch all saved charts'), | ||
), | ||
); | ||
dispatch( | ||
addDangerToast( | ||
t('Sorry there was an error fetching saved charts: ') + error, | ||
), | ||
); | ||
}), | ||
); | ||
} | ||
|
||
const FETCH_SLICES_PAGE_SIZE = 200; | ||
export function fetchAllSlices(userId, excludeFilterBox = false) { | ||
export function fetchAllSlices( | ||
userId, | ||
excludeFilterBox = false | ||
) { | ||
return (dispatch, getState) => { | ||
const { sliceEntities } = getState(); | ||
if (sliceEntities.lastUpdated === 0) { | ||
dispatch(fetchAllSlicesStarted()); | ||
|
||
return SupersetClient.get({ | ||
endpoint: `/api/v1/chart/?q=${rison.encode({ | ||
columns: [ | ||
'changed_on_delta_humanized', | ||
'changed_on_utc', | ||
'datasource_id', | ||
'datasource_type', | ||
'datasource_url', | ||
'datasource_name_text', | ||
'description_markeddown', | ||
'description', | ||
'id', | ||
'params', | ||
'slice_name', | ||
'url', | ||
'viz_type', | ||
], | ||
filters: [{ col: 'owners', opr: 'rel_m_m', value: userId }], | ||
page_size: FETCH_SLICES_PAGE_SIZE, | ||
order_column: 'changed_on_delta_humanized', | ||
order_direction: 'desc', | ||
})}`, | ||
}) | ||
.then(({ json }) => { | ||
const slices = {}; | ||
let { result } = json; | ||
// disable add filter_box viz to dashboard | ||
if (excludeFilterBox) { | ||
result = result.filter(slice => slice.viz_type !== 'filter_box'); | ||
} | ||
result.forEach(slice => { | ||
let form_data = JSON.parse(slice.params); | ||
form_data = { | ||
...form_data, | ||
// force using datasource stored in relational table prop | ||
datasource: | ||
getDatasourceParameter( | ||
slice.datasource_id, | ||
slice.datasource_type, | ||
) || form_data.datasource, | ||
}; | ||
slices[slice.id] = { | ||
slice_id: slice.id, | ||
slice_url: slice.url, | ||
slice_name: slice.slice_name, | ||
form_data, | ||
datasource_name: slice.datasource_name_text, | ||
datasource_url: slice.datasource_url, | ||
datasource_id: slice.datasource_id, | ||
datasource_type: slice.datasource_type, | ||
changed_on: new Date(slice.changed_on_utc).getTime(), | ||
description: slice.description, | ||
description_markdown: slice.description_markeddown, | ||
viz_type: slice.viz_type, | ||
modified: slice.changed_on_delta_humanized, | ||
changed_on_humanized: slice.changed_on_delta_humanized, | ||
}; | ||
}); | ||
|
||
return dispatch(setAllSlices(slices)); | ||
}) | ||
.catch( | ||
errorResponse => | ||
console.log(errorResponse) || | ||
getClientErrorObject(errorResponse).then(({ error }) => { | ||
dispatch( | ||
fetchAllSlicesFailed( | ||
error || t('Could not fetch all saved charts'), | ||
), | ||
); | ||
dispatch( | ||
addDangerToast( | ||
t('Sorry there was an error fetching saved charts: ') + error, | ||
), | ||
); | ||
}), | ||
); | ||
return fetchSlices( | ||
userId, | ||
excludeFilterBox, | ||
dispatch, | ||
undefined | ||
); | ||
} | ||
|
||
return dispatch(setAllSlices(sliceEntities.slices)); | ||
}; | ||
} | ||
|
||
export function fetchSortedSlices( | ||
userId, | ||
excludeFilterBox = false, | ||
order_column | ||
) { | ||
return dispatch => { | ||
dispatch(fetchAllSlicesStarted()); | ||
return fetchSlices( | ||
userId, | ||
excludeFilterBox, | ||
dispatch, | ||
undefined, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If passed as an |
||
order_column | ||
); | ||
} | ||
} | ||
|
||
export function fetchFilteredSlices( | ||
userId, | ||
excludeFilterBox = false, | ||
filter_value | ||
) { | ||
return (dispatch, getState) => { | ||
dispatch(fetchAllSlicesStarted()); | ||
const { sliceEntities } = getState(); | ||
return fetchSlices( | ||
userId, | ||
excludeFilterBox, | ||
dispatch, | ||
filter_value, | ||
undefined, | ||
sliceEntities.slices | ||
); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we send these as an
Option object
? So we don't have to worry about the order we send it and we avoid sendingundefined
when calling it? So we just send what options we need and we destructure here to get them?