fix: alert/report created by filter inconsistency with table display (#19518)
* fix: alert/report created by filter inconsistency with table display * Match column order to dashboard list
This commit is contained in:
parent
cf5145918b
commit
a05ff5e598
|
|
@ -89,7 +89,7 @@ function AlertList({
|
|||
const title = isReportEnabled ? t('report') : t('alert');
|
||||
const titlePlural = isReportEnabled ? t('reports') : t('alerts');
|
||||
const pathName = isReportEnabled ? 'Reports' : 'Alerts';
|
||||
const initalFilters = useMemo(
|
||||
const initialFilters = useMemo(
|
||||
() => [
|
||||
{
|
||||
id: 'type',
|
||||
|
|
@ -117,7 +117,7 @@ function AlertList({
|
|||
addDangerToast,
|
||||
true,
|
||||
undefined,
|
||||
initalFilters,
|
||||
initialFilters,
|
||||
);
|
||||
|
||||
const { updateResource } = useSingleViewResource<Partial<AlertObject>>(
|
||||
|
|
@ -261,9 +261,15 @@ function AlertList({
|
|||
size: 'xl',
|
||||
},
|
||||
{
|
||||
accessor: 'created_by',
|
||||
Cell: ({
|
||||
row: {
|
||||
original: { created_by },
|
||||
},
|
||||
}: any) =>
|
||||
created_by ? `${created_by.first_name} ${created_by.last_name}` : '',
|
||||
Header: t('Created by'),
|
||||
id: 'created_by',
|
||||
disableSortBy: true,
|
||||
hidden: true,
|
||||
size: 'xl',
|
||||
},
|
||||
{
|
||||
|
|
@ -378,6 +384,22 @@ function AlertList({
|
|||
|
||||
const filters: Filters = useMemo(
|
||||
() => [
|
||||
{
|
||||
Header: t('Owner'),
|
||||
id: 'owners',
|
||||
input: 'select',
|
||||
operator: FilterOperator.relationManyMany,
|
||||
unfilteredLabel: 'All',
|
||||
fetchSelects: createFetchRelated(
|
||||
'report',
|
||||
'owners',
|
||||
createErrorHandler(errMsg =>
|
||||
t('An error occurred while fetching owners values: %s', errMsg),
|
||||
),
|
||||
user,
|
||||
),
|
||||
paginate: true,
|
||||
},
|
||||
{
|
||||
Header: t('Created by'),
|
||||
id: 'created_by',
|
||||
|
|
|
|||
|
|
@ -189,6 +189,7 @@ class ReportScheduleRestApi(BaseSupersetModelRestApi):
|
|||
"name",
|
||||
"active",
|
||||
"created_by",
|
||||
"owners",
|
||||
"type",
|
||||
"last_state",
|
||||
"creation_method",
|
||||
|
|
@ -212,6 +213,7 @@ class ReportScheduleRestApi(BaseSupersetModelRestApi):
|
|||
"chart": "slice_name",
|
||||
"database": "database_name",
|
||||
"created_by": RelatedFieldFilter("first_name", FilterRelatedOwners),
|
||||
"owners": RelatedFieldFilter("first_name", FilterRelatedOwners),
|
||||
}
|
||||
|
||||
apispec_parameter_schemas = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue