chore: rebase on top of master

Signed-off-by: Nastya <[email protected]>
flyteorg · May 18, 2022 · 1859cf5 · 1859cf5
1 parent 093210b
commit 1859cf5
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/packages/zapp/console/package.json b/packages/zapp/console/package.json
@@ -58,7 +58,7 @@
         "@commitlint/cli": "^8.3.5",
         "@commitlint/config-conventional": "^8.3.4",
         "@date-io/moment": "1.3.9",
-        "@flyteorg/flyteidl": "0.24.11",
+        "@flyteorg/flyteidl": "1.1.0",
         "@material-ui/core": "^4.0.0",
         "@material-ui/icons": "^4.0.0",
         "@material-ui/pickers": "^3.2.2",

diff --git a/packages/zapp/console/src/components/Navigation/DefaultAppBarContent.tsx b/packages/zapp/console/src/components/Navigation/DefaultAppBarContent.tsx
@@ -10,7 +10,7 @@ import { FeatureFlag, useFeatureFlag } from 'basics/FeatureFlags';
 import { useAdminVersion } from 'components/hooks/useVersion';
 import { env } from 'common/env';
 import { UserInformation } from './UserInformation';
-import { OnlyMine } from './OnlyMine/OnlyMine';
+import { OnlyMine } from './OnlyMine';
 import t, { patternKey } from './strings';
 
 const { version: platformVersion } = require('../../../package.json');

diff --git a/...Navigation/OnlyMine/FilterPopoverIcon.tsx → ...Navigation/OnlyMine/FilterPopoverIcon.tsx b/...Navigation/OnlyMine/FilterPopoverIcon.tsx → ...Navigation/OnlyMine/FilterPopoverIcon.tsx
diff --git a/...mponents/Navigation/OnlyMine/OnlyMine.tsx → .../components/Navigation/OnlyMine/index.tsx b/...mponents/Navigation/OnlyMine/OnlyMine.tsx → .../components/Navigation/OnlyMine/index.tsx
diff --git a/...components/Navigation/OnlyMine/strings.ts → ...components/Navigation/OnlyMine/strings.ts b/...components/Navigation/OnlyMine/strings.ts → ...components/Navigation/OnlyMine/strings.ts
@@ -1,4 +1,4 @@
-import { createLocalizedString } from 'basics/Locale';
+import { createLocalizedString } from '@flyteconsole/locale';
 
 const str = {
   onlyMine_popup_label: 'execution id',