Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
salazarm committed Aug 8, 2024
1 parent 28ff365 commit 8264798
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Box} from '@dagster-io/ui-components';
import {ReactNode} from 'react';
import {useHistory} from 'react-router-dom';
import {FeatureFlag} from 'src/app/FeatureFlags.oss';
import {FeatureFlag} from 'shared/app/FeatureFlags.oss';

import {TopNavLink} from './AppTopNav';
import {
Expand Down
2 changes: 1 addition & 1 deletion js_modules/dagster-ui/packages/ui-core/src/app/Flags.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import memoize from 'lodash/memoize';
import {useMemo} from 'react';
import {FeatureFlag} from 'src/app/FeatureFlags.oss';
import {FeatureFlag} from 'shared/app/FeatureFlags.oss';

import {getJSONForKey} from '../hooks/useStateWithStorage';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Icon} from '@dagster-io/ui-components';
import {useState} from 'react';
import {getVisibleFeatureFlagRows} from 'src/app/getVisibleFeatureFlagRows.oss';
import {getVisibleFeatureFlagRows} from 'shared/app/getVisibleFeatureFlagRows.oss';

import {useFeatureFlags} from './Flags';
import {TopNavButton} from './TopNavButton';
Expand Down
2 changes: 1 addition & 1 deletion js_modules/dagster-ui/packages/ui-core/src/app/Util.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {cache} from 'idb-lru-cache';
import memoize from 'lodash/memoize';
import LRU from 'lru-cache';
import {FeatureFlag} from 'src/app/FeatureFlags.oss';
import {FeatureFlag} from 'shared/app/FeatureFlags.oss';

import {featureEnabled} from './Flags';
import {timeByParts} from './timeByParts';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {FeatureFlag} from 'src/app/FeatureFlags.oss';
import {FeatureFlag} from 'shared/app/FeatureFlags.oss';

/**
* Open-source feature flags to be displayed in Dagster UI "User settings"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Box, Icon} from '@dagster-io/ui-components';
import {useState} from 'react';
import {useLocation} from 'react-router-dom';
import {getVisibleFeatureFlagRows} from 'src/app/getVisibleFeatureFlagRows.oss';
import {getVisibleFeatureFlagRows} from 'shared/app/getVisibleFeatureFlagRows.oss';

import {UserSettingsDialog} from '../app/UserSettingsDialog/UserSettingsDialog';
import {SideNavItem, SideNavItemConfig} from '../ui/SideNavItem';
Expand Down

0 comments on commit 8264798

Please sign in to comment.