From 305eeab37a7ba47fe1a9866ccab71e5e7a918a30 Mon Sep 17 00:00:00 2001
From: Kevin Ghadyani <kevin.ghadyani@okta.com>
Date: Thu, 13 Oct 2022 16:33:42 -0500
Subject: [PATCH 1/3] fix: flattened odyssey-react-mui for better DX

Breaks functionality for anyone importing components directly rather than from the library root.
---
 .../src/{components/Icon => }/Icon.test.tsx      |  0
 .../src/{components/Icon => }/Icon.tsx           |  2 +-
 .../src/{components/Link => }/Link.tsx           |  0
 .../PasswordInput => }/PasswordInput.test.tsx    |  0
 .../PasswordInput => }/PasswordInput.tsx         |  0
 .../ThemeProvider => }/ThemeProvider.tsx         |  0
 .../src/components/Link/index.tsx                | 13 -------------
 .../src/components/PasswordInput/index.ts        | 13 -------------
 .../src/components/ThemeProvider/index.ts        | 13 -------------
 .../odyssey-react-mui/src/components/index.ts    | 16 ----------------
 .../src/{utils => }/createUniqueId.test.ts       |  0
 .../src/{utils => }/createUniqueId.ts            |  0
 .../{components/Icon => iconDictionary}/Add.tsx  |  0
 .../Icon => iconDictionary}/AddCircle.tsx        |  0
 .../Icon => iconDictionary}/AlertCircle.tsx      |  0
 .../AlertCircleFilled.tsx                        |  0
 .../AlertTriangleFilled.tsx                      |  0
 .../Icon => iconDictionary}/Anchor.tsx           |  0
 .../Icon => iconDictionary}/ArrowDown.tsx        |  0
 .../Icon => iconDictionary}/ArrowLeft.tsx        |  0
 .../Icon => iconDictionary}/ArrowRight.tsx       |  0
 .../Icon => iconDictionary}/ArrowUp.tsx          |  0
 .../Icon => iconDictionary}/ArrowUpDown.tsx      |  0
 .../Icon => iconDictionary}/Calendar.tsx         |  0
 .../Icon => iconDictionary}/Check.tsx            |  0
 .../CheckCircleFilled.tsx                        |  0
 .../Icon => iconDictionary}/ChevronDown.tsx      |  0
 .../Icon => iconDictionary}/ChevronUp.tsx        |  0
 .../Icon => iconDictionary}/Close.tsx            |  0
 .../CloseCircleFilled.tsx                        |  0
 .../{components/Icon => iconDictionary}/Copy.tsx |  0
 .../Icon => iconDictionary}/Delete.tsx           |  0
 .../Icon => iconDictionary}/Download.tsx         |  0
 .../Icon => iconDictionary}/DragHandle.tsx       |  0
 .../{components/Icon => iconDictionary}/Edit.tsx |  0
 .../Icon => iconDictionary}/ExternalLink.tsx     |  0
 .../{components/Icon => iconDictionary}/Eye.tsx  |  0
 .../Icon => iconDictionary}/EyeOff.tsx           |  0
 .../Icon => iconDictionary}/Filter.tsx           |  0
 .../Icon => iconDictionary}/Globe.tsx            |  0
 .../{components/Icon => iconDictionary}/Home.tsx |  0
 .../InformationCircle.tsx                        |  0
 .../InformationCircleFilled.tsx                  |  0
 .../Icon => iconDictionary}/Notification.tsx     |  0
 .../Icon => iconDictionary}/OverflowVertical.tsx |  0
 .../Icon => iconDictionary}/QuestionCircle.tsx   |  0
 .../QuestionCircleFilled.tsx                     |  0
 .../Icon => iconDictionary}/Search.tsx           |  0
 .../Icon => iconDictionary}/Settings.tsx         |  0
 .../Icon => iconDictionary}/Subtract.tsx         |  0
 .../Icon => iconDictionary}/SvgIcon.ts           |  0
 .../{components/Icon => iconDictionary}/User.tsx |  0
 .../Icon => iconDictionary}/UserGroup.tsx        |  0
 .../Icon => iconDictionary}/index.tsx            |  0
 .../{components/Icon => iconDictionary}/types.ts |  0
 packages/odyssey-react-mui/src/index.ts          | 12 ++++++++----
 .../src/{themes/odyssey => theme}/components.tsx |  0
 .../odyssey => theme}/components.types.ts        |  0
 .../src/{themes/odyssey => theme}/index.ts       |  0
 .../src/{themes/odyssey => theme}/mixins.ts      |  0
 .../{themes/odyssey => theme}/mixins.types.ts    |  0
 .../src/{themes/odyssey => theme}/palette.ts     |  0
 .../{themes/odyssey => theme}/palette.types.ts   |  0
 .../src/{themes/odyssey => theme}/shape.ts       |  0
 .../src/{themes/odyssey => theme}/spacing.ts     |  0
 .../src/{themes/odyssey => theme}/theme.ts       |  0
 .../src/{themes/odyssey => theme}/typography.ts  |  0
 .../odyssey => theme}/typography.types.ts        |  0
 packages/odyssey-react-mui/src/themes/index.ts   | 13 -------------
 .../src/{utils => }/useUniqueId.ts               |  0
 packages/odyssey-react-mui/src/utils/index.ts    | 14 --------------
 71 files changed, 9 insertions(+), 87 deletions(-)
 rename packages/odyssey-react-mui/src/{components/Icon => }/Icon.test.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => }/Icon.tsx (96%)
 rename packages/odyssey-react-mui/src/{components/Link => }/Link.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/PasswordInput => }/PasswordInput.test.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/PasswordInput => }/PasswordInput.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/ThemeProvider => }/ThemeProvider.tsx (100%)
 delete mode 100644 packages/odyssey-react-mui/src/components/Link/index.tsx
 delete mode 100644 packages/odyssey-react-mui/src/components/PasswordInput/index.ts
 delete mode 100644 packages/odyssey-react-mui/src/components/ThemeProvider/index.ts
 delete mode 100644 packages/odyssey-react-mui/src/components/index.ts
 rename packages/odyssey-react-mui/src/{utils => }/createUniqueId.test.ts (100%)
 rename packages/odyssey-react-mui/src/{utils => }/createUniqueId.ts (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Add.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/AddCircle.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/AlertCircle.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/AlertCircleFilled.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/AlertTriangleFilled.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Anchor.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/ArrowDown.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/ArrowLeft.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/ArrowRight.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/ArrowUp.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/ArrowUpDown.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Calendar.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Check.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/CheckCircleFilled.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/ChevronDown.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/ChevronUp.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Close.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/CloseCircleFilled.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Copy.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Delete.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Download.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/DragHandle.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Edit.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/ExternalLink.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Eye.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/EyeOff.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Filter.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Globe.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Home.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/InformationCircle.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/InformationCircleFilled.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Notification.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/OverflowVertical.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/QuestionCircle.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/QuestionCircleFilled.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Search.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Settings.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/Subtract.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/SvgIcon.ts (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/User.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/UserGroup.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/index.tsx (100%)
 rename packages/odyssey-react-mui/src/{components/Icon => iconDictionary}/types.ts (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/components.tsx (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/components.types.ts (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/index.ts (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/mixins.ts (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/mixins.types.ts (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/palette.ts (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/palette.types.ts (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/shape.ts (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/spacing.ts (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/theme.ts (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/typography.ts (100%)
 rename packages/odyssey-react-mui/src/{themes/odyssey => theme}/typography.types.ts (100%)
 delete mode 100644 packages/odyssey-react-mui/src/themes/index.ts
 rename packages/odyssey-react-mui/src/{utils => }/useUniqueId.ts (100%)
 delete mode 100644 packages/odyssey-react-mui/src/utils/index.ts

diff --git a/packages/odyssey-react-mui/src/components/Icon/Icon.test.tsx b/packages/odyssey-react-mui/src/Icon.test.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Icon.test.tsx
rename to packages/odyssey-react-mui/src/Icon.test.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Icon.tsx b/packages/odyssey-react-mui/src/Icon.tsx
similarity index 96%
rename from packages/odyssey-react-mui/src/components/Icon/Icon.tsx
rename to packages/odyssey-react-mui/src/Icon.tsx
index afd169e573..0f09501825 100644
--- a/packages/odyssey-react-mui/src/components/Icon/Icon.tsx
+++ b/packages/odyssey-react-mui/src/Icon.tsx
@@ -12,7 +12,7 @@
 
 import { forwardRef } from "react";
 import type { SvgIconNoChildrenProps } from "./types";
-import { iconDictionary } from "./";
+import { iconDictionary } from "./iconDictionary";
 
 export interface IconProps extends SvgIconNoChildrenProps {
   /**
diff --git a/packages/odyssey-react-mui/src/components/Link/Link.tsx b/packages/odyssey-react-mui/src/Link.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Link/Link.tsx
rename to packages/odyssey-react-mui/src/Link.tsx
diff --git a/packages/odyssey-react-mui/src/components/PasswordInput/PasswordInput.test.tsx b/packages/odyssey-react-mui/src/PasswordInput.test.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/PasswordInput/PasswordInput.test.tsx
rename to packages/odyssey-react-mui/src/PasswordInput.test.tsx
diff --git a/packages/odyssey-react-mui/src/components/PasswordInput/PasswordInput.tsx b/packages/odyssey-react-mui/src/PasswordInput.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/PasswordInput/PasswordInput.tsx
rename to packages/odyssey-react-mui/src/PasswordInput.tsx
diff --git a/packages/odyssey-react-mui/src/components/ThemeProvider/ThemeProvider.tsx b/packages/odyssey-react-mui/src/ThemeProvider.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/ThemeProvider/ThemeProvider.tsx
rename to packages/odyssey-react-mui/src/ThemeProvider.tsx
diff --git a/packages/odyssey-react-mui/src/components/Link/index.tsx b/packages/odyssey-react-mui/src/components/Link/index.tsx
deleted file mode 100644
index 36d338cf62..0000000000
--- a/packages/odyssey-react-mui/src/components/Link/index.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
- * Copyright (c) 2022-present, Okta, Inc. and/or its affiliates. All rights reserved.
- * The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
- *
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and limitations under the License.
- */
-
-export * from "./Link";
diff --git a/packages/odyssey-react-mui/src/components/PasswordInput/index.ts b/packages/odyssey-react-mui/src/components/PasswordInput/index.ts
deleted file mode 100644
index adf93d1109..0000000000
--- a/packages/odyssey-react-mui/src/components/PasswordInput/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
- * Copyright (c) 2022-present, Okta, Inc. and/or its affiliates. All rights reserved.
- * The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
- *
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and limitations under the License.
- */
-
-export * from "./PasswordInput";
diff --git a/packages/odyssey-react-mui/src/components/ThemeProvider/index.ts b/packages/odyssey-react-mui/src/components/ThemeProvider/index.ts
deleted file mode 100644
index 732a5fd078..0000000000
--- a/packages/odyssey-react-mui/src/components/ThemeProvider/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
- * Copyright (c) 2022-present, Okta, Inc. and/or its affiliates. All rights reserved.
- * The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
- *
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and limitations under the License.
- */
-
-export * from "./ThemeProvider";
diff --git a/packages/odyssey-react-mui/src/components/index.ts b/packages/odyssey-react-mui/src/components/index.ts
deleted file mode 100644
index e044fdf793..0000000000
--- a/packages/odyssey-react-mui/src/components/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*!
- * Copyright (c) 2022-present, Okta, Inc. and/or its affiliates. All rights reserved.
- * The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
- *
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and limitations under the License.
- */
-
-export * from "./Icon";
-export * from "./Link";
-export * from "./PasswordInput";
-export * from "./ThemeProvider";
diff --git a/packages/odyssey-react-mui/src/utils/createUniqueId.test.ts b/packages/odyssey-react-mui/src/createUniqueId.test.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/utils/createUniqueId.test.ts
rename to packages/odyssey-react-mui/src/createUniqueId.test.ts
diff --git a/packages/odyssey-react-mui/src/utils/createUniqueId.ts b/packages/odyssey-react-mui/src/createUniqueId.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/utils/createUniqueId.ts
rename to packages/odyssey-react-mui/src/createUniqueId.ts
diff --git a/packages/odyssey-react-mui/src/components/Icon/Add.tsx b/packages/odyssey-react-mui/src/iconDictionary/Add.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Add.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Add.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/AddCircle.tsx b/packages/odyssey-react-mui/src/iconDictionary/AddCircle.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/AddCircle.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/AddCircle.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/AlertCircle.tsx b/packages/odyssey-react-mui/src/iconDictionary/AlertCircle.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/AlertCircle.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/AlertCircle.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/AlertCircleFilled.tsx b/packages/odyssey-react-mui/src/iconDictionary/AlertCircleFilled.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/AlertCircleFilled.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/AlertCircleFilled.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/AlertTriangleFilled.tsx b/packages/odyssey-react-mui/src/iconDictionary/AlertTriangleFilled.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/AlertTriangleFilled.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/AlertTriangleFilled.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Anchor.tsx b/packages/odyssey-react-mui/src/iconDictionary/Anchor.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Anchor.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Anchor.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/ArrowDown.tsx b/packages/odyssey-react-mui/src/iconDictionary/ArrowDown.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/ArrowDown.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/ArrowDown.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/ArrowLeft.tsx b/packages/odyssey-react-mui/src/iconDictionary/ArrowLeft.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/ArrowLeft.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/ArrowLeft.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/ArrowRight.tsx b/packages/odyssey-react-mui/src/iconDictionary/ArrowRight.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/ArrowRight.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/ArrowRight.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/ArrowUp.tsx b/packages/odyssey-react-mui/src/iconDictionary/ArrowUp.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/ArrowUp.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/ArrowUp.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/ArrowUpDown.tsx b/packages/odyssey-react-mui/src/iconDictionary/ArrowUpDown.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/ArrowUpDown.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/ArrowUpDown.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Calendar.tsx b/packages/odyssey-react-mui/src/iconDictionary/Calendar.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Calendar.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Calendar.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Check.tsx b/packages/odyssey-react-mui/src/iconDictionary/Check.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Check.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Check.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/CheckCircleFilled.tsx b/packages/odyssey-react-mui/src/iconDictionary/CheckCircleFilled.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/CheckCircleFilled.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/CheckCircleFilled.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/ChevronDown.tsx b/packages/odyssey-react-mui/src/iconDictionary/ChevronDown.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/ChevronDown.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/ChevronDown.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/ChevronUp.tsx b/packages/odyssey-react-mui/src/iconDictionary/ChevronUp.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/ChevronUp.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/ChevronUp.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Close.tsx b/packages/odyssey-react-mui/src/iconDictionary/Close.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Close.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Close.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/CloseCircleFilled.tsx b/packages/odyssey-react-mui/src/iconDictionary/CloseCircleFilled.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/CloseCircleFilled.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/CloseCircleFilled.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Copy.tsx b/packages/odyssey-react-mui/src/iconDictionary/Copy.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Copy.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Copy.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Delete.tsx b/packages/odyssey-react-mui/src/iconDictionary/Delete.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Delete.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Delete.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Download.tsx b/packages/odyssey-react-mui/src/iconDictionary/Download.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Download.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Download.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/DragHandle.tsx b/packages/odyssey-react-mui/src/iconDictionary/DragHandle.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/DragHandle.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/DragHandle.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Edit.tsx b/packages/odyssey-react-mui/src/iconDictionary/Edit.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Edit.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Edit.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/ExternalLink.tsx b/packages/odyssey-react-mui/src/iconDictionary/ExternalLink.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/ExternalLink.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/ExternalLink.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Eye.tsx b/packages/odyssey-react-mui/src/iconDictionary/Eye.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Eye.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Eye.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/EyeOff.tsx b/packages/odyssey-react-mui/src/iconDictionary/EyeOff.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/EyeOff.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/EyeOff.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Filter.tsx b/packages/odyssey-react-mui/src/iconDictionary/Filter.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Filter.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Filter.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Globe.tsx b/packages/odyssey-react-mui/src/iconDictionary/Globe.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Globe.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Globe.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Home.tsx b/packages/odyssey-react-mui/src/iconDictionary/Home.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Home.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Home.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/InformationCircle.tsx b/packages/odyssey-react-mui/src/iconDictionary/InformationCircle.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/InformationCircle.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/InformationCircle.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/InformationCircleFilled.tsx b/packages/odyssey-react-mui/src/iconDictionary/InformationCircleFilled.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/InformationCircleFilled.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/InformationCircleFilled.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Notification.tsx b/packages/odyssey-react-mui/src/iconDictionary/Notification.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Notification.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Notification.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/OverflowVertical.tsx b/packages/odyssey-react-mui/src/iconDictionary/OverflowVertical.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/OverflowVertical.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/OverflowVertical.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/QuestionCircle.tsx b/packages/odyssey-react-mui/src/iconDictionary/QuestionCircle.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/QuestionCircle.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/QuestionCircle.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/QuestionCircleFilled.tsx b/packages/odyssey-react-mui/src/iconDictionary/QuestionCircleFilled.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/QuestionCircleFilled.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/QuestionCircleFilled.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Search.tsx b/packages/odyssey-react-mui/src/iconDictionary/Search.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Search.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Search.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Settings.tsx b/packages/odyssey-react-mui/src/iconDictionary/Settings.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Settings.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Settings.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/Subtract.tsx b/packages/odyssey-react-mui/src/iconDictionary/Subtract.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/Subtract.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/Subtract.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/SvgIcon.ts b/packages/odyssey-react-mui/src/iconDictionary/SvgIcon.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/SvgIcon.ts
rename to packages/odyssey-react-mui/src/iconDictionary/SvgIcon.ts
diff --git a/packages/odyssey-react-mui/src/components/Icon/User.tsx b/packages/odyssey-react-mui/src/iconDictionary/User.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/User.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/User.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/UserGroup.tsx b/packages/odyssey-react-mui/src/iconDictionary/UserGroup.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/UserGroup.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/UserGroup.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/index.tsx b/packages/odyssey-react-mui/src/iconDictionary/index.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/index.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/index.tsx
diff --git a/packages/odyssey-react-mui/src/components/Icon/types.ts b/packages/odyssey-react-mui/src/iconDictionary/types.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/components/Icon/types.ts
rename to packages/odyssey-react-mui/src/iconDictionary/types.ts
diff --git a/packages/odyssey-react-mui/src/index.ts b/packages/odyssey-react-mui/src/index.ts
index 2ecada7881..a2bee47f0c 100644
--- a/packages/odyssey-react-mui/src/index.ts
+++ b/packages/odyssey-react-mui/src/index.ts
@@ -10,6 +10,14 @@
  * See the License for the specific language governing permissions and limitations under the License.
  */
 
+export * from "./createUniqueId";
+export * from "./Icon";
+export * from "./iconDictionary";
+export * from "./Link";
+export * from "./PasswordInput";
+export * from "./ThemeProvider";
+export * from "./useUniqueId";
+
 export {
   Alert,
   AlertTitle,
@@ -88,7 +96,3 @@ export type { TabContextProps, TabListProps, TabPanelProps } from "@mui/lab";
 export { Favorite as FavoriteIcon } from "@mui/icons-material";
 
 export { visuallyHidden } from "@mui/utils";
-
-export * from "./components";
-export * from "./themes";
-export * from "./utils";
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/components.tsx b/packages/odyssey-react-mui/src/theme/components.tsx
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/components.tsx
rename to packages/odyssey-react-mui/src/theme/components.tsx
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/components.types.ts b/packages/odyssey-react-mui/src/theme/components.types.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/components.types.ts
rename to packages/odyssey-react-mui/src/theme/components.types.ts
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/index.ts b/packages/odyssey-react-mui/src/theme/index.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/index.ts
rename to packages/odyssey-react-mui/src/theme/index.ts
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/mixins.ts b/packages/odyssey-react-mui/src/theme/mixins.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/mixins.ts
rename to packages/odyssey-react-mui/src/theme/mixins.ts
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/mixins.types.ts b/packages/odyssey-react-mui/src/theme/mixins.types.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/mixins.types.ts
rename to packages/odyssey-react-mui/src/theme/mixins.types.ts
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/palette.ts b/packages/odyssey-react-mui/src/theme/palette.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/palette.ts
rename to packages/odyssey-react-mui/src/theme/palette.ts
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/palette.types.ts b/packages/odyssey-react-mui/src/theme/palette.types.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/palette.types.ts
rename to packages/odyssey-react-mui/src/theme/palette.types.ts
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/shape.ts b/packages/odyssey-react-mui/src/theme/shape.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/shape.ts
rename to packages/odyssey-react-mui/src/theme/shape.ts
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/spacing.ts b/packages/odyssey-react-mui/src/theme/spacing.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/spacing.ts
rename to packages/odyssey-react-mui/src/theme/spacing.ts
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/theme.ts b/packages/odyssey-react-mui/src/theme/theme.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/theme.ts
rename to packages/odyssey-react-mui/src/theme/theme.ts
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/typography.ts b/packages/odyssey-react-mui/src/theme/typography.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/typography.ts
rename to packages/odyssey-react-mui/src/theme/typography.ts
diff --git a/packages/odyssey-react-mui/src/themes/odyssey/typography.types.ts b/packages/odyssey-react-mui/src/theme/typography.types.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/themes/odyssey/typography.types.ts
rename to packages/odyssey-react-mui/src/theme/typography.types.ts
diff --git a/packages/odyssey-react-mui/src/themes/index.ts b/packages/odyssey-react-mui/src/themes/index.ts
deleted file mode 100644
index 19999d380b..0000000000
--- a/packages/odyssey-react-mui/src/themes/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
- * Copyright (c) 2022-present, Okta, Inc. and/or its affiliates. All rights reserved.
- * The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
- *
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and limitations under the License.
- */
-
-export * from "./odyssey";
diff --git a/packages/odyssey-react-mui/src/utils/useUniqueId.ts b/packages/odyssey-react-mui/src/useUniqueId.ts
similarity index 100%
rename from packages/odyssey-react-mui/src/utils/useUniqueId.ts
rename to packages/odyssey-react-mui/src/useUniqueId.ts
diff --git a/packages/odyssey-react-mui/src/utils/index.ts b/packages/odyssey-react-mui/src/utils/index.ts
deleted file mode 100644
index a2776b9044..0000000000
--- a/packages/odyssey-react-mui/src/utils/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*!
- * Copyright (c) 2021-present, Okta, Inc. and/or its affiliates. All rights reserved.
- * The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
- *
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and limitations under the License.
- */
-
-export * from "./createUniqueId";
-export * from "./useUniqueId";

From 1fbdfb9aeeb33d7e45ec9b2e62d0d85d04d848fa Mon Sep 17 00:00:00 2001
From: Kevin Ghadyani <kevin.ghadyani@okta.com>
Date: Thu, 13 Oct 2022 17:48:26 -0500
Subject: [PATCH 2/3] fix: broken imports in odyssey-react-mui after flattening

---
 packages/odyssey-react-mui/src/Icon.tsx             |  2 +-
 .../odyssey-react-mui/src/PasswordInput.test.tsx    |  5 +++--
 packages/odyssey-react-mui/src/PasswordInput.tsx    |  2 +-
 packages/odyssey-react-mui/src/ThemeProvider.tsx    |  2 +-
 .../odyssey-react-mui/{test => src}/a11yCheck.ts    |  0
 .../src/iconDictionary/{index.tsx => index.ts}      |  2 --
 packages/odyssey-react-mui/src/theme/components.tsx |  2 +-
 packages/odyssey-react-mui/test/index.ts            | 13 -------------
 8 files changed, 7 insertions(+), 21 deletions(-)
 rename packages/odyssey-react-mui/{test => src}/a11yCheck.ts (100%)
 rename packages/odyssey-react-mui/src/iconDictionary/{index.tsx => index.ts} (99%)
 delete mode 100644 packages/odyssey-react-mui/test/index.ts

diff --git a/packages/odyssey-react-mui/src/Icon.tsx b/packages/odyssey-react-mui/src/Icon.tsx
index 0f09501825..8d13a68024 100644
--- a/packages/odyssey-react-mui/src/Icon.tsx
+++ b/packages/odyssey-react-mui/src/Icon.tsx
@@ -11,7 +11,7 @@
  */
 
 import { forwardRef } from "react";
-import type { SvgIconNoChildrenProps } from "./types";
+import type { SvgIconNoChildrenProps } from "./iconDictionary/types";
 import { iconDictionary } from "./iconDictionary";
 
 export interface IconProps extends SvgIconNoChildrenProps {
diff --git a/packages/odyssey-react-mui/src/PasswordInput.test.tsx b/packages/odyssey-react-mui/src/PasswordInput.test.tsx
index a9a1e6c35f..5d4170452a 100644
--- a/packages/odyssey-react-mui/src/PasswordInput.test.tsx
+++ b/packages/odyssey-react-mui/src/PasswordInput.test.tsx
@@ -11,8 +11,9 @@
  */
 
 import { render, screen } from "@testing-library/react";
-import { a11yCheck } from "../../../test";
-import { PasswordInput } from ".";
+
+import { a11yCheck } from "./a11yCheck";
+import { PasswordInput } from "./PasswordInput";
 
 const label = "Password";
 const tooltipOnLabel = "Show password";
diff --git a/packages/odyssey-react-mui/src/PasswordInput.tsx b/packages/odyssey-react-mui/src/PasswordInput.tsx
index 3ce05510ab..08ae1d8f2e 100644
--- a/packages/odyssey-react-mui/src/PasswordInput.tsx
+++ b/packages/odyssey-react-mui/src/PasswordInput.tsx
@@ -22,7 +22,7 @@ import {
   InputAdornment,
 } from "@mui/material";
 import { Visibility, VisibilityOff } from "@mui/icons-material";
-import { useUniqueId } from "../../utils";
+import { useUniqueId } from "./useUniqueId";
 
 interface State {
   password: string;
diff --git a/packages/odyssey-react-mui/src/ThemeProvider.tsx b/packages/odyssey-react-mui/src/ThemeProvider.tsx
index 5ffd801ab8..e6b167b659 100644
--- a/packages/odyssey-react-mui/src/ThemeProvider.tsx
+++ b/packages/odyssey-react-mui/src/ThemeProvider.tsx
@@ -13,7 +13,7 @@
 import { ThemeProvider as MuiThemeProvider } from "@mui/material/styles";
 import { ReactElement } from "react";
 
-import { odysseyTheme } from "../../themes";
+import { odysseyTheme } from "./theme";
 
 export const ThemeProvider = ({ children }: { children: ReactElement }) => (
   <MuiThemeProvider theme={odysseyTheme}>{children}</MuiThemeProvider>
diff --git a/packages/odyssey-react-mui/test/a11yCheck.ts b/packages/odyssey-react-mui/src/a11yCheck.ts
similarity index 100%
rename from packages/odyssey-react-mui/test/a11yCheck.ts
rename to packages/odyssey-react-mui/src/a11yCheck.ts
diff --git a/packages/odyssey-react-mui/src/iconDictionary/index.tsx b/packages/odyssey-react-mui/src/iconDictionary/index.ts
similarity index 99%
rename from packages/odyssey-react-mui/src/iconDictionary/index.tsx
rename to packages/odyssey-react-mui/src/iconDictionary/index.ts
index 2077d9c6a8..6ae01268cb 100644
--- a/packages/odyssey-react-mui/src/iconDictionary/index.tsx
+++ b/packages/odyssey-react-mui/src/iconDictionary/index.ts
@@ -12,8 +12,6 @@
 
 // Code automatically generated by svgr; DO NOT EDIT.
 
-export * from "./Icon";
-
 import { AddCircleIcon } from "./AddCircle";
 export * from "./AddCircle";
 
diff --git a/packages/odyssey-react-mui/src/theme/components.tsx b/packages/odyssey-react-mui/src/theme/components.tsx
index 9acb18a505..43f4f84fa8 100644
--- a/packages/odyssey-react-mui/src/theme/components.tsx
+++ b/packages/odyssey-react-mui/src/theme/components.tsx
@@ -25,7 +25,7 @@ import {
   ArrowDownIcon,
   CheckCircleFilledIcon,
   InformationCircleFilledIcon,
-} from "../../components/Icon";
+} from "../iconDictionary";
 
 export const components: ThemeOptions["components"] = {
   MuiAlert: {
diff --git a/packages/odyssey-react-mui/test/index.ts b/packages/odyssey-react-mui/test/index.ts
deleted file mode 100644
index fa93880981..0000000000
--- a/packages/odyssey-react-mui/test/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*!
- * Copyright (c) 2022-present, Okta, Inc. and/or its affiliates. All rights reserved.
- * The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
- *
- * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- * See the License for the specific language governing permissions and limitations under the License.
- */
-
-export * from "./a11yCheck";

From 59ecdbf749057f33814c6742ebb9506a67dfa792 Mon Sep 17 00:00:00 2001
From: Kevin Ghadyani <kevin.ghadyani@okta.com>
Date: Fri, 14 Oct 2022 14:56:28 -0500
Subject: [PATCH 3/3] fix: added missing `theme` export

---
 packages/odyssey-react-mui/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/odyssey-react-mui/src/index.ts b/packages/odyssey-react-mui/src/index.ts
index a2bee47f0c..b6788ae2bc 100644
--- a/packages/odyssey-react-mui/src/index.ts
+++ b/packages/odyssey-react-mui/src/index.ts
@@ -15,6 +15,7 @@ export * from "./Icon";
 export * from "./iconDictionary";
 export * from "./Link";
 export * from "./PasswordInput";
+export * from "./theme";
 export * from "./ThemeProvider";
 export * from "./useUniqueId";