Skip to content

Commit

Permalink
Fix linter errors
Browse files Browse the repository at this point in the history
  • Loading branch information
dudasaron committed Apr 1, 2022
1 parent 34820b4 commit ced4cea
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 50 deletions.
4 changes: 2 additions & 2 deletions superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,13 @@ function DashboardList(props: DashboardListProps) {
original: { id },
},
}: any) =>
userId ? (
userId && (
<FaveStar
itemId={id}
saveFaveStar={saveFavoriteStatus}
isStarred={favoriteStatus[id]}
/>
) : null,
),
Header: '',
id: 'id',
disableSortBy: true,
Expand Down
99 changes: 51 additions & 48 deletions superset-frontend/src/views/CRUD/utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,57 +64,60 @@ import { Dashboard, Filters } from './types';
risonRef.next_id = new RegExp(idrx, 'g');
})();

const createFetchResourceMethod = (method: string) => (
resource: string,
relation: string,
handleError: (error: Response) => void,
user?: { userId: string | number; firstName: string; lastName: string },
) => async (filterValue = '', page: number, pageSize: number) => {
const resourceEndpoint = `/api/v1/${resource}/${method}/${relation}`;
const queryParams = rison.encode_uri({
filter: filterValue,
page,
page_size: pageSize,
});
const { json = {} } = await SupersetClient.get({
endpoint: `${resourceEndpoint}?q=${queryParams}`,
});

let fetchedLoggedUser = false;
const loggedUser = user
? {
label: `${user.firstName} ${user.lastName}`,
value: user.userId,
}
: undefined;

const data: { label: string; value: string | number }[] = [];
json?.result?.forEach(
({ text, value }: { text: string; value: string | number }) => {
if (
loggedUser &&
value === loggedUser.value &&
text === loggedUser.label
) {
fetchedLoggedUser = true;
} else {
data.push({
label: text,
value,
});
}
},
);
const createFetchResourceMethod =
(method: string) =>
(
resource: string,
relation: string,
handleError: (error: Response) => void,
user?: { userId: string | number; firstName: string; lastName: string },
) =>
async (filterValue = '', page: number, pageSize: number) => {
const resourceEndpoint = `/api/v1/${resource}/${method}/${relation}`;
const queryParams = rison.encode_uri({
filter: filterValue,
page,
page_size: pageSize,
});
const { json = {} } = await SupersetClient.get({
endpoint: `${resourceEndpoint}?q=${queryParams}`,
});

let fetchedLoggedUser = false;
const loggedUser = user
? {
label: `${user.firstName} ${user.lastName}`,
value: user.userId,
}
: undefined;

const data: { label: string; value: string | number }[] = [];
json?.result?.forEach(
({ text, value }: { text: string; value: string | number }) => {
if (
loggedUser &&
value === loggedUser.value &&
text === loggedUser.label
) {
fetchedLoggedUser = true;
} else {
data.push({
label: text,
value,
});
}
},
);

if (loggedUser && (!filterValue || fetchedLoggedUser)) {
data.unshift(loggedUser);
}
if (loggedUser && (!filterValue || fetchedLoggedUser)) {
data.unshift(loggedUser);
}

return {
data,
totalCount: json?.count,
return {
data,
totalCount: json?.count,
};
};
};

export const PAGE_SIZE = 5;
const getParams = (filters?: Array<Filters>) => {
Expand Down

0 comments on commit ced4cea

Please sign in to comment.