diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/ActivityFeed.spec.js b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/ActivityFeed.spec.js index a2d50b902f5..a4876206110 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/ActivityFeed.spec.js +++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/ActivityFeed.spec.js @@ -41,6 +41,7 @@ const reactOnFeed = (feedSelector, reaction) => { describe('Recently viwed data assets', () => { beforeEach(() => { cy.login(); + cy.get("[data-testid='welcome-screen-close-btn']").click(); }); it('Feed widget should be visible', () => { diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/Following.spec.js b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/Following.spec.js index c5682ba0577..627c62be8bc 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/Following.spec.js +++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/Following.spec.js @@ -54,6 +54,7 @@ const followEntity = ({ term, serviceName, entity }, isUnfollow) => { describe('Following data assets', () => { beforeEach(() => { cy.login(); + cy.get("[data-testid='welcome-screen-close-btn']").click(); }); it('following section should be present', () => { diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/RecentlyViewed.spec.js b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/RecentlyViewed.spec.js index 35691838244..66156b17c90 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/RecentlyViewed.spec.js +++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/RecentlyViewed.spec.js @@ -38,6 +38,7 @@ const RECENTLY_VIEW_ENTITIES = [ describe('Recently viwed data assets', () => { beforeEach(() => { cy.login(); + cy.get("[data-testid='welcome-screen-close-btn']").click(); }); it('recently view section should be present', () => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomeScreen.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomeScreen.component.tsx index c43aaa396cd..a19b73a4a53 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomeScreen.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/WelcomeScreen.component.tsx @@ -41,16 +41,17 @@ const WelcomeScreen = ({ onClose }: WelcomeScreenProps) => { return ( } type="text" onClick={onClose} /> }> - + welcome screen image { /> - +
{t('message.hi-user-welcome-to', { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/welcome-screen.style.less b/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/welcome-screen.style.less index aa68627de90..a76f07ca6ce 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/welcome-screen.style.less +++ b/openmetadata-ui/src/main/resources/ui/src/components/WelcomeScreen/welcome-screen.style.less @@ -11,7 +11,6 @@ * limitations under the License. */ @import url(../../styles/variables.less); -@dark-purple: #361a8f; .welcome-screen-container { .ant-card-head { @@ -19,9 +18,17 @@ border-bottom: unset; .welcome-screen-close-btn { - color: #afa3d2; + color: @primary-color; + &:hover { + background-color: @primary-color-hover; + } } } + .ant-card-body { + height: @welcome-page-height; + display: flex; + align-items: center; + } } .welcome-screen-header-first-line { @@ -44,7 +51,7 @@ } .welcome-screen-button-text { - color: @dark-purple; + color: @primary-color; text-decoration: underline; font-size: 1rem; line-height: 1.5rem; diff --git a/openmetadata-ui/src/main/resources/ui/src/constants/AdvancedSearch.constants.ts b/openmetadata-ui/src/main/resources/ui/src/constants/AdvancedSearch.constants.ts index 75ba446b5fe..886df61b5b4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/constants/AdvancedSearch.constants.ts +++ b/openmetadata-ui/src/main/resources/ui/src/constants/AdvancedSearch.constants.ts @@ -51,7 +51,7 @@ export const COMMON_DROPDOWN_ITEMS = [ }, { label: t('label.service-type'), - key: 'serviceType.keyword', + key: 'serviceType', }, ]; diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPageV1.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPageV1.component.tsx index 01fd1edaf14..52105fd218a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPageV1.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/MyDataPage/MyDataPageV1.component.tsx @@ -19,6 +19,7 @@ import KPIWidget from 'components/KPIWidget/KPIWidget.component'; import { MyDataWidget } from 'components/MyData/MyDataWidget/MyDataWidget.component'; import RightSidebar from 'components/MyData/RightSidebar/RightSidebar.component'; import TotalDataAssetsWidget from 'components/TotalDataAssetsWidget/TotalDataAssetsWidget.component'; +import WelcomeScreen from 'components/WelcomeScreen/WelcomeScreen.component'; import FeedsWidget from 'components/Widgets/FeedsWidget/FeedsWidget.component'; import { LOGGED_IN_USER_STORAGE_KEY } from 'constants/constants'; import { isEmpty, isNil } from 'lodash'; @@ -41,7 +42,7 @@ const MyDataPageV1 = () => { const [followedDataCount, setFollowedDataCount] = useState(0); const [isLoadingOwnedData, setIsLoadingOwnedData] = useState(false); const isMounted = useRef(false); - const [_, setShowWelcomeScreen] = useState(false); + const [showWelcomeScreen, setShowWelcomeScreen] = useState(false); const storageData = localStorage.getItem(LOGGED_IN_USER_STORAGE_KEY); const loggedInUserName = useMemo(() => { @@ -115,6 +116,14 @@ const MyDataPageV1 = () => { } }, [AppState.userDetails, AppState.users, isAuthDisabled]); + if (showWelcomeScreen) { + return ( +
+ updateWelcomeScreen(false)} /> +
+ ); + } + return (