diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/announcements-yellow.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/announcements-yellow.svg new file mode 100644 index 00000000000..f544c7ae17f --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/announcements-yellow.svg @@ -0,0 +1,3 @@ + + + diff --git a/openmetadata-ui/src/main/resources/ui/src/assets/svg/vector.svg b/openmetadata-ui/src/main/resources/ui/src/assets/svg/vector.svg index 490e9353386..0bdf61b95e7 100644 --- a/openmetadata-ui/src/main/resources/ui/src/assets/svg/vector.svg +++ b/openmetadata-ui/src/main/resources/ui/src/assets/svg/vector.svg @@ -1,3 +1,12 @@ - - - + + + + + + + + + + \ No newline at end of file diff --git a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/serviceAPI.ts b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/serviceAPI.ts index 4c2bd1a6e32..87901eea5ed 100644 --- a/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/serviceAPI.ts +++ b/openmetadata-ui/src/main/resources/ui/src/axiosAPIs/serviceAPI.ts @@ -35,11 +35,13 @@ export const getServices = async (serviceName: string, limit?: number) => { const searchParams = new URLSearchParams(); if (!isNil(limit)) { - searchParams.set('limit', `${limit}`); + searchParams.append('limit', `${limit}`); } - const strSearchParams = searchParams.toString(); - url += strSearchParams ? `?${strSearchParams}` : ''; + const isPaging = + serviceName.includes('after') || serviceName.includes('before'); + + url += isPaging ? `&${searchParams}` : `?${searchParams}`; const response = await APIClient.get(url); 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 86a976de98e..3f0ccd359f1 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 @@ -67,12 +67,13 @@ const ActivityFeedList: FC = ({ ); const [fieldListVisible, setFieldListVisible] = useState(false); const [showThreadTypeList, setShowThreadTypeList] = useState(false); - const [feedFilter, setFeedFilter] = useState(FeedFilter.ALL); + const [feedFilter, setFeedFilter] = useState(FeedFilter.OWNER); const [threadType, setThreadType] = useState(); const handleDropDown = useCallback( (_e: React.MouseEvent, value?: string) => { - const feedType = (value as FeedFilter) || FeedFilter.ALL; + const feedType = (value as FeedFilter) || FeedFilter.OWNER; + setFeedFilter(feedType); setFieldListVisible(false); onFeedFiltersUpdate && onFeedFiltersUpdate(feedType, threadType); @@ -166,7 +167,7 @@ const ActivityFeedList: FC = ({ icon={getFeedFilterDropdownIcon(feedFilter)} type="link" onClick={() => setFieldListVisible((visible) => !visible)}> - + {feedFilterList.find((f) => f.value === feedFilter)?.name} @@ -191,7 +192,7 @@ const ActivityFeedList: FC = ({ icon={getThreadFilterDropdownIcon(threadType ?? 'ALL')} type="link" onClick={() => setShowThreadTypeList((visible) => !visible)}> - + { threadFilterList.find( (f) => f.value === (threadType ?? 'ALL') @@ -235,7 +236,7 @@ const ActivityFeedList: FC = ({ return (
- {feedList.length === 0 && feedFilter === FeedFilter.ALL && !threadType + {feedList.length === 0 && feedFilter === FeedFilter.OWNER && !threadType ? null : getFilterDropDown()}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/FeedListBody.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/FeedListBody.less index 76a0074c11c..c45d8354b29 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/FeedListBody.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedList/FeedListBody.less @@ -12,8 +12,8 @@ */ @task-card-border: #c6b5f6; -@announcement-card-border: #b02aac99; -@announcement-background-color: #fcf6fc; +@announcement-card-border: #ffc143; +@announcement-background-color: #fffdf8; @feed-card-border-color: #dde3ea; @feed-card-shadow-color: #0000000f; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx index 4d994894849..3fef8db02c1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/AnnouncementBadge.tsx @@ -21,7 +21,7 @@ const AnnouncementBadge = () => { Announcement
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less index d7ebe32f7d2..717314bcbc5 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/Shared/Badge.less @@ -1,6 +1,6 @@ -@background: #fcf6fc; -@border: #b02aac99; -@text: #b02aac; +@background: #fffdf8; +@border: #ffc143; +@text: #37352f; @primary: #7147e8; .announcement-badge-container { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityList/EntityList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityList/EntityList.tsx index 26065dacf25..1007f95cd66 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/EntityList/EntityList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityList/EntityList.tsx @@ -44,7 +44,7 @@ const EntityList: FunctionComponent = ({ }: Prop) => { return ( - + {headerText} {entityList.length diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Execution/TreeView/TreeViewTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Execution/TreeView/TreeViewTab.component.tsx index bc67d462df9..38d7d6d3704 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Execution/TreeView/TreeViewTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Execution/TreeView/TreeViewTab.component.tsx @@ -59,10 +59,10 @@ const TreeViewTab = ({ - + {formatDateTimeFromSeconds(startTime)} to{' '} {formatDateTimeFromSeconds(endTime)} - + diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlossaryDetails/GlossaryDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/GlossaryDetails/GlossaryDetails.component.tsx index 29ab482d08f..df4c80d4b4b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/GlossaryDetails/GlossaryDetails.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/GlossaryDetails/GlossaryDetails.component.tsx @@ -136,7 +136,7 @@ const GlossaryDetails = ({ permissions, glossary, updateGlossary }: props) => { searchFormattedUsersAndTeams(searchQuery, from) .then((res) => { const { users, teams } = res; - setListOwners(getOwnerList(users, teams)); + setListOwners(getOwnerList(users, teams, false, searchQuery)); }) .catch(() => { setListOwners([]); @@ -154,7 +154,7 @@ const GlossaryDetails = ({ permissions, glossary, updateGlossary }: props) => { suggestFormattedUsersAndTeams(qSearchText) .then((res) => { const { users, teams } = res; - setListOwners(getOwnerList(users, teams)); + setListOwners(getOwnerList(users, teams, false, qSearchText)); }) .catch(() => { setListOwners([]); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx index c5ede16762e..5ce818e46d0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/GlossaryTerms/GlossaryTermsV1.component.tsx @@ -86,6 +86,7 @@ const GlossaryTermsV1 = ({ name: 'Assets', isProtected: false, position: 2, + count: assetData.total, }, ]; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx index a21492b72cd..4b8c68397d3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MlModelDetail/SourceList.component.tsx @@ -38,7 +38,7 @@ const SourceList = ({ feature }: { feature: MlFeature }) => { icon={isActive ? 'chevron-down' : 'chevron-right'} /> - + {t('label.source-plural')} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx index 9dc7dcd7e36..c6481599d44 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/MyData/MyData.component.tsx @@ -63,7 +63,7 @@ const MyData: React.FC = ({ }: MyDataProps): React.ReactElement => { const isMounted = useRef(false); const [elementRef, isInView] = useInfiniteScroll(observerOptions); - const [feedFilter, setFeedFilter] = useState(FeedFilter.ALL); + const [feedFilter, setFeedFilter] = useState(FeedFilter.OWNER); const [threadType, setThreadType] = useState(); const getLeftPanel = () => { @@ -175,10 +175,6 @@ const MyData: React.FC = ({ ); }, [ownedData, followedData, pendingTaskCount]); - const getLoader = () => { - return isFeedLoading ? : null; - }; - const fetchMoreFeed = ( isElementInView: boolean, pagingObj: Paging, @@ -195,7 +191,7 @@ const MyData: React.FC = ({ }; useEffect(() => { - fetchMoreFeed(isInView as boolean, paging, isFeedLoading); + fetchMoreFeed(Boolean(isInView), paging, isFeedLoading); }, [isInView, paging, isFeedLoading]); useEffect(() => { @@ -215,7 +211,7 @@ const MyData: React.FC = ({ // Check if feedFilter or ThreadType filter is applied or not const filtersApplied = useMemo( - () => feedFilter === FeedFilter.ALL && !threadType, + () => feedFilter === FeedFilter.OWNER && !threadType, [feedFilter, threadType] ); @@ -243,12 +239,12 @@ const MyData: React.FC = ({ ) : ( !isFeedLoading && )} + {isFeedLoading ? : null}
}> - {getLoader()} -
+ ref={elementRef as RefObject} + /> {/* Add spacer to work infinite scroll smoothly */}
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx index 6f8c95a503c..496491d767b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SearchDropdown/SearchDropdown.tsx @@ -201,6 +201,7 @@ const SearchDropdown: FC = ({ !isUndefined(onGetInitialOptions) && onGetInitialOptions(searchKey); setIsDropDownOpen(visible); + setSearchText(''); }}> + {showFilterList && (
))} - {entityData.total > LIST_SIZE && entityData.data.length > 0 && ( + {entityData.total > PAGE_SIZE && entityData.data.length > 0 && ( {
{name}
{userRoleArr.map((userRole, i) => ( {userRole} @@ -246,7 +246,7 @@ const Appbar: React.FC = (): JSX.Element => { Teams {teams.map((t, i) => ( diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx index 00f085617a7..8d7cd659c93 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/EntitySummaryDetails/EntitySummaryDetails.tsx @@ -198,7 +198,7 @@ const EntitySummaryDetails = ({ {data.key ? displayVal ? data.showLabel - ? `${t(`label.${toLower(data.key)}`)} : ` + ? `${t(`label.${toLower(data.key)}`)} - ` : null : `${t('label.no-entity', { entity: t(`label.${toLower(data.key)}`), diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerWidget/OwnerWidgetWrapper.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerWidget/OwnerWidgetWrapper.component.tsx index 6c16b39068d..ab5809ed45f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerWidget/OwnerWidgetWrapper.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/OwnerWidget/OwnerWidgetWrapper.component.tsx @@ -101,7 +101,7 @@ const OwnerWidgetWrapper = ({ // set team and user count for admin user setTotalTeamsCount(teamsTotal ?? 0); setTotalUsersCount(usersTotal ?? 0); - setListOwners(getOwnerList(users, teams)); + setListOwners(getOwnerList(users, teams, false, searchQuery)); }) .catch(() => { setListOwners([]); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.less b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.less index 1f42d191883..d1ef421a3b0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.less @@ -11,8 +11,8 @@ * limitations under the License. */ -@background: #fdfbfd; -@border: #dea4dc; +@background: #fffdf8; +@border: #ffc143; .announcement-card { width: 340px; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.tsx index dde87b227b3..aec652c70ae 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/entityPageInfo/AnnouncementCard/AnnouncementCard.tsx @@ -35,7 +35,7 @@ const AnnouncementCard: FC = ({ onClick, announcement }) => {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/dropdown/AnchorDropDownList.style.less b/openmetadata-ui/src/main/resources/ui/src/components/dropdown/AnchorDropDownList.style.less new file mode 100644 index 00000000000..52fd914f07b --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/components/dropdown/AnchorDropDownList.style.less @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Collate + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +.anchor-drop-down { + --shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), + 0 4px 6px -2px rgba(0, 0, 0, 0.05); + position: absolute; + transform-origin: top right; + z-index: 9999; + right: 0px; + margin-top: 0.5rem; + min-width: max-content; + border-radius: 0.375rem; + width: 10rem; + padding: 0.3rem; + background-color: #ffffff; + box-shadow: 0 0 #0000, 0 0 #0000, 0 0 #0000, 0 0 #0000, var(--shadow); + outline: 0.09rem solid #0000000d; +} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/dropdown/AnchorDropDownList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/dropdown/AnchorDropDownList.tsx index b8db62a30c8..798024604cc 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/dropdown/AnchorDropDownList.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/dropdown/AnchorDropDownList.tsx @@ -17,6 +17,7 @@ import { Link } from 'react-router-dom'; import { useAuthContext } from '../../authentication/auth-provider/AuthProvider'; import { useAuth } from '../../hooks/authHooks'; import SVGIcons from '../../utils/SvgUtils'; +import './AnchorDropDownList.style.less'; import { DropDownListItem, DropDownListProp } from './types'; const AnchorDropDownList = ({ dropDownList, setIsOpen }: DropDownListProp) => { @@ -33,9 +34,7 @@ const AnchorDropDownList = ({ dropDownList, setIsOpen }: DropDownListProp) => {
{dropDownList.map((item: DropDownListItem, index: number) => diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/Feeds.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/Feeds.constants.ts index 779a2929c2d..f24a40f22dd 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/Feeds.constants.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/Feeds.constants.ts @@ -62,6 +62,6 @@ export enum EntityField { TASKS = 'tasks', } -export const ANNOUNCEMENT_BG = '#FCF6FC'; -export const ANNOUNCEMENT_BORDER = 'rgba(176, 42, 172, 0.6)'; +export const ANNOUNCEMENT_BG = '#FFFDF8'; +export const ANNOUNCEMENT_BORDER = '#FFC143'; export const TASK_BORDER = '#C6B5F6'; diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts index e72f1153b8c..a2159116d09 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/constants.ts @@ -41,6 +41,7 @@ export const JSON_TAB_SIZE = 2; export const PAGE_SIZE = 10; export const PAGE_SIZE_BASE = 12; export const PAGE_SIZE_MEDIUM = 15; +export const SERVICE_VIEW_CAP = 20; export const PAGE_SIZE_LARGE = 100; export const API_RES_MAX_SIZE = 100000; export const LIST_SIZE = 5; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx index f7fd6097619..a93e5cc40f2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/UserPage/UserPage.component.tsx @@ -35,7 +35,7 @@ import PageContainerV1 from '../../components/containers/PageContainerV1'; import Loader from '../../components/Loader/Loader'; import Users from '../../components/Users/Users.component'; import { UserDetails } from '../../components/Users/Users.interface'; -import { LIST_SIZE } from '../../constants/constants'; +import { PAGE_SIZE } from '../../constants/constants'; import { myDataSearchIndex } from '../../constants/Mydata.constants'; import { getUserCurrentTab } from '../../constants/usersprofile.constants'; import { FeedFilter } from '../../enums/mydata.enum'; @@ -123,7 +123,7 @@ const UserPage = () => { ? `owner.id:${userData.id}` : `followers:${userData.id}`, entity.currPage, - LIST_SIZE, + PAGE_SIZE, ``, '', '', diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/forgot-password/forgot-password.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/forgot-password/forgot-password.component.tsx index dbc3ec7add0..4128541df40 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/forgot-password/forgot-password.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/forgot-password/forgot-password.component.tsx @@ -45,7 +45,7 @@ const ForgotPassword = () => { - + Enter your registered email to receive password reset link diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/login/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/login/index.tsx index 84345ad8811..836cb283703 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/login/index.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/login/index.tsx @@ -189,7 +189,7 @@ const SigninPage = () => { 'sso-container': !isAuthProviderBasic, })}> - + {t('label.om-description')}{' '} diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/reset-password/reset-password.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/reset-password/reset-password.component.tsx index 968ce0b3193..a923fbb3ee0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/reset-password/reset-password.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/reset-password/reset-password.component.tsx @@ -104,7 +104,7 @@ const ResetPassword = () => { - + Reset your Password diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/services/ServicesPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/services/ServicesPage.tsx index 647d69cbe88..446a11cb243 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/services/ServicesPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/services/ServicesPage.tsx @@ -22,7 +22,7 @@ import ErrorPlaceHolder from '../../components/common/error-with-placeholder/Err import Loader from '../../components/Loader/Loader'; import { usePermissionProvider } from '../../components/PermissionProvider/PermissionProvider'; import Services from '../../components/Services/Services'; -import { pagingObject } from '../../constants/constants'; +import { pagingObject, SERVICE_VIEW_CAP } from '../../constants/constants'; import { NO_PERMISSION_TO_VIEW } from '../../constants/HelperTextUtil'; import { SERVICE_CATEGORY } from '../../constants/Services.constant'; import { ServiceCategory as Category } from '../../enums/service.enum'; @@ -59,7 +59,7 @@ const ServicesPage = () => { const getServiceDetails = async (type: string) => { setIsLoading(true); try { - const { data, paging } = await getServices(type); + const { data, paging } = await getServices(type, SERVICE_VIEW_CAP); setServiceDetails(data); setPaging(paging); } catch (error) { diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/signup/basic-signup.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/signup/basic-signup.component.tsx index ea1b4992dec..6a018097c47 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/signup/basic-signup.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/signup/basic-signup.component.tsx @@ -76,7 +76,7 @@ const BasicSignUp = () => {
- + Centralized Metadata Store, Discover, Collaborate and get your Data Right diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/app.less b/openmetadata-ui/src/main/resources/ui/src/styles/app.less index 75f75fc646e..4ade70369e3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/app.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/app.less @@ -177,9 +177,6 @@ margin-right: auto; margin-left: auto; } -.text-semi-bold { - font-weight: 500; -} .bg-body-main { background: @body-bg-color; } diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/fonts.less b/openmetadata-ui/src/main/resources/ui/src/styles/fonts.less new file mode 100644 index 00000000000..cfc448ed455 --- /dev/null +++ b/openmetadata-ui/src/main/resources/ui/src/styles/fonts.less @@ -0,0 +1,50 @@ +/* + * Copyright 2022 Collate + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//font weight +.font-normal { + font-weight: 400; +} +.font-medium { + font-weight: 500; +} +.font-semibold { + font-weight: 600; +} +.font-bold { + font-weight: 700; +} + +// font size +.text-xs { + font-size: 12px; +} +.text-lg { + font-size: 18px; +} +.text-sm { + font-size: 14px; +} +.text-base { + font-size: 1rem /* 16px */; + line-height: 1.5rem /* 24px */; +} +.text-xl { + font-size: 1.25rem /* 20px */; + line-height: 1.75rem /* 28px */; +} + +.text-2xl { + font-size: 1.5rem /* 24px */; + line-height: 2rem /* 32px */; +} diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/index.js b/openmetadata-ui/src/main/resources/ui/src/styles/index.js index 4a2693a0e4c..bb1d35c7b36 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/index.js +++ b/openmetadata-ui/src/main/resources/ui/src/styles/index.js @@ -26,6 +26,7 @@ import './components/react-awesome-query.less'; import './components/size.less'; import './components/step.less'; import './fonts.css'; +import './fonts.less'; import './modal.less'; import './myDataDetailsTemp.css'; import './slick-carousel.scss'; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/ManageUtils.ts b/openmetadata-ui/src/main/resources/ui/src/utils/ManageUtils.ts index 35aa34903c3..95fda1cad67 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/ManageUtils.ts +++ b/openmetadata-ui/src/main/resources/ui/src/utils/ManageUtils.ts @@ -11,7 +11,9 @@ * limitations under the License. */ +import { toString } from 'lodash'; import AppState from '../AppState'; +import { WILD_CARD_CHAR } from '../constants/char.constants'; import { Team } from '../generated/entity/teams/team'; import { User } from '../generated/entity/teams/user'; import { EntityReference } from '../generated/type/entityUsage'; @@ -21,15 +23,23 @@ import { getEntityName } from './CommonUtils'; * @param listUsers - List of users * @param listTeams - List of teams * @param excludeCurrentUser - Wether to exclude current user to be on list. Needed when calls from searching + * @param searchQuery - search query for user or team * @returns List of user or team */ export const getOwnerList = ( listUsers?: User[], listTeams?: Team[], - excludeCurrentUser?: boolean + excludeCurrentUser?: boolean, + searchQuery?: string ) => { const userDetails = AppState.getCurrentUserDetails(); + const isAdminIncludeInQuery = + getEntityName(userDetails).includes(toString(searchQuery)) || + searchQuery === WILD_CARD_CHAR + ? true + : false; + if (userDetails?.isAdmin) { const users = (listUsers || []) .map((user) => ({ @@ -47,7 +57,7 @@ export const getOwnerList = ( })); return [ - ...(!excludeCurrentUser + ...(!excludeCurrentUser && isAdminIncludeInQuery ? [ { name: getEntityName(userDetails), 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 abd3f273ff1..7ff1e4a8cfe 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/SvgUtils.tsx @@ -30,6 +30,7 @@ import IconAnnouncementsBasicPrimary from '../assets/svg/announcements-basic-pri import IconAnnouncementsBlack from '../assets/svg/announcements-black.svg'; import IconAnnouncementsPrimary from '../assets/svg/announcements-primary.svg'; import IconAnnouncementsPurple from '../assets/svg/announcements-purple.svg'; +import IconAnnouncementsYellow from '../assets/svg/announcements-yellow.svg'; import IconAnnouncements from '../assets/svg/announcements.svg'; import IconAPI from '../assets/svg/api.svg'; import IconArrowDownLight from '../assets/svg/arrow-down-light.svg'; @@ -340,6 +341,7 @@ export const Icons = { ANNOUNCEMENT_BLACK: 'icon-announcement-black', ANNOUNCEMENT_PURPLE: 'icon-announcement-purple', ANNOUNCEMENT_PRIMARY: 'icon-announcement-primary', + ANNOUNCEMENT_YELLOW: 'icon-announcement-yellow', ANNOUNCEMENT_BASIC_PRIMARY: 'icon-announcement-basic-primary', CHEVRON_DOWN: 'icon-chevron-down', ICON_UP: 'icon-up', @@ -910,6 +912,10 @@ const SVGIcons: FunctionComponent = ({ icon, ...props }: Props) => { case Icons.ANNOUNCEMENT_PURPLE: IconComponent = IconAnnouncementsPurple; + break; + case Icons.ANNOUNCEMENT_YELLOW: + IconComponent = IconAnnouncementsYellow; + break; case Icons.ANNOUNCEMENT_BLACK: IconComponent = IconAnnouncementsBlack;