From 1859cf5ca8fc3000bec9f513dee517264846c08f Mon Sep 17 00:00:00 2001
From: Nastya <55718143+anrusina@users.noreply.github.com>
Date: Tue, 17 May 2022 12:54:39 -0700
Subject: [PATCH] chore: rebase on top of master

Signed-off-by: Nastya <55718143+anrusina@users.noreply.github.com>
---
 packages/zapp/console/package.json                              | 2 +-
 .../console/src/components/Navigation/DefaultAppBarContent.tsx  | 2 +-
 .../src}/components/Navigation/OnlyMine/FilterPopoverIcon.tsx   | 0
 .../zapp/console/src/components/Navigation/OnlyMine/index.tsx   | 0
 .../zapp/console/src}/components/Navigation/OnlyMine/strings.ts | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename {src => packages/zapp/console/src}/components/Navigation/OnlyMine/FilterPopoverIcon.tsx (100%)
 rename src/components/Navigation/OnlyMine/OnlyMine.tsx => packages/zapp/console/src/components/Navigation/OnlyMine/index.tsx (100%)
 rename {src => packages/zapp/console/src}/components/Navigation/OnlyMine/strings.ts (73%)

diff --git a/packages/zapp/console/package.json b/packages/zapp/console/package.json
index 19db41326..678cb3552 100644
--- 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
index 8c2cb0205..bad2aecba 100644
--- 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/src/components/Navigation/OnlyMine/FilterPopoverIcon.tsx b/packages/zapp/console/src/components/Navigation/OnlyMine/FilterPopoverIcon.tsx
similarity index 100%
rename from src/components/Navigation/OnlyMine/FilterPopoverIcon.tsx
rename to packages/zapp/console/src/components/Navigation/OnlyMine/FilterPopoverIcon.tsx
diff --git a/src/components/Navigation/OnlyMine/OnlyMine.tsx b/packages/zapp/console/src/components/Navigation/OnlyMine/index.tsx
similarity index 100%
rename from src/components/Navigation/OnlyMine/OnlyMine.tsx
rename to packages/zapp/console/src/components/Navigation/OnlyMine/index.tsx
diff --git a/src/components/Navigation/OnlyMine/strings.ts b/packages/zapp/console/src/components/Navigation/OnlyMine/strings.ts
similarity index 73%
rename from src/components/Navigation/OnlyMine/strings.ts
rename to packages/zapp/console/src/components/Navigation/OnlyMine/strings.ts
index 8e76bdba8..3cc56d24f 100644
--- a/src/components/Navigation/OnlyMine/strings.ts
+++ b/packages/zapp/console/src/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',