Merge branch 'icshwi-11747-improve-file-structure' into 'develop'

ICSHWI-11747 - Improve file structure

See merge request !259

package-lock.json

@@ -4046,9 +4046,9 @@
       "dev": true
     },
     "node_modules/eslint": {
-      "version": "8.33.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz",
-      "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==",
+      "version": "8.34.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
+      "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
       "dev": true,
       "dependencies": {
         "ignore": "^5.2.0",
@@ -9890,9 +9890,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.294",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.294.tgz",
-      "integrity": "sha512-PuHZB3jEN7D8WPPjLmBQAsqQz8tWHlkkB4n0E2OYw8RwVdmBYV0Wn+rUFH8JqYyIRb4HQhhedgxlZL163wqLrQ==",
+      "version": "1.4.295",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.295.tgz",
+      "integrity": "sha512-lEO94zqf1bDA3aepxwnWoHUjA8sZ+2owgcSZjYQy0+uOSEclJX0VieZC+r+wLpSxUHRd6gG32znTWmr+5iGzFw==",
       "dev": true
     },
     "node_modules/@babel/parser": {
@@ -21025,9 +21025,9 @@
       }
     },
     "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "dependencies": {
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
@@ -37660,9 +37660,9 @@
       }
     },
     "node_modules/ci-info": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz",
-      "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
       "funding": [
         {
           "type": "github",
@@ -52672,9 +52672,9 @@
       "dev": true
     },
     "ci-info": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz",
-      "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w=="
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="
     },
     "cipher-base": {
       "version": "1.0.4",
@@ -54794,9 +54794,9 @@
       "dev": true
     },
     "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "requires": {
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
@@ -55335,9 +55335,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.4.294",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.294.tgz",
-      "integrity": "sha512-PuHZB3jEN7D8WPPjLmBQAsqQz8tWHlkkB4n0E2OYw8RwVdmBYV0Wn+rUFH8JqYyIRb4HQhhedgxlZL163wqLrQ==",
+      "version": "1.4.295",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.295.tgz",
+      "integrity": "sha512-lEO94zqf1bDA3aepxwnWoHUjA8sZ+2owgcSZjYQy0+uOSEclJX0VieZC+r+wLpSxUHRd6gG32znTWmr+5iGzFw==",
       "dev": true
     },
     "elliptic": {
@@ -55640,9 +55640,9 @@
       }
     },
     "eslint": {
-      "version": "8.33.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz",
-      "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==",
+      "version": "8.34.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
+      "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
       "dev": true,
       "requires": {
         "@eslint/eslintrc": "^1.4.1",

src/components/IOC/AdministerUndeployment.js → src/components/IOC/AdministerUndeployment/AdministerUndeployment.js

@@ -2,14 +2,14 @@ import React, { useState, useRef, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import { makeStyles } from "@material-ui/core/styles";
 import { Button, Typography, Grid, Tooltip } from "@material-ui/core";
-import { theme } from "../../style/Theme";
-import { useUndeployInDb } from "../../api/SwaggerApi";
-import { SimpleAccordion } from "../common/Accordion/SimpleAccordion";
-import { ConfirmationDialog } from "../dialog/ConfirmationDialog";
-import { SimpleModal } from "../../components/common/SimpleModal/SimpleModal";
+import { theme } from "../../../style/Theme";
+import { useUndeployInDb } from "../../../api/SwaggerApi";
+import { SimpleAccordion } from "../../common/Accordion/SimpleAccordion";
+import { ConfirmationDialog } from "../../dialog/ConfirmationDialog";
+import { SimpleModal } from "../../common/SimpleModal/SimpleModal";
 import { Alert } from "@material-ui/lab";
-import AccessControl from "../auth/AccessControl";
-import { IocActiveDeployment } from "../../api/DataTypes";
+import AccessControl from "../../auth/AccessControl";
+import { IocActiveDeployment } from "../../../api/DataTypes";
 
 const useStyles = makeStyles({
   undeployButton: {

src/components/IOC/AdministerUndeployment/index.js

+import AdministerUndeployment from "./AdministerUndeployment";
+
+export { AdministerUndeployment };
+export default AdministerUndeployment;

src/components/IOC/AlertMessages.js → src/components/IOC/AlertMessages/AlertMessages.js

 import React from "react";
 import { Button, Grid, makeStyles } from "@material-ui/core";
 import { Alert } from "@material-ui/lab";
-import { theme } from "../../style/Theme";
+import { theme } from "../../../style/Theme";
 
 const useStyles = makeStyles((theme) => ({
   infoBadge: {

src/components/IOC/AlertMessages/index.js

+import AlertMessages from "./AlertMessages";
+
+export { AlertMessages };
+export default AlertMessages;

src/components/IOC/ChangeHostAdmin.js → src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js

 import React, { useState, useRef, useEffect, useCallback } from "react";
-import AccessControl from "../auth/AccessControl";
-import { SimpleAccordion } from "../common/Accordion/SimpleAccordion";
+import AccessControl from "../../auth/AccessControl";
+import { SimpleAccordion } from "../../common/Accordion/SimpleAccordion";
 import {
   Button,
   Typography,
@@ -8,15 +8,15 @@ import {
   Tooltip,
   TextField
 } from "@material-ui/core";
-import { SimpleModal } from "../../components/common/SimpleModal/SimpleModal";
-import { ConfirmationDialog } from "../dialog/ConfirmationDialog";
+import { SimpleModal } from "../../common/SimpleModal/SimpleModal";
+import { ConfirmationDialog } from "../../dialog/ConfirmationDialog";
 import {
   useUpdateActiveDeploymentHost,
   useCSEntrySearch
-} from "../../api/SwaggerApi";
+} from "../../../api/SwaggerApi";
 import { Alert, Autocomplete } from "@material-ui/lab";
-import { useTypingTimer } from "../common/SearchBoxFilter/TypingTimer";
-import { transformHostQuery } from "../common/Helper";
+import { useTypingTimer } from "../../common/SearchBoxFilter/TypingTimer";
+import { transformHostQuery } from "../../common/Helper";
 
 export default function ChangeHostAdmin({
   ioc,

src/components/IOC/ChangeHostAdmin/index.js

+import ChangeHostAdmin from "./ChangeHostAdmin";
+
+export { ChangeHostAdmin };
+export default ChangeHostAdmin;

src/components/IOC/CreateIOC.js → src/components/IOC/CreateIOC/CreateIOC.js

 import React, { useState } from "react";
 import { Navigate } from "react-router-dom";
-import { IOCCreateDialog } from "./IOCCreateDialog";
+import { IOCCreateDialog } from "../IOCCreateDialog";
 
 // Process component
 export function CreateIOC({ open, setOpen, submitCallback, hook }) {

src/components/IOC/CreateIOC/index.js

+import { CreateIOC } from "./CreateIOC";
+
+export { CreateIOC };
+export default CreateIOC;

src/components/IOC/DeployIOC.js → src/components/IOC/DeployIOC/DeployIOC.js

 import React, { useContext, useState } from "react";
 import { Navigate } from "react-router-dom";
-import { IOCDeployDialog } from "./IOCDeployDialog";
-import { notificationContext } from "../../components/common/notification/Notifications";
+import { IOCDeployDialog } from "../IOCDeployDialog";
+import { notificationContext } from "../../common/notification/Notifications";
 
 // Process component
 export function DeployIOC({

src/components/IOC/DeployIOC/index.js

+import { DeployIOC } from "./DeployIOC";
+
+export { DeployIOC };
+export default DeployIOC;

src/components/IOC/GitRefLink/index.js

+import GitRefLink from "./GitRefLink";
+
+export { GitRefLink };
+export default GitRefLink;

src/components/IOC/IOCAdmin.js → src/components/IOC/IOCAdmin/IOCAdmin.js

 import React from "react";
-import AdministerUndeployment from "./AdministerUndeployment";
-import IOCDelete from "./IOCDelete";
-import IOCDetailAdmin from "./IOCDetailAdmin";
-import ChangeHostAdmin from "./ChangeHostAdmin";
+import AdministerUndeployment from "../AdministerUndeployment";
+import IOCDelete from "../IOCDelete";
+import IOCDetailAdmin from "../IOCDetailAdmin";
+import ChangeHostAdmin from "../ChangeHostAdmin";
 
 export default function IOCAdmin({ ioc, getIOC, resetTab, buttonDisabled }) {
   return (

src/components/IOC/IOCAdmin/index.js

+import IOCAdmin from "./IOCAdmin";
+
+export { IOCAdmin };
+export default IOCAdmin;

src/components/IOC/IOCAsyncList.js → src/components/IOC/IOCAsyncList/IOCAsyncList.js

 import React from "react";
 import { Hidden } from "@material-ui/core";
-import { IOCDetailFetcher } from "./IOCDetailFetcher";
-import { IOCList } from "./IOCList";
-import { IOCTable } from "./IOCTable";
+import { IOCDetailFetcher } from "../IOCDetailFetcher";
+import { IOCList } from "../IOCList";
+import { IOCTable } from "../IOCTable";
 
 export function IOCAsyncList({
   iocs,

src/components/IOC/IOCAsyncList/index.js

+import { IOCAsyncList } from "./IOCAsyncList";
+
+export { IOCAsyncList };
+export default IOCAsyncList;

src/components/IOC/IOCBadge.js → src/components/IOC/IOCBadge/IOCBadge.js

 import React from "react";
-import { IconBadge } from "../common/Badge/IconBadge";
-import { IOCStatusIcon } from "./IOCIcons";
+import { IconBadge } from "../../common/Badge/IconBadge";
+import { IOCStatusIcon } from "../IOCIcons";
 
 export function IOCBadge({ ioc }) {
   return (

src/components/IOC/IOCBadge/index.js

+import { IOCBadge } from "./IOCBadge";
+
+export { IOCBadge };
+export default IOCBadge;