From 91b04ee9a396b3f9518ba8c6c078058800f5ec60 Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Fri, 14 Apr 2023 10:41:59 +0530 Subject: [PATCH] UI improvements and minor fixes (#11055) --- .../CreateUser/CreateUser.component.tsx | 8 +++++-- .../EmailConfigForm.component.tsx | 7 ++---- .../EntityLineage/EntityLineage.component.tsx | 7 ++++-- .../EntitySummaryPanel.style.less | 1 - .../components/Explore/Explore.component.tsx | 4 ++-- .../AddAnnouncementModal.tsx | 4 ++-- .../EditAnnouncementModal.tsx | 4 ++-- .../components/Users/ChangePasswordForm.tsx | 3 ++- .../table-data-card-v2/TableDataCardV2.less | 8 +++---- .../ui/src/constants/DataInsight.constants.ts | 7 ------ .../src/constants/GlobalSettings.constants.ts | 2 +- .../ui/src/constants/auth.constants.ts | 14 ------------ .../ui/src/pages/KPIPage/AddKPIPage.tsx | 3 +-- .../ui/src/pages/KPIPage/EditKPIPage.tsx | 7 ++---- .../pages/TestSuitePage/AddTestSuiteForm.tsx | 14 +++++------- .../resources/ui/src/pages/login/index.tsx | 3 +-- .../reset-password.component.tsx | 3 +-- .../pages/signup/basic-signup.component.tsx | 18 ++------------- .../ui/src/pages/teams/AddTeamForm.tsx | 22 ++----------------- .../ui/src/utils/AnnouncementsUtils.ts | 7 ------ 20 files changed, 41 insertions(+), 105 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx index 124922acb75..b608dbe0993 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/CreateUser/CreateUser.component.tsx @@ -27,7 +27,11 @@ import { isUndefined, trim } from 'lodash'; import React, { useEffect, useMemo, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { checkEmailInUse, generateRandomPwd } from 'rest/auth-API'; -import { getBotsPagePath, getUsersPagePath } from '../../constants/constants'; +import { + getBotsPagePath, + getUsersPagePath, + VALIDATE_MESSAGES, +} from '../../constants/constants'; import { passwordErrorMessage } from '../../constants/ErrorMessages.constant'; import { passwordRegex, @@ -710,7 +714,7 @@ const CreateUser = ({ form={form} id="create-user-bot-form" layout="vertical" - validateMessages={{ required: '${label} is required' }} + validateMessages={VALIDATE_MESSAGES} onFinish={handleSave}> diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx index c8aa25bb112..9e27e20cca3 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityLineage/EntityLineage.component.tsx @@ -1417,10 +1417,13 @@ const EntityLineageComponent: FunctionComponent = ({ ); const allTableNodes = nodes.filter( (node) => - node.type === EntityType.TABLE && - isUndefined(tableColumnsRef.current[node.id]) + [EntityType.TABLE, EntityType.DASHBOARD_DATA_MODEL].includes( + node.type as EntityType + ) && isUndefined(tableColumnsRef.current[node.id]) ); + console.log(allTableNodes); + allTableNodes.length && allTableNodes.map(async (node) => await getTableColumns(node)); toggleColumnView(true); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.style.less b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.style.less index 568e31a747d..bb621921387 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/EntitySummaryPanel/EntitySummaryPanel.style.less @@ -20,7 +20,6 @@ @section-header-color: #6b7280; .summary-panel-container { - background-color: @background-color; margin-right: -8px; position: sticky; height: calc(100vh - @summary-panel-offset); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx index e9c69a17799..3ca3b594327 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/Explore.component.tsx @@ -420,14 +420,14 @@ const Explore: React.FC = ({ - {showSummaryPanel && entityDetails && ( + {showSummaryPanel && entityDetails ? ( - )} + ) : null} )} diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx index d9022e7ed49..08e0eb729ed 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/AnnouncementModal/AddAnnouncementModal.tsx @@ -13,6 +13,7 @@ import { Form, Input, Modal, Space } from 'antd'; import { AxiosError } from 'axios'; +import { VALIDATE_MESSAGES } from 'constants/constants'; import { observer } from 'mobx-react'; import React, { FC, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; @@ -22,7 +23,6 @@ import { CreateThread, ThreadType, } from '../../../generated/api/feed/createThread'; -import { validateMessages } from '../../../utils/AnnouncementsUtils'; import { getEntityFeedLink } from '../../../utils/EntityUtils'; import { getTimeZone, getUTCDateTime } from '../../../utils/TimeUtils'; import { showErrorToast, showSuccessToast } from '../../../utils/ToastUtils'; @@ -112,7 +112,7 @@ const AddAnnouncementModal: FC = ({ data-testid="announcement-form" id="announcement-form" layout="vertical" - validateMessages={validateMessages} + validateMessages={VALIDATE_MESSAGES} onFinish={handleCreateAnnouncement}> = ({ id="announcement-form" initialValues={{ title, startDate, endDate }} layout="vertical" - validateMessages={validateMessages} + validateMessages={VALIDATE_MESSAGES} onFinish={handleConfirm}> = ({ id="change-password-form" layout="vertical" name="change-password-form" - validateMessages={{ required: '${label} is required' }} + validateMessages={VALIDATE_MESSAGES} onFinish={onSave}> {isLoggedinUser && ( = ({ onSubmit }) => { const [isLoading, setIsLoading] = useState(false); const history = useHistory(); - const validateMessages = { - required: t('message.field-text-is-required', { - fieldText: '${label}', - }), - }; - const fetchTestSuites = async () => { try { setIsLoading(true); @@ -65,7 +63,7 @@ const AddTestSuiteForm: React.FC = ({ onSubmit }) => { form={form} layout="vertical" name="selectTestSuite" - validateMessages={validateMessages} + validateMessages={VALIDATION_MESSAGES} onFinish={(data) => onSubmit(data)}> { const handleLogin = () => history.push(ROUTES.SIGNIN); - const validationMessages = { - required: t('message.field-text-is-required', { - fieldText: '${label}', - }), - types: { - email: t('message.entity-is-not-valid', { - entity: '${label}', - }), - }, - whitespace: t('message.entity-not-contain-whitespace', { - entity: '${label}', - }), - }; - return (
@@ -100,7 +86,7 @@ const BasicSignUp = () => { className="mt-20" form={form} layout="vertical" - validateMessages={validationMessages} + validateMessages={VALIDATION_MESSAGES} onFinish={handleSubmit}> = ({ })); }, []); - const validationMessages = useMemo( - () => ({ - required: t('message.field-text-is-required', { - fieldText: '${label}', - }), - string: { - range: t('message.entity-size-in-between', { - entity: '${label}', - min: '${min}', - max: '${max}', - }), - }, - whitespace: t('message.entity-not-contain-whitespace', { - entity: '${label}', - }), - }), - [] - ); - const handleSubmit = (data: Team) => { data = { ...data, @@ -121,7 +103,7 @@ const AddTeamForm: React.FC = ({ }} layout="vertical" name="add-team-nest-messages" - validateMessages={validationMessages} + validateMessages={VALIDATION_MESSAGES} onFinish={handleSubmit}> { const currentTime = Date.now() / 1000;