Change layout location (#158)

project-openubl · Dec 15, 2021 · cbe2e9a · cbe2e9a
1 parent e1bb3bf
commit cbe2e9a
Show file tree

Hide file tree

Showing 28 changed files with 6 additions and 26 deletions.
diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
@@ -22,7 +22,7 @@ jobs:
           distribution: temurin
           cache: maven
       - name: Maven
-        run: mvn test -Pui
+        run: mvn test
       - name: Prepare failure archive (if maven failed)
         if: failure()
         shell: bash

diff --git a/src/main/webapp/package.json b/src/main/webapp/package.json
@@ -16,7 +16,6 @@
     "@types/react-dom": "^17.0.0",
     "axios": "^0.24.0",
     "formik": "^2.2.9",
-    "keycloak-js": "^15.0.2",
     "moment": "^2.29.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

diff --git a/src/main/webapp/src/App.tsx b/src/main/webapp/src/App.tsx
@@ -17,7 +17,7 @@ import { WarningTriangleIcon } from "@patternfly/react-icons";
 import { AppRoutes } from "./Routes";
 import "./App.scss";
 
-import { DefaultLayout } from "./layout";
+import { DefaultLayout } from "./shared/components/layout";
 
 import NotificationsPortal from "@redhat-cloud-services/frontend-components-notifications/NotificationPortal";
 import "@redhat-cloud-services/frontend-components-notifications/index.css";

diff --git a/src/main/webapp/src/logo.svg b/src/main/webapp/src/logo.svg
diff --git a/src/main/webapp/src/pages/versions/version-list/version-list.tsx b/src/main/webapp/src/pages/versions/version-list/version-list.tsx
@@ -101,8 +101,8 @@ export const VersionList: React.FC = () => {
   const dispatch = useDispatch();
 
   const versions = useVersionsQuery();
-  const versionMutation = useCreateVersionMutation();
-  const deleleteVersionMutation = useDeleteVersionMutation();
+  const createVersionMutation = useCreateVersionMutation();
+  const deleteVersionMutation = useDeleteVersionMutation();
 
   const [filterText, setFilterText] = useState("");
 
@@ -148,7 +148,7 @@ export const VersionList: React.FC = () => {
               type: "version",
               onDelete: () => {
                 dispatch(deleteDialogActions.processing());
-                deleleteVersionMutation
+                deleteVersionMutation
                   .mutateAsync(row)
                   .catch((error) => {
                     dispatch(
@@ -179,7 +179,7 @@ export const VersionList: React.FC = () => {
   const rows: IRow[] = itemsToRow(pageItems || []);
 
   const onNewVersion = () => {
-    versionMutation.mutateAsync().catch((error) => {
+    createVersionMutation.mutateAsync().catch((error) => {
       dispatch(
         alertActions.addAlert("danger", "Error", getAxiosErrorMessage(error))
       );

diff --git a/...rc/layout/AppAboutModal/AppAboutModal.tsx → ...ts/layout/AppAboutModal/AppAboutModal.tsx b/...rc/layout/AppAboutModal/AppAboutModal.tsx → ...ts/layout/AppAboutModal/AppAboutModal.tsx
diff --git a/.../webapp/src/layout/AppAboutModal/index.ts → .../components/layout/AppAboutModal/index.ts b/.../webapp/src/layout/AppAboutModal/index.ts → .../components/layout/AppAboutModal/index.ts
diff --git a/...ppAboutModal/tests/AppAboutModal.test.tsx → ...ppAboutModal/tests/AppAboutModal.test.tsx b/...ppAboutModal/tests/AppAboutModal.test.tsx → ...ppAboutModal/tests/AppAboutModal.test.tsx
diff --git a/...__snapshots__/AppAboutModal.test.tsx.snap → ...__snapshots__/AppAboutModal.test.tsx.snap b/...__snapshots__/AppAboutModal.test.tsx.snap → ...__snapshots__/AppAboutModal.test.tsx.snap
diff --git a/...AppAboutModalState/AppAboutModalState.tsx → ...AppAboutModalState/AppAboutModalState.tsx b/...AppAboutModalState/AppAboutModalState.tsx → ...AppAboutModalState/AppAboutModalState.tsx
diff --git a/...pp/src/layout/AppAboutModalState/index.ts → ...onents/layout/AppAboutModalState/index.ts b/...pp/src/layout/AppAboutModalState/index.ts → ...onents/layout/AppAboutModalState/index.ts
diff --git a/...rc/layout/DefaultLayout/DefaultLayout.tsx → ...ts/layout/DefaultLayout/DefaultLayout.tsx b/...rc/layout/DefaultLayout/DefaultLayout.tsx → ...ts/layout/DefaultLayout/DefaultLayout.tsx
diff --git a/.../webapp/src/layout/DefaultLayout/index.ts → .../components/layout/DefaultLayout/index.ts b/.../webapp/src/layout/DefaultLayout/index.ts → .../components/layout/DefaultLayout/index.ts
diff --git a/...efaultLayout/tests/DefaultLayout.test.tsx → ...efaultLayout/tests/DefaultLayout.test.tsx b/...efaultLayout/tests/DefaultLayout.test.tsx → ...efaultLayout/tests/DefaultLayout.test.tsx
diff --git a/...__snapshots__/DefaultLayout.test.tsx.snap → ...__snapshots__/DefaultLayout.test.tsx.snap b/...__snapshots__/DefaultLayout.test.tsx.snap → ...__snapshots__/DefaultLayout.test.tsx.snap
diff --git a/...yout/HeaderApp/BasicMenuDropdownItems.tsx → ...yout/HeaderApp/BasicMenuDropdownItems.tsx b/...yout/HeaderApp/BasicMenuDropdownItems.tsx → ...yout/HeaderApp/BasicMenuDropdownItems.tsx
diff --git a/...webapp/src/layout/HeaderApp/HeaderApp.tsx → ...components/layout/HeaderApp/HeaderApp.tsx b/...webapp/src/layout/HeaderApp/HeaderApp.tsx → ...components/layout/HeaderApp/HeaderApp.tsx
diff --git a/...p/src/layout/HeaderApp/MobileDropdown.tsx → ...nents/layout/HeaderApp/MobileDropdown.tsx b/...p/src/layout/HeaderApp/MobileDropdown.tsx → ...nents/layout/HeaderApp/MobileDropdown.tsx
diff --git a/...ayout/HeaderApp/OidcMenuDropdownItems.tsx → ...ayout/HeaderApp/OidcMenuDropdownItems.tsx b/...ayout/HeaderApp/OidcMenuDropdownItems.tsx → ...ayout/HeaderApp/OidcMenuDropdownItems.tsx
diff --git a/...n/webapp/src/layout/HeaderApp/SSOMenu.tsx → ...d/components/layout/HeaderApp/SSOMenu.tsx b/...n/webapp/src/layout/HeaderApp/SSOMenu.tsx → ...d/components/layout/HeaderApp/SSOMenu.tsx
diff --git a/...main/webapp/src/layout/HeaderApp/index.ts → ...ared/components/layout/HeaderApp/index.ts b/...main/webapp/src/layout/HeaderApp/index.ts → ...ared/components/layout/HeaderApp/index.ts
diff --git a/...layout/HeaderApp/tests/HeaderApp.test.tsx → ...layout/HeaderApp/tests/HeaderApp.test.tsx b/...layout/HeaderApp/tests/HeaderApp.test.tsx → ...layout/HeaderApp/tests/HeaderApp.test.tsx
diff --git a/...sts/__snapshots__/HeaderApp.test.tsx.snap → ...sts/__snapshots__/HeaderApp.test.tsx.snap b/...sts/__snapshots__/HeaderApp.test.tsx.snap → ...sts/__snapshots__/HeaderApp.test.tsx.snap
diff --git a/src/main/webapp/src/layout/LayoutUtils.ts → ...c/shared/components/layout/LayoutUtils.ts b/src/main/webapp/src/layout/LayoutUtils.ts → ...c/shared/components/layout/LayoutUtils.ts
diff --git a/...bapp/src/layout/SidebarApp/SidebarApp.tsx → ...mponents/layout/SidebarApp/SidebarApp.tsx b/...bapp/src/layout/SidebarApp/SidebarApp.tsx → ...mponents/layout/SidebarApp/SidebarApp.tsx
diff --git a/...ain/webapp/src/layout/SidebarApp/index.ts → ...red/components/layout/SidebarApp/index.ts b/...ain/webapp/src/layout/SidebarApp/index.ts → ...red/components/layout/SidebarApp/index.ts
diff --git a/src/main/webapp/src/layout/index.ts → ...app/src/shared/components/layout/index.ts b/src/main/webapp/src/layout/index.ts → ...app/src/shared/components/layout/index.ts
diff --git a/src/main/webapp/yarn.lock b/src/main/webapp/yarn.lock
@@ -3688,11 +3688,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-[email protected]:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
-  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
-
 base64-js@^1.0.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -8948,11 +8943,6 @@ js-base64@^2.1.8:
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
   integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
 
-[email protected]:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966"
-  integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==
-
 [email protected]:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"
@@ -9171,14 +9161,6 @@ jsprim@^2.0.2:
     array-includes "^3.1.3"
     object.assign "^4.1.2"
 
-keycloak-js@^15.0.2:
-  version "15.0.2"
-  resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-15.0.2.tgz#9d12dd8860953a267b9b18f351ad2e76b8e94a9c"
-  integrity sha512-dv2a4NcPSH3AzGWG3ZtB+VrHpuQLdFBYXtQBj/+oBzm6XNwnVAMdL6LIC0OzCLQpn3rKTQJtNSATAGhbKJgewQ==
-  dependencies:
-    base64-js "1.3.1"
-    js-sha256 "0.9.0"
-
 killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"