From 6ebaa23bc556c4c9274bb8fe8b12a589400c483d Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Sat, 3 Sep 2022 18:56:06 +0530 Subject: [PATCH] Change Admin icon and make Dashboard filter panel color consistent (#7190) * Change Admin icon and make Dashboard filter panel color consistent * Fix the button in not found page * change to current color --- .../main/resources/ui/src/assets/svg/admin.svg | 12 ++++++++++++ .../ui/src/assets/svg/filter-primary.svg | 3 +++ .../ActivityFeedList/ActivityFeedList.tsx | 15 ++++++++++----- .../ui/src/pages/page-not-found/index.tsx | 8 ++++---- .../ui/src/utils/GlobalSettingsUtils.tsx | 3 ++- .../src/main/resources/ui/src/utils/SvgUtils.tsx | 13 +++++++++++++ 6 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 openmetadata-ui/src/main/resources/ui/src/assets/svg/admin.svg create mode 100644 openmetadata-ui/src/main/resources/ui/src/assets/svg/filter-primary.svg diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/admin.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/admin.svg new file mode 100644 index 00000000000..4c562e01790 --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/admin.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/filter-primary.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/filter-primary.svg new file mode 100644 index 00000000000..1972c0f72a6 --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/filter-primary.svg @@ -0,0 +1,3 @@ + + + diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx index cad973fb407..10fca57dda0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/ActivityFeedList.tsx @@ -159,10 +159,10 @@ const ActivityFeedList: FC = ({ tag="button" variant="link" onClick={() => setFieldListVisible((visible) => !visible)}> - + {feedFilterList.find((f) => f.value === feedFilter)?.name} - + {fieldListVisible && ( = ({ tag="button" variant="link" onClick={() => setShowThreadTypeList((visible) => !visible)}> - - + + { threadFilterList.find( (f) => f.value === (threadType ?? 'ALL') )?.name } - + {showThreadTypeList && ( { @@ -35,14 +35,14 @@ const PageNotFound = () => {

The page you are looking for is not available

-
+
- - diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx index d38d5a3ee84..e0b05cafeec 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/GlobalSettingsUtils.tsx @@ -14,6 +14,7 @@ import { ItemType } from 'antd/lib/menu/hooks/useItems'; import { camelCase } from 'lodash'; import React, { ReactNode } from 'react'; +import { ReactComponent as AdminIcon } from '../../src/assets/svg/admin.svg'; import { ReactComponent as AllActivityIcon } from '../../src/assets/svg/all-activity.svg'; import { ReactComponent as BotIcon } from '../../src/assets/svg/bot-profile.svg'; import { ReactComponent as DashboardIcon } from '../../src/assets/svg/dashboard-grey.svg'; @@ -78,7 +79,7 @@ export const getGlobalSettingsMenuWithPermission = ( ResourceEntity.USER, permissions ), - icon: , + icon: , }, ], }, diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx index 7d9fd1c0036..18709bb7ca6 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx @@ -21,6 +21,7 @@ import IconOkta from '../assets/img/icon-okta.png'; import IconWelcomePopper from '../assets/img/welcome-popper-icon.png'; import IconCommentPlus from '../assets/svg/add-chat.svg'; import IconAddReaction from '../assets/svg/add-reaction-emoji.svg'; +import IconAdmin from '../assets/svg/admin.svg'; import IconAlertBell from '../assets/svg/alert-bell.svg'; import IconAllActivity from '../assets/svg/all-activity.svg'; import IconAnnouncementsBlack from '../assets/svg/announcements-black.svg'; @@ -63,6 +64,7 @@ import IconExternalLinkGrey from '../assets/svg/external-link-grey.svg'; import IconExternalLinkWhite from '../assets/svg/external-link-white.svg'; import IconExternalLink from '../assets/svg/external-link.svg'; import IconFailBadge from '../assets/svg/fail-badge.svg'; +import IconFilterPrimary from '../assets/svg/filter-primary.svg'; import IconFitView from '../assets/svg/fitview.svg'; import IconForeignKey from '../assets/svg/foriegnKey.svg'; import IconGithubStar from '../assets/svg/github-star.svg'; @@ -357,6 +359,8 @@ export const Icons = { ALL_ACTIVITY: 'all-activity', OPEN_LOCK: 'open-lock', CLOSED_LOCK: 'closed-lock', + FILTER_PRIMARY: 'filter-primary', + ADMIN: 'admin', }; const SVGIcons: FunctionComponent = ({ @@ -1037,6 +1041,10 @@ const SVGIcons: FunctionComponent = ({ case Icons.ALL_ACTIVITY: IconComponent = IconAllActivity; + break; + case Icons.FILTER_PRIMARY: + IconComponent = IconFilterPrimary; + break; case Icons.OPEN_LOCK: @@ -1049,6 +1057,11 @@ const SVGIcons: FunctionComponent = ({ break; + case Icons.ADMIN: + IconComponent = IconAdmin; + + break; + default: IconComponent = null;