Skip to content

Commit

Permalink
Merge branch 'main' into AddingdbtTile
Browse files Browse the repository at this point in the history
  • Loading branch information
Prajwal214 authored Jan 10, 2025
2 parents 78e655f + 0e9c32c commit c79dbef
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,8 @@ test.describe('Glossary tests', () => {
test('Assign Glossary Term to entity and check assets', async ({
browser,
}) => {
test.slow(true);

const { page, afterAction, apiContext } = await performAdminLogin(browser);
const table = new TableClass();
const glossary1 = new Glossary();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ test.describe('User with different Roles', () => {
state: 'visible',
});

await userPage.locator(descriptionBox).clear();
await userPage.click(descriptionBox);
await userPage.keyboard.press('ControlOrMeta+A');
await userPage.keyboard.press('Backspace');

await expect(userPage.locator(descriptionBox)).not.toContainText(
'Name of the User'
Expand Down
3 changes: 0 additions & 3 deletions openmetadata-ui/src/main/resources/ui/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,13 @@ import PermissionProvider from './context/PermissionProvider/PermissionProvider'
import TourProvider from './context/TourProvider/TourProvider';
import WebSocketProvider from './context/WebSocketProvider/WebSocketProvider';
import { useApplicationStore } from './hooks/useApplicationStore';
import { useWelcomeStore } from './hooks/useWelcomeStore';
import { getCustomUiThemePreference } from './rest/settingConfigAPI';
import { history } from './utils/HistoryUtils';
import i18n from './utils/i18next/LocalUtil';
import { getThemeConfig } from './utils/ThemeUtils';

const App: FC = () => {
const { applicationConfig, setApplicationConfig } = useApplicationStore();
const { setIsWelcomeVisible } = useWelcomeStore();

const fetchApplicationConfig = async () => {
try {
Expand All @@ -56,7 +54,6 @@ const App: FC = () => {

useEffect(() => {
fetchApplicationConfig();
setIsWelcomeVisible(true);
}, []);

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1470,7 +1470,7 @@ Since we are introducing the Auto Classification workflow, we are going to remov
{
id: 58,
version: 'v1.6.2',
description: 'Released on 8th January 2025.',
description: 'Released on 10th January 2025.',
features: [],
changeLogs: {
Improvements: `- **Fix**: Test case getting removed from logical test suite after editing the test case.
Expand All @@ -1486,7 +1486,6 @@ Since we are introducing the Auto Classification workflow, we are going to remov
- **Fix**: Column lineage ingestion failed to parse column due to subquery raw_name AttributeError.
- **Fix**: Data Insight Tier Filter does not work.
- **Fix**: Add depth support for storage connector.
- **Fix**: The tag also adding to a different asset when a different asset with the same name is updated with the tag.
- **Fix**: Replace the description editor with a new block editor.
- **Fix**: Redshift Metadata ingestion failing for Stored Procedure.
- **Fix**: Lineage view not showing all the nodes in case of circular lineage.
Expand All @@ -1497,7 +1496,6 @@ Since we are introducing the Auto Classification workflow, we are going to remov
- **Fix**: Auto Classification Ingestion - AttributeError: 'DataType' object has no attribute 'dialect_impl'.
- **Fix**: Adding the profiler for doris failing to execute.
- **Fix**: Unable to remove existing values from custom property (enum data type).
- **Improvement**: Ability to disable soft delete when Ingestion pipeline fails.
- **Improvement**: Ability to sort the DI charts based on date or term.
- **Improvement**: Support test connection api cancellation on click of cancel.
- **Improvement**: Highlight the search term for schema table on table details page.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface WelcomeStore {
}

export const useWelcomeStore = create<WelcomeStore>()((set) => ({
isWelcomeVisible: false,
isWelcomeVisible: true,
setIsWelcomeVisible: (isVisible: boolean) => {
set({ isWelcomeVisible: isVisible });
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ const MyDataPage = () => {
updateWelcomeScreen(!usernameExistsInCookie && isWelcomeVisible);

return () => updateWelcomeScreen(false);
}, []);
}, [isWelcomeVisible]);

const fetchUserFollowedData = async () => {
if (!currentUser?.id) {
Expand Down Expand Up @@ -205,6 +205,10 @@ const MyDataPage = () => {
// call the hook to set the direction of the grid layout
useGridLayoutDirection(isLoading);

if (isLoading || applicationsLoading) {
return <Loader fullScreen />;
}

if (showWelcomeScreen) {
return (
<div className="bg-white full-height">
Expand All @@ -218,30 +222,21 @@ const MyDataPage = () => {
<PageLayoutV1
mainContainerClassName="p-t-0"
pageTitle={t('label.my-data')}>
{isLoading || applicationsLoading ? (
<div className="ant-layout-content flex-center">
<Loader />
</div>
) : (
<>
<ReactGridLayout
className="bg-white"
cols={4}
compactType="vertical"
isDraggable={false}
isResizable={false}
margin={[
customizePageClassBase.landingPageWidgetMargin,
customizePageClassBase.landingPageWidgetMargin,
]}
rowHeight={100}>
{widgets}
</ReactGridLayout>
<LimitWrapper resource="dataAssets">
<br />
</LimitWrapper>
</>
)}
<ReactGridLayout
className="bg-white"
cols={4}
isDraggable={false}
isResizable={false}
margin={[
customizePageClassBase.landingPageWidgetMargin,
customizePageClassBase.landingPageWidgetMargin,
]}
rowHeight={100}>
{widgets}
</ReactGridLayout>
<LimitWrapper resource="dataAssets">
<br />
</LimitWrapper>
</PageLayoutV1>
</ActivityFeedProvider>
);
Expand Down

0 comments on commit c79dbef

Please sign in to comment.