From 68d35805630e8eac93e776f74853714fc3047f17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Jan 2026 17:29:01 +0000 Subject: [PATCH 01/46] Bump @mui/x-date-pickers from 8.22.0 to 8.25.0 Bumps [@mui/x-date-pickers](https://github.com/mui/mui-x/tree/HEAD/packages/x-date-pickers) from 8.22.0 to 8.25.0. - [Release notes](https://github.com/mui/mui-x/releases) - [Changelog](https://github.com/mui/mui-x/blob/master/CHANGELOG.md) - [Commits](https://github.com/mui/mui-x/commits/v8.25.0/packages/x-date-pickers) --- updated-dependencies: - dependency-name: "@mui/x-date-pickers" dependency-version: 8.25.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 75f5b6ef3148..8fbf2983d986 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@mui/lab": "7.0.0-beta.17", "@mui/material": "7.3.2", "@mui/system": "7.3.2", - "@mui/x-date-pickers": "^8.11.1", + "@mui/x-date-pickers": "^8.25.0", "@musement/iso-duration": "^1.0.0", "@nivo/core": "^0.99.0", "@nivo/sankey": "^0.99.0", diff --git a/yarn.lock b/yarn.lock index 5e07ec26f491..874791e7e2e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1435,23 +1435,23 @@ prop-types "^15.8.1" react-is "^19.2.0" -"@mui/x-date-pickers@^8.11.1": - version "8.22.0" - resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-8.22.0.tgz#60bc176a308078002e93cfbf3ee55cae234280d5" - integrity sha512-iF4H8EJHcltiwfytTe6M1/iCwBUCB97oVh63nAsL4tre2Ew2jm8bKR4Dw2pbgvSUonB3okpZVuweFBQdnECJCg== +"@mui/x-date-pickers@^8.25.0": + version "8.25.0" + resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-8.25.0.tgz#6e35a740969eeacf3f532e24ffd8960c761bdd10" + integrity sha512-XmLQwlo9C9gPWY9OeFbQka4TGi3MXrW/jJ+E4LV1wdfg/ebOklq6KKKTbvRgTVWlMcIoQwqPbalFxcwQSUUbDw== dependencies: "@babel/runtime" "^7.28.4" "@mui/utils" "^7.3.5" - "@mui/x-internals" "8.22.0" + "@mui/x-internals" "8.25.0" "@types/react-transition-group" "^4.4.12" clsx "^2.1.1" prop-types "^15.8.1" react-transition-group "^4.4.5" -"@mui/x-internals@8.22.0": - version "8.22.0" - resolved "https://registry.yarnpkg.com/@mui/x-internals/-/x-internals-8.22.0.tgz#adf47979b3ef1e7c078965756916f6bd57c3c655" - integrity sha512-PA7jCKRLbS6aYvTSbGr3Id4CPUdTrUejHm31l8Vje7dw138gBBHrHeGsqWJh/S5foorpK8loiRejKrLlTZokyQ== +"@mui/x-internals@8.25.0": + version "8.25.0" + resolved "https://registry.yarnpkg.com/@mui/x-internals/-/x-internals-8.25.0.tgz#93849275bfb3a4e5e0130ae91449bb4f8517a1d7" + integrity sha512-RKexkVaK3xvAeLBNeLAw6oJCsQrXkx7TYSRoSUmmJveydqOqoBbimv+nbc8PmL4UL0ShVNkaFL1YWY7kYCCXUA== dependencies: "@babel/runtime" "^7.28.4" "@mui/utils" "^7.3.5" From bae84754b51759225c9117178562d41650e41128 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Jan 2026 17:29:13 +0000 Subject: [PATCH 02/46] Bump @mui/material from 7.3.2 to 7.3.7 Bumps [@mui/material](https://github.com/mui/material-ui/tree/HEAD/packages/mui-material) from 7.3.2 to 7.3.7. - [Release notes](https://github.com/mui/material-ui/releases) - [Changelog](https://github.com/mui/material-ui/blob/master/CHANGELOG.md) - [Commits](https://github.com/mui/material-ui/commits/v7.3.7/packages/mui-material) --- updated-dependencies: - dependency-name: "@mui/material" dependency-version: 7.3.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 97 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 60 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 75f5b6ef3148..4cddbc82e927 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@monaco-editor/react": "^4.6.0", "@mui/icons-material": "7.3.2", "@mui/lab": "7.0.0-beta.17", - "@mui/material": "7.3.2", + "@mui/material": "7.3.7", "@mui/system": "7.3.2", "@mui/x-date-pickers": "^8.11.1", "@musement/iso-duration": "^1.0.0", diff --git a/yarn.lock b/yarn.lock index 5e07ec26f491..5a88824febbd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1325,10 +1325,10 @@ dependencies: "@monaco-editor/loader" "^1.5.0" -"@mui/core-downloads-tracker@^7.3.2": - version "7.3.6" - resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-7.3.6.tgz#e7e3a4dc161a377be8224aa988410e89571ab40a" - integrity sha512-QaYtTHlr8kDFN5mE1wbvVARRKH7Fdw1ZuOjBJcFdVpfNfRYKF3QLT4rt+WaB6CKJvpqxRsmEo0kpYinhH5GeHg== +"@mui/core-downloads-tracker@^7.3.7": + version "7.3.7" + resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-7.3.7.tgz#99d9c60be3ce5632ec915b2c287682020ce19a99" + integrity sha512-8jWwS6FweMkpyRkrJooamUGe1CQfO1yJ+lM43IyUJbrhHW/ObES+6ry4vfGi8EKaldHL3t3BG1bcLcERuJPcjg== "@mui/icons-material@7.3.2": version "7.3.2" @@ -1349,25 +1349,25 @@ clsx "^2.1.1" prop-types "^15.8.1" -"@mui/material@7.3.2": - version "7.3.2" - resolved "https://registry.yarnpkg.com/@mui/material/-/material-7.3.2.tgz#21ad66bba695e2cd36e4a93e2e4ff5e04d8636a1" - integrity sha512-qXvbnawQhqUVfH1LMgMaiytP+ZpGoYhnGl7yYq2x57GYzcFL/iPzSZ3L30tlbwEjSVKNYcbiKO8tANR1tadjUg== +"@mui/material@7.3.7": + version "7.3.7" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-7.3.7.tgz#50fc9b9f8645a4d26a48d7c5f7fa0c9876a8c679" + integrity sha512-6bdIxqzeOtBAj2wAsfhWCYyMKPLkRO9u/2o5yexcL0C3APqyy91iGSWgT3H7hg+zR2XgE61+WAu12wXPON8b6A== dependencies: - "@babel/runtime" "^7.28.3" - "@mui/core-downloads-tracker" "^7.3.2" - "@mui/system" "^7.3.2" - "@mui/types" "^7.4.6" - "@mui/utils" "^7.3.2" + "@babel/runtime" "^7.28.4" + "@mui/core-downloads-tracker" "^7.3.7" + "@mui/system" "^7.3.7" + "@mui/types" "^7.4.10" + "@mui/utils" "^7.3.7" "@popperjs/core" "^2.11.8" "@types/react-transition-group" "^4.4.12" clsx "^2.1.1" - csstype "^3.1.3" + csstype "^3.2.3" prop-types "^15.8.1" - react-is "^19.1.1" + react-is "^19.2.3" react-transition-group "^4.4.5" -"@mui/private-theming@^7.3.2", "@mui/private-theming@^7.3.6": +"@mui/private-theming@^7.3.2": version "7.3.6" resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-7.3.6.tgz#1ca65a08e8f7f538d9a10ba974f1f4db5231a969" integrity sha512-Ws9wZpqM+FlnbZXaY/7yvyvWQo1+02Tbx50mVdNmzWEi51C51y56KAbaDCYyulOOBL6BJxuaqG8rNNuj7ivVyw== @@ -1376,7 +1376,16 @@ "@mui/utils" "^7.3.6" prop-types "^15.8.1" -"@mui/styled-engine@^7.3.2", "@mui/styled-engine@^7.3.6": +"@mui/private-theming@^7.3.7": + version "7.3.7" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-7.3.7.tgz#f5b41d573df3824fbfd10a7e6ac8de94bbcf15c5" + integrity sha512-w7r1+CYhG0syCAQUWAuV5zSaU2/67WA9JXUderdb7DzCIJdp/5RmJv6L85wRjgKCMsxFF0Kfn0kPgPbPgw/jdw== + dependencies: + "@babel/runtime" "^7.28.4" + "@mui/utils" "^7.3.7" + prop-types "^15.8.1" + +"@mui/styled-engine@^7.3.2": version "7.3.6" resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-7.3.6.tgz#dde8e6ae32c9b5b400dcd37afd9514a5344f7d91" integrity sha512-+wiYbtvj+zyUkmDB+ysH6zRjuQIJ+CM56w0fEXV+VDNdvOuSywG+/8kpjddvvlfMLsaWdQe5oTuYGBcodmqGzQ== @@ -1388,6 +1397,18 @@ csstype "^3.1.3" prop-types "^15.8.1" +"@mui/styled-engine@^7.3.7": + version "7.3.7" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-7.3.7.tgz#cde5a8381e14310f293a53dd59d27ae737a305fc" + integrity sha512-y/QkNXv6cF6dZ5APztd/dFWfQ6LHKPx3skyYO38YhQD4+Cxd6sFAL3Z38WMSSC8LQz145Mpp3CcLrSCLKPwYAg== + dependencies: + "@babel/runtime" "^7.28.4" + "@emotion/cache" "^11.14.0" + "@emotion/serialize" "^1.3.3" + "@emotion/sheet" "^1.4.0" + csstype "^3.2.3" + prop-types "^15.8.1" + "@mui/system@7.3.2": version "7.3.2" resolved "https://registry.yarnpkg.com/@mui/system/-/system-7.3.2.tgz#e838097fc6cb0a2e4c1822478950db89affb116a" @@ -1402,38 +1423,38 @@ csstype "^3.1.3" prop-types "^15.8.1" -"@mui/system@^7.3.2": - version "7.3.6" - resolved "https://registry.yarnpkg.com/@mui/system/-/system-7.3.6.tgz#460f82fc6fe1b79b8c04dc97694f6b162ffc3d25" - integrity sha512-8fehAazkHNP1imMrdD2m2hbA9sl7Ur6jfuNweh5o4l9YPty4iaZzRXqYvBCWQNwFaSHmMEj2KPbyXGp7Bt73Rg== +"@mui/system@^7.3.2", "@mui/system@^7.3.7": + version "7.3.7" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-7.3.7.tgz#530932e078ba58031cd9bcc71494a544fa635a27" + integrity sha512-DovL3k+FBRKnhmatzUMyO5bKkhMLlQ9L7Qw5qHrre3m8zCZmE+31NDVBFfqrbrA7sq681qaEIHdkWD5nmiAjyQ== dependencies: "@babel/runtime" "^7.28.4" - "@mui/private-theming" "^7.3.6" - "@mui/styled-engine" "^7.3.6" - "@mui/types" "^7.4.9" - "@mui/utils" "^7.3.6" + "@mui/private-theming" "^7.3.7" + "@mui/styled-engine" "^7.3.7" + "@mui/types" "^7.4.10" + "@mui/utils" "^7.3.7" clsx "^2.1.1" - csstype "^3.1.3" + csstype "^3.2.3" prop-types "^15.8.1" -"@mui/types@^7.4.6", "@mui/types@^7.4.9": - version "7.4.9" - resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.4.9.tgz#99accc87920b4c8c4ce33c5076a58f7f81b528fa" - integrity sha512-dNO8Z9T2cujkSIaCnWwprfeKmTWh97cnjkgmpFJ2sbfXLx8SMZijCYHOtP/y5nnUb/Rm2omxbDMmtUoSaUtKaw== +"@mui/types@^7.4.10", "@mui/types@^7.4.6": + version "7.4.10" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.4.10.tgz#c80ed5850a1da7802a01c1d0153d8603ce41be10" + integrity sha512-0+4mSjknSu218GW3isRqoxKRTOrTLd/vHi/7UC4+wZcUrOAqD9kRk7UQRL1mcrzqRoe7s3UT6rsRpbLkW5mHpQ== dependencies: "@babel/runtime" "^7.28.4" -"@mui/utils@^7.3.2", "@mui/utils@^7.3.5", "@mui/utils@^7.3.6": - version "7.3.6" - resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-7.3.6.tgz#508fbe864832f99b215d134eb89e1198cdc66b34" - integrity sha512-jn+Ba02O6PiFs7nKva8R2aJJ9kJC+3kQ2R0BbKNY3KQQ36Qng98GnPRFTlbwYTdMD6hLEBKaMLUktyg/rTfd2w== +"@mui/utils@^7.3.2", "@mui/utils@^7.3.5", "@mui/utils@^7.3.6", "@mui/utils@^7.3.7": + version "7.3.7" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-7.3.7.tgz#71443559a7fbd993b5b90fcb843fa26a60046f99" + integrity sha512-+YjnjMRnyeTkWnspzoxRdiSOgkrcpTikhNPoxOZW0APXx+urHtUoXJ9lbtCZRCA5a4dg5gSbd19alL1DvRs5fg== dependencies: "@babel/runtime" "^7.28.4" - "@mui/types" "^7.4.9" + "@mui/types" "^7.4.10" "@types/prop-types" "^15.7.15" clsx "^2.1.1" prop-types "^15.8.1" - react-is "^19.2.0" + react-is "^19.2.3" "@mui/x-date-pickers@^8.11.1": version "8.22.0" @@ -3406,7 +3427,7 @@ csso@^5.0.5: dependencies: css-tree "~2.2.0" -csstype@^3.0.2, csstype@^3.1.3, csstype@^3.2.2: +csstype@^3.0.2, csstype@^3.1.3, csstype@^3.2.2, csstype@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a" integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ== @@ -6680,7 +6701,7 @@ react-is@^17.0.2: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-is@^19.1.1, react-is@^19.2.0: +react-is@^19.2.3: version "19.2.3" resolved "https://registry.yarnpkg.com/react-is/-/react-is-19.2.3.tgz#eec2feb69c7fb31f77d0b5c08c10ae1c88886b29" integrity sha512-qJNJfu81ByyabuG7hPFEbXqNcWSU3+eVus+KJs+0ncpGfMyYdvSmxiJxbWR65lYi1I+/0HBcliO029gc4F+PnA== From 91d8fbb73b622b0568ef75d0b77b013db97cdbe1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Jan 2026 17:29:42 +0000 Subject: [PATCH 03/46] Bump next from 15.5.9 to 16.1.2 Bumps [next](https://github.com/vercel/next.js) from 15.5.9 to 16.1.2. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v15.5.9...v16.1.2) --- updated-dependencies: - dependency-name: next dependency-version: 16.1.2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 125 ++++++++++++++++++++++++++------------------------- 2 files changed, 64 insertions(+), 63 deletions(-) diff --git a/package.json b/package.json index 75f5b6ef3148..c1cb73a698e4 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "material-react-table": "^3.0.1", "monaco-editor": "^0.53.0", "mui-tiptap": "^1.14.0", - "next": "^15.2.2", + "next": "^16.1.2", "nprogress": "0.2.0", "numeral": "2.0.6", "prop-types": "15.8.1", diff --git a/yarn.lock b/yarn.lock index 5e07ec26f491..632be2ec1e60 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1472,10 +1472,10 @@ "@emnapi/runtime" "^1.4.3" "@tybys/wasm-util" "^0.10.0" -"@next/env@15.5.9": - version "15.5.9" - resolved "https://registry.yarnpkg.com/@next/env/-/env-15.5.9.tgz#53c2c34dc17cd87b61f70c6cc211e303123b2ab8" - integrity sha512-4GlTZ+EJM7WaW2HEZcyU317tIQDjkQIyENDLxYJfSWlfqguN+dHkZgyQTV/7ykvobU7yEH5gKvreNrH4B6QgIg== +"@next/env@16.1.2": + version "16.1.2" + resolved "https://registry.yarnpkg.com/@next/env/-/env-16.1.2.tgz#449128f465309fee4999cb9cc346a0bf33de6aad" + integrity sha512-r6TpLovDTvWtzw11UubUQxEK6IduT8rSAHbGX68yeFpA/1Oq9R4ovi5nqMUMgPN0jr2SpfeyFRbTZg3Inuuv3g== "@next/eslint-plugin-next@15.5.2": version "15.5.2" @@ -1484,45 +1484,45 @@ dependencies: fast-glob "3.3.1" -"@next/swc-darwin-arm64@15.5.7": - version "15.5.7" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.7.tgz#f0c9ccfec2cd87cbd4b241ce4c779a7017aed958" - integrity sha512-IZwtxCEpI91HVU/rAUOOobWSZv4P2DeTtNaCdHqLcTJU4wdNXgAySvKa/qJCgR5m6KI8UsKDXtO2B31jcaw1Yw== - -"@next/swc-darwin-x64@15.5.7": - version "15.5.7" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.7.tgz#18009e9fcffc5c0687cc9db24182ddeac56280d9" - integrity sha512-UP6CaDBcqaCBuiq/gfCEJw7sPEoX1aIjZHnBWN9v9qYHQdMKvCKcAVs4OX1vIjeE+tC5EIuwDTVIoXpUes29lg== - -"@next/swc-linux-arm64-gnu@15.5.7": - version "15.5.7" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.7.tgz#fe7c7e08264cf522d4e524299f6d3e63d68d579a" - integrity sha512-NCslw3GrNIw7OgmRBxHtdWFQYhexoUCq+0oS2ccjyYLtcn1SzGzeM54jpTFonIMUjNbHmpKpziXnpxhSWLcmBA== - -"@next/swc-linux-arm64-musl@15.5.7": - version "15.5.7" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.7.tgz#94228fe293475ec34a5a54284e1056876f43a3cf" - integrity sha512-nfymt+SE5cvtTrG9u1wdoxBr9bVB7mtKTcj0ltRn6gkP/2Nu1zM5ei8rwP9qKQP0Y//umK+TtkKgNtfboBxRrw== - -"@next/swc-linux-x64-gnu@15.5.7": - version "15.5.7" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.7.tgz#078c71201dfe7fcfb8fa6dc92aae6c94bc011cdc" - integrity sha512-hvXcZvCaaEbCZcVzcY7E1uXN9xWZfFvkNHwbe/n4OkRhFWrs1J1QV+4U1BN06tXLdaS4DazEGXwgqnu/VMcmqw== - -"@next/swc-linux-x64-musl@15.5.7": - version "15.5.7" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.7.tgz#72947f5357f9226292353e0bb775643da3c7a182" - integrity sha512-4IUO539b8FmF0odY6/SqANJdgwn1xs1GkPO5doZugwZ3ETF6JUdckk7RGmsfSf7ws8Qb2YB5It33mvNL/0acqA== - -"@next/swc-win32-arm64-msvc@15.5.7": - version "15.5.7" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.7.tgz#397b912cd51c6a80e32b9c0507ecd82514353941" - integrity sha512-CpJVTkYI3ZajQkC5vajM7/ApKJUOlm6uP4BknM3XKvJ7VXAvCqSjSLmM0LKdYzn6nBJVSjdclx8nYJSa3xlTgQ== - -"@next/swc-win32-x64-msvc@15.5.7": - version "15.5.7" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.7.tgz#e02b543d9dc6c1631d4ac239cb1177245dfedfe4" - integrity sha512-gMzgBX164I6DN+9/PGA+9dQiwmTkE4TloBNx8Kv9UiGARsr9Nba7IpcBRA1iTV9vwlYnrE3Uy6I7Aj6qLjQuqw== +"@next/swc-darwin-arm64@16.1.2": + version "16.1.2" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.2.tgz#74f81d4d4d1d6d0b7cda28fdf86c60c0a9ffa00d" + integrity sha512-0N2baysDpTXASTVxTV+DkBnD97bo9PatUj8sHlKA+oR9CyvReaPQchQyhCbH0Jm0mC/Oka5F52intN+lNOhSlA== + +"@next/swc-darwin-x64@16.1.2": + version "16.1.2" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.2.tgz#4ab440f5dbce4147e0044d2439a4cbf5264044e0" + integrity sha512-Q0wnSK0lmeC9ps+/w/bDsMSF3iWS45WEwF1bg8dvMH3CmKB2BV4346tVrjWxAkrZq20Ro6Of3R19IgrEJkXKyw== + +"@next/swc-linux-arm64-gnu@16.1.2": + version "16.1.2" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.2.tgz#62007c34504caa6d65d5174df6d575bd406a40a5" + integrity sha512-4twW+h7ZatGKWq+2pUQ9SDiin6kfZE/mY+D8jOhSZ0NDzKhQfAPReXqwTDWVrNjvLzHzOcDL5kYjADHfXL/b/Q== + +"@next/swc-linux-arm64-musl@16.1.2": + version "16.1.2" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.2.tgz#7dc9db5aa7d4dc705fc5831a0bf2210bd5dc8175" + integrity sha512-Sn6LxPIZcADe5AnqqMCfwBv6vRtDikhtrjwhu+19WM6jHZe31JDRcGuPZAlJrDk6aEbNBPUUAKmySJELkBOesg== + +"@next/swc-linux-x64-gnu@16.1.2": + version "16.1.2" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.1.2.tgz#588913369dac3191bb2833bd1739acc1d5c2f642" + integrity sha512-nwzesEQBfQIOOnQ7JArzB08w9qwvBQ7nC1i8gb0tiEFH94apzQM3IRpY19MlE8RBHxc9ArG26t1DEg2aaLaqVQ== + +"@next/swc-linux-x64-musl@16.1.2": + version "16.1.2" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.1.2.tgz#61c1466fe6e7a9176942ef9d276e9b5838d51c5f" + integrity sha512-s60bLf16BDoICQHeKEm0lDgUNMsL1UpQCkRNZk08ZNnRpK0QUV+6TvVHuBcIA7oItzU0m7kVmXe8QjXngYxJVA== + +"@next/swc-win32-arm64-msvc@16.1.2": + version "16.1.2" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.2.tgz#6854380d1c8456c955b5352c18ddf44e2373345d" + integrity sha512-Sq8k4SZd8Y8EokKdz304TvMO9HoiwGzo0CTacaiN1bBtbJSQ1BIwKzNFeFdxOe93SHn1YGnKXG6Mq3N+tVooyQ== + +"@next/swc-win32-x64-msvc@16.1.2": + version "16.1.2" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.1.2.tgz#5b884d3b722ccd751b1482b575daa74ce5434dd0" + integrity sha512-KQDBwspSaNX5/wwt6p7ed5oINJWIxcgpuqJdDNubAyq7dD+ZM76NuEjg8yUxNOl5R4NNgbMfqE/RyNrsbYmOKg== "@nivo/colors@0.99.0": version "0.99.0" @@ -3040,10 +3040,10 @@ base64-js@^1.1.2, base64-js@^1.3.0: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -baseline-browser-mapping@^2.9.0: - version "2.9.8" - resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.8.tgz#04fb5c10ff9c7a1b04ac08cfdfc3b10942a8ac72" - integrity sha512-Y1fOuNDowLfgKOypdc9SPABfoWXuZHBOyCS4cD52IeZBhr4Md6CLLs6atcxVrzRmQ06E7hSlm5bHHApPKR/byA== +baseline-browser-mapping@^2.8.3, baseline-browser-mapping@^2.9.0: + version "2.9.15" + resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.15.tgz#6baaa0069883f50a99cdb31b56646491f47c05d7" + integrity sha512-kX8h7K2srmDyYnXRIppo4AH/wYgzWVCs+eKr3RusRSQ5PvRYoEFmR/I0PbdTjKFAoKqp5+kbxnNTFO9jOfSVJg== bidi-js@^1.0.2: version "1.0.3" @@ -5986,26 +5986,27 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== -next@^15.2.2: - version "15.5.9" - resolved "https://registry.yarnpkg.com/next/-/next-15.5.9.tgz#1b80d05865cc27e710fb4dcfc6fd9e726ed12ad4" - integrity sha512-agNLK89seZEtC5zUHwtut0+tNrc0Xw4FT/Dg+B/VLEo9pAcS9rtTKpek3V6kVcVwsB2YlqMaHdfZL4eLEVYuCg== +next@^16.1.2: + version "16.1.2" + resolved "https://registry.yarnpkg.com/next/-/next-16.1.2.tgz#7b12fdc499448a809c3e6fe42ac3cbbcf543982d" + integrity sha512-SVSWX7wjUUDrIDVqhl4xm/jiOrvYGMG7NzVE/dGzzgs7r3dFGm4V19ia0xn3GDNtHCKM7C9h+5BoimnJBhmt9A== dependencies: - "@next/env" "15.5.9" + "@next/env" "16.1.2" "@swc/helpers" "0.5.15" + baseline-browser-mapping "^2.8.3" caniuse-lite "^1.0.30001579" postcss "8.4.31" styled-jsx "5.1.6" optionalDependencies: - "@next/swc-darwin-arm64" "15.5.7" - "@next/swc-darwin-x64" "15.5.7" - "@next/swc-linux-arm64-gnu" "15.5.7" - "@next/swc-linux-arm64-musl" "15.5.7" - "@next/swc-linux-x64-gnu" "15.5.7" - "@next/swc-linux-x64-musl" "15.5.7" - "@next/swc-win32-arm64-msvc" "15.5.7" - "@next/swc-win32-x64-msvc" "15.5.7" - sharp "^0.34.3" + "@next/swc-darwin-arm64" "16.1.2" + "@next/swc-darwin-x64" "16.1.2" + "@next/swc-linux-arm64-gnu" "16.1.2" + "@next/swc-linux-arm64-musl" "16.1.2" + "@next/swc-linux-x64-gnu" "16.1.2" + "@next/swc-linux-x64-musl" "16.1.2" + "@next/swc-win32-arm64-msvc" "16.1.2" + "@next/swc-win32-x64-msvc" "16.1.2" + sharp "^0.34.4" no-case@^3.0.4: version "3.0.4" @@ -7200,7 +7201,7 @@ set-proto@^1.0.0: es-errors "^1.3.0" es-object-atoms "^1.0.0" -sharp@^0.34.3: +sharp@^0.34.4: version "0.34.5" resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.34.5.tgz#b6f148e4b8c61f1797bde11a9d1cfebbae2c57b0" integrity sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg== From 60d3cc19c35b6c4be42def65063ba1c5fac14d25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Jan 2026 17:29:55 +0000 Subject: [PATCH 04/46] Bump react from 19.1.1 to 19.2.3 Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 19.1.1 to 19.2.3. - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/v19.2.3/packages/react) --- updated-dependencies: - dependency-name: react dependency-version: 19.2.3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 75f5b6ef3148..9a6df837382e 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "numeral": "2.0.6", "prop-types": "15.8.1", "punycode": "^2.3.1", - "react": "19.1.1", + "react": "19.2.3", "react-apexcharts": "1.7.0", "react-beautiful-dnd": "13.1.1", "react-copy-to-clipboard": "^5.1.0", diff --git a/yarn.lock b/yarn.lock index 5e07ec26f491..6c76ef2e2fc4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6815,10 +6815,10 @@ react-window@^2.1.0: resolved "https://registry.yarnpkg.com/react-window/-/react-window-2.2.3.tgz#f8ffdddbb612ccd3e1314b59fce79af85d3f15e3" integrity sha512-gTRqQYC8ojbiXyd9duYFiSn2TJw0ROXCgYjenOvNKITWzK0m0eCvkUsEUM08xvydkMh7ncp+LE0uS3DeNGZxnQ== -react@19.1.1: - version "19.1.1" - resolved "https://registry.yarnpkg.com/react/-/react-19.1.1.tgz#06d9149ec5e083a67f9a1e39ce97b06a03b644af" - integrity sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ== +react@19.2.3: + version "19.2.3" + resolved "https://registry.yarnpkg.com/react/-/react-19.2.3.tgz#d83e5e8e7a258cf6b4fe28640515f99b87cd19b8" + integrity sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA== readable-stream@^2.0.2: version "2.3.8" From 5cf55c339877539d0bd08d50669c6094f06f1b31 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Jan 2026 17:30:02 +0000 Subject: [PATCH 05/46] Bump react-error-boundary from 6.0.0 to 6.1.0 Bumps [react-error-boundary](https://github.com/bvaughn/react-error-boundary) from 6.0.0 to 6.1.0. - [Release notes](https://github.com/bvaughn/react-error-boundary/releases) - [Commits](https://github.com/bvaughn/react-error-boundary/compare/6.0.0...6.1.0) --- updated-dependencies: - dependency-name: react-error-boundary dependency-version: 6.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 75f5b6ef3148..6ef2ff9df003 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "react-copy-to-clipboard": "^5.1.0", "react-dom": "19.1.1", "react-dropzone": "14.3.8", - "react-error-boundary": "^6.0.0", + "react-error-boundary": "^6.1.0", "react-grid-layout": "^1.5.0", "react-hook-form": "^7.53.0", "react-hot-toast": "2.6.0", diff --git a/yarn.lock b/yarn.lock index 5e07ec26f491..f8d691c923aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6618,12 +6618,10 @@ react-dropzone@14.3.8: file-selector "^2.1.0" prop-types "^15.8.1" -react-error-boundary@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-6.0.0.tgz#a9e552146958fa77d873b587aa6a5e97544ee954" - integrity sha512-gdlJjD7NWr0IfkPlaREN2d9uUZUlksrfOx7SX62VRerwXbMY6ftGCIZua1VG1aXFNOimhISsTq+Owp725b9SiA== - dependencies: - "@babel/runtime" "^7.12.5" +react-error-boundary@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-6.1.0.tgz#d2965de0723d65d60d20aef2e120bd2c171ae4d7" + integrity sha512-02k9WQ/mUhdbXir0tC1NiMesGzRPaCsJEWU/4bcFrbY1YMZOtHShtZP6zw0SJrBWA/31H0KT9/FgdL8+sPKgHA== react-fast-compare@^2.0.1: version "2.0.4" From 32c7cdfe2cfce4a5230378bb31c10c972ac37c77 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Wed, 21 Jan 2026 10:53:25 -0500 Subject: [PATCH 06/46] Update index.js --- src/pages/email/reports/calendar-permissions/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/email/reports/calendar-permissions/index.js b/src/pages/email/reports/calendar-permissions/index.js index d945e29b8c10..c910f6a55955 100644 --- a/src/pages/email/reports/calendar-permissions/index.js +++ b/src/pages/email/reports/calendar-permissions/index.js @@ -104,7 +104,7 @@ const Page = () => { confirmText: `Run calendar permissions cache sync for ${currentTenant}? This will update mailbox and calendar permission data immediately.`, relatedQueryKeys: ["calendar-permissions"], data: { - Name: "Calendars", + Name: "Mailboxes", }, }} /> From 8366ae5f91739b2248d94622dcf2509ebd819638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 21 Jan 2026 22:45:20 +0100 Subject: [PATCH 07/46] feat: removal of ips and countries in named locations now have dropdowns with the entries in them --- .../CippComponents/CippApiDialog.jsx | 1 + .../CippComponents/CippFormComponent.jsx | 9 ++++- .../conditional/list-named-locations/index.js | 35 +++++++++++++++---- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/src/components/CippComponents/CippApiDialog.jsx b/src/components/CippComponents/CippApiDialog.jsx index 39f590570dd0..3748e4005376 100644 --- a/src/components/CippComponents/CippApiDialog.jsx +++ b/src/components/CippComponents/CippApiDialog.jsx @@ -364,6 +364,7 @@ export const CippApiDialog = (props) => { formControl={formHook} addedFieldData={addedFieldData} setAddedFieldData={setAddedFieldData} + row={row} {...fieldProps} /> diff --git a/src/components/CippComponents/CippFormComponent.jsx b/src/components/CippComponents/CippFormComponent.jsx index 5e76c4152ad1..bf525b89975f 100644 --- a/src/components/CippComponents/CippFormComponent.jsx +++ b/src/components/CippComponents/CippFormComponent.jsx @@ -56,6 +56,7 @@ export const CippFormComponent = (props) => { helperText, disableVariables = false, includeSystemVariables = false, + row, ...other } = props; const { errors } = useFormState({ control: formControl.control }); @@ -408,7 +409,11 @@ export const CippFormComponent = (props) => { ); - case "autoComplete": + case "autoComplete": { + // Resolve options if it's a function + const resolvedOptions = + typeof other.options === "function" ? other.options(row) : other.options; + return (
{ render={({ field }) => ( { )}
); + } case "richText": { const editorInstanceRef = React.useRef(null); diff --git a/src/pages/tenant/conditional/list-named-locations/index.js b/src/pages/tenant/conditional/list-named-locations/index.js index 8b19e50281cc..b02d1d6ef747 100644 --- a/src/pages/tenant/conditional/list-named-locations/index.js +++ b/src/pages/tenant/conditional/list-named-locations/index.js @@ -91,13 +91,20 @@ const Page = () => { type: "autoComplete", name: "input", label: "Country", - options: countryList.map(({ Code, Name }) => ({ - value: Code, - label: `${Name} (${Code})`, - })), + multiple: true, + options: (row) => { + const currentCountries = row?.countriesAndRegions || []; + return currentCountries.map((code) => { + const country = countryList.find((c) => c.Code === code); + return { + value: code, + label: country ? `${country.Name} (${code})` : code, + }; + }); + }, }, ], - confirmText: "Select a country to remove from this named location.", + confirmText: "Select countries to remove from this named location.", condition: (row) => row["@odata.type"] == "#microsoft.graph.countryNamedLocation", }, { @@ -122,8 +129,22 @@ const Page = () => { namedLocationId: "id", change: "!removeIp", }, - fields: [{ type: "textField", name: "input", label: "IP" }], - confirmText: "Enter an IP in CIDR format, e.g., 1.1.1.1/32.", + fields: [ + { + type: "autoComplete", + name: "input", + label: "IP", + multiple: true, + options: (row) => { + const ipRanges = row?.ipRanges || []; + return ipRanges.map((ip) => ({ + value: ip.cidrAddress, + label: ip.cidrAddress, + })); + }, + }, + ], + confirmText: "Select IPs to remove from this named location.", condition: (row) => row["@odata.type"] == "#microsoft.graph.ipNamedLocation", }, { From da9766d4974327ff3ff2366d7d83f62c3e144285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 21 Jan 2026 23:22:56 +0100 Subject: [PATCH 08/46] feat(named-locations): update conditions for removal actions - Ensure removal actions are only available when multiple entries exist. --- .../tenant/conditional/list-named-locations/index.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/tenant/conditional/list-named-locations/index.js b/src/pages/tenant/conditional/list-named-locations/index.js index b02d1d6ef747..bab50d74013a 100644 --- a/src/pages/tenant/conditional/list-named-locations/index.js +++ b/src/pages/tenant/conditional/list-named-locations/index.js @@ -105,7 +105,9 @@ const Page = () => { }, ], confirmText: "Select countries to remove from this named location.", - condition: (row) => row["@odata.type"] == "#microsoft.graph.countryNamedLocation", + condition: (row) => + row["@odata.type"] == "#microsoft.graph.countryNamedLocation" && + (row.countriesAndRegions?.length || 0) > 1, }, { label: "Add IP to named location", @@ -145,7 +147,9 @@ const Page = () => { }, ], confirmText: "Select IPs to remove from this named location.", - condition: (row) => row["@odata.type"] == "#microsoft.graph.ipNamedLocation", + condition: (row) => + row["@odata.type"] == "#microsoft.graph.ipNamedLocation" && + (row.ipRanges?.length || 0) > 1, }, { label: "Delete named location", From 4df236eb7075870fca41d9f98d3f4e180ba24fcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 21 Jan 2026 23:25:32 +0100 Subject: [PATCH 09/46] feat(named-locations): add IP validation for CIDR format --- .../conditional/list-named-locations/index.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/pages/tenant/conditional/list-named-locations/index.js b/src/pages/tenant/conditional/list-named-locations/index.js index bab50d74013a..9052b2c18800 100644 --- a/src/pages/tenant/conditional/list-named-locations/index.js +++ b/src/pages/tenant/conditional/list-named-locations/index.js @@ -118,7 +118,21 @@ const Page = () => { namedLocationId: "id", change: "!addIp", }, - fields: [{ type: "textField", name: "input", label: "IP" }], + fields: [ + { + type: "textField", + name: "input", + label: "IP", + validators: { + required: { value: true, message: "IP address is required" }, + pattern: { + value: + /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/(?:3[0-2]|[12]?[0-9])$/, + message: "Invalid CIDR format. Use format: x.x.x.x/xx (e.g., 1.1.1.1/32)", + }, + }, + }, + ], confirmText: "Enter an IP in CIDR format, e.g., 1.1.1.1/32.", condition: (row) => row["@odata.type"] == "#microsoft.graph.ipNamedLocation", }, From 35365fd1d54c702a932581e827a7112ae16f66d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 21 Jan 2026 23:27:39 +0100 Subject: [PATCH 10/46] feat: Update country options to exclude already selected countries. --- .../conditional/list-named-locations/index.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/pages/tenant/conditional/list-named-locations/index.js b/src/pages/tenant/conditional/list-named-locations/index.js index 9052b2c18800..fd0201ec485b 100644 --- a/src/pages/tenant/conditional/list-named-locations/index.js +++ b/src/pages/tenant/conditional/list-named-locations/index.js @@ -68,10 +68,15 @@ const Page = () => { type: "autoComplete", name: "input", label: "Country", - options: countryList.map(({ Code, Name }) => ({ - value: Code, - label: `${Name} (${Code})`, - })), + options: (row) => { + const existingCountries = row?.countriesAndRegions || []; + return countryList + .filter(({ Code }) => !existingCountries.includes(Code)) + .map(({ Code, Name }) => ({ + value: Code, + label: `${Name} (${Code})`, + })); + }, }, ], confirmText: "Select a country to add to this named location.", From 56e7ec1a98427bee857fbb1b4ce030d38adfb003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 21 Jan 2026 23:51:53 +0100 Subject: [PATCH 11/46] feat(validators): enhance validation for country and IP inputs --- .../CippComponents/CippFormComponent.jsx | 13 +++- .../conditional/list-named-locations/index.js | 60 +++++++++++++++++-- 2 files changed, 67 insertions(+), 6 deletions(-) diff --git a/src/components/CippComponents/CippFormComponent.jsx b/src/components/CippComponents/CippFormComponent.jsx index bf525b89975f..0ab4bbfc2164 100644 --- a/src/components/CippComponents/CippFormComponent.jsx +++ b/src/components/CippComponents/CippFormComponent.jsx @@ -414,12 +414,23 @@ export const CippFormComponent = (props) => { const resolvedOptions = typeof other.options === "function" ? other.options(row) : other.options; + // Wrap validate function to pass row as third parameter + const resolvedValidators = validators + ? { + ...validators, + validate: + typeof validators.validate === "function" + ? (value, formValues) => validators.validate(value, formValues, row) + : validators.validate, + } + : validators; + return (
( { type: "autoComplete", name: "input", label: "Country", + validators: { + required: { value: true, message: "Please select a country" }, + }, options: (row) => { const existingCountries = row?.countriesAndRegions || []; return countryList @@ -97,6 +100,17 @@ const Page = () => { name: "input", label: "Country", multiple: true, + validators: { + required: { value: true, message: "Please select at least one country" }, + validate: (value, formValues, row) => { + const totalCountries = row?.countriesAndRegions?.length || 0; + const selectedCount = Array.isArray(value) ? value.length : value ? 1 : 0; + if (selectedCount >= totalCountries) { + return "You must leave at least one country in the named location"; + } + return true; + }, + }, options: (row) => { const currentCountries = row?.countriesAndRegions || []; return currentCountries.map((code) => { @@ -130,15 +144,40 @@ const Page = () => { label: "IP", validators: { required: { value: true, message: "IP address is required" }, - pattern: { - value: - /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/(?:3[0-2]|[12]?[0-9])$/, - message: "Invalid CIDR format. Use format: x.x.x.x/xx (e.g., 1.1.1.1/32)", + validate: (value) => { + if (!value) return true; + // IPv4 CIDR pattern + const ipv4Cidr = + /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/(\d{1,3})$/; + // IPv6 CIDR pattern (simplified - covers most common formats) + const ipv6Cidr = + /^(?:(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,7}:|(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,5}(?::[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){1,4}(?::[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){1,3}(?::[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){1,2}(?::[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:(?::[0-9a-fA-F]{1,4}){1,6}|:(?::[0-9a-fA-F]{1,4}){1,7}|::)\/(\d{1,3})$/; + + const ipv4Match = value.match(ipv4Cidr); + const ipv6Match = value.match(ipv6Cidr); + + if (ipv4Match) { + const prefix = parseInt(ipv4Match[1], 10); + if (prefix < 9 || prefix > 32) { + return "CIDR prefix must be between /9 and /32 for IPv4"; + } + return true; + } + + if (ipv6Match) { + const prefix = parseInt(ipv6Match[1], 10); + if (prefix < 9 || prefix > 128) { + return "CIDR prefix must be between /9 and /128 for IPv6"; + } + return true; + } + + return "Invalid CIDR format. Use IPv4 (e.g., 1.1.1.1/32) or IPv6 (e.g., 2001:db8::/32)"; }, }, }, ], - confirmText: "Enter an IP in CIDR format, e.g., 1.1.1.1/32.", + confirmText: "Enter an IP in CIDR format, e.g., 1.1.1.1/32 or 2001:db8::/32.", condition: (row) => row["@odata.type"] == "#microsoft.graph.ipNamedLocation", }, { @@ -156,6 +195,17 @@ const Page = () => { name: "input", label: "IP", multiple: true, + validators: { + required: { value: true, message: "Please select at least one IP" }, + validate: (value, formValues, row) => { + const totalIps = row?.ipRanges?.length || 0; + const selectedCount = Array.isArray(value) ? value.length : value ? 1 : 0; + if (selectedCount >= totalIps) { + return "You must leave at least one IP in the named location"; + } + return true; + }, + }, options: (row) => { const ipRanges = row?.ipRanges || []; return ipRanges.map((ip) => ({ From 3f6dfd7732e0278b3aa57ca4ba4ea6b47dca4f21 Mon Sep 17 00:00:00 2001 From: Zacgoose <107489668+Zacgoose@users.noreply.github.com> Date: Fri, 23 Jan 2026 14:46:55 +0800 Subject: [PATCH 12/46] Ensure dashboard cards fill container height Added explicit height styling to AuthMethodCard, LicenseCard, MFACard, and SecureScoreCard components and wrapped them in fixed-height Box containers in the dashboard layout. This improves visual consistency and ensures cards fill their parent containers. Also refactored SecureScoreCard chart rendering for better axis and tooltip formatting. --- .../CippComponents/AuthMethodCard.jsx | 3 +- src/components/CippComponents/LicenseCard.jsx | 2 +- src/components/CippComponents/MFACard.jsx | 3 +- .../CippComponents/SecureScoreCard.jsx | 98 ++++++++++++------- src/pages/dashboardv2/index.js | 35 +++++-- 5 files changed, 93 insertions(+), 48 deletions(-) diff --git a/src/components/CippComponents/AuthMethodCard.jsx b/src/components/CippComponents/AuthMethodCard.jsx index 5fde4e6b48fd..1411c4831709 100644 --- a/src/components/CippComponents/AuthMethodCard.jsx +++ b/src/components/CippComponents/AuthMethodCard.jsx @@ -111,7 +111,7 @@ export const AuthMethodCard = ({ data, isLoading }) => { const processedData = processData(); return ( - + @@ -134,6 +134,7 @@ export const AuthMethodCard = ({ data, isLoading }) => { alignItems: "center", justifyContent: "center", height: "100%", + width: "100%", }} > diff --git a/src/components/CippComponents/LicenseCard.jsx b/src/components/CippComponents/LicenseCard.jsx index d6762196bc9b..dce02b1e12f6 100644 --- a/src/components/CippComponents/LicenseCard.jsx +++ b/src/components/CippComponents/LicenseCard.jsx @@ -90,7 +90,7 @@ export const LicenseCard = ({ data, isLoading }) => { const stats = calculateStats(); return ( - + diff --git a/src/components/CippComponents/MFACard.jsx b/src/components/CippComponents/MFACard.jsx index 3b2468415958..81640a447535 100644 --- a/src/components/CippComponents/MFACard.jsx +++ b/src/components/CippComponents/MFACard.jsx @@ -107,7 +107,7 @@ export const MFACard = ({ data, isLoading }) => { const processedData = processData(); return ( - + @@ -130,6 +130,7 @@ export const MFACard = ({ data, isLoading }) => { alignItems: "center", justifyContent: "center", height: "100%", + width: "100%", }} > diff --git a/src/components/CippComponents/SecureScoreCard.jsx b/src/components/CippComponents/SecureScoreCard.jsx index da849c069b3c..a26a3c466d20 100644 --- a/src/components/CippComponents/SecureScoreCard.jsx +++ b/src/components/CippComponents/SecureScoreCard.jsx @@ -12,7 +12,7 @@ import { export const SecureScoreCard = ({ data, isLoading }) => { return ( - + @@ -58,43 +58,65 @@ export const SecureScoreCard = ({ data, isLoading }) => { <> - new Date(a.createdDateTime) - new Date(b.createdDateTime)) - .map((score) => ({ - date: new Date(score.createdDateTime).toLocaleDateString("en-US", { - month: "short", - day: "numeric", - }), - score: score.currentScore, - percentage: Math.round((score.currentScore / score.maxScore) * 100), - }))} - margin={{ left: 12, right: 12, top: 10, bottom: 10 }} - > - - - - { - if (name === "score") return [value.toFixed(2), "Score"]; - if (name === "percentage") return [value + "%", "Percentage"]; - return value; - }} - /> - - + {(() => { + const sortedData = [...data].sort((a, b) => new Date(a.createdDateTime) - new Date(b.createdDateTime)); + const chartData = sortedData.map((score) => ({ + date: new Date(score.createdDateTime).toLocaleDateString("en-US", { + month: "short", + day: "numeric", + }), + score: score.currentScore, + percentage: Math.round((score.currentScore / score.maxScore) * 100), + })); + const ticks = chartData.map((d) => d.date); + return ( + + + + Math.round(value)} + /> + { + if (name === "score") return [value.toFixed(2), "Score"]; + if (name === "percentage") return [value + "%", "Percentage"]; + return value; + }} + /> + + + ); + })()} diff --git a/src/pages/dashboardv2/index.js b/src/pages/dashboardv2/index.js index 5f236257b5c4..96ad594f55e0 100644 --- a/src/pages/dashboardv2/index.js +++ b/src/pages/dashboardv2/index.js @@ -337,19 +337,40 @@ const Page = () => { {/* Left Column */} - - + + + + + + {/* Right Column */} - - + + + + + + From d9f7a9abd2d528767d996610524b891d91b11cd2 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Fri, 23 Jan 2026 11:02:18 +0100 Subject: [PATCH 13/46] Turbopack! --- next.config.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/next.config.js b/next.config.js index 7a97a124b4bb..416f3f22d1df 100644 --- a/next.config.js +++ b/next.config.js @@ -4,12 +4,13 @@ const config = { images: { unoptimized: true, }, - webpack(config) { - config.module.rules.push({ - test: /\.svg$/, - use: ["@svgr/webpack"], - }); - return config; + turbopack: { + rules: { + "*.svg": { + loaders: ["@svgr/webpack"], + as: "*.js", + }, + }, }, async redirects() { return []; From 1f327c06289c1ae5d291d06abf0726afc4321eaa Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Fri, 23 Jan 2026 12:45:26 +0100 Subject: [PATCH 14/46] Migrate import paths --- src/components/CippCards/CippDomainCards.jsx | 6 ++-- .../CippCards/CippExchangeInfoCard.jsx | 4 +-- src/components/CippCards/CippUserInfoCard.jsx | 4 +-- .../CippComponents/BPASyncDialog.jsx | 2 +- .../CippComponents/BreachSearchDialog.jsx | 2 +- .../CippAddEditTenantGroups.jsx | 2 +- .../CippAddVacationModeDrawer.jsx | 2 +- .../CippAppPermissionBuilder.jsx | 2 +- .../CippApplicationDeployDrawer.jsx | 2 +- .../CippComponents/CippAuditLogDetails.jsx | 10 +++--- .../CippAuditLogSearchDrawer.jsx | 2 +- .../CippAutopilotProfileDrawer.jsx | 2 +- .../CippComponents/CippBreadcrumbNav.jsx | 2 +- .../CippComponents/CippBulkUserDrawer.jsx | 2 +- .../CippComponents/CippCentralSearch.jsx | 6 ++-- .../CippComponents/CippCustomVariables.jsx | 8 ++--- .../CippComponents/CippExchangeActions.jsx | 2 +- .../CippComponents/CippFormTenantSelector.jsx | 2 +- .../CippComponents/CippForwardingSection.jsx | 2 +- .../CippComponents/CippGeoLocation.jsx | 2 +- src/components/CippComponents/CippMap.jsx | 11 ++++-- .../CippComponents/CippMessageViewer.jsx | 4 +-- .../CippPermissionSetDrawer.jsx | 2 +- src/components/CippComponents/CippSankey.jsx | 2 +- .../CippComponents/CippTemplateEditor.jsx | 10 +++--- .../CippTemplateFieldRenderer.jsx | 6 ++-- .../CippTextFieldWithVariables.jsx | 2 +- .../CippTransportRuleDrawer.jsx | 4 +-- .../CippComponents/CippUserActions.jsx | 2 +- .../CippVariableAutocomplete.jsx | 6 ++-- .../CippComponents/DomainAnalyserDialog.jsx | 2 +- .../CippComponents/ScheduledTaskDetails.jsx | 4 +-- .../CippAddAssignmentFilterForm.jsx | 2 +- .../CippAddAssignmentFilterTemplateForm.jsx | 2 +- .../CippFormPages/CippAddEditContact.jsx | 6 ++-- .../CippAddEditGdapRoleTemplate.jsx | 2 +- .../CippFormPages/CippAddEditUser.jsx | 12 +++---- .../CippFormPages/CippAddGroupForm.jsx | 4 +-- .../CippAddGroupTemplateForm.jsx | 4 +-- .../CippCustomDataMappingForm.jsx | 14 ++++---- .../CippExchangeSettingsForm.jsx | 2 +- .../CippFormPages/CippInviteGuest.jsx | 2 +- src/components/CippFormPages/CippJSONView.jsx | 2 +- .../CippSafeLinksPolicyRuleForm.jsx | 16 ++++----- .../CippFormPages/CippSchedulerForm.jsx | 14 ++++---- .../CippApiClientManagement.jsx | 2 +- .../CippIntegrationFieldMapping.jsx | 8 ++--- .../CippIntegrationSettings.jsx | 10 +++--- .../CippIntegrationTenantMapping.jsx | 4 +-- .../CippSettings/CippBackendCard.jsx | 4 +-- .../CippBackupRetentionSettings.jsx | 4 +-- .../CippSettings/CippBackupSettings.jsx | 6 ++-- .../CippSettings/CippBrandingSettings.jsx | 6 ++-- .../CippSettings/CippCacheSettings.jsx | 6 ++-- .../CippSettings/CippDnsSettings.jsx | 4 +-- .../CippSettings/CippGDAPResults.jsx | 4 +-- .../CippSettings/CippJitAdminSettings.jsx | 4 +-- .../CippSettings/CippPasswordSettings.jsx | 4 +-- .../CippSettings/CippPermissionCheck.jsx | 4 +-- .../CippSettings/CippPermissionResults.jsx | 4 +-- .../CippSettings/CippRoleAddEdit.jsx | 4 +-- .../CippSettings/CippVersionProperties.jsx | 4 +-- .../CippStandards/CippStandardAccordion.jsx | 8 ++--- .../CippStandards/CippStandardsSideBar.jsx | 6 ++-- .../CippTable/CIPPTableToptoolbar.js | 2 +- .../CippTable/CippGraphExplorerFilter.js | 4 +-- .../CippTestDetailOffCanvas.jsx | 2 +- .../CippWizard/CippWizardBulkOptions.jsx | 2 +- src/hooks/use-guid-resolver.js | 4 +-- src/hooks/use-permissions.js | 4 +-- src/hooks/use-securescore.js | 2 +- src/index.js | 2 +- src/layouts/HeaderedTabbedLayout.jsx | 2 +- src/layouts/index.js | 2 +- src/pages/cipp/advanced/diagnostics.js | 8 ++--- src/pages/cipp/advanced/exchange-cmdlets.js | 10 +++--- src/pages/cipp/advanced/table-maintenance.js | 6 ++-- src/pages/cipp/advanced/timers.js | 4 +-- .../custom-data/directory-extensions/add.js | 10 +++--- .../custom-data/directory-extensions/index.js | 6 ++-- src/pages/cipp/custom-data/mappings/add.js | 10 +++--- src/pages/cipp/custom-data/mappings/edit.js | 10 +++--- src/pages/cipp/custom-data/mappings/index.js | 6 ++-- .../cipp/custom-data/schema-extensions/add.js | 10 +++--- .../custom-data/schema-extensions/index.js | 6 ++-- src/pages/cipp/extension-sync/index.js | 4 +-- src/pages/cipp/integrations/configure.js | 12 +++---- src/pages/cipp/integrations/index.js | 10 +++--- src/pages/cipp/integrations/sync.js | 2 +- src/pages/cipp/logs/index.js | 4 +-- src/pages/cipp/logs/logentry.js | 10 +++--- src/pages/cipp/preferences.js | 4 +-- src/pages/cipp/scheduler/index.js | 4 +-- src/pages/cipp/scheduler/job.jsx | 4 +-- src/pages/cipp/scheduler/task.js | 2 +- src/pages/cipp/settings/backend.js | 10 +++--- src/pages/cipp/settings/backup.js | 2 +- src/pages/cipp/settings/index.js | 20 +++++------ src/pages/cipp/settings/licenses.js | 6 ++-- src/pages/cipp/settings/notifications.js | 6 ++-- src/pages/cipp/settings/partner-webhooks.js | 8 ++--- src/pages/cipp/settings/permissions.js | 6 ++-- src/pages/cipp/settings/tenants.js | 4 +-- src/pages/cipp/statistics/index.js | 2 +- src/pages/cipp/super-admin/cipp-roles/add.js | 6 ++-- src/pages/cipp/super-admin/cipp-roles/edit.js | 6 ++-- .../cipp/super-admin/cipp-roles/index.js | 8 ++--- .../cipp/super-admin/function-offloading.js | 10 +++--- .../cipp/super-admin/jit-admin-settings.js | 8 ++--- .../cipp/super-admin/sam-app-permissions.js | 8 ++--- src/pages/cipp/super-admin/sam-app-roles.js | 8 ++--- src/pages/cipp/super-admin/tenant-mode.js | 8 ++--- src/pages/cipp/super-admin/time-settings.js | 10 +++--- src/pages/dashboardv2/devices/index.js | 12 +++---- src/pages/dashboardv2/identity/index.js | 12 +++---- src/pages/dashboardv2/index.js | 36 +++++++++---------- .../administration/contacts-template/add.jsx | 6 ++-- .../administration/contacts-template/edit.jsx | 10 +++--- .../contacts-template/index.jsx | 6 ++-- .../email/administration/contacts/edit.jsx | 10 +++--- .../email/administration/contacts/index.js | 4 +-- .../administration/deleted-mailboxes/index.js | 4 +-- .../exchange-retention/policies/index.js | 8 ++--- .../exchange-retention/policies/policy.jsx | 12 +++---- .../exchange-retention/tags/index.js | 8 ++--- .../exchange-retention/tags/tag.jsx | 12 +++---- .../administration/mailbox-rules/index.js | 4 +-- .../administration/mailboxes/addshared.jsx | 6 ++-- .../email/administration/mailboxes/index.js | 8 ++--- .../email/administration/quarantine/index.js | 12 +++---- .../administration/restricted-users/index.js | 4 +-- .../tenant-allow-block-lists/index.js | 6 ++-- .../SharedMailboxEnabledAccount/index.js | 4 +-- .../reports/antiphishing-filters/index.js | 4 +-- .../reports/calendar-permissions/index.js | 4 +-- .../reports/global-address-list/index.js | 4 +-- .../email/reports/mailbox-activity/index.js | 6 ++-- .../reports/mailbox-cas-settings/index.js | 4 +-- .../reports/mailbox-permissions/index.js | 4 +-- .../email/reports/mailbox-statistics/index.js | 4 +-- .../email/reports/malware-filters/index.js | 4 +-- .../reports/safeattachments-filters/index.js | 4 +-- .../resources/management/equipment/edit.jsx | 16 ++++----- .../resources/management/equipment/index.js | 4 +-- .../resources/management/list-rooms/edit.jsx | 16 ++++----- .../resources/management/list-rooms/index.js | 4 +-- .../resources/management/room-lists/edit.jsx | 8 ++--- .../resources/management/room-lists/index.js | 4 +-- .../list-connectionfilter-templates/index.js | 6 ++-- .../spamfilter/list-connectionfilter/add.jsx | 8 ++--- .../spamfilter/list-connectionfilter/index.js | 4 +-- .../list-quarantine-policies/add.jsx | 8 ++--- .../list-quarantine-policies/index.js | 16 ++++----- .../email/spamfilter/list-spamfilter/add.jsx | 8 ++--- .../email/spamfilter/list-spamfilter/index.js | 4 +-- .../email/spamfilter/list-templates/index.js | 6 ++-- src/pages/email/tools/mail-test/index.js | 2 +- .../tools/mailbox-restore-wizard/index.js | 2 +- .../email/tools/mailbox-restores/add.jsx | 6 ++-- .../email/tools/mailbox-restores/index.js | 6 ++-- src/pages/email/tools/message-trace/index.js | 12 +++---- src/pages/email/tools/message-viewer/index.js | 2 +- .../list-connector-templates/index.js | 6 ++-- .../email/transport/list-connectors/index.js | 4 +-- src/pages/email/transport/list-rules/index.js | 6 ++-- .../email/transport/list-templates/index.js | 6 ++-- .../MEM/assignment-filter-templates/add.jsx | 2 +- .../MEM/assignment-filter-templates/deploy.js | 8 ++--- .../MEM/assignment-filter-templates/edit.jsx | 2 +- .../MEM/assignment-filter-templates/index.js | 6 ++-- .../endpoint/MEM/assignment-filters/add.jsx | 2 +- .../endpoint/MEM/assignment-filters/edit.jsx | 4 +-- .../endpoint/MEM/assignment-filters/index.js | 4 +-- src/pages/endpoint/MEM/devices/index.js | 6 ++-- .../MEM/list-appprotection-policies/index.js | 10 +++--- .../MEM/list-compliance-policies/index.js | 10 +++--- src/pages/endpoint/MEM/list-policies/index.js | 10 +++--- src/pages/endpoint/MEM/list-scripts/index.jsx | 8 ++--- .../endpoint/MEM/list-templates/edit.jsx | 10 +++--- .../endpoint/MEM/list-templates/index.js | 10 +++--- src/pages/endpoint/applications/list/index.js | 12 +++---- .../endpoint/applications/queue/index.js | 4 +-- .../endpoint/autopilot/add-device/index.js | 8 ++--- .../endpoint/autopilot/list-devices/index.js | 6 ++-- .../endpoint/autopilot/list-profiles/index.js | 6 ++-- .../autopilot/list-status-pages/index.js | 6 ++-- .../reports/analyticsdevicescore/index.js | 6 ++-- .../reports/autopilot-deployment/index.js | 6 ++-- .../endpoint/reports/detected-apps/index.js | 4 +-- .../reports/workfromanywhere/index.js | 6 ++-- .../administration/deleted-items/index.js | 4 +-- .../deploy-group-template/index.js | 2 +- .../identity/administration/devices/index.js | 6 ++-- .../administration/group-templates/add.jsx | 2 +- .../administration/group-templates/deploy.js | 8 ++--- .../administration/group-templates/edit.jsx | 2 +- .../administration/group-templates/index.js | 6 ++-- .../identity/administration/groups/add.jsx | 2 +- .../identity/administration/groups/edit.jsx | 8 ++--- .../identity/administration/groups/index.js | 4 +-- src/pages/identity/administration/index.js | 2 +- .../jit-admin-templates/add.jsx | 4 +-- .../jit-admin-templates/edit.jsx | 4 +-- .../jit-admin-templates/index.js | 6 ++-- .../identity/administration/jit-admin/add.jsx | 4 +-- .../administration/jit-admin/index.js | 4 +-- .../offboarding-wizard/index.js | 8 ++--- .../administration/risky-users/index.js | 4 +-- .../identity/administration/roles/index.js | 4 +-- .../identity/administration/users/add.jsx | 4 +-- .../identity/administration/users/bulk-add.js | 8 ++--- .../identity/administration/users/index.js | 16 ++++----- .../administration/users/patch-wizard.jsx | 12 +++---- .../administration/users/user/bec.jsx | 6 ++-- .../users/user/conditional-access.jsx | 12 +++---- .../administration/users/user/devices.jsx | 8 ++--- .../administration/users/user/edit.jsx | 14 ++++---- .../administration/users/user/exchange.jsx | 8 ++--- .../administration/users/user/index.jsx | 14 ++++---- .../reports/azure-ad-connect-report/index.js | 4 +-- .../reports/inactive-users-report/index.js | 4 +-- src/pages/identity/reports/index.js | 2 +- .../identity/reports/mfa-report/index.js | 4 +-- .../identity/reports/risk-detections/index.js | 4 +-- .../identity/reports/signin-report/index.js | 6 ++-- src/pages/license.js | 2 +- src/pages/logout/index.js | 2 +- .../security/defender/deployment/index.js | 12 +++---- .../defender/list-defender-tvm/index.js | 4 +-- .../security/defender/list-defender/index.js | 4 +-- .../security/incidents/list-alerts/index.js | 4 +-- .../incidents/list-check-alerts/index.js | 4 +-- .../incidents/list-incidents/index.js | 4 +-- .../incidents/list-mdo-alerts/index.js | 4 +-- .../reports/list-device-compliance/index.js | 4 +-- .../safelinks/safelinks-template/add.jsx | 8 ++--- .../safelinks/safelinks-template/create.jsx | 8 ++--- .../safelinks/safelinks-template/edit.jsx | 10 +++--- .../safelinks/safelinks-template/index.jsx | 6 ++-- .../security/safelinks/safelinks/add.jsx | 8 ++--- .../security/safelinks/safelinks/edit.jsx | 10 +++--- .../security/safelinks/safelinks/index.jsx | 4 +-- src/pages/teams-share/onedrive/index.js | 4 +-- src/pages/teams-share/sharepoint/add-site.js | 8 ++--- .../teams-share/sharepoint/bulk-add-site.js | 12 +++---- src/pages/teams-share/sharepoint/index.js | 8 ++--- .../teams-share/teams/business-voice/index.js | 4 +-- src/pages/teams-share/teams/list-team/add.jsx | 8 ++--- .../teams-share/teams/list-team/index.js | 4 +-- .../teams-share/teams/teams-activity/index.js | 4 +-- .../administration/add-subscription/index.jsx | 8 ++--- .../alert-configuration/alert.jsx | 12 +++---- .../alert-configuration/index.js | 4 +-- .../app-consent-requests/index.js | 8 ++--- .../applications/app-registrations.js | 14 ++++---- .../applications/enterprise-apps.js | 12 +++---- .../applications/permission-sets/add.js | 8 ++--- .../applications/permission-sets/edit.js | 8 ++--- .../applications/permission-sets/index.js | 8 ++--- .../applications/templates/add.js | 6 ++-- .../applications/templates/edit.js | 6 ++-- .../applications/templates/index.js | 10 +++--- .../audit-logs/directory-audits.js | 8 ++--- .../tenant/administration/audit-logs/index.js | 8 ++--- .../tenant/administration/audit-logs/log.js | 10 +++--- .../audit-logs/search-results.js | 10 +++--- .../administration/audit-logs/searches.js | 10 +++--- .../authentication-methods/index.js | 4 +-- .../tenant/administration/domains/index.js | 14 ++++---- src/pages/tenant/administration/index.js | 2 +- .../partner-relationships/index.js | 4 +-- .../administration/securescore/index.js | 4 +-- .../administration/securescore/table.js | 4 +-- .../administration/tenantlookup/index.js | 2 +- .../tenant/administration/tenants/edit.js | 14 ++++---- .../tenants/global-variables.js | 8 ++--- .../administration/tenants/groups/add.js | 6 ++-- .../administration/tenants/groups/edit.js | 8 ++--- .../administration/tenants/groups/index.js | 16 ++++----- .../tenant/administration/tenants/index.js | 6 ++-- src/pages/tenant/backup/backup-wizard/add.jsx | 8 ++--- .../tenant/backup/backup-wizard/index.js | 4 +-- .../tenant/backup/backup-wizard/restore.jsx | 10 +++--- .../conditional/deploy-vacation/add.jsx | 10 +++--- .../conditional/deploy-vacation/index.js | 6 ++-- .../conditional/list-named-locations/add.jsx | 12 +++---- .../conditional/list-named-locations/index.js | 6 ++-- .../tenant/conditional/list-policies/index.js | 6 ++-- .../tenant/conditional/list-template/edit.jsx | 10 +++--- .../tenant/conditional/list-template/index.js | 12 +++---- src/pages/tenant/gdap-management/index.js | 6 ++-- .../tenant/gdap-management/invites/add.js | 2 +- .../tenant/gdap-management/invites/index.js | 6 ++-- .../tenant/gdap-management/offboarding.js | 12 +++---- .../gdap-management/onboarding/index.js | 6 ++-- .../gdap-management/onboarding/start.js | 18 +++++----- .../gdap-management/relationships/index.js | 8 ++--- .../relationships/relationship/index.js | 10 +++--- .../relationships/relationship/mappings.js | 6 ++-- .../gdap-management/role-templates/add.js | 8 ++--- .../gdap-management/role-templates/edit.js | 8 ++--- .../gdap-management/role-templates/index.js | 6 ++-- src/pages/tenant/gdap-management/roles/add.js | 18 +++++----- .../tenant/gdap-management/roles/index.js | 6 ++-- src/pages/tenant/manage/applied-standards.js | 6 ++-- .../tenant/manage/configuration-backup.js | 24 ++++++------- src/pages/tenant/manage/drift.js | 24 ++++++------- src/pages/tenant/manage/edit.js | 24 ++++++------- src/pages/tenant/manage/history.js | 6 ++-- src/pages/tenant/manage/policies-deployed.js | 12 +++---- src/pages/tenant/manage/recover-policies.js | 16 ++++----- src/pages/tenant/manage/user-defaults.js | 8 ++--- .../reports/application-consent/index.js | 4 +-- src/pages/tenant/reports/index.js | 2 +- .../reports/list-csp-licenses/index.jsx | 4 +-- .../tenant/reports/list-licenses/index.js | 4 +-- src/pages/tenant/standards/alignment/index.js | 6 ++-- .../tenant/standards/bpa-report/builder.js | 2 +- .../tenant/standards/bpa-report/index.js | 10 +++--- src/pages/tenant/standards/bpa-report/view.js | 2 +- .../standards/domains-analyser/index.js | 4 +-- src/pages/tenant/standards/templates/index.js | 10 +++--- .../tenant/standards/templates/template.jsx | 8 ++--- src/pages/tenant/tools/appapproval/index.js | 8 ++--- .../tenant/tools/bpa-report-builder/index.js | 2 +- src/pages/tenant/tools/geoiplookup/index.js | 2 +- .../tenant/tools/graph-explorer/index.js | 6 ++-- .../tenant/tools/individual-domains/index.js | 2 +- src/pages/tenant/tools/tenantlookup/index.js | 2 +- src/pages/tools/breachlookup/index.js | 12 +++---- src/pages/tools/community-repos/index.js | 10 +++--- src/pages/tools/community-repos/repo.js | 10 +++--- src/pages/tools/templatelib/index.jsx | 8 ++--- src/pages/tools/tenantbreachlookup/index.js | 4 +-- .../get-cipp-signin-errorcode-translation.js | 2 +- src/utils/permissions.js | 2 +- 336 files changed, 1102 insertions(+), 1095 deletions(-) diff --git a/src/components/CippCards/CippDomainCards.jsx b/src/components/CippCards/CippDomainCards.jsx index b6d8adb58bf4..9268fcd08f96 100644 --- a/src/components/CippCards/CippDomainCards.jsx +++ b/src/components/CippCards/CippDomainCards.jsx @@ -22,9 +22,9 @@ import WarningIcon from "@mui/icons-material/Warning"; import HelpIcon from "@mui/icons-material/Help"; import MoreVertIcon from "@mui/icons-material/MoreVert"; import { Controller, useForm } from "react-hook-form"; -import { ApiGetCall } from "/src/api/ApiCall"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { CippCodeBlock } from "/src/components/CippComponents/CippCodeBlock"; +import { ApiGetCall } from "../../api/ApiCall"; +import CippButtonCard from "./CippButtonCard"; +import { CippCodeBlock } from "../CippComponents/CippCodeBlock"; import { CippOffCanvas } from "../CippComponents/CippOffCanvas"; import { CippPropertyListCard } from "./CippPropertyListCard"; import { getCippFormatting } from "../../utils/get-cipp-formatting"; diff --git a/src/components/CippCards/CippExchangeInfoCard.jsx b/src/components/CippCards/CippExchangeInfoCard.jsx index 9a5dfb574ae7..60e7ac7ef063 100644 --- a/src/components/CippCards/CippExchangeInfoCard.jsx +++ b/src/components/CippCards/CippExchangeInfoCard.jsx @@ -10,8 +10,8 @@ import { CircularProgress, Alert, } from "@mui/material"; -import { PropertyList } from "/src/components/property-list"; -import { PropertyListItem } from "/src/components/property-list-item"; +import { PropertyList } from "../property-list"; +import { PropertyListItem } from "../property-list-item"; import { getCippFormatting } from "../../utils/get-cipp-formatting"; import { Check as CheckIcon, Close as CloseIcon, Sync } from "@mui/icons-material"; import { LinearProgressWithLabel } from "../linearProgressWithLabel"; diff --git a/src/components/CippCards/CippUserInfoCard.jsx b/src/components/CippCards/CippUserInfoCard.jsx index 0e866efb39ac..43e4d6d26cb2 100644 --- a/src/components/CippCards/CippUserInfoCard.jsx +++ b/src/components/CippCards/CippUserInfoCard.jsx @@ -12,8 +12,8 @@ import { CircularProgress, } from "@mui/material"; import { AccountCircle, PhotoCamera, Delete } from "@mui/icons-material"; -import { PropertyList } from "/src/components/property-list"; -import { PropertyListItem } from "/src/components/property-list-item"; +import { PropertyList } from "../property-list"; +import { PropertyListItem } from "../property-list-item"; import { getCippFormatting } from "../../utils/get-cipp-formatting"; import { Stack, Grid, Box } from "@mui/system"; import { useState, useRef, useCallback } from "react"; diff --git a/src/components/CippComponents/BPASyncDialog.jsx b/src/components/CippComponents/BPASyncDialog.jsx index 43a16450416a..3add79b46f54 100644 --- a/src/components/CippComponents/BPASyncDialog.jsx +++ b/src/components/CippComponents/BPASyncDialog.jsx @@ -9,7 +9,7 @@ import { import { Sync } from "@mui/icons-material"; import { useForm, FormProvider } from "react-hook-form"; import { CippFormTenantSelector } from "./CippFormTenantSelector"; -import { ApiPostCall } from "/src/api/ApiCall"; +import { ApiPostCall } from "../../api/ApiCall"; import { CippApiResults } from "./CippApiResults"; export const BPASyncDialog = ({ createDialog }) => { diff --git a/src/components/CippComponents/BreachSearchDialog.jsx b/src/components/CippComponents/BreachSearchDialog.jsx index e089908ffb43..8a69cd40206c 100644 --- a/src/components/CippComponents/BreachSearchDialog.jsx +++ b/src/components/CippComponents/BreachSearchDialog.jsx @@ -2,7 +2,7 @@ import { useState } from "react"; import { Dialog, DialogContent, DialogTitle, Button, DialogActions } from "@mui/material"; import { Search } from "@mui/icons-material"; import { useForm, FormProvider } from "react-hook-form"; -import { ApiPostCall } from "/src/api/ApiCall"; +import { ApiPostCall } from "../../api/ApiCall"; import { CippApiResults } from "./CippApiResults"; import { useSettings } from "../../hooks/use-settings"; diff --git a/src/components/CippComponents/CippAddEditTenantGroups.jsx b/src/components/CippComponents/CippAddEditTenantGroups.jsx index 9ba637d003c8..4208c18eaf7c 100644 --- a/src/components/CippComponents/CippAddEditTenantGroups.jsx +++ b/src/components/CippComponents/CippAddEditTenantGroups.jsx @@ -1,4 +1,4 @@ -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "./CippFormComponent"; import { Typography } from "@mui/material"; import { Grid } from "@mui/system"; import { CippFormTenantSelector } from "./CippFormTenantSelector"; diff --git a/src/components/CippComponents/CippAddVacationModeDrawer.jsx b/src/components/CippComponents/CippAddVacationModeDrawer.jsx index 9434b456547e..bd6b4397d590 100644 --- a/src/components/CippComponents/CippAddVacationModeDrawer.jsx +++ b/src/components/CippComponents/CippAddVacationModeDrawer.jsx @@ -9,7 +9,7 @@ import { CippApiResults } from "./CippApiResults"; import { CippFormUserSelector } from "./CippFormUserSelector"; import { CippFormTenantSelector } from "./CippFormTenantSelector"; import { ApiPostCall, ApiGetCallWithPagination } from "../../api/ApiCall"; -import CippJsonView from "/src/components/CippFormPages/CippJSONView"; +import CippJsonView from "../CippFormPages/CippJSONView"; export const CippAddVacationModeDrawer = ({ buttonText = "Add Vacation Schedule", diff --git a/src/components/CippComponents/CippAppPermissionBuilder.jsx b/src/components/CippComponents/CippAppPermissionBuilder.jsx index 46adfc153008..3ff6635eec32 100644 --- a/src/components/CippComponents/CippAppPermissionBuilder.jsx +++ b/src/components/CippComponents/CippAppPermissionBuilder.jsx @@ -17,7 +17,7 @@ import { Tab, } from "@mui/material"; import { Grid } from "@mui/system"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; +import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; import { CippDataTable } from "../CippTable/CippDataTable"; import { PlusIcon, ShieldCheckIcon, WrenchIcon } from "@heroicons/react/24/outline"; import CippFormComponent from "./CippFormComponent"; diff --git a/src/components/CippComponents/CippApplicationDeployDrawer.jsx b/src/components/CippComponents/CippApplicationDeployDrawer.jsx index 16384787e6ec..6b51f4889e57 100644 --- a/src/components/CippComponents/CippApplicationDeployDrawer.jsx +++ b/src/components/CippComponents/CippApplicationDeployDrawer.jsx @@ -8,7 +8,7 @@ import CippFormComponent from "./CippFormComponent"; import { CippFormTenantSelector } from "./CippFormTenantSelector"; import { CippFormCondition } from "./CippFormCondition"; import { CippApiResults } from "./CippApiResults"; -import languageList from "/src/data/languageList.json"; +import languageList from "../../data/languageList.json"; import { ApiPostCall } from "../../api/ApiCall"; export const CippApplicationDeployDrawer = ({ diff --git a/src/components/CippComponents/CippAuditLogDetails.jsx b/src/components/CippComponents/CippAuditLogDetails.jsx index b5a3077a0da6..44a291245cb7 100644 --- a/src/components/CippComponents/CippAuditLogDetails.jsx +++ b/src/components/CippComponents/CippAuditLogDetails.jsx @@ -1,10 +1,10 @@ import { useEffect } from "react"; -import { getCippTranslation } from "/src/utils/get-cipp-translation"; -import { getCippFormatting } from "/src/utils/get-cipp-formatting"; -import CippGeoLocation from "/src/components/CippComponents/CippGeoLocation"; +import { getCippTranslation } from "../../utils/get-cipp-translation"; +import { getCippFormatting } from "../../utils/get-cipp-formatting"; +import CippGeoLocation from "./CippGeoLocation"; import { Tooltip, CircularProgress, Stack } from "@mui/material"; -import { useGuidResolver } from "/src/hooks/use-guid-resolver"; -import { CippPropertyListCard } from "/src/components/CippCards/CippPropertyListCard"; +import { useGuidResolver } from "../../hooks/use-guid-resolver"; +import { CippPropertyListCard } from "../CippCards/CippPropertyListCard"; const CippAuditLogDetails = ({ row }) => { const { diff --git a/src/components/CippComponents/CippAuditLogSearchDrawer.jsx b/src/components/CippComponents/CippAuditLogSearchDrawer.jsx index 93628842b386..9c3179f0490d 100644 --- a/src/components/CippComponents/CippAuditLogSearchDrawer.jsx +++ b/src/components/CippComponents/CippAuditLogSearchDrawer.jsx @@ -6,7 +6,7 @@ import { CippOffCanvas } from "./CippOffCanvas"; import { ApiPostCall, ApiGetCallWithPagination } from "../../api/ApiCall"; import CippFormComponent from "./CippFormComponent"; import { CippApiResults } from "./CippApiResults"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../hooks/use-settings"; export const CippAuditLogSearchDrawer = ({ buttonText = "New Search", diff --git a/src/components/CippComponents/CippAutopilotProfileDrawer.jsx b/src/components/CippComponents/CippAutopilotProfileDrawer.jsx index f5b48ae54040..7edc95b46b60 100644 --- a/src/components/CippComponents/CippAutopilotProfileDrawer.jsx +++ b/src/components/CippComponents/CippAutopilotProfileDrawer.jsx @@ -7,7 +7,7 @@ import { CippOffCanvas } from "./CippOffCanvas"; import CippFormComponent from "./CippFormComponent"; import { CippFormTenantSelector } from "./CippFormTenantSelector"; import { CippApiResults } from "./CippApiResults"; -import languageList from "/src/data/languageList.json"; +import languageList from "../../data/languageList.json"; import { ApiPostCall } from "../../api/ApiCall"; export const CippAutopilotProfileDrawer = ({ diff --git a/src/components/CippComponents/CippBreadcrumbNav.jsx b/src/components/CippComponents/CippBreadcrumbNav.jsx index ff146073ae1c..98093aa34974 100644 --- a/src/components/CippComponents/CippBreadcrumbNav.jsx +++ b/src/components/CippComponents/CippBreadcrumbNav.jsx @@ -32,7 +32,7 @@ async function loadTabOptions() { for (const basePath of tabOptionPaths) { try { - const module = await import(`/src/pages${basePath}/tabOptions.json`); + const module = await import(`../../pages${basePath}/tabOptions.json`); const options = module.default || module; // Add each tab option with metadata diff --git a/src/components/CippComponents/CippBulkUserDrawer.jsx b/src/components/CippComponents/CippBulkUserDrawer.jsx index 7718ae957138..6fd62b106c38 100644 --- a/src/components/CippComponents/CippBulkUserDrawer.jsx +++ b/src/components/CippComponents/CippBulkUserDrawer.jsx @@ -11,7 +11,7 @@ import { CippApiResults } from "./CippApiResults"; import { useSettings } from "../../hooks/use-settings"; import { ApiPostCall } from "../../api/ApiCall"; import { getCippTranslation } from "../../utils/get-cipp-translation"; -import countryList from "/src/data/countryList.json"; +import countryList from "../../data/countryList.json"; export const CippBulkUserDrawer = ({ buttonText = "Bulk Add Users", diff --git a/src/components/CippComponents/CippCentralSearch.jsx b/src/components/CippComponents/CippCentralSearch.jsx index 0c7bf858e88b..81bf241c6352 100644 --- a/src/components/CippComponents/CippCentralSearch.jsx +++ b/src/components/CippComponents/CippCentralSearch.jsx @@ -14,8 +14,8 @@ import { } from "@mui/material"; import { Grid } from "@mui/system"; import { useRouter } from "next/router"; -import { nativeMenuItems } from "/src/layouts/config"; -import { usePermissions } from "/src/hooks/use-permissions"; +import { nativeMenuItems } from "../../layouts/config"; +import { usePermissions } from "../../hooks/use-permissions"; /** * Recursively collects only leaf items (those without sub-items). @@ -62,7 +62,7 @@ async function loadTabOptions() { for (const basePath of tabOptionPaths) { try { - const module = await import(`/src/pages${basePath}/tabOptions.json`); + const module = await import(`../../pages${basePath}/tabOptions.json`); const options = module.default || module; // Add each tab option with metadata diff --git a/src/components/CippComponents/CippCustomVariables.jsx b/src/components/CippComponents/CippCustomVariables.jsx index b408deaae8ea..69b5975d1777 100644 --- a/src/components/CippComponents/CippCustomVariables.jsx +++ b/src/components/CippComponents/CippCustomVariables.jsx @@ -1,10 +1,10 @@ import { useState } from "react"; import { CardContent, Button, SvgIcon, Alert } from "@mui/material"; import { PlusIcon, TrashIcon, PencilIcon } from "@heroicons/react/24/outline"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; -import { CippApiResults } from "/src/components/CippComponents/CippApiResults"; -import { CippApiDialog } from "/src/components/CippComponents/CippApiDialog"; -import { ApiPostCall } from "/src/api/ApiCall"; +import { CippDataTable } from "../CippTable/CippDataTable"; +import { CippApiResults } from "./CippApiResults"; +import { CippApiDialog } from "./CippApiDialog"; +import { ApiPostCall } from "../../api/ApiCall"; const CippCustomVariables = ({ id }) => { const [openAddDialog, setOpenAddDialog] = useState(false); diff --git a/src/components/CippComponents/CippExchangeActions.jsx b/src/components/CippComponents/CippExchangeActions.jsx index e88171a3f20f..a783b263a339 100644 --- a/src/components/CippComponents/CippExchangeActions.jsx +++ b/src/components/CippComponents/CippExchangeActions.jsx @@ -17,7 +17,7 @@ import { PersonAdd, Email, } from "@mui/icons-material"; -import { useSettings } from "/src/hooks/use-settings.js"; +import { useSettings } from "../../hooks/use-settings.js"; import { useMemo } from "react"; export const CippExchangeActions = () => { diff --git a/src/components/CippComponents/CippFormTenantSelector.jsx b/src/components/CippComponents/CippFormTenantSelector.jsx index 0ce271515d29..4f39e48868d4 100644 --- a/src/components/CippComponents/CippFormTenantSelector.jsx +++ b/src/components/CippComponents/CippFormTenantSelector.jsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import { CippFormComponent } from "./CippFormComponent"; import { useSettings } from "../../hooks/use-settings"; import { GroupHeader, GroupItems } from "../CippComponents/CippAutocompleteGrouping"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../api/ApiCall"; export const CippFormTenantSelector = ({ formControl, diff --git a/src/components/CippComponents/CippForwardingSection.jsx b/src/components/CippComponents/CippForwardingSection.jsx index df7fcba9b177..24a18345ddc5 100644 --- a/src/components/CippComponents/CippForwardingSection.jsx +++ b/src/components/CippComponents/CippForwardingSection.jsx @@ -3,7 +3,7 @@ import CippFormComponent from "./CippFormComponent"; import { CippFormCondition } from "./CippFormCondition"; import { Grid } from "@mui/system"; import { CippApiResults } from "./CippApiResults"; -import { getCippValidator } from "/src/utils/get-cipp-validator"; +import { getCippValidator } from "../../utils/get-cipp-validator"; const CippForwardingSection = ({ formControl, usersList, contactsList, postRequest, handleSubmit }) => { diff --git a/src/components/CippComponents/CippGeoLocation.jsx b/src/components/CippComponents/CippGeoLocation.jsx index e7a4be63ed66..1621f602ba1d 100644 --- a/src/components/CippComponents/CippGeoLocation.jsx +++ b/src/components/CippComponents/CippGeoLocation.jsx @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import { Skeleton } from "@mui/material"; import { Grid } from "@mui/system"; import dynamic from "next/dynamic"; -import { ApiPostCall } from "/src/api/ApiCall"; +import { ApiPostCall } from "../../api/ApiCall"; import { CippPropertyList } from "./CippPropertyList"; import { getCippTranslation } from "../../utils/get-cipp-translation"; import { getCippFormatting } from "../../utils/get-cipp-formatting"; diff --git a/src/components/CippComponents/CippMap.jsx b/src/components/CippComponents/CippMap.jsx index 7f5be9bb4b92..5efed559ef70 100644 --- a/src/components/CippComponents/CippMap.jsx +++ b/src/components/CippComponents/CippMap.jsx @@ -1,11 +1,18 @@ import "leaflet/dist/leaflet.css"; import "react-leaflet-markercluster/styles"; -import "leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css"; -import "leaflet-defaulticon-compatibility"; import { useEffect, useRef } from "react"; import { MapContainer, Marker, Popup, TileLayer } from "react-leaflet"; +import L from "leaflet"; import MarkerClusterGroup from "react-leaflet-markercluster"; +// Fix leaflet icon paths for Turbopack/Next.js +delete L.Icon.Default.prototype._getIconUrl; +L.Icon.Default.mergeOptions({ + iconRetinaUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-icon-2x.png", + iconUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-icon.png", + shadowUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-shadow.png", +}); + export default function CippMap({ markers = [], zoom = 11, diff --git a/src/components/CippComponents/CippMessageViewer.jsx b/src/components/CippComponents/CippMessageViewer.jsx index 366c17dcc507..e91530db384b 100644 --- a/src/components/CippComponents/CippMessageViewer.jsx +++ b/src/components/CippComponents/CippMessageViewer.jsx @@ -43,7 +43,7 @@ import { CippTimeAgo } from "./CippTimeAgo"; import { CippCodeBlock } from "./CippCodeBlock"; import DOMPurify from "dompurify"; import ReactHtmlParser from "react-html-parser"; -import { FileDropzone } from "/src/components/file-dropzone.js"; +import { FileDropzone } from "../file-dropzone.js"; import CippPageCard from "../CippCards/CippPageCard"; import { MoonIcon, @@ -51,7 +51,7 @@ import { ShieldExclamationIcon, SunIcon, } from "@heroicons/react/24/outline"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../hooks/use-settings"; import CippForefrontHeaderDialog from "./CippForefrontHeaderDialog"; export const CippMessageViewer = ({ emailSource }) => { diff --git a/src/components/CippComponents/CippPermissionSetDrawer.jsx b/src/components/CippComponents/CippPermissionSetDrawer.jsx index de9f45b6d58f..cd432409a144 100644 --- a/src/components/CippComponents/CippPermissionSetDrawer.jsx +++ b/src/components/CippComponents/CippPermissionSetDrawer.jsx @@ -6,7 +6,7 @@ import { Edit, Add } from "@mui/icons-material"; import { CippOffCanvas } from "./CippOffCanvas"; import CippFormComponent from "./CippFormComponent"; import { CippApiResults } from "./CippApiResults"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; +import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; import CippAppPermissionBuilder from "./CippAppPermissionBuilder"; export const CippPermissionSetDrawer = ({ diff --git a/src/components/CippComponents/CippSankey.jsx b/src/components/CippComponents/CippSankey.jsx index 9fd49e3bc712..35024dbfea78 100644 --- a/src/components/CippComponents/CippSankey.jsx +++ b/src/components/CippComponents/CippSankey.jsx @@ -1,5 +1,5 @@ import { ResponsiveSankey } from "@nivo/sankey"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../hooks/use-settings"; export const CippSankey = ({ data }) => { const settings = useSettings(); diff --git a/src/components/CippComponents/CippTemplateEditor.jsx b/src/components/CippComponents/CippTemplateEditor.jsx index e223abf49962..bb2c38af8b53 100644 --- a/src/components/CippComponents/CippTemplateEditor.jsx +++ b/src/components/CippComponents/CippTemplateEditor.jsx @@ -2,11 +2,11 @@ import React, { useEffect, useState } from "react"; import { Box, Typography, Divider } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import { ApiGetCall } from "/src/api/ApiCall"; -import { getCippTranslation } from "/src/utils/get-cipp-translation"; +import CippFormPage from "../CippFormPages/CippFormPage"; +import CippFormComponent from "./CippFormComponent"; +import CippFormSkeleton from "../CippFormPages/CippFormSkeleton"; +import { ApiGetCall } from "../../api/ApiCall"; +import { getCippTranslation } from "../../utils/get-cipp-translation"; const CippTemplateEditor = ({ templateId, diff --git a/src/components/CippComponents/CippTemplateFieldRenderer.jsx b/src/components/CippComponents/CippTemplateFieldRenderer.jsx index 7fae93ec413f..5f385bfdda64 100644 --- a/src/components/CippComponents/CippTemplateFieldRenderer.jsx +++ b/src/components/CippComponents/CippTemplateFieldRenderer.jsx @@ -1,9 +1,9 @@ import React from "react"; import { Typography, Divider } from "@mui/material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { getCippTranslation } from "/src/utils/get-cipp-translation"; -import intuneCollection from "/src/data/intuneCollection.json"; +import CippFormComponent from "./CippFormComponent"; +import { getCippTranslation } from "../../utils/get-cipp-translation"; +import intuneCollection from "../../data/intuneCollection.json"; const CippTemplateFieldRenderer = ({ templateData, diff --git a/src/components/CippComponents/CippTextFieldWithVariables.jsx b/src/components/CippComponents/CippTextFieldWithVariables.jsx index 0f6abd9fea99..80d720ac9440 100644 --- a/src/components/CippComponents/CippTextFieldWithVariables.jsx +++ b/src/components/CippComponents/CippTextFieldWithVariables.jsx @@ -1,7 +1,7 @@ import React, { useState, useRef, useEffect, useMemo, useCallback } from "react"; import { TextField } from "@mui/material"; import { CippVariableAutocomplete } from "./CippVariableAutocomplete"; -import { useSettings } from "/src/hooks/use-settings.js"; +import { useSettings } from "../../hooks/use-settings.js"; /** * Enhanced TextField that supports custom variable autocomplete diff --git a/src/components/CippComponents/CippTransportRuleDrawer.jsx b/src/components/CippComponents/CippTransportRuleDrawer.jsx index b3beea3d0b1c..494ae0fdce1a 100644 --- a/src/components/CippComponents/CippTransportRuleDrawer.jsx +++ b/src/components/CippComponents/CippTransportRuleDrawer.jsx @@ -7,8 +7,8 @@ import { CippOffCanvas } from "./CippOffCanvas"; import CippFormComponent from "./CippFormComponent"; import { CippFormDomainSelector } from "./CippFormDomainSelector"; import { CippApiResults } from "./CippApiResults"; -import { useSettings } from "/src/hooks/use-settings"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; +import { useSettings } from "../../hooks/use-settings"; +import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; import { useQueryClient } from "@tanstack/react-query"; export const CippTransportRuleDrawer = ({ diff --git a/src/components/CippComponents/CippUserActions.jsx b/src/components/CippComponents/CippUserActions.jsx index 9b79b58fd32c..ac6bf04a952d 100644 --- a/src/components/CippComponents/CippUserActions.jsx +++ b/src/components/CippComponents/CippUserActions.jsx @@ -20,7 +20,7 @@ import { CloudSync, } from "@mui/icons-material"; import { getCippLicenseTranslation } from "../../utils/get-cipp-license-translation"; -import { useSettings } from "/src/hooks/use-settings.js"; +import { useSettings } from "../../hooks/use-settings.js"; import { usePermissions } from "../../hooks/use-permissions"; import { Tooltip, Box } from "@mui/material"; import CippFormComponent from "./CippFormComponent"; diff --git a/src/components/CippComponents/CippVariableAutocomplete.jsx b/src/components/CippComponents/CippVariableAutocomplete.jsx index 9910e9771afd..49e89fda27ee 100644 --- a/src/components/CippComponents/CippVariableAutocomplete.jsx +++ b/src/components/CippComponents/CippVariableAutocomplete.jsx @@ -9,9 +9,9 @@ import { useTheme, CircularProgress, } from "@mui/material"; -import { ApiGetCall } from "/src/api/ApiCall"; -import { useSettings } from "/src/hooks/use-settings.js"; -import { getCippError } from "/src/utils/get-cipp-error"; +import { ApiGetCall } from "../../api/ApiCall"; +import { useSettings } from "../../hooks/use-settings.js"; +import { getCippError } from "../../utils/get-cipp-error"; /** * Autocomplete component specifically for custom variables diff --git a/src/components/CippComponents/DomainAnalyserDialog.jsx b/src/components/CippComponents/DomainAnalyserDialog.jsx index 803baf43f154..ed5a6a948119 100644 --- a/src/components/CippComponents/DomainAnalyserDialog.jsx +++ b/src/components/CippComponents/DomainAnalyserDialog.jsx @@ -3,7 +3,7 @@ import { Dialog, DialogContent, DialogTitle, Button, DialogActions } from "@mui/ import { Refresh } from "@mui/icons-material"; import { useForm, FormProvider } from "react-hook-form"; import { CippFormTenantSelector } from "./CippFormTenantSelector"; -import { ApiPostCall } from "/src/api/ApiCall"; +import { ApiPostCall } from "../../api/ApiCall"; import { CippApiResults } from "./CippApiResults"; export const DomainAnalyserDialog = ({ createDialog }) => { diff --git a/src/components/CippComponents/ScheduledTaskDetails.jsx b/src/components/CippComponents/ScheduledTaskDetails.jsx index c02cf9d8f3f6..51991b1b88a7 100644 --- a/src/components/CippComponents/ScheduledTaskDetails.jsx +++ b/src/components/CippComponents/ScheduledTaskDetails.jsx @@ -19,8 +19,8 @@ import { CippPropertyListCard } from "../CippCards/CippPropertyListCard"; import { ExpandMore, Sync, Search, Close } from "@mui/icons-material"; import { getCippFormatting } from "../../utils/get-cipp-formatting"; import { CippDataTable } from "../CippTable/CippDataTable"; -import { CippTimeAgo } from "/src/components/CippComponents/CippTimeAgo"; -import { ActionsMenu } from "/src/components/actions-menu"; +import { CippTimeAgo } from "./CippTimeAgo"; +import { ActionsMenu } from "../actions-menu"; import { CippScheduledTaskActions } from "./CippScheduledTaskActions"; import { CippApiLogsDrawer } from "./CippApiLogsDrawer"; diff --git a/src/components/CippFormPages/CippAddAssignmentFilterForm.jsx b/src/components/CippFormPages/CippAddAssignmentFilterForm.jsx index 447b6ae4012d..551ec914e35b 100644 --- a/src/components/CippFormPages/CippAddAssignmentFilterForm.jsx +++ b/src/components/CippFormPages/CippAddAssignmentFilterForm.jsx @@ -1,7 +1,7 @@ import "@mui/material"; import { Grid } from "@mui/system"; import { useWatch } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../CippComponents/CippFormComponent"; const DEVICE_PLATFORM_OPTIONS = [ { label: "Windows 10 and later", value: "windows10AndLater" }, diff --git a/src/components/CippFormPages/CippAddAssignmentFilterTemplateForm.jsx b/src/components/CippFormPages/CippAddAssignmentFilterTemplateForm.jsx index 2b43d8f4c6b6..626b15db6e7a 100644 --- a/src/components/CippFormPages/CippAddAssignmentFilterTemplateForm.jsx +++ b/src/components/CippFormPages/CippAddAssignmentFilterTemplateForm.jsx @@ -1,7 +1,7 @@ import "@mui/material"; import { Grid } from "@mui/system"; import { useWatch } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../CippComponents/CippFormComponent"; const DEVICE_PLATFORM_OPTIONS = [ { label: "Windows 10 and later", value: "windows10AndLater" }, diff --git a/src/components/CippFormPages/CippAddEditContact.jsx b/src/components/CippFormPages/CippAddEditContact.jsx index cbc96616d37c..1e038f8231a5 100644 --- a/src/components/CippFormPages/CippAddEditContact.jsx +++ b/src/components/CippFormPages/CippAddEditContact.jsx @@ -1,8 +1,8 @@ import { Divider } from "@mui/material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { getCippValidator } from "/src/utils/get-cipp-validator"; -import countryList from "/src/data/countryList.json"; +import CippFormComponent from "../CippComponents/CippFormComponent"; +import { getCippValidator } from "../../utils/get-cipp-validator"; +import countryList from "../../data/countryList.json"; const countryOptions = countryList.map(({ Code, Name }) => ({ label: Name, diff --git a/src/components/CippFormPages/CippAddEditGdapRoleTemplate.jsx b/src/components/CippFormPages/CippAddEditGdapRoleTemplate.jsx index 1ed0e4163f88..891935f0f99a 100644 --- a/src/components/CippFormPages/CippAddEditGdapRoleTemplate.jsx +++ b/src/components/CippFormPages/CippAddEditGdapRoleTemplate.jsx @@ -1,5 +1,5 @@ import { Alert, Box, Stack, Typography } from "@mui/material"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../CippComponents/CippFormComponent"; export const CippAddEditGdapRoleTemplate = (props) => { const { formControl, availableRoles } = props; diff --git a/src/components/CippFormPages/CippAddEditUser.jsx b/src/components/CippFormPages/CippAddEditUser.jsx index 79b42de33f6f..87e8088861a0 100644 --- a/src/components/CippFormPages/CippAddEditUser.jsx +++ b/src/components/CippFormPages/CippAddEditUser.jsx @@ -1,10 +1,10 @@ import { Alert, Divider, InputAdornment, Typography } from "@mui/material"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormCondition } from "/src/components/CippComponents/CippFormCondition"; -import { CippFormDomainSelector } from "/src/components/CippComponents/CippFormDomainSelector"; -import { CippFormUserSelector } from "/src/components/CippComponents/CippFormUserSelector"; -import countryList from "/src/data/countryList.json"; -import { CippFormLicenseSelector } from "/src/components/CippComponents/CippFormLicenseSelector"; +import CippFormComponent from "../CippComponents/CippFormComponent"; +import { CippFormCondition } from "../CippComponents/CippFormCondition"; +import { CippFormDomainSelector } from "../CippComponents/CippFormDomainSelector"; +import { CippFormUserSelector } from "../CippComponents/CippFormUserSelector"; +import countryList from "../../data/countryList.json"; +import { CippFormLicenseSelector } from "../CippComponents/CippFormLicenseSelector"; import { Grid } from "@mui/system"; import { ApiGetCall } from "../../api/ApiCall"; import { useSettings } from "../../hooks/use-settings"; diff --git a/src/components/CippFormPages/CippAddGroupForm.jsx b/src/components/CippFormPages/CippAddGroupForm.jsx index 9644b0426faf..713bb414c638 100644 --- a/src/components/CippFormPages/CippAddGroupForm.jsx +++ b/src/components/CippFormPages/CippAddGroupForm.jsx @@ -1,7 +1,7 @@ import { InputAdornment } from "@mui/material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormCondition } from "/src/components/CippComponents/CippFormCondition"; +import CippFormComponent from "../CippComponents/CippFormComponent"; +import { CippFormCondition } from "../CippComponents/CippFormCondition"; import { CippFormDomainSelector } from "../CippComponents/CippFormDomainSelector"; import { CippFormUserSelector } from "../CippComponents/CippFormUserSelector"; diff --git a/src/components/CippFormPages/CippAddGroupTemplateForm.jsx b/src/components/CippFormPages/CippAddGroupTemplateForm.jsx index 8db3b1ebea3f..36747ee70f32 100644 --- a/src/components/CippFormPages/CippAddGroupTemplateForm.jsx +++ b/src/components/CippFormPages/CippAddGroupTemplateForm.jsx @@ -1,8 +1,8 @@ import { useEffect } from "react"; import "@mui/material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormCondition } from "/src/components/CippComponents/CippFormCondition"; +import CippFormComponent from "../CippComponents/CippFormComponent"; +import { CippFormCondition } from "../CippComponents/CippFormCondition"; const CippAddGroupTemplateForm = (props) => { const { formControl } = props; diff --git a/src/components/CippFormPages/CippCustomDataMappingForm.jsx b/src/components/CippFormPages/CippCustomDataMappingForm.jsx index f8dce65b8592..8a5d30af5da7 100644 --- a/src/components/CippFormPages/CippCustomDataMappingForm.jsx +++ b/src/components/CippFormPages/CippCustomDataMappingForm.jsx @@ -1,13 +1,13 @@ import { useWatch } from "react-hook-form"; import { Box, Stack, Typography, Divider } from "@mui/material"; import { Grid } from "@mui/system"; -import { CippFormComponent } from "/src/components/CippComponents/CippFormComponent"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; -import { CippFormCondition } from "/src/components/CippComponents/CippFormCondition"; -import { CippPropertyListCard } from "/src/components/CippCards/CippPropertyListCard"; -import { CippCopyToClipBoard } from "/src/components/CippComponents/CippCopyToClipboard"; -import extensionDataMapping from "/src/data/extensionDataMapping"; -import { getCippTranslation } from "/src/utils/get-cipp-translation"; +import { CippFormComponent } from "../CippComponents/CippFormComponent"; +import { CippFormTenantSelector } from "../CippComponents/CippFormTenantSelector"; +import { CippFormCondition } from "../CippComponents/CippFormCondition"; +import { CippPropertyListCard } from "../CippCards/CippPropertyListCard"; +import { CippCopyToClipBoard } from "../CippComponents/CippCopyToClipboard"; +import extensionDataMapping from "../../data/extensionDataMapping"; +import { getCippTranslation } from "../../utils/get-cipp-translation"; const CippCustomDataMappingForm = ({ formControl }) => { const selectedAttribute = useWatch({ control: formControl.control, name: "customDataAttribute" }); diff --git a/src/components/CippFormPages/CippExchangeSettingsForm.jsx b/src/components/CippFormPages/CippExchangeSettingsForm.jsx index db7c15da5af8..ee8bfc143074 100644 --- a/src/components/CippFormPages/CippExchangeSettingsForm.jsx +++ b/src/components/CippFormPages/CippExchangeSettingsForm.jsx @@ -13,7 +13,7 @@ import { IconButton, } from "@mui/material"; import { Check, Error, Sync } from "@mui/icons-material"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../CippComponents/CippFormComponent"; import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; import { useSettings } from "../../hooks/use-settings"; import { Grid } from "@mui/system"; diff --git a/src/components/CippFormPages/CippInviteGuest.jsx b/src/components/CippFormPages/CippInviteGuest.jsx index 7d62d071da0b..225c3282dd45 100644 --- a/src/components/CippFormPages/CippInviteGuest.jsx +++ b/src/components/CippFormPages/CippInviteGuest.jsx @@ -1,6 +1,6 @@ import "@mui/material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../CippComponents/CippFormComponent"; const CippInviteUser = (props) => { const { formControl, userSettingsDefaults } = props; diff --git a/src/components/CippFormPages/CippJSONView.jsx b/src/components/CippFormPages/CippJSONView.jsx index 0215385cbc89..4f082ef9ac33 100644 --- a/src/components/CippFormPages/CippJSONView.jsx +++ b/src/components/CippFormPages/CippJSONView.jsx @@ -19,7 +19,7 @@ import { PropertyList } from "../property-list"; import { getCippTranslation } from "../../utils/get-cipp-translation"; import { getCippFormatting } from "../../utils/get-cipp-formatting"; import { CippCodeBlock } from "../CippComponents/CippCodeBlock"; -import intuneCollection from "/src/data/intuneCollection.json"; +import intuneCollection from "../../data/intuneCollection.json"; import { useGuidResolver } from "../../hooks/use-guid-resolver"; const cleanObject = (obj) => { diff --git a/src/components/CippFormPages/CippSafeLinksPolicyRuleForm.jsx b/src/components/CippFormPages/CippSafeLinksPolicyRuleForm.jsx index ce25cc269028..2937aec1ae1a 100644 --- a/src/components/CippFormPages/CippSafeLinksPolicyRuleForm.jsx +++ b/src/components/CippFormPages/CippSafeLinksPolicyRuleForm.jsx @@ -1,15 +1,15 @@ import { useEffect, useState } from "react"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../CippComponents/CippFormComponent"; import { Typography } from "@mui/material"; -import { CippFormUserSelector } from "/src/components/CippComponents/CippFormUserSelector"; -import { CippFormGroupSelector } from "/src/components/CippComponents/CippFormGroupSelector"; -import { CippFormDomainSelector } from "/src/components/CippComponents/CippFormDomainSelector"; -import { CippInfoCard } from "/src/components/CippCards/CippInfoCard"; +import { CippFormUserSelector } from "../CippComponents/CippFormUserSelector"; +import { CippFormGroupSelector } from "../CippComponents/CippFormGroupSelector"; +import { CippFormDomainSelector } from "../CippComponents/CippFormDomainSelector"; +import { CippInfoCard } from "../CippCards/CippInfoCard"; import { InformationCircleIcon } from "@heroicons/react/24/outline"; -import { getCippValidator } from "/src/utils/get-cipp-validator"; -import { ApiGetCall } from "/src/api/ApiCall"; -import { useSettings } from "/src/hooks/use-settings"; +import { getCippValidator } from "../../utils/get-cipp-validator"; +import { ApiGetCall } from "../../api/ApiCall"; +import { useSettings } from "../../hooks/use-settings"; // Utility functions for data processing export const safeLinksDataUtils = { diff --git a/src/components/CippFormPages/CippSchedulerForm.jsx b/src/components/CippFormPages/CippSchedulerForm.jsx index f134461bce8c..8857a9d427a5 100644 --- a/src/components/CippFormPages/CippSchedulerForm.jsx +++ b/src/components/CippFormPages/CippSchedulerForm.jsx @@ -14,15 +14,15 @@ import { } from "@mui/material"; import { Grid, Stack } from "@mui/system"; import { useWatch } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; -import { CippFormCondition } from "/src/components/CippComponents/CippFormCondition"; -import CippGraphResourceSelector from "/src/components/CippComponents/CippGraphResourceSelector"; -import CippGraphAttributeSelector from "/src/components/CippComponents/CippGraphAttributeSelector"; -import { getCippValidator } from "/src/utils/get-cipp-validator"; +import CippFormComponent from "../CippComponents/CippFormComponent"; +import { CippFormTenantSelector } from "../CippComponents/CippFormTenantSelector"; +import { CippFormCondition } from "../CippComponents/CippFormCondition"; +import CippGraphResourceSelector from "../CippComponents/CippGraphResourceSelector"; +import CippGraphAttributeSelector from "../CippComponents/CippGraphAttributeSelector"; +import { getCippValidator } from "../../utils/get-cipp-validator"; import { useRouter } from "next/router"; import Link from "next/link"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; +import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; import { useEffect, useState } from "react"; import CippFormInputArray from "../CippComponents/CippFormInputArray"; import { CippApiResults } from "../CippComponents/CippApiResults"; diff --git a/src/components/CippIntegrations/CippApiClientManagement.jsx b/src/components/CippIntegrations/CippApiClientManagement.jsx index 4f42eb3d99a7..829ad4413ce2 100644 --- a/src/components/CippIntegrations/CippApiClientManagement.jsx +++ b/src/components/CippIntegrations/CippApiClientManagement.jsx @@ -2,7 +2,7 @@ import { Button, Stack, SvgIcon, Menu, MenuItem, ListItemText, Alert } from "@mu import { useState } from "react"; import isEqual from "lodash/isEqual"; import { useForm } from "react-hook-form"; -import { ApiGetCall, ApiGetCallWithPagination, ApiPostCall } from "/src/api/ApiCall"; +import { ApiGetCall, ApiGetCallWithPagination, ApiPostCall } from "../../api/ApiCall"; import { CippDataTable } from "../CippTable/CippDataTable"; import { ChevronDownIcon, diff --git a/src/components/CippIntegrations/CippIntegrationFieldMapping.jsx b/src/components/CippIntegrations/CippIntegrationFieldMapping.jsx index ae0014d0e276..53a88787de19 100644 --- a/src/components/CippIntegrations/CippIntegrationFieldMapping.jsx +++ b/src/components/CippIntegrations/CippIntegrationFieldMapping.jsx @@ -8,13 +8,13 @@ import { Button, Alert, } from "@mui/material"; -import CippFormSection from "/src/components/CippFormPages/CippFormSection"; +import CippFormSection from "../CippFormPages/CippFormSection"; import { useForm } from "react-hook-form"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../api/ApiCall"; import { useRouter } from "next/router"; -import extensions from "/src/data/Extensions.json"; +import extensions from "../../data/Extensions.json"; import React, { useEffect, useState } from "react"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../CippComponents/CippFormComponent"; import { Sync } from "@mui/icons-material"; import { Stack, Grid } from "@mui/system"; diff --git a/src/components/CippIntegrations/CippIntegrationSettings.jsx b/src/components/CippIntegrations/CippIntegrationSettings.jsx index 3ff5bea6f256..d0156df3897a 100644 --- a/src/components/CippIntegrations/CippIntegrationSettings.jsx +++ b/src/components/CippIntegrations/CippIntegrationSettings.jsx @@ -1,12 +1,12 @@ import { Box, CardContent } from "@mui/material"; import { Grid } from "@mui/system"; -import CippFormSection from "/src/components/CippFormPages/CippFormSection"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormSection from "../CippFormPages/CippFormSection"; +import CippFormComponent from "../CippComponents/CippFormComponent"; import { useForm } from "react-hook-form"; -import { useSettings } from "/src/hooks/use-settings"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { useSettings } from "../../hooks/use-settings"; +import { ApiGetCall } from "../../api/ApiCall"; import { useRouter } from "next/router"; -import extensions from "/src/data/Extensions.json"; +import extensions from "../../data/Extensions.json"; import React, { useEffect } from "react"; import { CippFormCondition } from "../CippComponents/CippFormCondition"; diff --git a/src/components/CippIntegrations/CippIntegrationTenantMapping.jsx b/src/components/CippIntegrations/CippIntegrationTenantMapping.jsx index 57680d8bae7d..cfe214218139 100644 --- a/src/components/CippIntegrations/CippIntegrationTenantMapping.jsx +++ b/src/components/CippIntegrations/CippIntegrationTenantMapping.jsx @@ -12,9 +12,9 @@ import { import { Grid } from "@mui/system"; import { useState, useMemo } from "react"; import { useForm } from "react-hook-form"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; +import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; import { useRouter } from "next/router"; -import extensions from "/src/data/Extensions.json"; +import extensions from "../../data/Extensions.json"; import { useEffect } from "react"; import { CippDataTable } from "../CippTable/CippDataTable"; import { PlusSmallIcon, SparklesIcon, TrashIcon } from "@heroicons/react/24/outline"; diff --git a/src/components/CippSettings/CippBackendCard.jsx b/src/components/CippSettings/CippBackendCard.jsx index 2b0890b0f340..6c9465ae5a90 100644 --- a/src/components/CippSettings/CippBackendCard.jsx +++ b/src/components/CippSettings/CippBackendCard.jsx @@ -1,9 +1,9 @@ import { OpenInNew } from "@mui/icons-material"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; +import CippButtonCard from "../CippCards/CippButtonCard"; import { Button, Stack, SvgIcon, Typography } from "@mui/material"; import { CippOffCanvas } from "../CippComponents/CippOffCanvas"; import { useState } from "react"; -import { getCippTranslation } from "/src/utils/get-cipp-translation"; +import { getCippTranslation } from "../../utils/get-cipp-translation"; export const CippBackendCard = ({ backendComponents, item, hosted }) => { const [open, setOpen] = useState(false); diff --git a/src/components/CippSettings/CippBackupRetentionSettings.jsx b/src/components/CippSettings/CippBackupRetentionSettings.jsx index bcd74ec4bb5d..38cd78ed2ceb 100644 --- a/src/components/CippSettings/CippBackupRetentionSettings.jsx +++ b/src/components/CippSettings/CippBackupRetentionSettings.jsx @@ -1,6 +1,6 @@ import { Button, ButtonGroup, SvgIcon, Typography, TextField, Box } from "@mui/material"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; +import CippButtonCard from "../CippCards/CippButtonCard"; +import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; import { History } from "@mui/icons-material"; import { useState, useEffect } from "react"; diff --git a/src/components/CippSettings/CippBackupSettings.jsx b/src/components/CippSettings/CippBackupSettings.jsx index 39663651f7d2..a7f56afe7d0f 100644 --- a/src/components/CippSettings/CippBackupSettings.jsx +++ b/src/components/CippSettings/CippBackupSettings.jsx @@ -1,7 +1,7 @@ import { Button, SvgIcon, Typography } from "@mui/material"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { ApiPostCall } from "/src/api/ApiCall"; -import { useDialog } from "/src/hooks/use-dialog"; +import CippButtonCard from "../CippCards/CippButtonCard"; +import { ApiPostCall } from "../../api/ApiCall"; +import { useDialog } from "../../hooks/use-dialog"; import { SettingsBackupRestore } from "@mui/icons-material"; import Link from "next/link"; diff --git a/src/components/CippSettings/CippBrandingSettings.jsx b/src/components/CippSettings/CippBrandingSettings.jsx index 88838995811a..b0e0f747ef35 100644 --- a/src/components/CippSettings/CippBrandingSettings.jsx +++ b/src/components/CippSettings/CippBrandingSettings.jsx @@ -1,9 +1,9 @@ import { useState } from "react"; import { Button, Typography, Box, Alert } from "@mui/material"; import { Palette, Upload } from "@mui/icons-material"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; -import { useSettings } from "/src/hooks/use-settings"; +import CippButtonCard from "../CippCards/CippButtonCard"; +import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; +import { useSettings } from "../../hooks/use-settings"; import { CippApiResults } from "../CippComponents/CippApiResults"; import CippFormComponent from "../CippComponents/CippFormComponent"; import { useForm } from "react-hook-form"; diff --git a/src/components/CippSettings/CippCacheSettings.jsx b/src/components/CippSettings/CippCacheSettings.jsx index ad736adf604f..3b9ebf55ec53 100644 --- a/src/components/CippSettings/CippCacheSettings.jsx +++ b/src/components/CippSettings/CippCacheSettings.jsx @@ -1,8 +1,8 @@ import { Button, SvgIcon, Typography } from "@mui/material"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { ApiPostCall } from "/src/api/ApiCall"; +import CippButtonCard from "../CippCards/CippButtonCard"; +import { ApiPostCall } from "../../api/ApiCall"; import { CippApiDialog } from "../CippComponents/CippApiDialog"; -import { useDialog } from "/src/hooks/use-dialog"; +import { useDialog } from "../../hooks/use-dialog"; import { TrashIcon } from "@heroicons/react/24/outline"; const CippCacheSettings = () => { diff --git a/src/components/CippSettings/CippDnsSettings.jsx b/src/components/CippSettings/CippDnsSettings.jsx index 847c0451bf87..92f73d10195f 100644 --- a/src/components/CippSettings/CippDnsSettings.jsx +++ b/src/components/CippSettings/CippDnsSettings.jsx @@ -1,6 +1,6 @@ import { Button, ButtonGroup, SvgIcon, Typography } from "@mui/material"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; +import CippButtonCard from "../CippCards/CippButtonCard"; +import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; import { Dns } from "@mui/icons-material"; const CippDnsSettings = () => { diff --git a/src/components/CippSettings/CippGDAPResults.jsx b/src/components/CippSettings/CippGDAPResults.jsx index 055a8f0136a1..5c381668c78a 100644 --- a/src/components/CippSettings/CippGDAPResults.jsx +++ b/src/components/CippSettings/CippGDAPResults.jsx @@ -1,9 +1,9 @@ import { List, ListItem, Skeleton, SvgIcon, Typography } from "@mui/material"; import { Cancel, CheckCircle, Warning } from "@mui/icons-material"; -import { CippPropertyList } from "/src/components/CippComponents/CippPropertyList"; +import { CippPropertyList } from "../CippComponents/CippPropertyList"; import { XMarkIcon } from "@heroicons/react/24/outline"; import { CippOffCanvas } from "../CippComponents/CippOffCanvas"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; +import { CippDataTable } from "../CippTable/CippDataTable"; import { useEffect, useState } from "react"; export const CippGDAPResults = (props) => { diff --git a/src/components/CippSettings/CippJitAdminSettings.jsx b/src/components/CippSettings/CippJitAdminSettings.jsx index f4c175e6c65d..7068c6fb6de5 100644 --- a/src/components/CippSettings/CippJitAdminSettings.jsx +++ b/src/components/CippSettings/CippJitAdminSettings.jsx @@ -1,7 +1,7 @@ import { Button, Typography, Alert, Box } from "@mui/material"; import { ClockIcon } from "@heroicons/react/24/outline"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; +import CippButtonCard from "../CippCards/CippButtonCard"; +import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; import { CippApiResults } from "../CippComponents/CippApiResults"; import CippFormComponent from "../CippComponents/CippFormComponent"; import { useForm } from "react-hook-form"; diff --git a/src/components/CippSettings/CippPasswordSettings.jsx b/src/components/CippSettings/CippPasswordSettings.jsx index 0f3a8d6f4976..1394beff3fe5 100644 --- a/src/components/CippSettings/CippPasswordSettings.jsx +++ b/src/components/CippSettings/CippPasswordSettings.jsx @@ -1,6 +1,6 @@ import { Button, ButtonGroup, SvgIcon, Typography } from "@mui/material"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; +import CippButtonCard from "../CippCards/CippButtonCard"; +import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; import { KeyIcon } from "@heroicons/react/24/outline"; const CippPasswordSettings = () => { diff --git a/src/components/CippSettings/CippPermissionCheck.jsx b/src/components/CippSettings/CippPermissionCheck.jsx index db0c81c7ad38..c38f8aa49d5a 100644 --- a/src/components/CippSettings/CippPermissionCheck.jsx +++ b/src/components/CippSettings/CippPermissionCheck.jsx @@ -9,8 +9,8 @@ import { SvgIcon, Typography, } from "@mui/material"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { ApiGetCall } from "/src/api/ApiCall"; +import CippButtonCard from "../CippCards/CippButtonCard"; +import { ApiGetCall } from "../../api/ApiCall"; import { useEffect, useState } from "react"; import { CippPermissionResults } from "./CippPermissionResults"; import { CippGDAPResults } from "./CippGDAPResults"; diff --git a/src/components/CippSettings/CippPermissionResults.jsx b/src/components/CippSettings/CippPermissionResults.jsx index 22c0b3d425c4..10beabd93f6e 100644 --- a/src/components/CippSettings/CippPermissionResults.jsx +++ b/src/components/CippSettings/CippPermissionResults.jsx @@ -1,10 +1,10 @@ import { Button, Link, List, ListItem, Skeleton, SvgIcon, Typography } from "@mui/material"; import { Cancel, CheckCircle } from "@mui/icons-material"; -import { CippPropertyList } from "/src/components/CippComponents/CippPropertyList"; +import { CippPropertyList } from "../CippComponents/CippPropertyList"; import { WrenchIcon, XMarkIcon } from "@heroicons/react/24/outline"; import { CippOffCanvas } from "../CippComponents/CippOffCanvas"; import { CippPropertyListCard } from "../CippCards/CippPropertyListCard"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; +import { CippDataTable } from "../CippTable/CippDataTable"; import { ApiPostCall } from "../../api/ApiCall"; import { CippApiResults } from "../CippComponents/CippApiResults"; import { useEffect, useState } from "react"; diff --git a/src/components/CippSettings/CippRoleAddEdit.jsx b/src/components/CippSettings/CippRoleAddEdit.jsx index 86bf06168ac9..4c02bf71e673 100644 --- a/src/components/CippSettings/CippRoleAddEdit.jsx +++ b/src/components/CippSettings/CippRoleAddEdit.jsx @@ -15,8 +15,8 @@ import { import { Grid } from "@mui/system"; import { ApiGetCall, ApiGetCallWithPagination, ApiPostCall } from "../../api/ApiCall"; -import { CippOffCanvas } from "/src/components/CippComponents/CippOffCanvas"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; +import { CippOffCanvas } from "../CippComponents/CippOffCanvas"; +import { CippFormTenantSelector } from "../CippComponents/CippFormTenantSelector"; import { Save, WarningOutlined } from "@mui/icons-material"; import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; import CippFormComponent from "../CippComponents/CippFormComponent"; diff --git a/src/components/CippSettings/CippVersionProperties.jsx b/src/components/CippSettings/CippVersionProperties.jsx index 6fbf88a39311..4b19e1d9e328 100644 --- a/src/components/CippSettings/CippVersionProperties.jsx +++ b/src/components/CippSettings/CippVersionProperties.jsx @@ -1,7 +1,7 @@ import { Box, Button, SvgIcon } from "@mui/material"; -import { CippPropertyListCard } from "/src/components/CippCards/CippPropertyListCard"; +import { CippPropertyListCard } from "../CippCards/CippPropertyListCard"; import { CheckCircle, SystemUpdateAlt, Warning } from "@mui/icons-material"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../api/ApiCall"; import { useEffect } from "react"; const CippVersionProperties = () => { diff --git a/src/components/CippStandards/CippStandardAccordion.jsx b/src/components/CippStandards/CippStandardAccordion.jsx index e5c90b075932..dd59cee0bccc 100644 --- a/src/components/CippStandards/CippStandardAccordion.jsx +++ b/src/components/CippStandards/CippStandardAccordion.jsx @@ -29,7 +29,7 @@ import { Construction, } from "@mui/icons-material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../CippComponents/CippFormComponent"; import { useWatch, useFormState } from "react-hook-form"; import _ from "lodash"; import Microsoft from "../../icons/iconly/bulk/microsoft"; @@ -37,9 +37,9 @@ import Azure from "../../icons/iconly/bulk/azure"; import Exchange from "../../icons/iconly/bulk/exchange"; import Defender from "../../icons/iconly/bulk/defender"; import Intune from "../../icons/iconly/bulk/intune"; -import GDAPRoles from "/src/data/GDAPRoles"; -import timezoneList from "/src/data/timezoneList"; -import standards from "/src/data/standards.json"; +import GDAPRoles from "../../data/GDAPRoles"; +import timezoneList from "../../data/timezoneList"; +import standards from "../../data/standards.json"; import { CippFormCondition } from "../CippComponents/CippFormCondition"; import { CippPolicyImportDrawer } from "../CippComponents/CippPolicyImportDrawer"; import ReactMarkdown from "react-markdown"; diff --git a/src/components/CippStandards/CippStandardsSideBar.jsx b/src/components/CippStandards/CippStandardsSideBar.jsx index 7e2ccdcb6647..8fde6343fe41 100644 --- a/src/components/CippStandards/CippStandardsSideBar.jsx +++ b/src/components/CippStandards/CippStandardsSideBar.jsx @@ -10,14 +10,14 @@ import { timelineItemClasses, TimelineSeparator, } from "@mui/lab"; -import { ActionList } from "/src/components/action-list"; -import { ActionListItem } from "/src/components/action-list-item"; +import { ActionList } from "../action-list"; +import { ActionListItem } from "../action-list-item"; import CheckIcon from "@heroicons/react/24/outline/CheckIcon"; import CloseIcon from "@mui/icons-material/Close"; import { useWatch } from "react-hook-form"; import { useEffect, useState } from "react"; import _ from "lodash"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../CippComponents/CippFormComponent"; import { CippFormTenantSelector } from "../CippComponents/CippFormTenantSelector"; import { CippApiDialog } from "../CippComponents/CippApiDialog"; import ReactTimeAgo from "react-time-ago"; diff --git a/src/components/CippTable/CIPPTableToptoolbar.js b/src/components/CippTable/CIPPTableToptoolbar.js index 8393cd3b9a86..32c28c31e84a 100644 --- a/src/components/CippTable/CIPPTableToptoolbar.js +++ b/src/components/CippTable/CIPPTableToptoolbar.js @@ -49,7 +49,7 @@ import { useRouter } from "next/router"; import { CippOffCanvas } from "../CippComponents/CippOffCanvas"; import { CippCodeBlock } from "../CippComponents/CippCodeBlock"; import { ApiGetCall } from "../../api/ApiCall"; -import GraphExplorerPresets from "/src/data/GraphExplorerPresets.json"; +import GraphExplorerPresets from "../../data/GraphExplorerPresets.json"; import CippGraphExplorerFilter from "./CippGraphExplorerFilter"; import { Stack } from "@mui/system"; diff --git a/src/components/CippTable/CippGraphExplorerFilter.js b/src/components/CippTable/CippGraphExplorerFilter.js index 6ce020886005..9d296e50ef2f 100644 --- a/src/components/CippTable/CippGraphExplorerFilter.js +++ b/src/components/CippTable/CippGraphExplorerFilter.js @@ -10,8 +10,8 @@ import { } from "@mui/icons-material"; import { useForm, useWatch } from "react-hook-form"; import { debounce } from "lodash"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippButtonCard from "../CippCards/CippButtonCard"; +import CippFormComponent from "../CippComponents/CippFormComponent"; import { ApiGetCall, ApiPostCall } from "../../api/ApiCall"; import { useSettings } from "../../hooks/use-settings"; import { CippApiResults } from "../CippComponents/CippApiResults"; diff --git a/src/components/CippTestDetail/CippTestDetailOffCanvas.jsx b/src/components/CippTestDetail/CippTestDetailOffCanvas.jsx index 2a621d3d205e..3a5b29a24301 100644 --- a/src/components/CippTestDetail/CippTestDetailOffCanvas.jsx +++ b/src/components/CippTestDetail/CippTestDetailOffCanvas.jsx @@ -4,7 +4,7 @@ import { KeyboardArrowRight } from "@mui/icons-material"; import ReactMarkdown from "react-markdown"; import remarkGfm from "remark-gfm"; import { Grid } from "@mui/system"; -import standardsData from "/src/data/standards.json"; +import standardsData from "../../data/standards.json"; const getStatusColor = (status) => { switch (status?.toLowerCase()) { diff --git a/src/components/CippWizard/CippWizardBulkOptions.jsx b/src/components/CippWizard/CippWizardBulkOptions.jsx index 4396b9ee319b..43fcaf1171b6 100644 --- a/src/components/CippWizard/CippWizardBulkOptions.jsx +++ b/src/components/CippWizard/CippWizardBulkOptions.jsx @@ -2,7 +2,7 @@ import { Stack } from "@mui/material"; import { Grid } from "@mui/system"; import CippWizardStepButtons from "./CippWizardStepButtons"; import CippFormComponent from "../CippComponents/CippFormComponent"; -import countryList from "/src/data/countryList.json"; +import countryList from "../../data/countryList.json"; import { CippFormLicenseSelector } from "../CippComponents/CippFormLicenseSelector"; export const CippWizardBulkOptions = (props) => { const { postUrl, formControl, onPreviousStep, onNextStep, currentStep } = props; diff --git a/src/hooks/use-guid-resolver.js b/src/hooks/use-guid-resolver.js index 1325722fc872..f51a9a2bb201 100644 --- a/src/hooks/use-guid-resolver.js +++ b/src/hooks/use-guid-resolver.js @@ -1,6 +1,6 @@ import { useState, useCallback, useRef, useEffect } from "react"; -import { ApiPostCall } from "/src/api/ApiCall"; -import { useSettings } from "/src/hooks/use-settings"; +import { ApiPostCall } from "../api/ApiCall"; +import { useSettings } from "./use-settings"; // Function to check if a string is a GUID const isGuid = (str) => { diff --git a/src/hooks/use-permissions.js b/src/hooks/use-permissions.js index 6b7973c164f8..3fa9b6185707 100644 --- a/src/hooks/use-permissions.js +++ b/src/hooks/use-permissions.js @@ -1,6 +1,6 @@ import { useCallback } from "react"; -import { ApiGetCall } from "/src/api/ApiCall"; -import { hasAccess, hasPermission, hasRole } from "/src/utils/permissions"; +import { ApiGetCall } from "../api/ApiCall"; +import { hasAccess, hasPermission, hasRole } from "../utils/permissions"; /** * Hook for checking user permissions and roles diff --git a/src/hooks/use-securescore.js b/src/hooks/use-securescore.js index a51dc18d9138..66287c8f87bd 100644 --- a/src/hooks/use-securescore.js +++ b/src/hooks/use-securescore.js @@ -1,7 +1,7 @@ import { useEffect, useState } from "react"; import { ApiGetCall } from "../api/ApiCall"; import { useSettings } from "./use-settings"; -import standards from "/src/data/standards.json"; +import standards from "../data/standards.json"; export function useSecureScore({ waiting = true } = {}) { const currentTenant = useSettings().currentTenant; diff --git a/src/index.js b/src/index.js index 6f78fb85ec69..141824e0c90c 100644 --- a/src/index.js +++ b/src/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "./layouts/index.js"; const Page = () => { const pageTitle = "Dashboard"; diff --git a/src/layouts/HeaderedTabbedLayout.jsx b/src/layouts/HeaderedTabbedLayout.jsx index ece1d0659924..1b5585a6812a 100644 --- a/src/layouts/HeaderedTabbedLayout.jsx +++ b/src/layouts/HeaderedTabbedLayout.jsx @@ -15,7 +15,7 @@ import { Tabs, Typography, } from "@mui/material"; -import { ActionsMenu } from "/src/components/actions-menu"; +import { ActionsMenu } from "../components/actions-menu"; import { useMediaQuery } from "@mui/material"; export const HeaderedTabbedLayout = (props) => { diff --git a/src/layouts/index.js b/src/layouts/index.js index 92774c200e4d..b33cb452bf4f 100644 --- a/src/layouts/index.js +++ b/src/layouts/index.js @@ -23,7 +23,7 @@ import { Box, Container, Grid } from "@mui/system"; import { CippImageCard } from "../components/CippCards/CippImageCard"; import Page from "../pages/onboardingv2"; import { useDialog } from "../hooks/use-dialog"; -import { nativeMenuItems } from "/src/layouts/config"; +import { nativeMenuItems } from "./config"; import { CippBreadcrumbNav } from "../components/CippComponents/CippBreadcrumbNav"; const SIDE_NAV_WIDTH = 270; diff --git a/src/pages/cipp/advanced/diagnostics.js b/src/pages/cipp/advanced/diagnostics.js index c37e5ef5c478..962eced7a27a 100644 --- a/src/pages/cipp/advanced/diagnostics.js +++ b/src/pages/cipp/advanced/diagnostics.js @@ -1,7 +1,7 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import CippDiagnosticsFilter from "/src/components/CippTable/CippDiagnosticsFilter"; -import { CippPropertyListCard } from "/src/components/CippCards/CippPropertyListCard"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { CippTablePage } from "../../../components/CippComponents/CippTablePage.jsx"; +import CippDiagnosticsFilter from "../../../components/CippTable/CippDiagnosticsFilter"; +import { CippPropertyListCard } from "../../../components/CippCards/CippPropertyListCard"; import { useState } from "react"; import { Grid } from "@mui/system"; import { Box, Typography, Chip, Stack, Divider } from "@mui/material"; diff --git a/src/pages/cipp/advanced/exchange-cmdlets.js b/src/pages/cipp/advanced/exchange-cmdlets.js index 14f4ba74ec91..9e6e61bcd379 100644 --- a/src/pages/cipp/advanced/exchange-cmdlets.js +++ b/src/pages/cipp/advanced/exchange-cmdlets.js @@ -1,4 +1,4 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import { Alert, Button, @@ -12,10 +12,10 @@ import { } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { ApiPostCall } from "/src/api/ApiCall"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; +import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; +import { ApiPostCall } from "../../../api/ApiCall"; +import CippButtonCard from "../../../components/CippCards/CippButtonCard"; +import { CippDataTable } from "../../../components/CippTable/CippDataTable"; import { useState, useEffect } from "react"; import { Search, Close } from "@mui/icons-material"; import { CippFormTenantSelector } from "../../../components/CippComponents/CippFormTenantSelector"; diff --git a/src/pages/cipp/advanced/table-maintenance.js b/src/pages/cipp/advanced/table-maintenance.js index d7e317b5c6b5..fea95d6e3774 100644 --- a/src/pages/cipp/advanced/table-maintenance.js +++ b/src/pages/cipp/advanced/table-maintenance.js @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import { useEffect, useState } from "react"; import { ApiPostCall } from "../../../api/ApiCall"; -import { CippPropertyListCard } from "/src/components/CippCards/CippPropertyListCard"; // Fixed import -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; // Fixed import +import { CippPropertyListCard } from "../../../components/CippCards/CippPropertyListCard"; // Fixed import +import { CippDataTable } from "../../../components/CippTable/CippDataTable"; // Fixed import import { useDialog } from "../../../hooks/use-dialog"; import { Box, diff --git a/src/pages/cipp/advanced/timers.js b/src/pages/cipp/advanced/timers.js index 116d27cd836f..669500a24d80 100644 --- a/src/pages/cipp/advanced/timers.js +++ b/src/pages/cipp/advanced/timers.js @@ -1,9 +1,9 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import { SvgIcon, Button } from "@mui/material"; import { Refresh, PlayArrow } from "@mui/icons-material"; import { ApiPostCall } from "../../../api/ApiCall"; import { useEffect, useState } from "react"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage"; +import { CippTablePage } from "../../../components/CippComponents/CippTablePage"; import { useDialog } from "../../../hooks/use-dialog"; import { CippApiDialog } from "../../../components/CippComponents/CippApiDialog"; diff --git a/src/pages/cipp/custom-data/directory-extensions/add.js b/src/pages/cipp/custom-data/directory-extensions/add.js index 975c7be997de..0b7d2e11e6ee 100644 --- a/src/pages/cipp/custom-data/directory-extensions/add.js +++ b/src/pages/cipp/custom-data/directory-extensions/add.js @@ -1,6 +1,6 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useFormState } from "react-hook-form"; -import { ApiPostCall } from "/src/api/ApiCall"; +import { ApiPostCall } from "../../../../api/ApiCall"; import { useRouter } from "next/router"; import { Box, @@ -12,9 +12,9 @@ import { CardActions, } from "@mui/material"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; -import { CippApiResults } from "/src/components/CippComponents/CippApiResults"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippPageCard from "../../../../components/CippCards/CippPageCard"; +import { CippApiResults } from "../../../../components/CippComponents/CippApiResults"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; const availableTargetObjects = [ { value: "User", label: "User" }, diff --git a/src/pages/cipp/custom-data/directory-extensions/index.js b/src/pages/cipp/custom-data/directory-extensions/index.js index 891342e97ce1..5a223007c863 100644 --- a/src/pages/cipp/custom-data/directory-extensions/index.js +++ b/src/pages/cipp/custom-data/directory-extensions/index.js @@ -1,6 +1,6 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Alert, Button, Link, SvgIcon } from "@mui/material"; import { Add } from "@mui/icons-material"; import tabOptions from "../tabOptions"; diff --git a/src/pages/cipp/custom-data/mappings/add.js b/src/pages/cipp/custom-data/mappings/add.js index cd77fc9eff6e..601fd777aa9e 100644 --- a/src/pages/cipp/custom-data/mappings/add.js +++ b/src/pages/cipp/custom-data/mappings/add.js @@ -1,12 +1,12 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useFormState } from "react-hook-form"; -import { ApiPostCall } from "/src/api/ApiCall"; +import { ApiPostCall } from "../../../../api/ApiCall"; import { useRouter } from "next/router"; import { Button, Stack, CardContent, CardActions } from "@mui/material"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; -import { CippApiResults } from "/src/components/CippComponents/CippApiResults"; -import CippCustomDataMappingForm from "/src/components/CippFormPages/CippCustomDataMappingForm"; +import CippPageCard from "../../../../components/CippCards/CippPageCard"; +import { CippApiResults } from "../../../../components/CippComponents/CippApiResults"; +import CippCustomDataMappingForm from "../../../../components/CippFormPages/CippCustomDataMappingForm"; const Page = () => { const router = useRouter(); diff --git a/src/pages/cipp/custom-data/mappings/edit.js b/src/pages/cipp/custom-data/mappings/edit.js index 55a2bbc648e8..ca48da77ed14 100644 --- a/src/pages/cipp/custom-data/mappings/edit.js +++ b/src/pages/cipp/custom-data/mappings/edit.js @@ -1,13 +1,13 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useFormState } from "react-hook-form"; import { useRouter } from "next/router"; import { useEffect } from "react"; -import { ApiPostCall, ApiGetCall } from "/src/api/ApiCall"; +import { ApiPostCall, ApiGetCall } from "../../../../api/ApiCall"; import { Button, Stack, CardContent, CardActions, Skeleton } from "@mui/material"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; -import { CippApiResults } from "/src/components/CippComponents/CippApiResults"; -import CippCustomDataMappingForm from "/src/components/CippFormPages/CippCustomDataMappingForm"; +import CippPageCard from "../../../../components/CippCards/CippPageCard"; +import { CippApiResults } from "../../../../components/CippComponents/CippApiResults"; +import CippCustomDataMappingForm from "../../../../components/CippFormPages/CippCustomDataMappingForm"; const Page = () => { const router = useRouter(); diff --git a/src/pages/cipp/custom-data/mappings/index.js b/src/pages/cipp/custom-data/mappings/index.js index 7579685d1f62..f25c17fd83e1 100644 --- a/src/pages/cipp/custom-data/mappings/index.js +++ b/src/pages/cipp/custom-data/mappings/index.js @@ -1,6 +1,6 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Alert, Button, SvgIcon, Typography } from "@mui/material"; import { Add } from "@mui/icons-material"; import tabOptions from "../tabOptions"; diff --git a/src/pages/cipp/custom-data/schema-extensions/add.js b/src/pages/cipp/custom-data/schema-extensions/add.js index 07be1c409067..4d8fb8760c80 100644 --- a/src/pages/cipp/custom-data/schema-extensions/add.js +++ b/src/pages/cipp/custom-data/schema-extensions/add.js @@ -1,6 +1,6 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch, useFormState } from "react-hook-form"; -import { ApiPostCall } from "/src/api/ApiCall"; +import { ApiPostCall } from "../../../../api/ApiCall"; import { useRouter } from "next/router"; import { Box, @@ -14,9 +14,9 @@ import { } from "@mui/material"; import { AddCircle, RemoveCircle } from "@mui/icons-material"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; -import { CippApiResults } from "/src/components/CippComponents/CippApiResults"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippPageCard from "../../../../components/CippCards/CippPageCard"; +import { CippApiResults } from "../../../../components/CippComponents/CippApiResults"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; const availableTargetTypes = [ { value: "user", label: "User" }, diff --git a/src/pages/cipp/custom-data/schema-extensions/index.js b/src/pages/cipp/custom-data/schema-extensions/index.js index daca34251209..fab26e70f51c 100644 --- a/src/pages/cipp/custom-data/schema-extensions/index.js +++ b/src/pages/cipp/custom-data/schema-extensions/index.js @@ -1,6 +1,6 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Alert, Button, Link, SvgIcon, Typography } from "@mui/material"; import { Add, Block, CheckCircleOutline } from "@mui/icons-material"; import tabOptions from "../tabOptions"; diff --git a/src/pages/cipp/extension-sync/index.js b/src/pages/cipp/extension-sync/index.js index c4d91f784d45..7fe6fa1c271e 100644 --- a/src/pages/cipp/extension-sync/index.js +++ b/src/pages/cipp/extension-sync/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { CippTablePage } from "../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import { Refresh } from "@mui/icons-material"; diff --git a/src/pages/cipp/integrations/configure.js b/src/pages/cipp/integrations/configure.js index 3cae174bbb56..330e03d55b13 100644 --- a/src/pages/cipp/integrations/configure.js +++ b/src/pages/cipp/integrations/configure.js @@ -9,18 +9,18 @@ import { Tabs, Typography, } from "@mui/material"; -import CippIntegrationSettings from "/src/components/CippIntegrations/CippIntegrationSettings"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippIntegrationSettings from "../../../components/CippIntegrations/CippIntegrationSettings"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import { useForm } from "react-hook-form"; -import { useSettings } from "/src/hooks/use-settings"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { useSettings } from "../../../hooks/use-settings"; +import { ApiGetCall } from "../../../api/ApiCall"; import { useRouter } from "next/router"; -import extensions from "/src/data/Extensions.json"; +import extensions from "../../../data/Extensions.json"; import { useEffect } from "react"; import { ArrowPathIcon, ArrowTopRightOnSquareIcon, BeakerIcon } from "@heroicons/react/24/outline"; import { SvgIcon } from "@mui/material"; import { useState } from "react"; -import { CippApiResults } from "/src/components/CippComponents/CippApiResults"; +import { CippApiResults } from "../../../components/CippComponents/CippApiResults"; import CippPageCard from "../../../components/CippCards/CippPageCard"; import CippIntegrationTenantMapping from "../../../components/CippIntegrations/CippIntegrationTenantMapping"; import CippIntegrationFieldMapping from "../../../components/CippIntegrations/CippIntegrationFieldMapping"; diff --git a/src/pages/cipp/integrations/index.js b/src/pages/cipp/integrations/index.js index 033dac2aaf06..e6ae38f8de12 100644 --- a/src/pages/cipp/integrations/index.js +++ b/src/pages/cipp/integrations/index.js @@ -1,4 +1,4 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import { Box, Button, @@ -11,13 +11,13 @@ import { Stack, Typography, } from "@mui/material"; -import extensions from "/src/data/Extensions"; +import extensions from "../../../data/Extensions"; import { Sync } from "@mui/icons-material"; -import { useSettings } from "/src/hooks/use-settings"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { useSettings } from "../../../hooks/use-settings"; +import { ApiGetCall } from "../../../api/ApiCall"; import Link from "next/link"; import { Grid } from "@mui/system"; -import { CippHead } from "/src/components/CippComponents/CippHead"; +import { CippHead } from "../../../components/CippComponents/CippHead"; const Page = () => { const settings = useSettings(); diff --git a/src/pages/cipp/integrations/sync.js b/src/pages/cipp/integrations/sync.js index 27b6fb1dfa8f..952dae276db2 100644 --- a/src/pages/cipp/integrations/sync.js +++ b/src/pages/cipp/integrations/sync.js @@ -1,7 +1,7 @@ import { Box } from "@mui/system"; import CippPageCard from "../../../components/CippCards/CippPageCard"; import { CippDataTable } from "../../../components/CippTable/CippDataTable"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; const Page = () => { const simpleColumns = [ diff --git a/src/pages/cipp/logs/index.js b/src/pages/cipp/logs/index.js index 41eac2225d46..55dc8bdcac75 100644 --- a/src/pages/cipp/logs/index.js +++ b/src/pages/cipp/logs/index.js @@ -1,6 +1,6 @@ import { useState } from "react"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { CippTablePage } from "../../../components/CippComponents/CippTablePage.jsx"; import { Button, Accordion, diff --git a/src/pages/cipp/logs/logentry.js b/src/pages/cipp/logs/logentry.js index 175dcc915aba..521026693fd8 100644 --- a/src/pages/cipp/logs/logentry.js +++ b/src/pages/cipp/logs/logentry.js @@ -1,12 +1,12 @@ import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { ApiGetCall } from "../../../api/ApiCall"; import { Button, SvgIcon, Box, Container, Chip } from "@mui/material"; import { Stack } from "@mui/system"; import ArrowLeftIcon from "@mui/icons-material/ArrowLeft"; -import { CippPropertyListCard } from "/src/components/CippCards/CippPropertyListCard"; -import { CippInfoBar } from "/src/components/CippCards/CippInfoBar"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; +import { CippPropertyListCard } from "../../../components/CippCards/CippPropertyListCard"; +import { CippInfoBar } from "../../../components/CippCards/CippInfoBar"; +import CippFormSkeleton from "../../../components/CippFormPages/CippFormSkeleton"; import { getCippTranslation } from "../../../utils/get-cipp-translation"; const Page = () => { diff --git a/src/pages/cipp/preferences.js b/src/pages/cipp/preferences.js index 011acfb4c724..bd15fbf9ae70 100644 --- a/src/pages/cipp/preferences.js +++ b/src/pages/cipp/preferences.js @@ -1,14 +1,14 @@ import Head from "next/head"; import { Box, Container, Stack } from "@mui/material"; import { Grid } from "@mui/system"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../layouts/index.js"; import { CippPropertyListCard } from "../../components/CippCards/CippPropertyListCard"; import CippFormComponent from "../../components/CippComponents/CippFormComponent"; import { useForm, useWatch } from "react-hook-form"; import { useSettings } from "../../hooks/use-settings"; import countryList from "../../data/countryList.json"; import { CippSettingsSideBar } from "../../components/CippComponents/CippSettingsSideBar"; -import CippDevOptions from "/src/components/CippComponents/CippDevOptions"; +import CippDevOptions from "../../components/CippComponents/CippDevOptions"; import { CippOffboardingDefaultSettings } from "../../components/CippComponents/CippOffboardingDefaultSettings"; import { ApiGetCall } from "../../api/ApiCall"; import { getCippFormatting } from "../../utils/get-cipp-formatting"; diff --git a/src/pages/cipp/scheduler/index.js b/src/pages/cipp/scheduler/index.js index 2596035f733b..f3a877ea79ba 100644 --- a/src/pages/cipp/scheduler/index.js +++ b/src/pages/cipp/scheduler/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippTablePage from "/src/components/CippComponents/CippTablePage"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import CippTablePage from "../../../components/CippComponents/CippTablePage"; import { Button } from "@mui/material"; import { CalendarDaysIcon } from "@heroicons/react/24/outline"; import { useState } from "react"; diff --git a/src/pages/cipp/scheduler/job.jsx b/src/pages/cipp/scheduler/job.jsx index afef6c8a4c9c..11b00051a48d 100644 --- a/src/pages/cipp/scheduler/job.jsx +++ b/src/pages/cipp/scheduler/job.jsx @@ -1,6 +1,6 @@ import { useForm } from "react-hook-form"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import CippSchedulerForm from "../../../components/CippFormPages/CippSchedulerForm"; import { useRouter } from "next/router"; diff --git a/src/pages/cipp/scheduler/task.js b/src/pages/cipp/scheduler/task.js index 8f52ae443ece..dd9fdfbcee9e 100644 --- a/src/pages/cipp/scheduler/task.js +++ b/src/pages/cipp/scheduler/task.js @@ -1,5 +1,5 @@ import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import ScheduledTaskDetails from "../../../components/CippComponents/ScheduledTaskDetails"; import CippPageCard from "../../../components/CippCards/CippPageCard"; import { CardContent } from "@mui/material"; diff --git a/src/pages/cipp/settings/backend.js b/src/pages/cipp/settings/backend.js index 6cb35a490f1a..a988cb463a1c 100644 --- a/src/pages/cipp/settings/backend.js +++ b/src/pages/cipp/settings/backend.js @@ -1,11 +1,11 @@ import { Container } from "@mui/material"; import { Grid } from "@mui/system"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; -import { ApiGetCall } from "/src/api/ApiCall.jsx"; -import { CippBackendCard } from "/src/components/CippSettings/CippBackendCard"; -import { CippCodeBlock } from "/src/components/CippComponents/CippCodeBlock"; +import { ApiGetCall } from "../../../api/ApiCall.jsx"; +import { CippBackendCard } from "../../../components/CippSettings/CippBackendCard"; +import { CippCodeBlock } from "../../../components/CippComponents/CippCodeBlock"; import { CommandLineIcon } from "@heroicons/react/24/outline"; const Page = () => { diff --git a/src/pages/cipp/settings/backup.js b/src/pages/cipp/settings/backup.js index 4c5249cf51ec..6de4144029b6 100644 --- a/src/pages/cipp/settings/backup.js +++ b/src/pages/cipp/settings/backup.js @@ -11,7 +11,7 @@ import { FormControl, FormLabel, } from "@mui/material"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import CippPageCard from "../../../components/CippCards/CippPageCard"; import { ApiGetCall, ApiPostCall } from "../../../api/ApiCall"; import { CippInfoBar } from "../../../components/CippCards/CippInfoBar"; diff --git a/src/pages/cipp/settings/index.js b/src/pages/cipp/settings/index.js index 487e9a1cc719..07f6cd63a0fe 100644 --- a/src/pages/cipp/settings/index.js +++ b/src/pages/cipp/settings/index.js @@ -1,17 +1,17 @@ import { Container } from "@mui/material"; import { Grid } from "@mui/system"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; -import CippVersionProperties from "/src/components/CippSettings/CippVersionProperties"; -import CippPasswordSettings from "/src/components/CippSettings/CippPasswordSettings"; -import CippDnsSettings from "/src/components/CippSettings/CippDnsSettings"; -import CippCacheSettings from "/src/components/CippSettings/CippCacheSettings"; -import CippBackupSettings from "/src/components/CippSettings/CippBackupSettings"; -import CippBrandingSettings from "/src/components/CippSettings/CippBrandingSettings"; -import CippBackupRetentionSettings from "/src/components/CippSettings/CippBackupRetentionSettings"; -import CippJitAdminSettings from "/src/components/CippSettings/CippJitAdminSettings"; +import CippVersionProperties from "../../../components/CippSettings/CippVersionProperties"; +import CippPasswordSettings from "../../../components/CippSettings/CippPasswordSettings"; +import CippDnsSettings from "../../../components/CippSettings/CippDnsSettings"; +import CippCacheSettings from "../../../components/CippSettings/CippCacheSettings"; +import CippBackupSettings from "../../../components/CippSettings/CippBackupSettings"; +import CippBrandingSettings from "../../../components/CippSettings/CippBrandingSettings"; +import CippBackupRetentionSettings from "../../../components/CippSettings/CippBackupRetentionSettings"; +import CippJitAdminSettings from "../../../components/CippSettings/CippJitAdminSettings"; const Page = () => { return ( diff --git a/src/pages/cipp/settings/licenses.js b/src/pages/cipp/settings/licenses.js index 89abb862d188..b5816cadde66 100644 --- a/src/pages/cipp/settings/licenses.js +++ b/src/pages/cipp/settings/licenses.js @@ -1,7 +1,7 @@ import tabOptions from "./tabOptions"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { CippTablePage } from "../../../components/CippComponents/CippTablePage.jsx"; import { Button, SvgIcon, Stack } from "@mui/material"; import { TrashIcon } from "@heroicons/react/24/outline"; import { Add, RestartAlt } from "@mui/icons-material"; diff --git a/src/pages/cipp/settings/notifications.js b/src/pages/cipp/settings/notifications.js index 295012322952..99f2d9441bff 100644 --- a/src/pages/cipp/settings/notifications.js +++ b/src/pages/cipp/settings/notifications.js @@ -1,7 +1,7 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; +import CippFormPage from "../../../components/CippFormPages/CippFormPage"; import { useForm } from "react-hook-form"; import { useDialog } from "../../../hooks/use-dialog"; import { CippNotificationForm } from "../../../components/CippComponents/CippNotificationForm"; diff --git a/src/pages/cipp/settings/partner-webhooks.js b/src/pages/cipp/settings/partner-webhooks.js index 6bd90229f237..f6771b76c49a 100644 --- a/src/pages/cipp/settings/partner-webhooks.js +++ b/src/pages/cipp/settings/partner-webhooks.js @@ -1,7 +1,7 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; +import CippFormPage from "../../../components/CippFormPages/CippFormPage"; import { useForm } from "react-hook-form"; import { Box, @@ -17,7 +17,7 @@ import { SvgIcon, } from "@mui/material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; import { ApiGetCall, ApiPostCall } from "../../../api/ApiCall"; import { useEffect } from "react"; import { CippPropertyList } from "../../../components/CippComponents/CippPropertyList"; diff --git a/src/pages/cipp/settings/permissions.js b/src/pages/cipp/settings/permissions.js index 44ac6ea5b644..29f7ceb452e1 100644 --- a/src/pages/cipp/settings/permissions.js +++ b/src/pages/cipp/settings/permissions.js @@ -1,9 +1,9 @@ import { Container } from "@mui/material"; import { Grid } from "@mui/system"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; -import CippPermissionCheck from "/src/components/CippSettings/CippPermissionCheck"; +import CippPermissionCheck from "../../../components/CippSettings/CippPermissionCheck"; import { CippPermissionReport } from "../../../components/CippSettings/CippPermissionReport"; import { useState } from "react"; diff --git a/src/pages/cipp/settings/tenants.js b/src/pages/cipp/settings/tenants.js index a5495b4b77e8..3ce10da19c2d 100644 --- a/src/pages/cipp/settings/tenants.js +++ b/src/pages/cipp/settings/tenants.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; import tabOptions from "./tabOptions"; import { CippTenantTable } from "../../../components/CippWizard/CippTenantTable"; diff --git a/src/pages/cipp/statistics/index.js b/src/pages/cipp/statistics/index.js index 0fb2f0f9fae9..445f0ee704e2 100644 --- a/src/pages/cipp/statistics/index.js +++ b/src/pages/cipp/statistics/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; const Page = () => { const pageTitle = "Statistics"; diff --git a/src/pages/cipp/super-admin/cipp-roles/add.js b/src/pages/cipp/super-admin/cipp-roles/add.js index 1734bd047245..4f140837d2cd 100644 --- a/src/pages/cipp/super-admin/cipp-roles/add.js +++ b/src/pages/cipp/super-admin/cipp-roles/add.js @@ -1,6 +1,6 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; -import { CippRoleAddEdit } from "/src/components/CippSettings/CippRoleAddEdit"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippPageCard from "../../../../components/CippCards/CippPageCard"; +import { CippRoleAddEdit } from "../../../../components/CippSettings/CippRoleAddEdit"; import { CardContent, Stack, Alert } from "@mui/material"; const AddRolePage = () => { diff --git a/src/pages/cipp/super-admin/cipp-roles/edit.js b/src/pages/cipp/super-admin/cipp-roles/edit.js index 85a4b2e0c431..cfb95f8be947 100644 --- a/src/pages/cipp/super-admin/cipp-roles/edit.js +++ b/src/pages/cipp/super-admin/cipp-roles/edit.js @@ -1,7 +1,7 @@ import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; -import { CippRoleAddEdit } from "/src/components/CippSettings/CippRoleAddEdit"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippPageCard from "../../../../components/CippCards/CippPageCard"; +import { CippRoleAddEdit } from "../../../../components/CippSettings/CippRoleAddEdit"; import { CardContent, Stack, Alert } from "@mui/material"; const EditRolePage = () => { diff --git a/src/pages/cipp/super-admin/cipp-roles/index.js b/src/pages/cipp/super-admin/cipp-roles/index.js index 9af891be7049..594dc13be696 100644 --- a/src/pages/cipp/super-admin/cipp-roles/index.js +++ b/src/pages/cipp/super-admin/cipp-roles/index.js @@ -1,8 +1,8 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import tabOptions from "../tabOptions"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; -import CippRoles from "/src/components/CippSettings/CippRoles"; +import CippPageCard from "../../../../components/CippCards/CippPageCard"; +import CippRoles from "../../../../components/CippSettings/CippRoles"; import { CardContent, Stack, Alert } from "@mui/material"; const Page = () => { diff --git a/src/pages/cipp/super-admin/function-offloading.js b/src/pages/cipp/super-admin/function-offloading.js index 8ac30a79831e..ee4ed7fa6d05 100644 --- a/src/pages/cipp/super-admin/function-offloading.js +++ b/src/pages/cipp/super-admin/function-offloading.js @@ -1,15 +1,15 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; +import CippFormPage from "../../../components/CippFormPages/CippFormPage"; import { useForm } from "react-hook-form"; import { Alert, Link } from "@mui/material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; import { ApiGetCall, ApiPostCall } from "../../../api/ApiCall"; import { useEffect } from "react"; import NextLink from "next/link"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; +import { CippDataTable } from "../../../components/CippTable/CippDataTable"; import { TrashIcon } from "@heroicons/react/24/outline"; const Page = () => { diff --git a/src/pages/cipp/super-admin/jit-admin-settings.js b/src/pages/cipp/super-admin/jit-admin-settings.js index ff7228e017fd..c2f7766e670e 100644 --- a/src/pages/cipp/super-admin/jit-admin-settings.js +++ b/src/pages/cipp/super-admin/jit-admin-settings.js @@ -1,11 +1,11 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; +import CippFormPage from "../../../components/CippFormPages/CippFormPage"; import { useForm } from "react-hook-form"; import { Typography, Alert } from "@mui/material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; import { ApiGetCall } from "../../../api/ApiCall"; import { useEffect } from "react"; diff --git a/src/pages/cipp/super-admin/sam-app-permissions.js b/src/pages/cipp/super-admin/sam-app-permissions.js index f52b0a0711d5..90bb414701df 100644 --- a/src/pages/cipp/super-admin/sam-app-permissions.js +++ b/src/pages/cipp/super-admin/sam-app-permissions.js @@ -1,10 +1,10 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; import { useForm } from "react-hook-form"; import { ApiGetCall, ApiPostCall } from "../../../api/ApiCall"; -import CippAppPermissionBuilder from "/src/components/CippComponents/CippAppPermissionBuilder"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; +import CippAppPermissionBuilder from "../../../components/CippComponents/CippAppPermissionBuilder"; +import CippPageCard from "../../../components/CippCards/CippPageCard"; import { Alert, CardContent, Skeleton, Stack, Typography } from "@mui/material"; import { WarningAmberOutlined } from "@mui/icons-material"; diff --git a/src/pages/cipp/super-admin/sam-app-roles.js b/src/pages/cipp/super-admin/sam-app-roles.js index a5c0632206eb..b48efc3dcf9a 100644 --- a/src/pages/cipp/super-admin/sam-app-roles.js +++ b/src/pages/cipp/super-admin/sam-app-roles.js @@ -1,14 +1,14 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; +import CippFormPage from "../../../components/CippFormPages/CippFormPage"; import { Alert, CardContent, Stack, Typography } from "@mui/material"; import { WarningAmberOutlined } from "@mui/icons-material"; import { useForm } from "react-hook-form"; import { ApiGetCall, ApiGetCallWithPagination } from "../../../api/ApiCall"; import { useEffect } from "react"; import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; -import GDAPRoles from "/src/data/GDAPRoles"; +import GDAPRoles from "../../../data/GDAPRoles"; import { CippFormTenantSelector } from "../../../components/CippComponents/CippFormTenantSelector"; const Page = () => { diff --git a/src/pages/cipp/super-admin/tenant-mode.js b/src/pages/cipp/super-admin/tenant-mode.js index 185ae5896ad3..ea4468ce1ff5 100644 --- a/src/pages/cipp/super-admin/tenant-mode.js +++ b/src/pages/cipp/super-admin/tenant-mode.js @@ -1,11 +1,11 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; +import CippFormPage from "../../../components/CippFormPages/CippFormPage"; import { useForm } from "react-hook-form"; import { Typography } from "@mui/material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; import { ApiGetCall } from "../../../api/ApiCall"; import { useEffect } from "react"; import Link from "next/link"; diff --git a/src/pages/cipp/super-admin/time-settings.js b/src/pages/cipp/super-admin/time-settings.js index d1cde1737f66..10245f89f3e2 100644 --- a/src/pages/cipp/super-admin/time-settings.js +++ b/src/pages/cipp/super-admin/time-settings.js @@ -1,13 +1,13 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { Alert, Typography } from "@mui/material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; import { ApiGetCall } from "../../../api/ApiCall"; import { useEffect, useMemo } from "react"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { useTimezones } from "/src/hooks/use-timezones"; +import CippFormPage from "../../../components/CippFormPages/CippFormPage"; +import { useTimezones } from "../../../hooks/use-timezones"; import tabOptions from "./tabOptions"; const Page = () => { diff --git a/src/pages/dashboardv2/devices/index.js b/src/pages/dashboardv2/devices/index.js index 09738bb8b994..b3766dcf6c4c 100644 --- a/src/pages/dashboardv2/devices/index.js +++ b/src/pages/dashboardv2/devices/index.js @@ -9,13 +9,13 @@ import { Stack, Chip, } from "@mui/material"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "../tabOptions"; -import { useSettings } from "/src/hooks/use-settings"; -import { ApiGetCall } from "/src/api/ApiCall.jsx"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; -import { CippTestDetailOffCanvas } from "/src/components/CippTestDetail/CippTestDetailOffCanvas"; +import { useSettings } from "../../../hooks/use-settings"; +import { ApiGetCall } from "../../../api/ApiCall.jsx"; +import { CippDataTable } from "../../../components/CippTable/CippDataTable"; +import { CippTestDetailOffCanvas } from "../../../components/CippTestDetail/CippTestDetailOffCanvas"; import { useRouter } from "next/router"; const Page = () => { diff --git a/src/pages/dashboardv2/identity/index.js b/src/pages/dashboardv2/identity/index.js index 4f6b66856f9a..bdc4f0e8ddb4 100644 --- a/src/pages/dashboardv2/identity/index.js +++ b/src/pages/dashboardv2/identity/index.js @@ -1,11 +1,11 @@ import { Container } from "@mui/material"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "../tabOptions"; -import { useSettings } from "/src/hooks/use-settings"; -import { ApiGetCall } from "/src/api/ApiCall.jsx"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; -import { CippTestDetailOffCanvas } from "/src/components/CippTestDetail/CippTestDetailOffCanvas"; +import { useSettings } from "../../../hooks/use-settings"; +import { ApiGetCall } from "../../../api/ApiCall.jsx"; +import { CippDataTable } from "../../../components/CippTable/CippDataTable"; +import { CippTestDetailOffCanvas } from "../../../components/CippTestDetail/CippTestDetailOffCanvas"; import { useRouter } from "next/router"; const Page = () => { diff --git a/src/pages/dashboardv2/index.js b/src/pages/dashboardv2/index.js index 96ad594f55e0..6d4e5d5b24c1 100644 --- a/src/pages/dashboardv2/index.js +++ b/src/pages/dashboardv2/index.js @@ -3,25 +3,25 @@ import { useState, useEffect } from "react"; import { useRouter } from "next/router"; import { useForm, useWatch } from "react-hook-form"; import { Grid } from "@mui/system"; -import { useSettings } from "/src/hooks/use-settings"; -import { ApiGetCall } from "/src/api/ApiCall.jsx"; -import Portals from "/src/data/portals"; -import { BulkActionsMenu } from "/src/components/bulk-actions-menu.js"; -import { ExecutiveReportButton } from "/src/components/ExecutiveReportButton.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { useSettings } from "../../hooks/use-settings"; +import { ApiGetCall } from "../../api/ApiCall.jsx"; +import Portals from "../../data/portals"; +import { BulkActionsMenu } from "../../components/bulk-actions-menu.js"; +import { ExecutiveReportButton } from "../../components/ExecutiveReportButton.js"; +import { TabbedLayout } from "../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../layouts/index.js"; import tabOptions from "./tabOptions"; -import { dashboardDemoData } from "/src/data/dashboardv2-demo-data"; -import { SecureScoreCard } from "/src/components/CippComponents/SecureScoreCard"; -import { MFACard } from "/src/components/CippComponents/MFACard"; -import { AuthMethodCard } from "/src/components/CippComponents/AuthMethodCard"; -import { LicenseCard } from "/src/components/CippComponents/LicenseCard"; -import { TenantInfoCard } from "/src/components/CippComponents/TenantInfoCard"; -import { TenantMetricsGrid } from "/src/components/CippComponents/TenantMetricsGrid"; -import { AssessmentCard } from "/src/components/CippComponents/AssessmentCard"; -import { CippApiDialog } from "/src/components/CippComponents/CippApiDialog"; -import { CippAddTestReportDrawer } from "/src/components/CippComponents/CippAddTestReportDrawer"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import { dashboardDemoData } from "../../data/dashboardv2-demo-data"; +import { SecureScoreCard } from "../../components/CippComponents/SecureScoreCard"; +import { MFACard } from "../../components/CippComponents/MFACard"; +import { AuthMethodCard } from "../../components/CippComponents/AuthMethodCard"; +import { LicenseCard } from "../../components/CippComponents/LicenseCard"; +import { TenantInfoCard } from "../../components/CippComponents/TenantInfoCard"; +import { TenantMetricsGrid } from "../../components/CippComponents/TenantMetricsGrid"; +import { AssessmentCard } from "../../components/CippComponents/AssessmentCard"; +import { CippApiDialog } from "../../components/CippComponents/CippApiDialog"; +import { CippAddTestReportDrawer } from "../../components/CippComponents/CippAddTestReportDrawer"; +import CippFormComponent from "../../components/CippComponents/CippFormComponent"; import { Devices as DevicesIcon, CheckCircle as CheckCircleIcon, diff --git a/src/pages/email/administration/contacts-template/add.jsx b/src/pages/email/administration/contacts-template/add.jsx index 1f476fbe1ff7..b05da569e29e 100644 --- a/src/pages/email/administration/contacts-template/add.jsx +++ b/src/pages/email/administration/contacts-template/add.jsx @@ -1,7 +1,7 @@ import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import ContactFormLayout from "/src/components/CippFormPages/CippAddEditContact"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import ContactFormLayout from "../../../../components/CippFormPages/CippAddEditContact"; const AddContactTemplates = () => { diff --git a/src/pages/email/administration/contacts-template/edit.jsx b/src/pages/email/administration/contacts-template/edit.jsx index 100eebe46731..987e9f45a3bb 100644 --- a/src/pages/email/administration/contacts-template/edit.jsx +++ b/src/pages/email/administration/contacts-template/edit.jsx @@ -1,11 +1,11 @@ import { useEffect, useMemo, useCallback } from "react"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import ContactFormLayout from "/src/components/CippFormPages/CippAddEditContact"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormSkeleton from "../../../../components/CippFormPages/CippFormSkeleton"; +import ContactFormLayout from "../../../../components/CippFormPages/CippAddEditContact"; import { ApiGetCall } from "../../../../api/ApiCall"; -import countryList from "/src/data/countryList.json"; +import countryList from "../../../../data/countryList.json"; import { useRouter } from "next/router"; const countryLookup = new Map(countryList.map((country) => [country.Name, country.Code])); diff --git a/src/pages/email/administration/contacts-template/index.jsx b/src/pages/email/administration/contacts-template/index.jsx index 718d0c2f8ae5..d24604c9a9af 100644 --- a/src/pages/email/administration/contacts-template/index.jsx +++ b/src/pages/email/administration/contacts-template/index.jsx @@ -1,11 +1,11 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { Button } from "@mui/material"; import Link from "next/link"; import { RocketLaunch } from "@mui/icons-material"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { TrashIcon } from "@heroicons/react/24/outline"; import { GitHub, Edit } from "@mui/icons-material"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; import { CippDeployContactTemplateDrawer } from "../../../../components/CippComponents/CippDeployContactTemplateDrawer"; const Page = () => { diff --git a/src/pages/email/administration/contacts/edit.jsx b/src/pages/email/administration/contacts/edit.jsx index 963b0be981d0..f47ef7c88d34 100644 --- a/src/pages/email/administration/contacts/edit.jsx +++ b/src/pages/email/administration/contacts/edit.jsx @@ -1,14 +1,14 @@ import { useEffect, useMemo, useCallback } from "react"; import { useRouter } from "next/router"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormSkeleton from "../../../../components/CippFormPages/CippFormSkeleton"; import { useSettings } from "../../../../hooks/use-settings"; import { ApiGetCall } from "../../../../api/ApiCall"; -import countryList from "/src/data/countryList.json"; +import countryList from "../../../../data/countryList.json"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; import { Divider } from "@mui/material"; const countryLookup = new Map(countryList.map((country) => [country.Name, country.Code])); diff --git a/src/pages/email/administration/contacts/index.js b/src/pages/email/administration/contacts/index.js index ce0becd832e1..471a06aa7e85 100644 --- a/src/pages/email/administration/contacts/index.js +++ b/src/pages/email/administration/contacts/index.js @@ -1,6 +1,6 @@ import { useMemo } from "react"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { CloudSync, Edit } from "@mui/icons-material"; import TrashIcon from "@heroicons/react/24/outline/TrashIcon"; import { CippAddContactDrawer } from "../../../../components/CippComponents/CippAddContactDrawer"; diff --git a/src/pages/email/administration/deleted-mailboxes/index.js b/src/pages/email/administration/deleted-mailboxes/index.js index 488c783dd71f..8b7841ddfedf 100644 --- a/src/pages/email/administration/deleted-mailboxes/index.js +++ b/src/pages/email/administration/deleted-mailboxes/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const Page = () => { const pageTitle = "Deleted Mailboxes"; diff --git a/src/pages/email/administration/exchange-retention/policies/index.js b/src/pages/email/administration/exchange-retention/policies/index.js index ede3ed7034ea..650e79e76ea6 100644 --- a/src/pages/email/administration/exchange-retention/policies/index.js +++ b/src/pages/email/administration/exchange-retention/policies/index.js @@ -1,13 +1,13 @@ import { useMemo } from "react"; -import { Layout as DashboardLayout } from "/src/layouts/index"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage"; +import { Layout as DashboardLayout } from "../../../../../layouts/index"; +import { CippTablePage } from "../../../../../components/CippComponents/CippTablePage"; import { Policy, Edit } from "@mui/icons-material"; import { Button } from "@mui/material"; import Link from "next/link"; import TrashIcon from "@heroicons/react/24/outline/TrashIcon"; -import { HeaderedTabbedLayout } from "/src/layouts/HeaderedTabbedLayout"; +import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; import tabOptions from "../tabOptions"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../../../../hooks/use-settings"; const Page = () => { const pageTitle = "Retention Policy Management"; diff --git a/src/pages/email/administration/exchange-retention/policies/policy.jsx b/src/pages/email/administration/exchange-retention/policies/policy.jsx index 7abef58d6a57..5118fbd13160 100644 --- a/src/pages/email/administration/exchange-retention/policies/policy.jsx +++ b/src/pages/email/administration/exchange-retention/policies/policy.jsx @@ -1,14 +1,14 @@ import { useForm } from "react-hook-form"; import { useEffect, useMemo } from "react"; import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../../layouts/index"; +import CippFormPage from "../../../../../components/CippFormPages/CippFormPage"; +import CippFormSkeleton from "../../../../../components/CippFormPages/CippFormSkeleton"; +import { useSettings } from "../../../../../hooks/use-settings"; import { Grid } from "@mui/system"; import { Divider } from "@mui/material"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { ApiGetCall } from "/src/api/ApiCall"; +import CippFormComponent from "../../../../../components/CippComponents/CippFormComponent"; +import { ApiGetCall } from "../../../../../api/ApiCall"; const RetentionPolicy = () => { const userSettingsDefaults = useSettings(); diff --git a/src/pages/email/administration/exchange-retention/tags/index.js b/src/pages/email/administration/exchange-retention/tags/index.js index 8daa866d0c8a..9749f8b62aa7 100644 --- a/src/pages/email/administration/exchange-retention/tags/index.js +++ b/src/pages/email/administration/exchange-retention/tags/index.js @@ -1,13 +1,13 @@ import { useMemo } from "react"; -import { Layout as DashboardLayout } from "/src/layouts/index"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage"; +import { Layout as DashboardLayout } from "../../../../../layouts/index"; +import { CippTablePage } from "../../../../../components/CippComponents/CippTablePage"; import { Sell, Edit } from "@mui/icons-material"; import { Button } from "@mui/material"; import Link from "next/link"; import TrashIcon from "@heroicons/react/24/outline/TrashIcon"; -import { HeaderedTabbedLayout } from "/src/layouts/HeaderedTabbedLayout"; +import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; import tabOptions from "../tabOptions"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../../../../hooks/use-settings"; const Page = () => { const pageTitle = "Retention Tag Management"; diff --git a/src/pages/email/administration/exchange-retention/tags/tag.jsx b/src/pages/email/administration/exchange-retention/tags/tag.jsx index 81fb60b87505..40d6291257a1 100644 --- a/src/pages/email/administration/exchange-retention/tags/tag.jsx +++ b/src/pages/email/administration/exchange-retention/tags/tag.jsx @@ -1,14 +1,14 @@ import { useForm } from "react-hook-form"; import { useEffect } from "react"; import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import CippFormPage from "../../../../../components/CippFormPages/CippFormPage"; +import CippFormSkeleton from "../../../../../components/CippFormPages/CippFormSkeleton"; +import { useSettings } from "../../../../../hooks/use-settings"; import { Grid } from "@mui/system"; import { Divider } from "@mui/material"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { ApiGetCall } from "/src/api/ApiCall"; +import CippFormComponent from "../../../../../components/CippComponents/CippFormComponent"; +import { ApiGetCall } from "../../../../../api/ApiCall"; const RetentionTag = () => { const userSettingsDefaults = useSettings(); diff --git a/src/pages/email/administration/mailbox-rules/index.js b/src/pages/email/administration/mailbox-rules/index.js index 956d9df8aa38..343b810e526c 100644 --- a/src/pages/email/administration/mailbox-rules/index.js +++ b/src/pages/email/administration/mailbox-rules/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { getCippTranslation } from "../../../../utils/get-cipp-translation"; import { getCippFormatting } from "../../../../utils/get-cipp-formatting"; import { CippPropertyListCard } from "../../../../components/CippCards/CippPropertyListCard"; diff --git a/src/pages/email/administration/mailboxes/addshared.jsx b/src/pages/email/administration/mailboxes/addshared.jsx index 7c1e00885b84..5992df015d1f 100644 --- a/src/pages/email/administration/mailboxes/addshared.jsx +++ b/src/pages/email/administration/mailboxes/addshared.jsx @@ -1,9 +1,9 @@ import { Divider } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; import { useSettings } from "../../../../hooks/use-settings"; import { CippFormDomainSelector } from "../../../../components/CippComponents/CippFormDomainSelector"; diff --git a/src/pages/email/administration/mailboxes/index.js b/src/pages/email/administration/mailboxes/index.js index c2abbe1b854e..eb2df5e015ae 100644 --- a/src/pages/email/administration/mailboxes/index.js +++ b/src/pages/email/administration/mailboxes/index.js @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import CippExchangeActions from "../../../../components/CippComponents/CippExchangeActions"; -import { CippHVEUserDrawer } from "/src/components/CippComponents/CippHVEUserDrawer.jsx"; -import { CippSharedMailboxDrawer } from "/src/components/CippComponents/CippSharedMailboxDrawer.jsx"; +import { CippHVEUserDrawer } from "../../../../components/CippComponents/CippHVEUserDrawer.jsx"; +import { CippSharedMailboxDrawer } from "../../../../components/CippComponents/CippSharedMailboxDrawer.jsx"; const Page = () => { const pageTitle = "Mailboxes"; diff --git a/src/pages/email/administration/quarantine/index.js b/src/pages/email/administration/quarantine/index.js index 3009973001a0..a5126764ba47 100644 --- a/src/pages/email/administration/quarantine/index.js +++ b/src/pages/email/administration/quarantine/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { useEffect, useState } from "react"; import { Dialog, @@ -11,11 +11,11 @@ import { CircularProgress, } from "@mui/material"; import { Block, Close, Done, DoneAll } from "@mui/icons-material"; -import { CippMessageViewer } from "/src/components/CippComponents/CippMessageViewer.jsx"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; -import { useSettings } from "/src/hooks/use-settings"; +import { CippMessageViewer } from "../../../../components/CippComponents/CippMessageViewer.jsx"; +import { ApiGetCall, ApiPostCall } from "../../../../api/ApiCall"; +import { useSettings } from "../../../../hooks/use-settings"; import { EyeIcon, DocumentTextIcon } from "@heroicons/react/24/outline"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; +import { CippDataTable } from "../../../../components/CippTable/CippDataTable"; const simpleColumns = [ "ReceivedTime", diff --git a/src/pages/email/administration/restricted-users/index.js b/src/pages/email/administration/restricted-users/index.js index f02e27356442..8adf4ecdef57 100644 --- a/src/pages/email/administration/restricted-users/index.js +++ b/src/pages/email/administration/restricted-users/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Alert, Link, Typography, List, ListItem, ListItemText } from "@mui/material"; import { Block as BlockIcon } from "@mui/icons-material"; diff --git a/src/pages/email/administration/tenant-allow-block-lists/index.js b/src/pages/email/administration/tenant-allow-block-lists/index.js index 628eacd1be83..00b5c690792e 100644 --- a/src/pages/email/administration/tenant-allow-block-lists/index.js +++ b/src/pages/email/administration/tenant-allow-block-lists/index.js @@ -1,7 +1,7 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Delete } from "@mui/icons-material"; -import { CippAddTenantAllowBlockListDrawer } from "/src/components/CippComponents/CippAddTenantAllowBlockListDrawer.jsx"; +import { CippAddTenantAllowBlockListDrawer } from "../../../../components/CippComponents/CippAddTenantAllowBlockListDrawer.jsx"; const Page = () => { const pageTitle = "Tenant Allow/Block Lists"; diff --git a/src/pages/email/reports/SharedMailboxEnabledAccount/index.js b/src/pages/email/reports/SharedMailboxEnabledAccount/index.js index 4323f53703aa..3dd3d08c5398 100644 --- a/src/pages/email/reports/SharedMailboxEnabledAccount/index.js +++ b/src/pages/email/reports/SharedMailboxEnabledAccount/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Block } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/email/reports/antiphishing-filters/index.js b/src/pages/email/reports/antiphishing-filters/index.js index c691d035088b..d23dea441539 100644 --- a/src/pages/email/reports/antiphishing-filters/index.js +++ b/src/pages/email/reports/antiphishing-filters/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Block, Check } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/email/reports/calendar-permissions/index.js b/src/pages/email/reports/calendar-permissions/index.js index c910f6a55955..2eef1d98477d 100644 --- a/src/pages/email/reports/calendar-permissions/index.js +++ b/src/pages/email/reports/calendar-permissions/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { useState } from "react"; import { Button, diff --git a/src/pages/email/reports/global-address-list/index.js b/src/pages/email/reports/global-address-list/index.js index c8b7ff18d0d7..adbe3ae6b86d 100644 --- a/src/pages/email/reports/global-address-list/index.js +++ b/src/pages/email/reports/global-address-list/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Visibility, VisibilityOff } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/email/reports/mailbox-activity/index.js b/src/pages/email/reports/mailbox-activity/index.js index 554f6337b717..6010951bd406 100644 --- a/src/pages/email/reports/mailbox-activity/index.js +++ b/src/pages/email/reports/mailbox-activity/index.js @@ -1,6 +1,6 @@ import { useState } from "react"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button, Accordion, @@ -14,7 +14,7 @@ import { Grid } from "@mui/system"; import { ExpandMore, Sort } from "@mui/icons-material"; import { FunnelIcon, XMarkIcon } from "@heroicons/react/24/outline"; import { useForm } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; const Page = () => { const formControl = useForm({ diff --git a/src/pages/email/reports/mailbox-cas-settings/index.js b/src/pages/email/reports/mailbox-cas-settings/index.js index 10cb93963b58..1058c83e93b2 100644 --- a/src/pages/email/reports/mailbox-cas-settings/index.js +++ b/src/pages/email/reports/mailbox-cas-settings/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const Page = () => { return ( diff --git a/src/pages/email/reports/mailbox-permissions/index.js b/src/pages/email/reports/mailbox-permissions/index.js index 54ec41158bce..2d88aae48d04 100644 --- a/src/pages/email/reports/mailbox-permissions/index.js +++ b/src/pages/email/reports/mailbox-permissions/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { useState } from "react"; import { Button, diff --git a/src/pages/email/reports/mailbox-statistics/index.js b/src/pages/email/reports/mailbox-statistics/index.js index 9291843bab97..18167383ee6f 100644 --- a/src/pages/email/reports/mailbox-statistics/index.js +++ b/src/pages/email/reports/mailbox-statistics/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const Page = () => { return ( diff --git a/src/pages/email/reports/malware-filters/index.js b/src/pages/email/reports/malware-filters/index.js index 20f09161b7d1..b049cef12444 100644 --- a/src/pages/email/reports/malware-filters/index.js +++ b/src/pages/email/reports/malware-filters/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Block, Check } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/email/reports/safeattachments-filters/index.js b/src/pages/email/reports/safeattachments-filters/index.js index a35d329be6ca..b8212f38cc74 100644 --- a/src/pages/email/reports/safeattachments-filters/index.js +++ b/src/pages/email/reports/safeattachments-filters/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Block, Check } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/email/resources/management/equipment/edit.jsx b/src/pages/email/resources/management/equipment/edit.jsx index a29c8b84ac0f..1e6cd1f2a5e6 100644 --- a/src/pages/email/resources/management/equipment/edit.jsx +++ b/src/pages/email/resources/management/equipment/edit.jsx @@ -2,15 +2,15 @@ import React, { useEffect } from "react"; import { Divider, Typography } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import CippFormPage from "../../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../../components/CippComponents/CippFormComponent"; +import CippFormSkeleton from "../../../../../components/CippFormPages/CippFormSkeleton"; +import { useSettings } from "../../../../../hooks/use-settings"; import { useRouter } from "next/router"; -import { ApiGetCall } from "/src/api/ApiCall"; -import countryList from "/src/data/countryList.json"; -import timezoneList from "/src/data/timezoneList.json"; +import { ApiGetCall } from "../../../../../api/ApiCall"; +import countryList from "../../../../../data/countryList.json"; +import timezoneList from "../../../../../data/timezoneList.json"; // Work days options const workDaysOptions = [ diff --git a/src/pages/email/resources/management/equipment/index.js b/src/pages/email/resources/management/equipment/index.js index 538143f24b96..4a1b45a30413 100644 --- a/src/pages/email/resources/management/equipment/index.js +++ b/src/pages/email/resources/management/equipment/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import { CippTablePage } from "../../../../../components/CippComponents/CippTablePage.jsx"; import { Edit, Block, LockOpen, Key } from "@mui/icons-material"; import { TrashIcon } from "@heroicons/react/24/outline"; import { CippAddEquipmentDrawer } from "../../../../../components/CippComponents/CippAddEquipmentDrawer"; diff --git a/src/pages/email/resources/management/list-rooms/edit.jsx b/src/pages/email/resources/management/list-rooms/edit.jsx index 97cb3f35078e..75fc4170ad04 100644 --- a/src/pages/email/resources/management/list-rooms/edit.jsx +++ b/src/pages/email/resources/management/list-rooms/edit.jsx @@ -2,15 +2,15 @@ import { useEffect } from "react"; import { Divider, Typography } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import CippFormPage from "../../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../../components/CippComponents/CippFormComponent"; +import CippFormSkeleton from "../../../../../components/CippFormPages/CippFormSkeleton"; +import { useSettings } from "../../../../../hooks/use-settings"; import { useRouter } from "next/router"; -import { ApiGetCall } from "/src/api/ApiCall"; -import countryList from "/src/data/countryList.json"; -import timezoneList from "/src/data/timezoneList.json"; +import { ApiGetCall } from "../../../../../api/ApiCall"; +import countryList from "../../../../../data/countryList.json"; +import timezoneList from "../../../../../data/timezoneList.json"; // Work days options const workDaysOptions = [ diff --git a/src/pages/email/resources/management/list-rooms/index.js b/src/pages/email/resources/management/list-rooms/index.js index 61201421734a..5348f25ce5dc 100644 --- a/src/pages/email/resources/management/list-rooms/index.js +++ b/src/pages/email/resources/management/list-rooms/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import { CippTablePage } from "../../../../../components/CippComponents/CippTablePage.jsx"; import { Edit, Block, LockOpen, Key } from "@mui/icons-material"; import { TrashIcon } from "@heroicons/react/24/outline"; import { CippAddRoomDrawer } from "../../../../../components/CippComponents/CippAddRoomDrawer"; diff --git a/src/pages/email/resources/management/room-lists/edit.jsx b/src/pages/email/resources/management/room-lists/edit.jsx index b1d77015f017..7fa8c786936e 100644 --- a/src/pages/email/resources/management/room-lists/edit.jsx +++ b/src/pages/email/resources/management/room-lists/edit.jsx @@ -2,10 +2,10 @@ import { useEffect, useState } from "react"; import { Box, Button, Divider, Typography } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormUserSelector } from "/src/components/CippComponents/CippFormUserSelector"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import CippFormPage from "../../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../../components/CippComponents/CippFormComponent"; +import { CippFormUserSelector } from "../../../../../components/CippComponents/CippFormUserSelector"; import { useRouter } from "next/router"; import { ApiGetCall } from "../../../../../api/ApiCall"; import { useSettings } from "../../../../../hooks/use-settings"; diff --git a/src/pages/email/resources/management/room-lists/index.js b/src/pages/email/resources/management/room-lists/index.js index ce8573687897..bff09714fd9f 100644 --- a/src/pages/email/resources/management/room-lists/index.js +++ b/src/pages/email/resources/management/room-lists/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import { CippTablePage } from "../../../../../components/CippComponents/CippTablePage.jsx"; import { Edit } from "@mui/icons-material"; import { TrashIcon } from "@heroicons/react/24/outline"; import { CippAddRoomListDrawer } from "../../../../../components/CippComponents/CippAddRoomListDrawer"; diff --git a/src/pages/email/spamfilter/list-connectionfilter-templates/index.js b/src/pages/email/spamfilter/list-connectionfilter-templates/index.js index f5d660457154..ff908fa0bb14 100644 --- a/src/pages/email/spamfilter/list-connectionfilter-templates/index.js +++ b/src/pages/email/spamfilter/list-connectionfilter-templates/index.js @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { TrashIcon } from "@heroicons/react/24/outline"; import { GitHub } from "@mui/icons-material"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; const Page = () => { const pageTitle = "Connection filter Templates"; diff --git a/src/pages/email/spamfilter/list-connectionfilter/add.jsx b/src/pages/email/spamfilter/list-connectionfilter/add.jsx index a0c30550356d..77a9dabfa170 100644 --- a/src/pages/email/spamfilter/list-connectionfilter/add.jsx +++ b/src/pages/email/spamfilter/list-connectionfilter/add.jsx @@ -2,10 +2,10 @@ import React, { useEffect } from "react"; import { Divider } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm, useWatch } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { CippFormTenantSelector } from "../../../../components/CippComponents/CippFormTenantSelector"; const AddPolicy = () => { const formControl = useForm({ diff --git a/src/pages/email/spamfilter/list-connectionfilter/index.js b/src/pages/email/spamfilter/list-connectionfilter/index.js index 3ce94c37ec8b..027dea277e30 100644 --- a/src/pages/email/spamfilter/list-connectionfilter/index.js +++ b/src/pages/email/spamfilter/list-connectionfilter/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import { Book, AddModerator } from "@mui/icons-material"; import Link from "next/link"; diff --git a/src/pages/email/spamfilter/list-quarantine-policies/add.jsx b/src/pages/email/spamfilter/list-quarantine-policies/add.jsx index 69def81cf558..c2fe68b9e437 100644 --- a/src/pages/email/spamfilter/list-quarantine-policies/add.jsx +++ b/src/pages/email/spamfilter/list-quarantine-policies/add.jsx @@ -2,10 +2,10 @@ import { useEffect } from "react"; import { Divider } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm, useWatch } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { CippFormTenantSelector } from "../../../../components/CippComponents/CippFormTenantSelector"; const AddPolicy = () => { const formControl = useForm({ diff --git a/src/pages/email/spamfilter/list-quarantine-policies/index.js b/src/pages/email/spamfilter/list-quarantine-policies/index.js index 021c90820439..33d1101bd445 100644 --- a/src/pages/email/spamfilter/list-quarantine-policies/index.js +++ b/src/pages/email/spamfilter/list-quarantine-policies/index.js @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { CippInfoBar } from "/src/components/CippCards/CippInfoBar"; -import { CippApiDialog } from "/src/components/CippComponents/CippApiDialog.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import CippButtonCard from "../../../../components/CippCards/CippButtonCard"; +import { CippInfoBar } from "../../../../components/CippCards/CippInfoBar"; +import { CippApiDialog } from "../../../../components/CippComponents/CippApiDialog.jsx"; import { Alert, Typography, Stack, Tooltip, IconButton, SvgIcon, Button } from "@mui/material"; import { Grid } from "@mui/system"; import Link from "next/link"; @@ -16,9 +16,9 @@ import { Edit, Delete, } from "@mui/icons-material"; -import { useSettings } from "/src/hooks/use-settings"; -import { useDialog } from "/src/hooks/use-dialog"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { useSettings } from "../../../../hooks/use-settings"; +import { useDialog } from "../../../../hooks/use-dialog"; +import { ApiGetCall } from "../../../../api/ApiCall"; const Page = () => { const pageTitle = "Quarantine Policies"; diff --git a/src/pages/email/spamfilter/list-spamfilter/add.jsx b/src/pages/email/spamfilter/list-spamfilter/add.jsx index b25c936e8ecc..824844d8bdf0 100644 --- a/src/pages/email/spamfilter/list-spamfilter/add.jsx +++ b/src/pages/email/spamfilter/list-spamfilter/add.jsx @@ -2,10 +2,10 @@ import React, { useEffect } from "react"; import { Divider } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm, useWatch } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { CippFormTenantSelector } from "../../../../components/CippComponents/CippFormTenantSelector"; const AddPolicy = () => { const formControl = useForm({ diff --git a/src/pages/email/spamfilter/list-spamfilter/index.js b/src/pages/email/spamfilter/list-spamfilter/index.js index d6a2fe54dd01..dc2123ea8f93 100644 --- a/src/pages/email/spamfilter/list-spamfilter/index.js +++ b/src/pages/email/spamfilter/list-spamfilter/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import { Book, Block, Check } from "@mui/icons-material"; import { TrashIcon } from "@heroicons/react/24/outline"; diff --git a/src/pages/email/spamfilter/list-templates/index.js b/src/pages/email/spamfilter/list-templates/index.js index adcc2884e065..3abe32d9d210 100644 --- a/src/pages/email/spamfilter/list-templates/index.js +++ b/src/pages/email/spamfilter/list-templates/index.js @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { TrashIcon } from "@heroicons/react/24/outline"; import { GitHub } from "@mui/icons-material"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; const Page = () => { const pageTitle = "Spamfilter Templates"; diff --git a/src/pages/email/tools/mail-test/index.js b/src/pages/email/tools/mail-test/index.js index 9edd92002471..0f9871807038 100644 --- a/src/pages/email/tools/mail-test/index.js +++ b/src/pages/email/tools/mail-test/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; const Page = () => { const pageTitle = "Mail Test"; diff --git a/src/pages/email/tools/mailbox-restore-wizard/index.js b/src/pages/email/tools/mailbox-restore-wizard/index.js index 407eba25f97d..fb7521dfd4cb 100644 --- a/src/pages/email/tools/mailbox-restore-wizard/index.js +++ b/src/pages/email/tools/mailbox-restore-wizard/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; const Page = () => { const pageTitle = "Mailbox Restore Wizard"; diff --git a/src/pages/email/tools/mailbox-restores/add.jsx b/src/pages/email/tools/mailbox-restores/add.jsx index 75602521ec80..a238c0c29b1a 100644 --- a/src/pages/email/tools/mailbox-restores/add.jsx +++ b/src/pages/email/tools/mailbox-restores/add.jsx @@ -1,9 +1,9 @@ import { useEffect } from "react"; import { Grid } from "@mui/system"; import { useForm, useWatch } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; import { useSettings } from "../../../../hooks/use-settings"; import { getCippTranslation } from "../../../../utils/get-cipp-translation"; import { Alert, Divider, Typography } from "@mui/material"; diff --git a/src/pages/email/tools/mailbox-restores/index.js b/src/pages/email/tools/mailbox-restores/index.js index 0cd211b5aa4d..bc2e200ce30c 100644 --- a/src/pages/email/tools/mailbox-restores/index.js +++ b/src/pages/email/tools/mailbox-restores/index.js @@ -1,9 +1,9 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { RestoreFromTrash, PlayArrow, Pause, Delete } from "@mui/icons-material"; import MailboxRestoreDetails from "../../../../components/CippComponents/MailboxRestoreDetails"; import { CippMailboxRestoreDrawer } from "../../../../components/CippComponents/CippMailboxRestoreDrawer"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../../../hooks/use-settings"; const Page = () => { const pageTitle = "Mailbox Restores"; diff --git a/src/pages/email/tools/message-trace/index.js b/src/pages/email/tools/message-trace/index.js index eabef17792e5..56ccf9bcd20a 100644 --- a/src/pages/email/tools/message-trace/index.js +++ b/src/pages/email/tools/message-trace/index.js @@ -1,4 +1,4 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { Button, Dialog, @@ -10,11 +10,11 @@ import { CircularProgress, } from "@mui/material"; import { useForm } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { ApiPostCall } from "/src/api/ApiCall"; -import { useSettings } from "/src/hooks/use-settings"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { ApiPostCall } from "../../../../api/ApiCall"; +import { useSettings } from "../../../../hooks/use-settings"; +import CippButtonCard from "../../../../components/CippCards/CippButtonCard"; +import { CippDataTable } from "../../../../components/CippTable/CippDataTable"; import { useState } from "react"; import { Search, Close, ClearAll } from "@mui/icons-material"; import { Grid } from "@mui/system"; diff --git a/src/pages/email/tools/message-viewer/index.js b/src/pages/email/tools/message-viewer/index.js index ab5b7499c8a0..2521f67b1e22 100644 --- a/src/pages/email/tools/message-viewer/index.js +++ b/src/pages/email/tools/message-viewer/index.js @@ -1,5 +1,5 @@ import CippMessageViewerPage from "../../../../components/CippComponents/CippMessageViewer"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; const Page = () => { return ; diff --git a/src/pages/email/transport/list-connector-templates/index.js b/src/pages/email/transport/list-connector-templates/index.js index 2e2b3e406959..4357ed52af23 100644 --- a/src/pages/email/transport/list-connector-templates/index.js +++ b/src/pages/email/transport/list-connector-templates/index.js @@ -1,13 +1,13 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { Button } from "@mui/material"; import Link from "next/link"; import { RocketLaunch } from "@mui/icons-material"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { TrashIcon } from "@heroicons/react/24/outline"; import { GitHub } from "@mui/icons-material"; import ConnectorTemplateDetails from "../../../../components/CippComponents/ConnectorTemplateDetails"; import { CippAddConnectorDrawer } from "../../../../components/CippComponents/CippAddConnectorDrawer"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; const Page = () => { const pageTitle = "Exchange Connector Templates"; diff --git a/src/pages/email/transport/list-connectors/index.js b/src/pages/email/transport/list-connectors/index.js index 4a3eeebcc84c..8bc44bbe7f81 100644 --- a/src/pages/email/transport/list-connectors/index.js +++ b/src/pages/email/transport/list-connectors/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Book, Check, Block, Delete } from "@mui/icons-material"; import { CippAddConnectorDrawer } from "../../../../components/CippComponents/CippAddConnectorDrawer"; diff --git a/src/pages/email/transport/list-rules/index.js b/src/pages/email/transport/list-rules/index.js index 2bf7e928c254..3ff3e24d4dd8 100644 --- a/src/pages/email/transport/list-rules/index.js +++ b/src/pages/email/transport/list-rules/index.js @@ -1,10 +1,10 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Book, DoDisturb, Done, Edit } from "@mui/icons-material"; import { TrashIcon } from "@heroicons/react/24/outline"; import { CippAddTransportRuleDrawer } from "../../../../components/CippComponents/CippAddTransportRuleDrawer"; import { CippTransportRuleDrawer } from "../../../../components/CippComponents/CippTransportRuleDrawer"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../../../hooks/use-settings"; import { useRef } from "react"; const Page = () => { diff --git a/src/pages/email/transport/list-templates/index.js b/src/pages/email/transport/list-templates/index.js index 0f4d417efeae..3a9ee1947f52 100644 --- a/src/pages/email/transport/list-templates/index.js +++ b/src/pages/email/transport/list-templates/index.js @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { TrashIcon } from "@heroicons/react/24/outline"; import { GitHub } from "@mui/icons-material"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; import { CippAddTransportRuleDrawer } from "../../../../components/CippComponents/CippAddTransportRuleDrawer"; const Page = () => { diff --git a/src/pages/endpoint/MEM/assignment-filter-templates/add.jsx b/src/pages/endpoint/MEM/assignment-filter-templates/add.jsx index ca731ffd54cb..e955a271bc99 100644 --- a/src/pages/endpoint/MEM/assignment-filter-templates/add.jsx +++ b/src/pages/endpoint/MEM/assignment-filter-templates/add.jsx @@ -1,6 +1,6 @@ import { Box } from "@mui/material"; import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { useSettings } from "../../../../hooks/use-settings"; import CippAddAssignmentFilterTemplateForm from "../../../../components/CippFormPages/CippAddAssignmentFilterTemplateForm"; diff --git a/src/pages/endpoint/MEM/assignment-filter-templates/deploy.js b/src/pages/endpoint/MEM/assignment-filter-templates/deploy.js index 5c5f9c0ce1df..4943b2868ef9 100644 --- a/src/pages/endpoint/MEM/assignment-filter-templates/deploy.js +++ b/src/pages/endpoint/MEM/assignment-filter-templates/deploy.js @@ -1,7 +1,7 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippWizardConfirmation } from "/src/components/CippWizard/CippWizardConfirmation"; -import CippWizardPage from "/src/components/CippWizard/CippWizardPage.jsx"; -import { CippTenantStep } from "/src/components/CippWizard/CippTenantStep.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippWizardConfirmation } from "../../../../components/CippWizard/CippWizardConfirmation"; +import CippWizardPage from "../../../../components/CippWizard/CippWizardPage.jsx"; +import { CippTenantStep } from "../../../../components/CippWizard/CippTenantStep.jsx"; import { CippWizardAssignmentFilterTemplates } from "../../../../components/CippWizard/CippWizardAssignmentFilterTemplates"; const Page = () => { diff --git a/src/pages/endpoint/MEM/assignment-filter-templates/edit.jsx b/src/pages/endpoint/MEM/assignment-filter-templates/edit.jsx index 2d10d7502e61..0eb68a160c8a 100644 --- a/src/pages/endpoint/MEM/assignment-filter-templates/edit.jsx +++ b/src/pages/endpoint/MEM/assignment-filter-templates/edit.jsx @@ -1,6 +1,6 @@ import { Box, CircularProgress } from "@mui/material"; import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { useSettings } from "../../../../hooks/use-settings"; import CippAddAssignmentFilterTemplateForm from "../../../../components/CippFormPages/CippAddAssignmentFilterTemplateForm"; diff --git a/src/pages/endpoint/MEM/assignment-filter-templates/index.js b/src/pages/endpoint/MEM/assignment-filter-templates/index.js index b3736a0fc346..5634b8b7e699 100644 --- a/src/pages/endpoint/MEM/assignment-filter-templates/index.js +++ b/src/pages/endpoint/MEM/assignment-filter-templates/index.js @@ -1,9 +1,9 @@ import { Button } from "@mui/material"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { AddBox, RocketLaunch, Delete, GitHub, Edit } from "@mui/icons-material"; import Link from "next/link"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; import { CippPropertyListCard } from "../../../../components/CippCards/CippPropertyListCard"; import { getCippTranslation } from "../../../../utils/get-cipp-translation"; import { getCippFormatting } from "../../../../utils/get-cipp-formatting"; diff --git a/src/pages/endpoint/MEM/assignment-filters/add.jsx b/src/pages/endpoint/MEM/assignment-filters/add.jsx index 68c8cb027983..c4aead07619d 100644 --- a/src/pages/endpoint/MEM/assignment-filters/add.jsx +++ b/src/pages/endpoint/MEM/assignment-filters/add.jsx @@ -1,6 +1,6 @@ import { Box } from "@mui/material"; import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { useSettings } from "../../../../hooks/use-settings"; import { useEffect } from "react"; diff --git a/src/pages/endpoint/MEM/assignment-filters/edit.jsx b/src/pages/endpoint/MEM/assignment-filters/edit.jsx index 0fae5e9b6b0d..f5a6dbad163f 100644 --- a/src/pages/endpoint/MEM/assignment-filters/edit.jsx +++ b/src/pages/endpoint/MEM/assignment-filters/edit.jsx @@ -1,8 +1,8 @@ import { useEffect, useState } from "react"; import { Box } from "@mui/material"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; import { useRouter } from "next/router"; import { ApiGetCall } from "../../../../api/ApiCall"; import { useSettings } from "../../../../hooks/use-settings"; diff --git a/src/pages/endpoint/MEM/assignment-filters/index.js b/src/pages/endpoint/MEM/assignment-filters/index.js index 0260840a9ba9..462647494c98 100644 --- a/src/pages/endpoint/MEM/assignment-filters/index.js +++ b/src/pages/endpoint/MEM/assignment-filters/index.js @@ -1,6 +1,6 @@ import { Button } from "@mui/material"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import Link from "next/link"; import { TrashIcon } from "@heroicons/react/24/outline"; import { Edit, Add, Book } from "@mui/icons-material"; diff --git a/src/pages/endpoint/MEM/devices/index.js b/src/pages/endpoint/MEM/devices/index.js index e2d5c52ef4ef..86003a3106a6 100644 --- a/src/pages/endpoint/MEM/devices/index.js +++ b/src/pages/endpoint/MEM/devices/index.js @@ -1,6 +1,6 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { useSettings } from "../../../../hooks/use-settings"; import { EyeIcon } from "@heroicons/react/24/outline"; import { Sync, diff --git a/src/pages/endpoint/MEM/list-appprotection-policies/index.js b/src/pages/endpoint/MEM/list-appprotection-policies/index.js index f86460eab062..85349e8668ed 100644 --- a/src/pages/endpoint/MEM/list-appprotection-policies/index.js +++ b/src/pages/endpoint/MEM/list-appprotection-policies/index.js @@ -1,10 +1,10 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Book, LaptopChromebook } from "@mui/icons-material"; import { GlobeAltIcon, TrashIcon, UserIcon, UserGroupIcon } from "@heroicons/react/24/outline"; -import { PermissionButton } from "/src/utils/permissions.js"; -import { CippPolicyDeployDrawer } from "/src/components/CippComponents/CippPolicyDeployDrawer.jsx"; -import { useSettings } from "/src/hooks/use-settings.js"; +import { PermissionButton } from "../../../../utils/permissions.js"; +import { CippPolicyDeployDrawer } from "../../../../components/CippComponents/CippPolicyDeployDrawer.jsx"; +import { useSettings } from "../../../../hooks/use-settings.js"; const assignmentModeOptions = [ { label: "Replace existing assignments", value: "replace" }, diff --git a/src/pages/endpoint/MEM/list-compliance-policies/index.js b/src/pages/endpoint/MEM/list-compliance-policies/index.js index 1a3cf8a86de6..dcb37a6eadc7 100644 --- a/src/pages/endpoint/MEM/list-compliance-policies/index.js +++ b/src/pages/endpoint/MEM/list-compliance-policies/index.js @@ -1,10 +1,10 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Book, LaptopChromebook } from "@mui/icons-material"; import { GlobeAltIcon, TrashIcon, UserIcon, UserGroupIcon } from "@heroicons/react/24/outline"; -import { PermissionButton } from "/src/utils/permissions.js"; -import { CippPolicyDeployDrawer } from "/src/components/CippComponents/CippPolicyDeployDrawer.jsx"; -import { useSettings } from "/src/hooks/use-settings.js"; +import { PermissionButton } from "../../../../utils/permissions.js"; +import { CippPolicyDeployDrawer } from "../../../../components/CippComponents/CippPolicyDeployDrawer.jsx"; +import { useSettings } from "../../../../hooks/use-settings.js"; const assignmentModeOptions = [ { label: "Replace existing assignments", value: "replace" }, diff --git a/src/pages/endpoint/MEM/list-policies/index.js b/src/pages/endpoint/MEM/list-policies/index.js index 9682d72d9ce8..ec6fa08d0d08 100644 --- a/src/pages/endpoint/MEM/list-policies/index.js +++ b/src/pages/endpoint/MEM/list-policies/index.js @@ -1,10 +1,10 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Book, LaptopChromebook } from "@mui/icons-material"; import { GlobeAltIcon, TrashIcon, UserIcon, UserGroupIcon } from "@heroicons/react/24/outline"; -import { PermissionButton } from "/src/utils/permissions.js"; -import { CippPolicyDeployDrawer } from "/src/components/CippComponents/CippPolicyDeployDrawer.jsx"; -import { useSettings } from "/src/hooks/use-settings.js"; +import { PermissionButton } from "../../../../utils/permissions.js"; +import { CippPolicyDeployDrawer } from "../../../../components/CippComponents/CippPolicyDeployDrawer.jsx"; +import { useSettings } from "../../../../hooks/use-settings.js"; const assignmentModeOptions = [ { label: "Replace existing assignments", value: "replace" }, diff --git a/src/pages/endpoint/MEM/list-scripts/index.jsx b/src/pages/endpoint/MEM/list-scripts/index.jsx index 8ace41a37f4f..91eb0bf675a6 100644 --- a/src/pages/endpoint/MEM/list-scripts/index.jsx +++ b/src/pages/endpoint/MEM/list-scripts/index.jsx @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage"; +import { Layout as DashboardLayout } from "../../../../layouts/index"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage"; import { TrashIcon, PencilIcon, @@ -7,7 +7,7 @@ import { UserGroupIcon, GlobeAltIcon, } from "@heroicons/react/24/outline"; -import { showToast } from "/src/store/toasts"; +import { showToast } from "../../../../store/toasts"; import { Button, Dialog, @@ -17,7 +17,7 @@ import { CircularProgress, DialogActions, } from "@mui/material"; -import { CippCodeBlock } from "/src/components/CippComponents/CippCodeBlock"; +import { CippCodeBlock } from "../../../../components/CippComponents/CippCodeBlock"; import { useState, useEffect, useMemo } from "react"; import { useDispatch } from "react-redux"; import { Close, Save, LaptopChromebook } from "@mui/icons-material"; diff --git a/src/pages/endpoint/MEM/list-templates/edit.jsx b/src/pages/endpoint/MEM/list-templates/edit.jsx index c58cbe7e0920..3e0f7c47409d 100644 --- a/src/pages/endpoint/MEM/list-templates/edit.jsx +++ b/src/pages/endpoint/MEM/list-templates/edit.jsx @@ -1,11 +1,11 @@ import { Alert, Box } from "@mui/material"; import { useForm } from "react-hook-form"; import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import { ApiGetCall } from "/src/api/ApiCall"; -import CippTemplateFieldRenderer from "/src/components/CippComponents/CippTemplateFieldRenderer"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormSkeleton from "../../../../components/CippFormPages/CippFormSkeleton"; +import { ApiGetCall } from "../../../../api/ApiCall"; +import CippTemplateFieldRenderer from "../../../../components/CippComponents/CippTemplateFieldRenderer"; const EditIntuneTemplate = () => { const router = useRouter(); diff --git a/src/pages/endpoint/MEM/list-templates/index.js b/src/pages/endpoint/MEM/list-templates/index.js index c9de8a83b7f6..fcfc8aa81e5a 100644 --- a/src/pages/endpoint/MEM/list-templates/index.js +++ b/src/pages/endpoint/MEM/list-templates/index.js @@ -1,11 +1,11 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { PencilIcon, TrashIcon } from "@heroicons/react/24/outline"; import { Edit, GitHub, LocalOffer, LocalOfferOutlined, CopyAll } from "@mui/icons-material"; import CippJsonView from "../../../../components/CippFormPages/CippJSONView"; -import { ApiGetCall } from "/src/api/ApiCall"; -import { CippPolicyImportDrawer } from "/src/components/CippComponents/CippPolicyImportDrawer.jsx"; -import { PermissionButton } from "/src/utils/permissions.js"; +import { ApiGetCall } from "../../../../api/ApiCall"; +import { CippPolicyImportDrawer } from "../../../../components/CippComponents/CippPolicyImportDrawer.jsx"; +import { PermissionButton } from "../../../../utils/permissions.js"; const Page = () => { const pageTitle = "Available Endpoint Manager Templates"; diff --git a/src/pages/endpoint/applications/list/index.js b/src/pages/endpoint/applications/list/index.js index 6a5073f1ddef..0405962e188b 100644 --- a/src/pages/endpoint/applications/list/index.js +++ b/src/pages/endpoint/applications/list/index.js @@ -1,12 +1,12 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { CippApiDialog } from "/src/components/CippComponents/CippApiDialog.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { CippApiDialog } from "../../../../components/CippComponents/CippApiDialog.jsx"; import { GlobeAltIcon, TrashIcon, UserIcon, UserGroupIcon } from "@heroicons/react/24/outline"; import { LaptopMac, Sync } from "@mui/icons-material"; -import { CippApplicationDeployDrawer } from "/src/components/CippComponents/CippApplicationDeployDrawer"; +import { CippApplicationDeployDrawer } from "../../../../components/CippComponents/CippApplicationDeployDrawer"; import { Button, Box } from "@mui/material"; -import { useSettings } from "/src/hooks/use-settings.js"; -import { useDialog } from "/src/hooks/use-dialog.js"; +import { useSettings } from "../../../../hooks/use-settings.js"; +import { useDialog } from "../../../../hooks/use-dialog.js"; const assignmentIntentOptions = [ { label: "Required", value: "Required" }, diff --git a/src/pages/endpoint/applications/queue/index.js b/src/pages/endpoint/applications/queue/index.js index 08e24e18ad30..57a8337a0289 100644 --- a/src/pages/endpoint/applications/queue/index.js +++ b/src/pages/endpoint/applications/queue/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import { PlayArrow } from "@mui/icons-material"; import { TrashIcon } from "@heroicons/react/24/outline"; diff --git a/src/pages/endpoint/autopilot/add-device/index.js b/src/pages/endpoint/autopilot/add-device/index.js index 7c1f657e3dcd..5758c4a0507d 100644 --- a/src/pages/endpoint/autopilot/add-device/index.js +++ b/src/pages/endpoint/autopilot/add-device/index.js @@ -1,7 +1,7 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippWizardConfirmation } from "/src/components/CippWizard/CippWizardConfirmation"; -import CippWizardPage from "/src/components/CippWizard/CippWizardPage.jsx"; -import { CippTenantStep } from "/src/components/CippWizard/CippTenantStep.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippWizardConfirmation } from "../../../../components/CippWizard/CippWizardConfirmation"; +import CippWizardPage from "../../../../components/CippWizard/CippWizardPage.jsx"; +import { CippTenantStep } from "../../../../components/CippWizard/CippTenantStep.jsx"; import { CippWizardAutopilotImport } from "../../../../components/CippWizard/CippWizardAutopilotImport"; import { CippWizardAutopilotOptions } from "../../../../components/CippWizard/CippWizardAutopilotOptions"; diff --git a/src/pages/endpoint/autopilot/list-devices/index.js b/src/pages/endpoint/autopilot/list-devices/index.js index cd5d6244aa74..3c25271def7c 100644 --- a/src/pages/endpoint/autopilot/list-devices/index.js +++ b/src/pages/endpoint/autopilot/list-devices/index.js @@ -1,6 +1,6 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { CippApiDialog } from "/src/components/CippComponents/CippApiDialog.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { CippApiDialog } from "../../../../components/CippComponents/CippApiDialog.jsx"; import { Button } from "@mui/material"; import { PersonAdd, Delete, Sync, Add, Edit, Sell } from "@mui/icons-material"; import { useDialog } from "../../../../hooks/use-dialog"; diff --git a/src/pages/endpoint/autopilot/list-profiles/index.js b/src/pages/endpoint/autopilot/list-profiles/index.js index 63626a661e54..12f2369f4e05 100644 --- a/src/pages/endpoint/autopilot/list-profiles/index.js +++ b/src/pages/endpoint/autopilot/list-profiles/index.js @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Delete } from "@mui/icons-material"; import CippJsonView from "../../../../components/CippFormPages/CippJSONView"; -import { CippAutopilotProfileDrawer } from "/src/components/CippComponents/CippAutopilotProfileDrawer"; +import { CippAutopilotProfileDrawer } from "../../../../components/CippComponents/CippAutopilotProfileDrawer"; const Page = () => { const pageTitle = "Autopilot Profiles"; diff --git a/src/pages/endpoint/autopilot/list-status-pages/index.js b/src/pages/endpoint/autopilot/list-status-pages/index.js index 6143b8eab136..4ec8a3b93313 100644 --- a/src/pages/endpoint/autopilot/list-status-pages/index.js +++ b/src/pages/endpoint/autopilot/list-status-pages/index.js @@ -1,6 +1,6 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { CippAutopilotStatusPageDrawer } from "/src/components/CippComponents/CippAutopilotStatusPageDrawer"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { CippAutopilotStatusPageDrawer } from "../../../../components/CippComponents/CippAutopilotStatusPageDrawer"; const Page = () => { const pageTitle = "Autopilot Status Pages"; diff --git a/src/pages/endpoint/reports/analyticsdevicescore/index.js b/src/pages/endpoint/reports/analyticsdevicescore/index.js index 5660e0fbf612..73051fe1318b 100644 --- a/src/pages/endpoint/reports/analyticsdevicescore/index.js +++ b/src/pages/endpoint/reports/analyticsdevicescore/index.js @@ -1,7 +1,7 @@ import { EyeIcon } from "@heroicons/react/24/outline"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { useSettings } from "../../../../hooks/use-settings"; const Page = () => { const pageTitle = "Analytics Device Score Report"; diff --git a/src/pages/endpoint/reports/autopilot-deployment/index.js b/src/pages/endpoint/reports/autopilot-deployment/index.js index 94a8c0226c18..49f8b56e4d07 100644 --- a/src/pages/endpoint/reports/autopilot-deployment/index.js +++ b/src/pages/endpoint/reports/autopilot-deployment/index.js @@ -1,7 +1,7 @@ import { EyeIcon, DocumentTextIcon } from "@heroicons/react/24/outline"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { useSettings } from "../../../../hooks/use-settings"; import { CheckCircle, Error, Warning, Refresh } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/endpoint/reports/detected-apps/index.js b/src/pages/endpoint/reports/detected-apps/index.js index 308d02cf3d79..5f692c12428d 100644 --- a/src/pages/endpoint/reports/detected-apps/index.js +++ b/src/pages/endpoint/reports/detected-apps/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const Page = () => { const pageTitle = "Discovered Apps"; diff --git a/src/pages/endpoint/reports/workfromanywhere/index.js b/src/pages/endpoint/reports/workfromanywhere/index.js index cd963abfbe72..27fdfbe1e5a7 100644 --- a/src/pages/endpoint/reports/workfromanywhere/index.js +++ b/src/pages/endpoint/reports/workfromanywhere/index.js @@ -1,7 +1,7 @@ import { EyeIcon } from "@heroicons/react/24/outline"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { useSettings } from "../../../../hooks/use-settings"; const Page = () => { const pageTitle = "Work from anywhere Report"; diff --git a/src/pages/identity/administration/deleted-items/index.js b/src/pages/identity/administration/deleted-items/index.js index 66d27c8bfd83..961298efb234 100644 --- a/src/pages/identity/administration/deleted-items/index.js +++ b/src/pages/identity/administration/deleted-items/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { RestoreFromTrash, Warning } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/identity/administration/deploy-group-template/index.js b/src/pages/identity/administration/deploy-group-template/index.js index d96412b632bf..04313ef9bf2d 100644 --- a/src/pages/identity/administration/deploy-group-template/index.js +++ b/src/pages/identity/administration/deploy-group-template/index.js @@ -1,4 +1,4 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; const Page = () => { const pageTitle = "Deploy Group Template"; diff --git a/src/pages/identity/administration/devices/index.js b/src/pages/identity/administration/devices/index.js index 9d0f56c18643..74791fb678c2 100644 --- a/src/pages/identity/administration/devices/index.js +++ b/src/pages/identity/administration/devices/index.js @@ -1,6 +1,6 @@ -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative. -import { useSettings } from "/src/hooks/use-settings"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative. +import { useSettings } from "../../../../hooks/use-settings"; import { Visibility, CheckCircleOutline, Block, VpnKey, DeleteForever } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/identity/administration/group-templates/add.jsx b/src/pages/identity/administration/group-templates/add.jsx index fe5b597fe926..4e79cc7900c5 100644 --- a/src/pages/identity/administration/group-templates/add.jsx +++ b/src/pages/identity/administration/group-templates/add.jsx @@ -1,6 +1,6 @@ import { Box } from "@mui/material"; import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { useSettings } from "../../../../hooks/use-settings"; import CippAddGroupTemplateForm from "../../../../components/CippFormPages/CippAddGroupTemplateForm"; diff --git a/src/pages/identity/administration/group-templates/deploy.js b/src/pages/identity/administration/group-templates/deploy.js index 31791894f361..e27fa27a56ab 100644 --- a/src/pages/identity/administration/group-templates/deploy.js +++ b/src/pages/identity/administration/group-templates/deploy.js @@ -1,7 +1,7 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippWizardConfirmation } from "/src/components/CippWizard/CippWizardConfirmation"; -import CippWizardPage from "/src/components/CippWizard/CippWizardPage.jsx"; -import { CippTenantStep } from "/src/components/CippWizard/CippTenantStep.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippWizardConfirmation } from "../../../../components/CippWizard/CippWizardConfirmation"; +import CippWizardPage from "../../../../components/CippWizard/CippWizardPage.jsx"; +import { CippTenantStep } from "../../../../components/CippWizard/CippTenantStep.jsx"; import { CippWizardGroupTemplates } from "../../../../components/CippWizard/CippWizardGroupTemplates"; const Page = () => { diff --git a/src/pages/identity/administration/group-templates/edit.jsx b/src/pages/identity/administration/group-templates/edit.jsx index 6bcf87af7c0a..5fd7f3417805 100644 --- a/src/pages/identity/administration/group-templates/edit.jsx +++ b/src/pages/identity/administration/group-templates/edit.jsx @@ -1,6 +1,6 @@ import { Box, CircularProgress } from "@mui/material"; import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { useSettings } from "../../../../hooks/use-settings"; import CippAddGroupTemplateForm from "../../../../components/CippFormPages/CippAddGroupTemplateForm"; diff --git a/src/pages/identity/administration/group-templates/index.js b/src/pages/identity/administration/group-templates/index.js index b7dc1b5aa2a3..3920e4a01d26 100644 --- a/src/pages/identity/administration/group-templates/index.js +++ b/src/pages/identity/administration/group-templates/index.js @@ -1,9 +1,9 @@ import { Button } from "@mui/material"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { AddBox, RocketLaunch, Delete, GitHub, Edit } from "@mui/icons-material"; import Link from "next/link"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; import { CippPropertyListCard } from "../../../../components/CippCards/CippPropertyListCard"; import { getCippTranslation } from "../../../../utils/get-cipp-translation"; import { getCippFormatting } from "../../../../utils/get-cipp-formatting"; diff --git a/src/pages/identity/administration/groups/add.jsx b/src/pages/identity/administration/groups/add.jsx index 3eddb73d6ba0..1fa0ccfc83c4 100644 --- a/src/pages/identity/administration/groups/add.jsx +++ b/src/pages/identity/administration/groups/add.jsx @@ -1,6 +1,6 @@ import { Box } from "@mui/material"; import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { useSettings } from "../../../../hooks/use-settings"; import { useEffect } from "react"; diff --git a/src/pages/identity/administration/groups/edit.jsx b/src/pages/identity/administration/groups/edit.jsx index 304a1792d51b..4409353cb92b 100644 --- a/src/pages/identity/administration/groups/edit.jsx +++ b/src/pages/identity/administration/groups/edit.jsx @@ -2,10 +2,10 @@ import { useEffect, useState } from "react"; import { Box, Button, Divider, Typography, Alert } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormUserSelector } from "/src/components/CippComponents/CippFormUserSelector"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { CippFormUserSelector } from "../../../../components/CippComponents/CippFormUserSelector"; import { useRouter } from "next/router"; import { ApiGetCall } from "../../../../api/ApiCall"; import { useSettings } from "../../../../hooks/use-settings"; diff --git a/src/pages/identity/administration/groups/index.js b/src/pages/identity/administration/groups/index.js index 4289bb9d01e6..bb5de39a09a2 100644 --- a/src/pages/identity/administration/groups/index.js +++ b/src/pages/identity/administration/groups/index.js @@ -1,6 +1,6 @@ import { Button } from "@mui/material"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import Link from "next/link"; import { TrashIcon } from "@heroicons/react/24/outline"; import { diff --git a/src/pages/identity/administration/index.js b/src/pages/identity/administration/index.js index ddd398e434f7..f2222b9e4fab 100644 --- a/src/pages/identity/administration/index.js +++ b/src/pages/identity/administration/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; const Page = () => { const pageTitle = "Administration"; diff --git a/src/pages/identity/administration/jit-admin-templates/add.jsx b/src/pages/identity/administration/jit-admin-templates/add.jsx index baf303eff438..5b776241428d 100644 --- a/src/pages/identity/administration/jit-admin-templates/add.jsx +++ b/src/pages/identity/administration/jit-admin-templates/add.jsx @@ -1,13 +1,13 @@ import { Box, Divider, Typography } from "@mui/material"; import { Grid } from "@mui/system"; import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; import { CippFormCondition } from "../../../../components/CippComponents/CippFormCondition"; import { CippFormDomainSelector } from "../../../../components/CippComponents/CippFormDomainSelector"; import { CippFormUserSelector } from "../../../../components/CippComponents/CippFormUserSelector"; -import gdaproles from "/src/data/GDAPRoles.json"; +import gdaproles from "../../../../data/GDAPRoles.json"; import { useSettings } from "../../../../hooks/use-settings"; const Page = () => { diff --git a/src/pages/identity/administration/jit-admin-templates/edit.jsx b/src/pages/identity/administration/jit-admin-templates/edit.jsx index fdbcf63b650e..468c457d4240 100644 --- a/src/pages/identity/administration/jit-admin-templates/edit.jsx +++ b/src/pages/identity/administration/jit-admin-templates/edit.jsx @@ -1,13 +1,13 @@ import { Box, Divider, Typography } from "@mui/material"; import { Grid } from "@mui/system"; import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; import { CippFormCondition } from "../../../../components/CippComponents/CippFormCondition"; import { CippFormDomainSelector } from "../../../../components/CippComponents/CippFormDomainSelector"; import { CippFormUserSelector } from "../../../../components/CippComponents/CippFormUserSelector"; -import gdaproles from "/src/data/GDAPRoles.json"; +import gdaproles from "../../../../data/GDAPRoles.json"; import { useSettings } from "../../../../hooks/use-settings"; import { useRouter } from "next/router"; import { ApiGetCall } from "../../../../api/ApiCall"; diff --git a/src/pages/identity/administration/jit-admin-templates/index.js b/src/pages/identity/administration/jit-admin-templates/index.js index d5d2e798c7a8..8f3c4cd85a50 100644 --- a/src/pages/identity/administration/jit-admin-templates/index.js +++ b/src/pages/identity/administration/jit-admin-templates/index.js @@ -1,9 +1,9 @@ import { Button } from "@mui/material"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { AddBox, Delete, GitHub, Edit } from "@mui/icons-material"; import Link from "next/link"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; import { CippPropertyListCard } from "../../../../components/CippCards/CippPropertyListCard"; import { getCippTranslation } from "../../../../utils/get-cipp-translation"; import { getCippFormatting } from "../../../../utils/get-cipp-formatting"; diff --git a/src/pages/identity/administration/jit-admin/add.jsx b/src/pages/identity/administration/jit-admin/add.jsx index c1e60624caa4..9deef7e51b1b 100644 --- a/src/pages/identity/administration/jit-admin/add.jsx +++ b/src/pages/identity/administration/jit-admin/add.jsx @@ -1,12 +1,12 @@ import { Box, Divider } from "@mui/material"; import { Grid } from "@mui/system"; import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { CippFormTenantSelector } from "../../../../components/CippComponents/CippFormTenantSelector"; import { useForm, useWatch } from "react-hook-form"; import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; import { CippFormCondition } from "../../../../components/CippComponents/CippFormCondition"; -import gdaproles from "/src/data/GDAPRoles.json"; +import gdaproles from "../../../../data/GDAPRoles.json"; import { CippFormDomainSelector } from "../../../../components/CippComponents/CippFormDomainSelector"; import { CippFormUserSelector } from "../../../../components/CippComponents/CippFormUserSelector"; import { ApiGetCall } from "../../../../api/ApiCall"; diff --git a/src/pages/identity/administration/jit-admin/index.js b/src/pages/identity/administration/jit-admin/index.js index 46fd36efb4c9..b92faa05decb 100644 --- a/src/pages/identity/administration/jit-admin/index.js +++ b/src/pages/identity/administration/jit-admin/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippTablePage from "/src/components/CippComponents/CippTablePage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippTablePage from "../../../../components/CippComponents/CippTablePage"; import { Button } from "@mui/material"; import { AdminPanelSettings } from "@mui/icons-material"; import Link from "next/link"; diff --git a/src/pages/identity/administration/offboarding-wizard/index.js b/src/pages/identity/administration/offboarding-wizard/index.js index bb99dc1e6ada..931cfded2eef 100644 --- a/src/pages/identity/administration/offboarding-wizard/index.js +++ b/src/pages/identity/administration/offboarding-wizard/index.js @@ -1,7 +1,7 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippWizardConfirmation } from "/src/components/CippWizard/CippWizardConfirmation"; -import CippWizardPage from "/src/components/CippWizard/CippWizardPage.jsx"; -import { CippTenantStep } from "/src/components/CippWizard/CippTenantStep.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippWizardConfirmation } from "../../../../components/CippWizard/CippWizardConfirmation"; +import CippWizardPage from "../../../../components/CippWizard/CippWizardPage.jsx"; +import { CippTenantStep } from "../../../../components/CippWizard/CippTenantStep.jsx"; import { CippWizardAutoComplete } from "../../../../components/CippWizard/CippWizardAutoComplete"; import { CippWizardOffboarding } from "../../../../components/CippWizard/CippWizardOffboarding"; import { useSettings } from "../../../../hooks/use-settings"; diff --git a/src/pages/identity/administration/risky-users/index.js b/src/pages/identity/administration/risky-users/index.js index 9fe9b7004690..d3ff4080d112 100644 --- a/src/pages/identity/administration/risky-users/index.js +++ b/src/pages/identity/administration/risky-users/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Clear, Search } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/identity/administration/roles/index.js b/src/pages/identity/administration/roles/index.js index 4229e12eb622..f09fb8a01388 100644 --- a/src/pages/identity/administration/roles/index.js +++ b/src/pages/identity/administration/roles/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const Page = () => { const pageTitle = "Roles"; diff --git a/src/pages/identity/administration/users/add.jsx b/src/pages/identity/administration/users/add.jsx index ce2b545c7032..eabb890fa965 100644 --- a/src/pages/identity/administration/users/add.jsx +++ b/src/pages/identity/administration/users/add.jsx @@ -1,8 +1,8 @@ import { Box } from "@mui/material"; import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; -import { CippFormUserSelector } from "/src/components/CippComponents/CippFormUserSelector"; +import { CippFormUserSelector } from "../../../../components/CippComponents/CippFormUserSelector"; import { useSettings } from "../../../../hooks/use-settings"; import { useEffect } from "react"; diff --git a/src/pages/identity/administration/users/bulk-add.js b/src/pages/identity/administration/users/bulk-add.js index af435fb04982..215982897f48 100644 --- a/src/pages/identity/administration/users/bulk-add.js +++ b/src/pages/identity/administration/users/bulk-add.js @@ -1,7 +1,7 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippWizardConfirmation } from "/src/components/CippWizard/CippWizardConfirmation"; -import CippWizardPage from "/src/components/CippWizard/CippWizardPage.jsx"; -import { CippTenantStep } from "/src/components/CippWizard/CippTenantStep.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippWizardConfirmation } from "../../../../components/CippWizard/CippWizardConfirmation"; +import CippWizardPage from "../../../../components/CippWizard/CippWizardPage.jsx"; +import { CippTenantStep } from "../../../../components/CippWizard/CippTenantStep.jsx"; import { useSettings } from "../../../../hooks/use-settings"; import { CippWizardCSVImport } from "../../../../components/CippWizard/CippWizardCSVImport"; import { CippWizardBulkOptions } from "../../../../components/CippWizard/CippWizardBulkOptions"; diff --git a/src/pages/identity/administration/users/index.js b/src/pages/identity/administration/users/index.js index 8f5d613095d1..41de8a086bd5 100644 --- a/src/pages/identity/administration/users/index.js +++ b/src/pages/identity/administration/users/index.js @@ -1,12 +1,12 @@ -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { useSettings } from "/src/hooks/use-settings.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { useSettings } from "../../../../hooks/use-settings.js"; import { PermissionButton } from "../../../../utils/permissions"; -import { useCippUserActions } from "/src/components/CippComponents/CippUserActions.jsx"; -import { CippInviteGuestDrawer } from "/src/components/CippComponents/CippInviteGuestDrawer.jsx"; -import { CippBulkUserDrawer } from "/src/components/CippComponents/CippBulkUserDrawer.jsx"; -import { CippAddUserDrawer } from "/src/components/CippComponents/CippAddUserDrawer.jsx"; -import { CippApiLogsDrawer } from "/src/components/CippComponents/CippApiLogsDrawer.jsx"; +import { useCippUserActions } from "../../../../components/CippComponents/CippUserActions.jsx"; +import { CippInviteGuestDrawer } from "../../../../components/CippComponents/CippInviteGuestDrawer.jsx"; +import { CippBulkUserDrawer } from "../../../../components/CippComponents/CippBulkUserDrawer.jsx"; +import { CippAddUserDrawer } from "../../../../components/CippComponents/CippAddUserDrawer.jsx"; +import { CippApiLogsDrawer } from "../../../../components/CippComponents/CippApiLogsDrawer.jsx"; import { Box } from "@mui/material"; const Page = () => { diff --git a/src/pages/identity/administration/users/patch-wizard.jsx b/src/pages/identity/administration/users/patch-wizard.jsx index 1fece737f175..b990988398de 100644 --- a/src/pages/identity/administration/users/patch-wizard.jsx +++ b/src/pages/identity/administration/users/patch-wizard.jsx @@ -1,7 +1,7 @@ import { useState, useEffect, useMemo } from "react"; import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippWizardPage from "/src/components/CippWizard/CippWizardPage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippWizardPage from "../../../../components/CippWizard/CippWizardPage.jsx"; import { Stack, Typography, @@ -16,10 +16,10 @@ import { FormControlLabel, Autocomplete, } from "@mui/material"; -import { CippWizardStepButtons } from "/src/components/CippWizard/CippWizardStepButtons"; -import { ApiPostCall, ApiGetCall } from "/src/api/ApiCall"; -import { CippApiResults } from "/src/components/CippComponents/CippApiResults"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; +import { CippWizardStepButtons } from "../../../../components/CippWizard/CippWizardStepButtons"; +import { ApiPostCall, ApiGetCall } from "../../../../api/ApiCall"; +import { CippApiResults } from "../../../../components/CippComponents/CippApiResults"; +import { CippDataTable } from "../../../../components/CippTable/CippDataTable"; import { Delete } from "@mui/icons-material"; // User properties that can be patched diff --git a/src/pages/identity/administration/users/user/bec.jsx b/src/pages/identity/administration/users/user/bec.jsx index 7ff997b562cd..6d305994513d 100644 --- a/src/pages/identity/administration/users/user/bec.jsx +++ b/src/pages/identity/administration/users/user/bec.jsx @@ -1,8 +1,8 @@ import { useEffect, useState } from "react"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import { useSettings } from "../../../../../hooks/use-settings"; import { useRouter } from "next/router"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../../api/ApiCall"; import CalendarIcon from "@heroicons/react/24/outline/CalendarIcon"; import { CheckCircle, Download, Mail, Fingerprint, Launch } from "@mui/icons-material"; import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; diff --git a/src/pages/identity/administration/users/user/conditional-access.jsx b/src/pages/identity/administration/users/user/conditional-access.jsx index a22232248742..ea58b93207dc 100644 --- a/src/pages/identity/administration/users/user/conditional-access.jsx +++ b/src/pages/identity/administration/users/user/conditional-access.jsx @@ -1,8 +1,8 @@ import { useState } from "react"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import { useSettings } from "../../../../../hooks/use-settings"; import { useRouter } from "next/router"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; +import CippFormSkeleton from "../../../../../components/CippFormPages/CippFormSkeleton"; import CalendarIcon from "@heroicons/react/24/outline/CalendarIcon"; import { Mail, Fingerprint, Launch } from "@mui/icons-material"; import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; @@ -11,9 +11,9 @@ import ReactTimeAgo from "react-time-ago"; import { CippCopyToClipBoard } from "../../../../../components/CippComponents/CippCopyToClipboard"; import { Box, Stack, Typography, Button } from "@mui/material"; import { Grid } from "@mui/system"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import countryList from "/src/data/countryList"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; +import CippFormComponent from "../../../../../components/CippComponents/CippFormComponent"; +import countryList from "../../../../../data/countryList"; +import { CippDataTable } from "../../../../../components/CippTable/CippDataTable"; import { useForm } from "react-hook-form"; import CippButtonCard from "../../../../../components/CippCards/CippButtonCard"; import { ApiGetCall, ApiPostCall } from "../../../../../api/ApiCall"; diff --git a/src/pages/identity/administration/users/user/devices.jsx b/src/pages/identity/administration/users/user/devices.jsx index 2b0f4823415c..9fcb9086bdbc 100644 --- a/src/pages/identity/administration/users/user/devices.jsx +++ b/src/pages/identity/administration/users/user/devices.jsx @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import { useSettings } from "../../../../../hooks/use-settings"; import { useRouter } from "next/router"; -import { ApiGetCall } from "/src/api/ApiCall"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; +import { ApiGetCall } from "../../../../../api/ApiCall"; +import CippFormSkeleton from "../../../../../components/CippFormPages/CippFormSkeleton"; import CalendarIcon from "@heroicons/react/24/outline/CalendarIcon"; import { Check, Mail, Fingerprint } from "@mui/icons-material"; import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; diff --git a/src/pages/identity/administration/users/user/edit.jsx b/src/pages/identity/administration/users/user/edit.jsx index d7a559e57922..be61990e7e29 100644 --- a/src/pages/identity/administration/users/user/edit.jsx +++ b/src/pages/identity/administration/users/user/edit.jsx @@ -1,13 +1,13 @@ -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../../../components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; import { useForm } from "react-hook-form"; -import { useSettings } from "/src/hooks/use-settings"; -import CippAddEditUser from "/src/components/CippFormPages/CippAddEditUser"; +import { useSettings } from "../../../../../hooks/use-settings"; +import CippAddEditUser from "../../../../../components/CippFormPages/CippAddEditUser"; import { useRouter } from "next/router"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../../api/ApiCall"; import { useState, useEffect } from "react"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import { getCippLicenseTranslation } from "/src/utils/get-cipp-license-translation"; +import CippFormSkeleton from "../../../../../components/CippFormPages/CippFormSkeleton"; +import { getCippLicenseTranslation } from "../../../../../utils/get-cipp-license-translation"; import CalendarIcon from "@heroicons/react/24/outline/CalendarIcon"; import { Mail, Fingerprint, Launch } from "@mui/icons-material"; import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; diff --git a/src/pages/identity/administration/users/user/exchange.jsx b/src/pages/identity/administration/users/user/exchange.jsx index 258a46db771e..3338e3388eb4 100644 --- a/src/pages/identity/administration/users/user/exchange.jsx +++ b/src/pages/identity/administration/users/user/exchange.jsx @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import { useSettings } from "../../../../../hooks/use-settings"; import { useRouter } from "next/router"; -import { ApiGetCall } from "/src/api/ApiCall"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; +import { ApiGetCall } from "../../../../../api/ApiCall"; +import CippFormSkeleton from "../../../../../components/CippFormPages/CippFormSkeleton"; import CalendarIcon from "@heroicons/react/24/outline/CalendarIcon"; import { Check, diff --git a/src/pages/identity/administration/users/user/index.jsx b/src/pages/identity/administration/users/user/index.jsx index 3fe06b8d7853..ce2432eed52a 100644 --- a/src/pages/identity/administration/users/user/index.jsx +++ b/src/pages/identity/administration/users/user/index.jsx @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import { useSettings } from "../../../../../hooks/use-settings"; import { useRouter } from "next/router"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; +import { ApiGetCall, ApiPostCall } from "../../../../../api/ApiCall"; +import CippFormSkeleton from "../../../../../components/CippFormPages/CippFormSkeleton"; import CalendarIcon from "@heroicons/react/24/outline/CalendarIcon"; import { AdminPanelSettings, Check, Group, Mail, Fingerprint, Launch } from "@mui/icons-material"; import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; @@ -15,11 +15,11 @@ import { SvgIcon, Typography } from "@mui/material"; import { CippBannerListCard } from "../../../../../components/CippCards/CippBannerListCard"; import { CippTimeAgo } from "../../../../../components/CippComponents/CippTimeAgo"; import { useEffect, useState } from "react"; -import { useCippUserActions } from "/src/components/CippComponents/CippUserActions"; +import { useCippUserActions } from "../../../../../components/CippComponents/CippUserActions"; import { EyeIcon, PencilIcon } from "@heroicons/react/24/outline"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; +import { CippDataTable } from "../../../../../components/CippTable/CippDataTable"; import dynamic from "next/dynamic"; -const CippMap = dynamic(() => import("/src/components/CippComponents/CippMap"), { ssr: false }); +const CippMap = dynamic(() => import("../../../../../components/CippComponents/CippMap"), { ssr: false }); import { Button, Dialog, DialogTitle, DialogContent, IconButton } from "@mui/material"; import { Close } from "@mui/icons-material"; diff --git a/src/pages/identity/reports/azure-ad-connect-report/index.js b/src/pages/identity/reports/azure-ad-connect-report/index.js index 97594a13d6ac..5a75dd7a60d9 100644 --- a/src/pages/identity/reports/azure-ad-connect-report/index.js +++ b/src/pages/identity/reports/azure-ad-connect-report/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const simpleColumns = [ "displayName", diff --git a/src/pages/identity/reports/inactive-users-report/index.js b/src/pages/identity/reports/inactive-users-report/index.js index b3bd18ea373a..9c6573ac1154 100644 --- a/src/pages/identity/reports/inactive-users-report/index.js +++ b/src/pages/identity/reports/inactive-users-report/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { EyeIcon, TrashIcon } from "@heroicons/react/24/outline"; import { Edit, Block } from "@mui/icons-material"; diff --git a/src/pages/identity/reports/index.js b/src/pages/identity/reports/index.js index 095383995762..cb5872a4486b 100644 --- a/src/pages/identity/reports/index.js +++ b/src/pages/identity/reports/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; const Page = () => { const pageTitle = "Reports"; diff --git a/src/pages/identity/reports/mfa-report/index.js b/src/pages/identity/reports/mfa-report/index.js index 9497efed4939..a389e3cb6118 100644 --- a/src/pages/identity/reports/mfa-report/index.js +++ b/src/pages/identity/reports/mfa-report/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { LockPerson, Sync, Info } from "@mui/icons-material"; import { Button, Alert, SvgIcon, IconButton, Tooltip } from "@mui/material"; import { useSettings } from "../../../../hooks/use-settings"; diff --git a/src/pages/identity/reports/risk-detections/index.js b/src/pages/identity/reports/risk-detections/index.js index 3c54fc260e31..ef62600025d3 100644 --- a/src/pages/identity/reports/risk-detections/index.js +++ b/src/pages/identity/reports/risk-detections/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { MagnifyingGlassIcon } from "@heroicons/react/24/outline"; const Page = () => { diff --git a/src/pages/identity/reports/signin-report/index.js b/src/pages/identity/reports/signin-report/index.js index 38aada551af9..9f55cf2d2376 100644 --- a/src/pages/identity/reports/signin-report/index.js +++ b/src/pages/identity/reports/signin-report/index.js @@ -1,9 +1,9 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { useState } from "react"; import { Button, TextField, Switch, FormControlLabel } from "@mui/material"; import { Grid } from "@mui/system"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; +import CippButtonCard from "../../../../components/CippCards/CippButtonCard"; const Page = () => { const pageTitle = "Sign Ins Report"; diff --git a/src/pages/license.js b/src/pages/license.js index 442aede25829..e95baaff74b7 100644 --- a/src/pages/license.js +++ b/src/pages/license.js @@ -1,5 +1,5 @@ import { Container } from "@mui/system"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../layouts/index.js"; import { Link } from "@mui/material"; const Page = () => { diff --git a/src/pages/logout/index.js b/src/pages/logout/index.js index dcc11b67276a..f0e0aef0ea09 100644 --- a/src/pages/logout/index.js +++ b/src/pages/logout/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../layouts/index.js"; const Page = () => { const pageTitle = "Log Out"; diff --git a/src/pages/security/defender/deployment/index.js b/src/pages/security/defender/deployment/index.js index a7eb6dbfa7db..65c1967f7d6a 100644 --- a/src/pages/security/defender/deployment/index.js +++ b/src/pages/security/defender/deployment/index.js @@ -1,12 +1,12 @@ import { Typography, Divider } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; -import { CippFormCondition } from "/src/components/CippComponents/CippFormCondition"; -import { CippFormInputArray } from "/src/components/CippComponents/CippFormInputArray"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { CippFormTenantSelector } from "../../../../components/CippComponents/CippFormTenantSelector"; +import { CippFormCondition } from "../../../../components/CippComponents/CippFormCondition"; +import { CippFormInputArray } from "../../../../components/CippComponents/CippFormInputArray"; const DeployDefenderForm = () => { const formControl = useForm({ diff --git a/src/pages/security/defender/list-defender-tvm/index.js b/src/pages/security/defender/list-defender-tvm/index.js index cc0f7a971bb7..0282426b7873 100644 --- a/src/pages/security/defender/list-defender-tvm/index.js +++ b/src/pages/security/defender/list-defender-tvm/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const Page = () => { const pageTitle = "Software Vulnerabilities Status"; diff --git a/src/pages/security/defender/list-defender/index.js b/src/pages/security/defender/list-defender/index.js index 93834cfd42b2..b2aa76a3fe05 100644 --- a/src/pages/security/defender/list-defender/index.js +++ b/src/pages/security/defender/list-defender/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const Page = () => { const pageTitle = "Defender Status"; diff --git a/src/pages/security/incidents/list-alerts/index.js b/src/pages/security/incidents/list-alerts/index.js index 9379da71347d..e3c4148a3e0d 100644 --- a/src/pages/security/incidents/list-alerts/index.js +++ b/src/pages/security/incidents/list-alerts/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Assignment, Done } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/security/incidents/list-check-alerts/index.js b/src/pages/security/incidents/list-check-alerts/index.js index 6d1401518d0f..db56faf0454e 100644 --- a/src/pages/security/incidents/list-check-alerts/index.js +++ b/src/pages/security/incidents/list-check-alerts/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Alert, Link } from "@mui/material"; const Page = () => { diff --git a/src/pages/security/incidents/list-incidents/index.js b/src/pages/security/incidents/list-incidents/index.js index 354a86355a8f..821fbd6e8c3c 100644 --- a/src/pages/security/incidents/list-incidents/index.js +++ b/src/pages/security/incidents/list-incidents/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { PersonAdd, PlayArrow, Assignment, Done } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/security/incidents/list-mdo-alerts/index.js b/src/pages/security/incidents/list-mdo-alerts/index.js index 2bd7601faefa..6ad4151c2ffa 100644 --- a/src/pages/security/incidents/list-mdo-alerts/index.js +++ b/src/pages/security/incidents/list-mdo-alerts/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { PersonAdd, PlayArrow, Assignment, Done } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/security/reports/list-device-compliance/index.js b/src/pages/security/reports/list-device-compliance/index.js index 6c4ab4343db3..27ce02ecbe70 100644 --- a/src/pages/security/reports/list-device-compliance/index.js +++ b/src/pages/security/reports/list-device-compliance/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const Page = () => { const pageTitle = "Device Compliance"; diff --git a/src/pages/security/safelinks/safelinks-template/add.jsx b/src/pages/security/safelinks/safelinks-template/add.jsx index 3e9998b0a63e..3a427161d451 100644 --- a/src/pages/security/safelinks/safelinks-template/add.jsx +++ b/src/pages/security/safelinks/safelinks-template/add.jsx @@ -2,10 +2,10 @@ import { useEffect } from "react"; import { Divider } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm, useWatch } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { CippFormTenantSelector } from "../../../../components/CippComponents/CippFormTenantSelector"; const DeploySafeLinksPolicyTemplate = () => { const formControl = useForm({ diff --git a/src/pages/security/safelinks/safelinks-template/create.jsx b/src/pages/security/safelinks/safelinks-template/create.jsx index e87962890042..4d373aa77995 100644 --- a/src/pages/security/safelinks/safelinks-template/create.jsx +++ b/src/pages/security/safelinks/safelinks-template/create.jsx @@ -1,9 +1,9 @@ import { Box } from "@mui/material"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; -import { useSettings } from "/src/hooks/use-settings"; -import { SafeLinksForm, safeLinksDataUtils } from "/src/components/CippFormPages/CippSafeLinksPolicyRuleForm"; +import { useSettings } from "../../../../hooks/use-settings"; +import { SafeLinksForm, safeLinksDataUtils } from "../../../../components/CippFormPages/CippSafeLinksPolicyRuleForm"; const Page = () => { const userSettingsDefaults = useSettings(); diff --git a/src/pages/security/safelinks/safelinks-template/edit.jsx b/src/pages/security/safelinks/safelinks-template/edit.jsx index 4945a158aa58..568b4163e0de 100644 --- a/src/pages/security/safelinks/safelinks-template/edit.jsx +++ b/src/pages/security/safelinks/safelinks-template/edit.jsx @@ -1,12 +1,12 @@ import { Box } from "@mui/material"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../../../hooks/use-settings"; import { useEffect } from "react"; -import { SafeLinksForm, safeLinksDataUtils } from "/src/components/CippFormPages/CippSafeLinksPolicyRuleForm"; +import { SafeLinksForm, safeLinksDataUtils } from "../../../../components/CippFormPages/CippSafeLinksPolicyRuleForm"; import { useRouter } from "next/router"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; const Page = () => { const router = useRouter(); diff --git a/src/pages/security/safelinks/safelinks-template/index.jsx b/src/pages/security/safelinks/safelinks-template/index.jsx index 87388958ff66..6fa5924ef055 100644 --- a/src/pages/security/safelinks/safelinks-template/index.jsx +++ b/src/pages/security/safelinks/safelinks-template/index.jsx @@ -1,10 +1,10 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { TrashIcon } from "@heroicons/react/24/outline"; import { Button } from "@mui/material"; import { RocketLaunch, GitHub, Edit, Add } from "@mui/icons-material"; import Link from "next/link"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; const Page = () => { const pageTitle = "Safe Links Policy Templates"; diff --git a/src/pages/security/safelinks/safelinks/add.jsx b/src/pages/security/safelinks/safelinks/add.jsx index 0153bdb1dcac..ebce15a03ece 100644 --- a/src/pages/security/safelinks/safelinks/add.jsx +++ b/src/pages/security/safelinks/safelinks/add.jsx @@ -1,9 +1,9 @@ import { Box } from "@mui/material"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; -import { useSettings } from "/src/hooks/use-settings"; -import { SafeLinksForm, safeLinksDataUtils } from "/src/components/CippFormPages/CippSafeLinksPolicyRuleForm"; +import { useSettings } from "../../../../hooks/use-settings"; +import { SafeLinksForm, safeLinksDataUtils } from "../../../../components/CippFormPages/CippSafeLinksPolicyRuleForm"; const Page = () => { const userSettingsDefaults = useSettings(); diff --git a/src/pages/security/safelinks/safelinks/edit.jsx b/src/pages/security/safelinks/safelinks/edit.jsx index c0ed200b0b26..c49846119edb 100644 --- a/src/pages/security/safelinks/safelinks/edit.jsx +++ b/src/pages/security/safelinks/safelinks/edit.jsx @@ -1,12 +1,12 @@ import { Box } from "@mui/material"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../../../hooks/use-settings"; import { useEffect } from "react"; -import { SafeLinksForm, safeLinksDataUtils } from "/src/components/CippFormPages/CippSafeLinksPolicyRuleForm"; +import { SafeLinksForm, safeLinksDataUtils } from "../../../../components/CippFormPages/CippSafeLinksPolicyRuleForm"; import { useRouter } from "next/router"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; const Page = () => { const router = useRouter(); diff --git a/src/pages/security/safelinks/safelinks/index.jsx b/src/pages/security/safelinks/safelinks/index.jsx index 70ac3bcf51c0..02ccc9f872ea 100644 --- a/src/pages/security/safelinks/safelinks/index.jsx +++ b/src/pages/security/safelinks/safelinks/index.jsx @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Block, Check, LowPriority, Edit, DeleteForever, Policy, Book } from "@mui/icons-material"; import { Button } from "@mui/material"; import Link from "next/link"; diff --git a/src/pages/teams-share/onedrive/index.js b/src/pages/teams-share/onedrive/index.js index 9ec970fbda1e..8d279cffaf73 100644 --- a/src/pages/teams-share/onedrive/index.js +++ b/src/pages/teams-share/onedrive/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { CippTablePage } from "../../../components/CippComponents/CippTablePage.jsx"; import { PersonAdd, PersonRemove } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/teams-share/sharepoint/add-site.js b/src/pages/teams-share/sharepoint/add-site.js index d901d6156c61..b6d2650d890b 100644 --- a/src/pages/teams-share/sharepoint/add-site.js +++ b/src/pages/teams-share/sharepoint/add-site.js @@ -1,10 +1,10 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { useSettings } from "/src/hooks/use-settings"; +import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; +import CippFormPage from "../../../components/CippFormPages/CippFormPage"; +import { useSettings } from "../../../hooks/use-settings"; const AddSiteForm = () => { const userSettingsDefaults = useSettings(); diff --git a/src/pages/teams-share/sharepoint/bulk-add-site.js b/src/pages/teams-share/sharepoint/bulk-add-site.js index 7c36905ad519..944d319ebe04 100644 --- a/src/pages/teams-share/sharepoint/bulk-add-site.js +++ b/src/pages/teams-share/sharepoint/bulk-add-site.js @@ -1,9 +1,9 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { useSettings } from "/src/hooks/use-settings"; -import { CippWizardConfirmation } from "/src/components/CippWizard/CippWizardConfirmation"; -import CippWizardPage from "/src/components/CippWizard/CippWizardPage.jsx"; -import { CippTenantStep } from "/src/components/CippWizard/CippTenantStep.jsx"; -import { CippWizardCSVImport } from "/src/components/CippWizard/CippWizardCSVImport"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { useSettings } from "../../../hooks/use-settings"; +import { CippWizardConfirmation } from "../../../components/CippWizard/CippWizardConfirmation"; +import CippWizardPage from "../../../components/CippWizard/CippWizardPage.jsx"; +import { CippTenantStep } from "../../../components/CippWizard/CippTenantStep.jsx"; +import { CippWizardCSVImport } from "../../../components/CippWizard/CippWizardCSVImport"; const BulkAddSiteForm = () => { const tenantFilter = useSettings().currentTenant; diff --git a/src/pages/teams-share/sharepoint/index.js b/src/pages/teams-share/sharepoint/index.js index d11415f904a8..b92b04c5c5aa 100644 --- a/src/pages/teams-share/sharepoint/index.js +++ b/src/pages/teams-share/sharepoint/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { CippTablePage } from "../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import { Add, @@ -11,8 +11,8 @@ import { Delete, } from "@mui/icons-material"; import Link from "next/link"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; -import { useSettings } from "/src/hooks/use-settings"; +import { CippDataTable } from "../../../components/CippTable/CippDataTable"; +import { useSettings } from "../../../hooks/use-settings"; const Page = () => { const pageTitle = "SharePoint Sites"; diff --git a/src/pages/teams-share/teams/business-voice/index.js b/src/pages/teams-share/teams/business-voice/index.js index 6cef4fd00045..a3aa56764153 100644 --- a/src/pages/teams-share/teams/business-voice/index.js +++ b/src/pages/teams-share/teams/business-voice/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { PersonAdd, PersonRemove, LocationOn } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/teams-share/teams/list-team/add.jsx b/src/pages/teams-share/teams/list-team/add.jsx index 23cdb4df916e..fe625e628eea 100644 --- a/src/pages/teams-share/teams/list-team/add.jsx +++ b/src/pages/teams-share/teams/list-team/add.jsx @@ -2,10 +2,10 @@ import React from "react"; import { Divider } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormUserSelector } from "/src/components/CippComponents/CippFormUserSelector"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { CippFormUserSelector } from "../../../../components/CippComponents/CippFormUserSelector"; import { useSettings } from "../../../../hooks/use-settings"; const TeamsAddTeamForm = () => { diff --git a/src/pages/teams-share/teams/list-team/index.js b/src/pages/teams-share/teams/list-team/index.js index 3ac53cdcfe3a..bf48cccb08a3 100644 --- a/src/pages/teams-share/teams/list-team/index.js +++ b/src/pages/teams-share/teams/list-team/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import { Delete, GroupAdd } from "@mui/icons-material"; import Link from "next/link"; diff --git a/src/pages/teams-share/teams/teams-activity/index.js b/src/pages/teams-share/teams/teams-activity/index.js index c2e8acb22944..2f2797a57cbb 100644 --- a/src/pages/teams-share/teams/teams-activity/index.js +++ b/src/pages/teams-share/teams/teams-activity/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const Page = () => { const pageTitle = "Teams Activity List"; diff --git a/src/pages/tenant/administration/add-subscription/index.jsx b/src/pages/tenant/administration/add-subscription/index.jsx index 474313f5879b..457f350b3d3b 100644 --- a/src/pages/tenant/administration/add-subscription/index.jsx +++ b/src/pages/tenant/administration/add-subscription/index.jsx @@ -1,9 +1,9 @@ import { Box } from "@mui/material"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { useSettings } from "/src/hooks/use-settings"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { useSettings } from "../../../../hooks/use-settings"; import { Grid, darken, lighten, styled } from "@mui/system"; import { CippPropertyListCard } from "../../../../components/CippCards/CippPropertyListCard"; import { getCippFormatting } from "../../../../utils/get-cipp-formatting"; diff --git a/src/pages/tenant/administration/alert-configuration/alert.jsx b/src/pages/tenant/administration/alert-configuration/alert.jsx index a156d6086093..864bc8cac4ef 100644 --- a/src/pages/tenant/administration/alert-configuration/alert.jsx +++ b/src/pages/tenant/administration/alert-configuration/alert.jsx @@ -18,15 +18,15 @@ import { Grid } from "@mui/system"; import { ArrowLeftIcon } from "@mui/x-date-pickers"; import { useRouter } from "next/router"; import { useForm, useFormState, useWatch } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { CippFormTenantSelector } from "../../../../components/CippComponents/CippFormTenantSelector"; import CippButtonCard from "../../../../components/CippCards/CippButtonCard"; -import alertList from "/src/data/alerts.json"; -import auditLogTemplates from "/src/data/AuditLogTemplates"; -import auditLogSchema from "/src/data/AuditLogSchema.json"; +import alertList from "../../../../data/alerts.json"; +import auditLogTemplates from "../../../../data/AuditLogTemplates"; +import auditLogSchema from "../../../../data/AuditLogSchema.json"; import { Save, Delete } from "@mui/icons-material"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; // Dashboard layout +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; // Dashboard layout import { CippApiResults } from "../../../../components/CippComponents/CippApiResults"; import { ApiGetCall, ApiPostCall } from "../../../../api/ApiCall"; import { PlusIcon } from "@heroicons/react/24/outline"; diff --git a/src/pages/tenant/administration/alert-configuration/index.js b/src/pages/tenant/administration/alert-configuration/index.js index 1cb731572572..da1d36a4fc6a 100644 --- a/src/pages/tenant/administration/alert-configuration/index.js +++ b/src/pages/tenant/administration/alert-configuration/index.js @@ -1,6 +1,6 @@ import { Button } from "@mui/material"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative. +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative. import Link from "next/link"; import { CopyAll, Delete, Edit, NotificationAdd, Visibility } from "@mui/icons-material"; diff --git a/src/pages/tenant/administration/app-consent-requests/index.js b/src/pages/tenant/administration/app-consent-requests/index.js index 3127fdfd8dd1..658f1996b523 100644 --- a/src/pages/tenant/administration/app-consent-requests/index.js +++ b/src/pages/tenant/administration/app-consent-requests/index.js @@ -1,6 +1,6 @@ import { useState } from "react"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button, Accordion, @@ -14,8 +14,8 @@ import { Grid } from "@mui/system"; import { Visibility, CheckCircle, ExpandMore, Security } from "@mui/icons-material"; import { FunnelIcon, XMarkIcon } from "@heroicons/react/24/outline"; import { useForm } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { useSettings } from "/src/hooks/use-settings"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { useSettings } from "../../../../hooks/use-settings"; const apiUrl = "/api/ListAppConsentRequests"; const pageTitle = "App Consent Requests"; diff --git a/src/pages/tenant/administration/applications/app-registrations.js b/src/pages/tenant/administration/applications/app-registrations.js index 05f1a54dee30..74dcf8b4e072 100644 --- a/src/pages/tenant/administration/applications/app-registrations.js +++ b/src/pages/tenant/administration/applications/app-registrations.js @@ -1,12 +1,12 @@ // this page is going to need some love for accounting for filters: https://github.com/KelvinTegelaar/CIPP/blob/main/src/views/tenant/administration/ListEnterpriseApps.jsx#L83 -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { CippFormComponent } from "/src/components/CippComponents/CippFormComponent.jsx"; -import { CertificateCredentialRemovalForm } from "/src/components/CippComponents/CertificateCredentialRemovalForm.jsx"; -import CippPermissionPreview from "/src/components/CippComponents/CippPermissionPreview.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { CippFormComponent } from "../../../../components/CippComponents/CippFormComponent.jsx"; +import { CertificateCredentialRemovalForm } from "../../../../components/CippComponents/CertificateCredentialRemovalForm.jsx"; +import CippPermissionPreview from "../../../../components/CippComponents/CippPermissionPreview.jsx"; import { Launch, Delete, Key, Security, ContentCopy } from "@mui/icons-material"; -import { usePermissions } from "/src/hooks/use-permissions.js"; +import { usePermissions } from "../../../../hooks/use-permissions.js"; import tabOptions from "./tabOptions"; const Page = () => { diff --git a/src/pages/tenant/administration/applications/enterprise-apps.js b/src/pages/tenant/administration/applications/enterprise-apps.js index 52efc533eef1..39aac9021b60 100644 --- a/src/pages/tenant/administration/applications/enterprise-apps.js +++ b/src/pages/tenant/administration/applications/enterprise-apps.js @@ -1,9 +1,9 @@ // this page is going to need some love for accounting for filters: https://github.com/KelvinTegelaar/CIPP/blob/main/src/views/tenant/administration/ListEnterpriseApps.jsx#L83 -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { CippFormComponent } from "/src/components/CippComponents/CippFormComponent.jsx"; -import { CertificateCredentialRemovalForm } from "/src/components/CippComponents/CertificateCredentialRemovalForm.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { CippFormComponent } from "../../../../components/CippComponents/CippFormComponent.jsx"; +import { CertificateCredentialRemovalForm } from "../../../../components/CippComponents/CertificateCredentialRemovalForm.jsx"; import { Launch, Delete, @@ -15,7 +15,7 @@ import { ContentCopy, RocketLaunch, } from "@mui/icons-material"; -import { usePermissions } from "/src/hooks/use-permissions.js"; +import { usePermissions } from "../../../../hooks/use-permissions.js"; import tabOptions from "./tabOptions"; import { Button } from "@mui/material"; import Link from "next/link"; diff --git a/src/pages/tenant/administration/applications/permission-sets/add.js b/src/pages/tenant/administration/applications/permission-sets/add.js index 6f27122c5562..aa189d7be95d 100644 --- a/src/pages/tenant/administration/applications/permission-sets/add.js +++ b/src/pages/tenant/administration/applications/permission-sets/add.js @@ -1,11 +1,11 @@ import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { ApiGetCall, ApiPostCall } from "../../../../../api/ApiCall"; -import CippAppPermissionBuilder from "/src/components/CippComponents/CippAppPermissionBuilder"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; +import CippAppPermissionBuilder from "../../../../../components/CippComponents/CippAppPermissionBuilder"; +import CippPageCard from "../../../../../components/CippCards/CippPageCard"; import { Alert, CardContent, Stack, Typography, Button, Box } from "@mui/material"; -import { CippFormComponent } from "/src/components/CippComponents/CippFormComponent"; +import { CippFormComponent } from "../../../../../components/CippComponents/CippFormComponent"; import { useEffect, useState } from "react"; import { CopyAll } from "@mui/icons-material"; diff --git a/src/pages/tenant/administration/applications/permission-sets/edit.js b/src/pages/tenant/administration/applications/permission-sets/edit.js index e14272fb7b76..1ccb71f38380 100644 --- a/src/pages/tenant/administration/applications/permission-sets/edit.js +++ b/src/pages/tenant/administration/applications/permission-sets/edit.js @@ -1,14 +1,14 @@ import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { ApiGetCall, ApiPostCall } from "../../../../../api/ApiCall"; -import CippAppPermissionBuilder from "/src/components/CippComponents/CippAppPermissionBuilder"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; +import CippAppPermissionBuilder from "../../../../../components/CippComponents/CippAppPermissionBuilder"; +import CippPageCard from "../../../../../components/CippCards/CippPageCard"; import { Alert, CardContent, Skeleton, Stack, Typography } from "@mui/material"; import { useEffect, useState } from "react"; import Link from "next/link"; import { Button } from "@mui/material"; -import { CippFormComponent } from "/src/components/CippComponents/CippFormComponent"; +import { CippFormComponent } from "../../../../../components/CippComponents/CippFormComponent"; const Page = () => { const router = useRouter(); diff --git a/src/pages/tenant/administration/applications/permission-sets/index.js b/src/pages/tenant/administration/applications/permission-sets/index.js index 79280e07e2a9..174a55ec6d39 100644 --- a/src/pages/tenant/administration/applications/permission-sets/index.js +++ b/src/pages/tenant/administration/applications/permission-sets/index.js @@ -1,11 +1,11 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../../components/CippComponents/CippTablePage.jsx"; import { Edit, Delete, ContentCopy, Add } from "@mui/icons-material"; import tabOptions from "../tabOptions"; import { Button } from "@mui/material"; import Link from "next/link"; -import { CippPermissionSetDrawer } from "/src/components/CippComponents/CippPermissionSetDrawer"; +import { CippPermissionSetDrawer } from "../../../../../components/CippComponents/CippPermissionSetDrawer"; import { useRef } from "react"; const Page = () => { diff --git a/src/pages/tenant/administration/applications/templates/add.js b/src/pages/tenant/administration/applications/templates/add.js index e927db0acdcf..ef56de9b9fff 100644 --- a/src/pages/tenant/administration/applications/templates/add.js +++ b/src/pages/tenant/administration/applications/templates/add.js @@ -1,11 +1,11 @@ import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { ApiGetCall, ApiPostCall } from "../../../../../api/ApiCall"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; +import CippPageCard from "../../../../../components/CippCards/CippPageCard"; import { CardContent } from "@mui/material"; import { useState } from "react"; -import AppApprovalTemplateForm from "/src/components/CippComponents/AppApprovalTemplateForm"; +import AppApprovalTemplateForm from "../../../../../components/CippComponents/AppApprovalTemplateForm"; const Page = () => { const router = useRouter(); diff --git a/src/pages/tenant/administration/applications/templates/edit.js b/src/pages/tenant/administration/applications/templates/edit.js index 807717c763cf..bef82c603d0b 100644 --- a/src/pages/tenant/administration/applications/templates/edit.js +++ b/src/pages/tenant/administration/applications/templates/edit.js @@ -1,12 +1,12 @@ import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { ApiGetCall, ApiPostCall } from "../../../../../api/ApiCall"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; +import CippPageCard from "../../../../../components/CippCards/CippPageCard"; import { Alert, Button, CardContent } from "@mui/material"; import { useState } from "react"; import Link from "next/link"; -import AppApprovalTemplateForm from "/src/components/CippComponents/AppApprovalTemplateForm"; +import AppApprovalTemplateForm from "../../../../../components/CippComponents/AppApprovalTemplateForm"; const Page = () => { const router = useRouter(); diff --git a/src/pages/tenant/administration/applications/templates/index.js b/src/pages/tenant/administration/applications/templates/index.js index 37de08dd805b..7878f066ef7a 100644 --- a/src/pages/tenant/administration/applications/templates/index.js +++ b/src/pages/tenant/administration/applications/templates/index.js @@ -1,10 +1,10 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import CippPermissionPreview from "/src/components/CippComponents/CippPermissionPreview.jsx"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../../components/CippComponents/CippTablePage.jsx"; +import CippPermissionPreview from "../../../../../components/CippComponents/CippPermissionPreview.jsx"; import { Edit, Delete, ContentCopy, Add, GitHub, RocketLaunch } from "@mui/icons-material"; import tabOptions from "../tabOptions"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../../api/ApiCall"; import { Button } from "@mui/material"; import { Stack } from "@mui/system"; import Link from "next/link"; diff --git a/src/pages/tenant/administration/audit-logs/directory-audits.js b/src/pages/tenant/administration/audit-logs/directory-audits.js index 4edda8fd0ec0..8683a1221c5f 100644 --- a/src/pages/tenant/administration/audit-logs/directory-audits.js +++ b/src/pages/tenant/administration/audit-logs/directory-audits.js @@ -1,7 +1,7 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import CippJsonView from "/src/components/CippFormPages/CippJSONView"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import CippJsonView from "../../../../components/CippFormPages/CippJSONView"; import tabOptions from "./tabOptions.json"; const DirectoryAuditsPage = () => { diff --git a/src/pages/tenant/administration/audit-logs/index.js b/src/pages/tenant/administration/audit-logs/index.js index 9a329abfb73a..c04388b8a3cc 100644 --- a/src/pages/tenant/administration/audit-logs/index.js +++ b/src/pages/tenant/administration/audit-logs/index.js @@ -1,8 +1,8 @@ import { useState } from "react"; import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Box, Button, @@ -13,7 +13,7 @@ import { } from "@mui/material"; import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; import { useForm } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; import { EyeIcon } from "@heroicons/react/24/outline"; import { Grid } from "@mui/system"; import tabOptions from "./tabOptions.json"; diff --git a/src/pages/tenant/administration/audit-logs/log.js b/src/pages/tenant/administration/audit-logs/log.js index d240889c26e7..ce8c8554ec5d 100644 --- a/src/pages/tenant/administration/audit-logs/log.js +++ b/src/pages/tenant/administration/audit-logs/log.js @@ -1,7 +1,7 @@ import { useRouter } from "next/router"; import { useEffect, useState } from "react"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { ApiGetCall } from "../../../../api/ApiCall"; import { Box, Typography, @@ -13,14 +13,14 @@ import { Divider, SvgIcon, } from "@mui/material"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import { CippPropertyListCard } from "/src/components/CippCards/CippPropertyListCard"; +import CippFormSkeleton from "../../../../components/CippFormPages/CippFormSkeleton"; +import { CippPropertyListCard } from "../../../../components/CippCards/CippPropertyListCard"; import { getCippFormatting } from "../../../../utils/get-cipp-formatting"; import { getCippTranslation } from "../../../../utils/get-cipp-translation"; import CippGeoLocation from "../../../../components/CippComponents/CippGeoLocation"; import { Grid } from "@mui/system"; import { OpenInNew } from "@mui/icons-material"; -import auditLogTranslation from "/src/data/audit-log-translations.json"; +import auditLogTranslation from "../../../../data/audit-log-translations.json"; import { ArrowLeftIcon } from "@mui/x-date-pickers"; const Page = () => { diff --git a/src/pages/tenant/administration/audit-logs/search-results.js b/src/pages/tenant/administration/audit-logs/search-results.js index 88ab5a7bf26b..93cedb6d263a 100644 --- a/src/pages/tenant/administration/audit-logs/search-results.js +++ b/src/pages/tenant/administration/audit-logs/search-results.js @@ -1,13 +1,13 @@ import { useRouter } from "next/router"; import { useState, useEffect } from "react"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { CippApiDialog } from "/src/components/CippComponents/CippApiDialog.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { CippApiDialog } from "../../../../components/CippComponents/CippApiDialog.jsx"; import { EyeIcon, ArrowLeftIcon } from "@heroicons/react/24/outline"; -import CippAuditLogDetails from "/src/components/CippComponents/CippAuditLogDetails.jsx"; +import CippAuditLogDetails from "../../../../components/CippComponents/CippAuditLogDetails.jsx"; import { Button, SvgIcon, Box } from "@mui/material"; import { ManageSearch } from "@mui/icons-material"; -import { useDialog } from "/src/hooks/use-dialog"; +import { useDialog } from "../../../../hooks/use-dialog"; const searchResultsColumns = [ "createdDateTime", diff --git a/src/pages/tenant/administration/audit-logs/searches.js b/src/pages/tenant/administration/audit-logs/searches.js index a16a4e3122e0..ffa70e4ab681 100644 --- a/src/pages/tenant/administration/audit-logs/searches.js +++ b/src/pages/tenant/administration/audit-logs/searches.js @@ -1,11 +1,11 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { CippAuditLogSearchDrawer } from "/src/components/CippComponents/CippAuditLogSearchDrawer.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { CippAuditLogSearchDrawer } from "../../../../components/CippComponents/CippAuditLogSearchDrawer.jsx"; import { EyeIcon } from "@heroicons/react/24/outline"; import { ManageSearch } from "@mui/icons-material"; import tabOptions from "./tabOptions.json"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../../../hooks/use-settings"; const simpleColumns = ["displayName", "status", "filterStartDateTime", "filterEndDateTime"]; diff --git a/src/pages/tenant/administration/authentication-methods/index.js b/src/pages/tenant/administration/authentication-methods/index.js index d86eccb0c3e6..104f44c93be8 100644 --- a/src/pages/tenant/administration/authentication-methods/index.js +++ b/src/pages/tenant/administration/authentication-methods/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Check, Block } from "@mui/icons-material"; const Page = () => { diff --git a/src/pages/tenant/administration/domains/index.js b/src/pages/tenant/administration/domains/index.js index 4d4548691292..52bb5ec87977 100644 --- a/src/pages/tenant/administration/domains/index.js +++ b/src/pages/tenant/administration/domains/index.js @@ -1,13 +1,13 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { CheckCircle, Star, Delete } from "@mui/icons-material"; -import { CippAddDomainDrawer } from "/src/components/CippComponents/CippAddDomainDrawer.jsx"; -import { CippDomainVerificationRecords } from "/src/components/CippComponents/CippDomainVerificationRecords.jsx"; -import { CippDomainServiceConfigurationRecords } from "/src/components/CippComponents/CippDomainServiceConfigurationRecords.jsx"; +import { CippAddDomainDrawer } from "../../../../components/CippComponents/CippAddDomainDrawer.jsx"; +import { CippDomainVerificationRecords } from "../../../../components/CippComponents/CippDomainVerificationRecords.jsx"; +import { CippDomainServiceConfigurationRecords } from "../../../../components/CippComponents/CippDomainServiceConfigurationRecords.jsx"; import { Box, Typography, Divider } from "@mui/material"; import { Stack } from "@mui/system"; -import { CippPropertyList } from "/src/components/CippComponents/CippPropertyList"; -import { getCippFormatting } from "/src/utils/get-cipp-formatting"; +import { CippPropertyList } from "../../../../components/CippComponents/CippPropertyList"; +import { getCippFormatting } from "../../../../utils/get-cipp-formatting"; const Page = () => { const pageTitle = "Domains"; diff --git a/src/pages/tenant/administration/index.js b/src/pages/tenant/administration/index.js index ddd398e434f7..f2222b9e4fab 100644 --- a/src/pages/tenant/administration/index.js +++ b/src/pages/tenant/administration/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; const Page = () => { const pageTitle = "Administration"; diff --git a/src/pages/tenant/administration/partner-relationships/index.js b/src/pages/tenant/administration/partner-relationships/index.js index 82d2307a0935..7784454e8d5b 100644 --- a/src/pages/tenant/administration/partner-relationships/index.js +++ b/src/pages/tenant/administration/partner-relationships/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; // Developer Note: The "Tenant" column should be omitted if tenant is not "AllTenants". // You may handle tenant filtering or visibility at a higher level if required. diff --git a/src/pages/tenant/administration/securescore/index.js b/src/pages/tenant/administration/securescore/index.js index 42002937e143..3c3a3aafb1bf 100644 --- a/src/pages/tenant/administration/securescore/index.js +++ b/src/pages/tenant/administration/securescore/index.js @@ -1,5 +1,5 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import tabOptions from "./tabOptions"; import { useSecureScore } from "../../../../hooks/use-securescore"; import { CippInfoBar } from "../../../../components/CippCards/CippInfoBar"; diff --git a/src/pages/tenant/administration/securescore/table.js b/src/pages/tenant/administration/securescore/table.js index e06dc5cc13f4..79afdef8d532 100644 --- a/src/pages/tenant/administration/securescore/table.js +++ b/src/pages/tenant/administration/securescore/table.js @@ -1,5 +1,5 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import tabOptions from "./tabOptions"; import CippTablePage from "../../../../components/CippComponents/CippTablePage"; import { useSecureScore } from "../../../../hooks/use-securescore"; diff --git a/src/pages/tenant/administration/tenantlookup/index.js b/src/pages/tenant/administration/tenantlookup/index.js index bb1c50698df7..9143eb017d07 100644 --- a/src/pages/tenant/administration/tenantlookup/index.js +++ b/src/pages/tenant/administration/tenantlookup/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; const Page = () => { const pageTitle = "Tenant Lookup"; diff --git a/src/pages/tenant/administration/tenants/edit.js b/src/pages/tenant/administration/tenants/edit.js index 44f643c5653d..960e536859b1 100644 --- a/src/pages/tenant/administration/tenants/edit.js +++ b/src/pages/tenant/administration/tenants/edit.js @@ -1,18 +1,18 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { ApiGetCall } from "../../../../api/ApiCall"; import { useEffect, useState } from "react"; import { useRouter } from "next/router"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; import { Stack, Box, Tab, Tabs, Typography, Button } from "@mui/material"; import { Grid } from "@mui/system"; -import { CippCardTabPanel } from "/src/components/CippComponents/CippCardTabPanel"; -import CippFormSection from "/src/components/CippFormPages/CippFormSection"; +import { CippCardTabPanel } from "../../../../components/CippComponents/CippCardTabPanel"; +import CippFormSection from "../../../../components/CippFormPages/CippFormSection"; import CippPageCard from "../../../../components/CippCards/CippPageCard"; -import { CippPropertyListCard } from "/src/components/CippCards/CippPropertyListCard"; +import { CippPropertyListCard } from "../../../../components/CippCards/CippPropertyListCard"; import { getCippFormatting } from "../../../../utils/get-cipp-formatting"; -import CippCustomVariables from "/src/components/CippComponents/CippCustomVariables"; -import { CippOffboardingDefaultSettings } from "/src/components/CippComponents/CippOffboardingDefaultSettings"; +import CippCustomVariables from "../../../../components/CippComponents/CippCustomVariables"; +import { CippOffboardingDefaultSettings } from "../../../../components/CippComponents/CippOffboardingDefaultSettings"; function tabProps(index) { return { diff --git a/src/pages/tenant/administration/tenants/global-variables.js b/src/pages/tenant/administration/tenants/global-variables.js index c5ed3f7e60d0..9ebdb7b8b5ee 100644 --- a/src/pages/tenant/administration/tenants/global-variables.js +++ b/src/pages/tenant/administration/tenants/global-variables.js @@ -1,8 +1,8 @@ import tabOptions from "./tabOptions"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippCustomVariables from "/src/components/CippComponents/CippCustomVariables.jsx"; -import CippPageCard from "/src/components/CippCards/CippPageCard.jsx"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippCustomVariables from "../../../../components/CippComponents/CippCustomVariables.jsx"; +import CippPageCard from "../../../../components/CippCards/CippPageCard.jsx"; const Page = () => { return ( diff --git a/src/pages/tenant/administration/tenants/groups/add.js b/src/pages/tenant/administration/tenants/groups/add.js index 9b3c48e42494..229313fb75ad 100644 --- a/src/pages/tenant/administration/tenants/groups/add.js +++ b/src/pages/tenant/administration/tenants/groups/add.js @@ -1,11 +1,11 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; import { useForm } from "react-hook-form"; import { ApiPostCall } from "../../../../../api/ApiCall"; import { Box } from "@mui/material"; import { Grid } from "@mui/system"; import CippPageCard from "../../../../../components/CippCards/CippPageCard"; -import { CippApiResults } from "/src/components/CippComponents/CippApiResults"; -import CippAddEditTenantGroups from "/src/components/CippComponents/CippAddEditTenantGroups"; +import { CippApiResults } from "../../../../../components/CippComponents/CippApiResults"; +import CippAddEditTenantGroups from "../../../../../components/CippComponents/CippAddEditTenantGroups"; const Page = () => { const formControl = useForm({ diff --git a/src/pages/tenant/administration/tenants/groups/edit.js b/src/pages/tenant/administration/tenants/groups/edit.js index 33edecd5e1c6..f46b1d4d47ad 100644 --- a/src/pages/tenant/administration/tenants/groups/edit.js +++ b/src/pages/tenant/administration/tenants/groups/edit.js @@ -1,11 +1,11 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; import { useForm } from "react-hook-form"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../../api/ApiCall"; import { useEffect } from "react"; import { useRouter } from "next/router"; import { Box } from "@mui/material"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippAddEditTenantGroups from "/src/components/CippComponents/CippAddEditTenantGroups"; +import CippFormPage from "../../../../../components/CippFormPages/CippFormPage"; +import CippAddEditTenantGroups from "../../../../../components/CippComponents/CippAddEditTenantGroups"; const Page = () => { const router = useRouter(); diff --git a/src/pages/tenant/administration/tenants/groups/index.js b/src/pages/tenant/administration/tenants/groups/index.js index ea0416d936bf..ca49669462af 100644 --- a/src/pages/tenant/administration/tenants/groups/index.js +++ b/src/pages/tenant/administration/tenants/groups/index.js @@ -1,15 +1,15 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../../components/CippComponents/CippTablePage.jsx"; import tabOptions from "../tabOptions"; import { Edit, PlayArrow, GroupAdd } from "@mui/icons-material"; import { TrashIcon } from "@heroicons/react/24/outline"; -import { CippAddTenantGroupDrawer } from "/src/components/CippComponents/CippAddTenantGroupDrawer"; -import { CippApiLogsDrawer } from "/src/components/CippComponents/CippApiLogsDrawer"; -import { CippTenantGroupOffCanvas } from "/src/components/CippComponents/CippTenantGroupOffCanvas"; -import { CippApiDialog } from "/src/components/CippComponents/CippApiDialog.jsx"; +import { CippAddTenantGroupDrawer } from "../../../../../components/CippComponents/CippAddTenantGroupDrawer"; +import { CippApiLogsDrawer } from "../../../../../components/CippComponents/CippApiLogsDrawer"; +import { CippTenantGroupOffCanvas } from "../../../../../components/CippComponents/CippTenantGroupOffCanvas"; +import { CippApiDialog } from "../../../../../components/CippComponents/CippApiDialog.jsx"; import { Box, Button } from "@mui/material"; -import { useDialog } from "/src/hooks/use-dialog.js"; +import { useDialog } from "../../../../../hooks/use-dialog.js"; const Page = () => { const pageTitle = "Tenant Groups"; diff --git a/src/pages/tenant/administration/tenants/index.js b/src/pages/tenant/administration/tenants/index.js index 129b26fb1db2..b6539a5ad323 100644 --- a/src/pages/tenant/administration/tenants/index.js +++ b/src/pages/tenant/administration/tenants/index.js @@ -1,6 +1,6 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { DeleteOutline, Edit } from "@mui/icons-material"; import tabOptions from "./tabOptions"; diff --git a/src/pages/tenant/backup/backup-wizard/add.jsx b/src/pages/tenant/backup/backup-wizard/add.jsx index cbceda81daf6..d4efe84bcbda 100644 --- a/src/pages/tenant/backup/backup-wizard/add.jsx +++ b/src/pages/tenant/backup/backup-wizard/add.jsx @@ -3,10 +3,10 @@ import { Typography } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; import { omit } from "lodash"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { useSettings } from "../../../../hooks/use-settings"; import { CippFormTenantSelector } from "../../../../components/CippComponents/CippFormTenantSelector"; const CreateBackup = () => { diff --git a/src/pages/tenant/backup/backup-wizard/index.js b/src/pages/tenant/backup/backup-wizard/index.js index f7b9e0b6b452..59b1f67b6c25 100644 --- a/src/pages/tenant/backup/backup-wizard/index.js +++ b/src/pages/tenant/backup/backup-wizard/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import { Restore, Backup } from "@mui/icons-material"; import Link from "next/link"; diff --git a/src/pages/tenant/backup/backup-wizard/restore.jsx b/src/pages/tenant/backup/backup-wizard/restore.jsx index 7f4a6414346a..12a628ddc16f 100644 --- a/src/pages/tenant/backup/backup-wizard/restore.jsx +++ b/src/pages/tenant/backup/backup-wizard/restore.jsx @@ -2,11 +2,11 @@ import { useState, useEffect } from "react"; import { Alert, Divider, Typography } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { useSettings } from "/src/hooks/use-settings"; -import { CippFormCondition } from "/src/components/CippComponents/CippFormCondition"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { useSettings } from "../../../../hooks/use-settings"; +import { CippFormCondition } from "../../../../components/CippComponents/CippFormCondition"; import { Chip, Stack } from "@mui/material"; const RestoreBackupForm = () => { diff --git a/src/pages/tenant/conditional/deploy-vacation/add.jsx b/src/pages/tenant/conditional/deploy-vacation/add.jsx index d9472444cc49..8ca5bbd67cc5 100644 --- a/src/pages/tenant/conditional/deploy-vacation/add.jsx +++ b/src/pages/tenant/conditional/deploy-vacation/add.jsx @@ -1,12 +1,12 @@ import React from "react"; import { Box, Divider, Stack, Typography } from "@mui/material"; import { Grid } from "@mui/system"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormUserSelector } from "/src/components/CippComponents/CippFormUserSelector"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { CippFormUserSelector } from "../../../../components/CippComponents/CippFormUserSelector"; +import { CippFormTenantSelector } from "../../../../components/CippComponents/CippFormTenantSelector"; const Page = () => { const formControl = useForm({ diff --git a/src/pages/tenant/conditional/deploy-vacation/index.js b/src/pages/tenant/conditional/deploy-vacation/index.js index bf1dfcafc145..14034536f6a5 100644 --- a/src/pages/tenant/conditional/deploy-vacation/index.js +++ b/src/pages/tenant/conditional/deploy-vacation/index.js @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippTablePage from "/src/components/CippComponents/CippTablePage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippTablePage from "../../../../components/CippComponents/CippTablePage"; import { Delete } from "@mui/icons-material"; import { EyeIcon } from "@heroicons/react/24/outline"; -import { CippAddVacationModeDrawer } from "/src/components/CippComponents/CippAddVacationModeDrawer"; +import { CippAddVacationModeDrawer } from "../../../../components/CippComponents/CippAddVacationModeDrawer"; const Page = () => { const actions = [ diff --git a/src/pages/tenant/conditional/list-named-locations/add.jsx b/src/pages/tenant/conditional/list-named-locations/add.jsx index 906b869ed9d1..e7ba7ebe610e 100644 --- a/src/pages/tenant/conditional/list-named-locations/add.jsx +++ b/src/pages/tenant/conditional/list-named-locations/add.jsx @@ -2,12 +2,12 @@ import React from "react"; import { Typography } from "@mui/material"; import { Grid } from "@mui/system"; import { useForm } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; -import { CippFormCondition } from "/src/components/CippComponents/CippFormCondition"; -import countryList from "/src/data/countryList.json"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import { CippFormTenantSelector } from "../../../../components/CippComponents/CippFormTenantSelector"; +import { CippFormCondition } from "../../../../components/CippComponents/CippFormCondition"; +import countryList from "../../../../data/countryList.json"; const DeployNamedLocationForm = () => { const formControl = useForm({ diff --git a/src/pages/tenant/conditional/list-named-locations/index.js b/src/pages/tenant/conditional/list-named-locations/index.js index 23f5b8b5f437..20e6ca12d03e 100644 --- a/src/pages/tenant/conditional/list-named-locations/index.js +++ b/src/pages/tenant/conditional/list-named-locations/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import Link from "next/link"; import { @@ -11,7 +11,7 @@ import { TrashIcon, } from "@heroicons/react/24/outline"; import { LocationOn } from "@mui/icons-material"; -import countryList from "/src/data/countryList.json"; +import countryList from "../../../../data/countryList.json"; const Page = () => { const pageTitle = "Named Locations"; diff --git a/src/pages/tenant/conditional/list-policies/index.js b/src/pages/tenant/conditional/list-policies/index.js index 22eed3c63e59..d7f48eac6694 100644 --- a/src/pages/tenant/conditional/list-policies/index.js +++ b/src/pages/tenant/conditional/list-policies/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Block, Check, @@ -14,7 +14,7 @@ import CippJsonView from "../../../../components/CippFormPages/CippJSONView"; import { CippCADeployDrawer } from "../../../../components/CippComponents/CippCADeployDrawer"; import { CippApiLogsDrawer } from "../../../../components/CippComponents/CippApiLogsDrawer"; import { PermissionButton } from "../../../../utils/permissions"; -import { useSettings } from "/src/hooks/use-settings.js"; +import { useSettings } from "../../../../hooks/use-settings.js"; // Page Component const Page = () => { diff --git a/src/pages/tenant/conditional/list-template/edit.jsx b/src/pages/tenant/conditional/list-template/edit.jsx index 0639fb829417..9521ddae99ed 100644 --- a/src/pages/tenant/conditional/list-template/edit.jsx +++ b/src/pages/tenant/conditional/list-template/edit.jsx @@ -2,11 +2,11 @@ import React, { useEffect, useState } from "react"; import { Alert, Box, Typography } from "@mui/material"; import { useForm } from "react-hook-form"; import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import { ApiGetCall } from "/src/api/ApiCall"; -import CippTemplateFieldRenderer from "/src/components/CippComponents/CippTemplateFieldRenderer"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import CippFormSkeleton from "../../../../components/CippFormPages/CippFormSkeleton"; +import { ApiGetCall } from "../../../../api/ApiCall"; +import CippTemplateFieldRenderer from "../../../../components/CippComponents/CippTemplateFieldRenderer"; const EditCATemplate = () => { const router = useRouter(); diff --git a/src/pages/tenant/conditional/list-template/index.js b/src/pages/tenant/conditional/list-template/index.js index a79bfeef2200..41221d021582 100644 --- a/src/pages/tenant/conditional/list-template/index.js +++ b/src/pages/tenant/conditional/list-template/index.js @@ -1,14 +1,14 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button, Box } from "@mui/material"; import CippJsonView from "../../../../components/CippFormPages/CippJSONView"; import { Delete, GitHub, Edit, RocketLaunch } from "@mui/icons-material"; -import { ApiGetCall } from "/src/api/ApiCall"; -import { CippPolicyImportDrawer } from "/src/components/CippComponents/CippPolicyImportDrawer.jsx"; -import { CippCADeployDrawer } from "/src/components/CippComponents/CippCADeployDrawer.jsx"; +import { ApiGetCall } from "../../../../api/ApiCall"; +import { CippPolicyImportDrawer } from "../../../../components/CippComponents/CippPolicyImportDrawer.jsx"; +import { CippCADeployDrawer } from "../../../../components/CippComponents/CippCADeployDrawer.jsx"; import { CippApiLogsDrawer } from "../../../../components/CippComponents/CippApiLogsDrawer"; import { PermissionButton } from "../../../../utils/permissions"; -import { useSettings } from "/src/hooks/use-settings.js"; +import { useSettings } from "../../../../hooks/use-settings.js"; import { useState } from "react"; const Page = () => { diff --git a/src/pages/tenant/gdap-management/index.js b/src/pages/tenant/gdap-management/index.js index 5614dea97127..915caff047a0 100644 --- a/src/pages/tenant/gdap-management/index.js +++ b/src/pages/tenant/gdap-management/index.js @@ -1,5 +1,5 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; import { Container } from "@mui/system"; import { Grid } from "@mui/system"; @@ -16,7 +16,7 @@ import CippPermissionCheck from "../../../components/CippSettings/CippPermission import { Button } from "@mui/material"; import { useEffect, useState } from "react"; import CippButtonCard from "../../../components/CippCards/CippButtonCard"; -import { WizardSteps } from "/src/components/CippWizard/wizard-steps"; +import { WizardSteps } from "../../../components/CippWizard/wizard-steps"; import Link from "next/link"; import { CippHead } from "../../../components/CippComponents/CippHead"; diff --git a/src/pages/tenant/gdap-management/invites/add.js b/src/pages/tenant/gdap-management/invites/add.js index ce6fe95f1226..736b207a8742 100644 --- a/src/pages/tenant/gdap-management/invites/add.js +++ b/src/pages/tenant/gdap-management/invites/add.js @@ -1,4 +1,4 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; import { Grid } from "@mui/system"; diff --git a/src/pages/tenant/gdap-management/invites/index.js b/src/pages/tenant/gdap-management/invites/index.js index ce1384c92fb5..39729ae02fad 100644 --- a/src/pages/tenant/gdap-management/invites/index.js +++ b/src/pages/tenant/gdap-management/invites/index.js @@ -1,7 +1,7 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import tabOptions from "../tabOptions"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import { Add } from "@mui/icons-material"; import Link from "next/link"; diff --git a/src/pages/tenant/gdap-management/offboarding.js b/src/pages/tenant/gdap-management/offboarding.js index 07495a99119b..d9486f775c25 100644 --- a/src/pages/tenant/gdap-management/offboarding.js +++ b/src/pages/tenant/gdap-management/offboarding.js @@ -1,13 +1,13 @@ -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../components/CippFormPages/CippFormPage"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import tabOptions from "./tabOptions"; import { useForm, useWatch } from "react-hook-form"; -import { CippFormComponent } from "/src/components/CippComponents/CippFormComponent"; -import vendorTenantList from "/src/data/vendorTenantList"; +import { CippFormComponent } from "../../../components/CippComponents/CippFormComponent"; +import vendorTenantList from "../../../data/vendorTenantList"; import { Box, Grid, Stack } from "@mui/system"; import { Alert, Divider, Typography } from "@mui/material"; -import { ApiGetCall, ApiGetCallWithPagination } from "/src/api/ApiCall"; +import { ApiGetCall, ApiGetCallWithPagination } from "../../../api/ApiCall"; import { CippInfoBar } from "../../../components/CippCards/CippInfoBar"; import { ShieldCheckIcon } from "@heroicons/react/24/outline"; import { Apps, Description, Widgets } from "@mui/icons-material"; diff --git a/src/pages/tenant/gdap-management/onboarding/index.js b/src/pages/tenant/gdap-management/onboarding/index.js index d7e0af05ef34..bd411615702f 100644 --- a/src/pages/tenant/gdap-management/onboarding/index.js +++ b/src/pages/tenant/gdap-management/onboarding/index.js @@ -1,7 +1,7 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import tabOptions from "../tabOptions"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import Link from "next/link"; import { Cancel, PlayArrow, Replay } from "@mui/icons-material"; diff --git a/src/pages/tenant/gdap-management/onboarding/start.js b/src/pages/tenant/gdap-management/onboarding/start.js index 6d37fbf75650..c2908d22a467 100644 --- a/src/pages/tenant/gdap-management/onboarding/start.js +++ b/src/pages/tenant/gdap-management/onboarding/start.js @@ -8,21 +8,21 @@ import { CardContent, Typography, } from "@mui/material"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import GDAPRoles from "/src/data/GDAPRoles"; +import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; +import GDAPRoles from "../../../../data/GDAPRoles"; import { Box, Stack } from "@mui/system"; import { Grid } from "@mui/system"; -import { CippPropertyList } from "/src/components/CippComponents/CippPropertyList"; -import { ApiGetCall, ApiGetCallWithPagination, ApiPostCall } from "/src/api/ApiCall"; +import { CippPropertyList } from "../../../../components/CippComponents/CippPropertyList"; +import { ApiGetCall, ApiGetCallWithPagination, ApiPostCall } from "../../../../api/ApiCall"; import { useEffect, useState } from "react"; -import { getCippFormatting } from "/src/utils/get-cipp-formatting"; +import { getCippFormatting } from "../../../../utils/get-cipp-formatting"; import { router } from "next/router"; -import cippDefaults from "/src/data/CIPPDefaultGDAPRoles"; -import { WizardSteps } from "/src/components/CippWizard/wizard-steps"; +import cippDefaults from "../../../../data/CIPPDefaultGDAPRoles"; +import { WizardSteps } from "../../../../components/CippWizard/wizard-steps"; import { ExpandMore, PlayArrow, Replay } from "@mui/icons-material"; -import CippPageCard from "/src/components/CippCards/CippPageCard"; +import CippPageCard from "../../../../components/CippCards/CippPageCard"; import { getCippTranslation } from "../../../../utils/get-cipp-translation"; import CippDataTableButton from "../../../../components/CippTable/CippDataTableButton"; diff --git a/src/pages/tenant/gdap-management/relationships/index.js b/src/pages/tenant/gdap-management/relationships/index.js index 5a389831bade..8c3c3da01bc0 100644 --- a/src/pages/tenant/gdap-management/relationships/index.js +++ b/src/pages/tenant/gdap-management/relationships/index.js @@ -1,8 +1,8 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import tabOptions from "../tabOptions"; -import CippTablePage from "/src/components/CippComponents/CippTablePage"; -import CippGdapActions from "/src/components/CippComponents/CippGdapActions"; +import CippTablePage from "../../../../components/CippComponents/CippTablePage"; +import CippGdapActions from "../../../../components/CippComponents/CippGdapActions"; const pageTitle = "GDAP Relationships"; diff --git a/src/pages/tenant/gdap-management/relationships/relationship/index.js b/src/pages/tenant/gdap-management/relationships/relationship/index.js index 40e01ba7c7e9..9c9bfee83400 100644 --- a/src/pages/tenant/gdap-management/relationships/relationship/index.js +++ b/src/pages/tenant/gdap-management/relationships/relationship/index.js @@ -1,8 +1,8 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; import { useRouter } from "next/router"; -import { ApiGetCall } from "/src/api/ApiCall"; -import CippFormSkeleton from "/src/components/CippFormPages/CippFormSkeleton"; -import { HeaderedTabbedLayout } from "/src/layouts/HeaderedTabbedLayout"; +import { ApiGetCall } from "../../../../../api/ApiCall"; +import CippFormSkeleton from "../../../../../components/CippFormPages/CippFormSkeleton"; +import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; import tabOptions from "./tabOptions.json"; import { Box, Grid, Stack } from "@mui/system"; import { CippTimeAgo } from "../../../../../components/CippComponents/CippTimeAgo"; @@ -11,7 +11,7 @@ import { CippPropertyListCard } from "../../../../../components/CippCards/CippPr import { getCippFormatting } from "../../../../../utils/get-cipp-formatting"; import { CippDataTable } from "../../../../../components/CippTable/CippDataTable"; import { Alert, Link } from "@mui/material"; -import CIPPDefaultGDAPRoles from "/src/data/CIPPDefaultGDAPRoles.json"; +import CIPPDefaultGDAPRoles from "../../../../../data/CIPPDefaultGDAPRoles.json"; import { CippCopyToClipBoard } from "../../../../../components/CippComponents/CippCopyToClipboard"; import { Schedule } from "@mui/icons-material"; import { useEffect, useState } from "react"; diff --git a/src/pages/tenant/gdap-management/relationships/relationship/mappings.js b/src/pages/tenant/gdap-management/relationships/relationship/mappings.js index 229637399653..3ec708b70c66 100644 --- a/src/pages/tenant/gdap-management/relationships/relationship/mappings.js +++ b/src/pages/tenant/gdap-management/relationships/relationship/mappings.js @@ -1,7 +1,7 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../../layouts/index.js"; import { useRouter } from "next/router"; -import { ApiGetCall } from "/src/api/ApiCall"; -import { HeaderedTabbedLayout } from "/src/layouts/HeaderedTabbedLayout"; +import { ApiGetCall } from "../../../../../api/ApiCall"; +import { HeaderedTabbedLayout } from "../../../../../layouts/HeaderedTabbedLayout"; import tabOptions from "./tabOptions.json"; import { CippTimeAgo } from "../../../../../components/CippComponents/CippTimeAgo"; import { CippDataTable } from "../../../../../components/CippTable/CippDataTable"; diff --git a/src/pages/tenant/gdap-management/role-templates/add.js b/src/pages/tenant/gdap-management/role-templates/add.js index 82b6e1cde666..3d3652e40d64 100644 --- a/src/pages/tenant/gdap-management/role-templates/add.js +++ b/src/pages/tenant/gdap-management/role-templates/add.js @@ -1,8 +1,8 @@ -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm } from "react-hook-form"; -import { CippAddEditGdapRoleTemplate } from "/src/components/CippFormPages/CippAddEditGdapRoleTemplate"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { CippAddEditGdapRoleTemplate } from "../../../../components/CippFormPages/CippAddEditGdapRoleTemplate"; +import { ApiGetCall } from "../../../../api/ApiCall"; const Page = () => { const formControl = useForm({ diff --git a/src/pages/tenant/gdap-management/role-templates/edit.js b/src/pages/tenant/gdap-management/role-templates/edit.js index 8a0fe7564634..24623ef563b8 100644 --- a/src/pages/tenant/gdap-management/role-templates/edit.js +++ b/src/pages/tenant/gdap-management/role-templates/edit.js @@ -1,8 +1,8 @@ -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm } from "react-hook-form"; -import { CippAddEditGdapRoleTemplate } from "/src/components/CippFormPages/CippAddEditGdapRoleTemplate"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { CippAddEditGdapRoleTemplate } from "../../../../components/CippFormPages/CippAddEditGdapRoleTemplate"; +import { ApiGetCall } from "../../../../api/ApiCall"; import { useEffect } from "react"; import { useRouter } from "next/router"; import { ApiGetCallWithPagination } from "../../../../api/ApiCall"; diff --git a/src/pages/tenant/gdap-management/role-templates/index.js b/src/pages/tenant/gdap-management/role-templates/index.js index c884bc8cc484..9364a937a96e 100644 --- a/src/pages/tenant/gdap-management/role-templates/index.js +++ b/src/pages/tenant/gdap-management/role-templates/index.js @@ -1,7 +1,7 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import tabOptions from "../tabOptions"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Alert, Button, SvgIcon } from "@mui/material"; import Link from "next/link"; import { ApiGetCallWithPagination, ApiPostCall } from "../../../../api/ApiCall"; diff --git a/src/pages/tenant/gdap-management/roles/add.js b/src/pages/tenant/gdap-management/roles/add.js index 06808b7e77df..31f4e86b9d09 100644 --- a/src/pages/tenant/gdap-management/roles/add.js +++ b/src/pages/tenant/gdap-management/roles/add.js @@ -1,18 +1,18 @@ import React, { useState } from "react"; import { Alert, Button, SvgIcon, Typography, Tooltip, Link } from "@mui/material"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import CippFormPage from "../../../../components/CippFormPages/CippFormPage"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; -import { CippFormComponent } from "/src/components/CippComponents/CippFormComponent"; -import { CippFormCondition } from "/src/components/CippComponents/CippFormCondition"; -import GDAPRoles from "/src/data/GDAPRoles"; +import { CippFormComponent } from "../../../../components/CippComponents/CippFormComponent"; +import { CippFormCondition } from "../../../../components/CippComponents/CippFormCondition"; +import GDAPRoles from "../../../../data/GDAPRoles"; import { Box, Stack, Grid } from "@mui/system"; import { ShieldCheckIcon, PlusSmallIcon } from "@heroicons/react/24/outline"; -import { CippPropertyList } from "/src/components/CippComponents/CippPropertyList"; -import cippDefaults from "/src/data/CIPPDefaultGDAPRoles"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { CippPropertyList } from "../../../../components/CippComponents/CippPropertyList"; +import cippDefaults from "../../../../data/CIPPDefaultGDAPRoles"; +import { ApiGetCall } from "../../../../api/ApiCall"; import { Settings, SyncAlt } from "@mui/icons-material"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; +import { CippDataTable } from "../../../../components/CippTable/CippDataTable"; import { TrashIcon } from "@heroicons/react/24/outline"; const Page = () => { diff --git a/src/pages/tenant/gdap-management/roles/index.js b/src/pages/tenant/gdap-management/roles/index.js index 9a050a7d5150..09ce733370b7 100644 --- a/src/pages/tenant/gdap-management/roles/index.js +++ b/src/pages/tenant/gdap-management/roles/index.js @@ -1,7 +1,7 @@ -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import tabOptions from "../tabOptions"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import { AdminPanelSettings, Add, Delete } from "@mui/icons-material"; import Link from "next/link"; diff --git a/src/pages/tenant/manage/applied-standards.js b/src/pages/tenant/manage/applied-standards.js index ef11f5e33e34..fbd55c304e6c 100644 --- a/src/pages/tenant/manage/applied-standards.js +++ b/src/pages/tenant/manage/applied-standards.js @@ -18,8 +18,8 @@ import { Menu, MenuItem, } from "@mui/material"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { HeaderedTabbedLayout } from "/src/layouts/HeaderedTabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { HeaderedTabbedLayout } from "../../../layouts/HeaderedTabbedLayout"; import { CheckCircle, Cancel, @@ -37,7 +37,7 @@ import { Schedule, Check, } from "@mui/icons-material"; -import standards from "/src/data/standards.json"; +import standards from "../../../data/standards.json"; import { CippApiDialog } from "../../../components/CippComponents/CippApiDialog"; import { SvgIcon } from "@mui/material"; import { useForm } from "react-hook-form"; diff --git a/src/pages/tenant/manage/configuration-backup.js b/src/pages/tenant/manage/configuration-backup.js index d2f8e5e19ac4..cda8f505d56f 100644 --- a/src/pages/tenant/manage/configuration-backup.js +++ b/src/pages/tenant/manage/configuration-backup.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { HeaderedTabbedLayout } from "/src/layouts/HeaderedTabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { HeaderedTabbedLayout } from "../../../layouts/HeaderedTabbedLayout"; import { useState } from "react"; import { useForm, useWatch } from "react-hook-form"; import { @@ -26,19 +26,19 @@ import { Cancel, Delete, } from "@mui/icons-material"; -import { useSettings } from "/src/hooks/use-settings"; -import { ApiGetCall } from "/src/api/ApiCall"; -import { CippPropertyListCard } from "/src/components/CippCards/CippPropertyListCard"; -import { CippBackupScheduleDrawer } from "/src/components/CippComponents/CippBackupScheduleDrawer"; -import { CippRestoreBackupDrawer } from "/src/components/CippComponents/CippRestoreBackupDrawer"; -import { CippApiDialog } from "/src/components/CippComponents/CippApiDialog"; -import { CippTimeAgo } from "/src/components/CippComponents/CippTimeAgo"; -import { CippFormTenantSelector } from "/src/components/CippComponents/CippFormTenantSelector"; -import { useDialog } from "/src/hooks/use-dialog"; +import { useSettings } from "../../../hooks/use-settings"; +import { ApiGetCall } from "../../../api/ApiCall"; +import { CippPropertyListCard } from "../../../components/CippCards/CippPropertyListCard"; +import { CippBackupScheduleDrawer } from "../../../components/CippComponents/CippBackupScheduleDrawer"; +import { CippRestoreBackupDrawer } from "../../../components/CippComponents/CippRestoreBackupDrawer"; +import { CippApiDialog } from "../../../components/CippComponents/CippApiDialog"; +import { CippTimeAgo } from "../../../components/CippComponents/CippTimeAgo"; +import { CippFormTenantSelector } from "../../../components/CippComponents/CippFormTenantSelector"; +import { useDialog } from "../../../hooks/use-dialog"; import ReactTimeAgo from "react-time-ago"; import tabOptions from "./tabOptions.json"; import { useRouter } from "next/router"; -import { CippHead } from "/src/components/CippComponents/CippHead"; +import { CippHead } from "../../../components/CippComponents/CippHead"; const Page = () => { const router = useRouter(); diff --git a/src/pages/tenant/manage/drift.js b/src/pages/tenant/manage/drift.js index 0b3c226bc693..26c4374585bf 100644 --- a/src/pages/tenant/manage/drift.js +++ b/src/pages/tenant/manage/drift.js @@ -1,4 +1,4 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import { useRouter } from "next/router"; import { Check, @@ -29,20 +29,20 @@ import { import { Grid } from "@mui/system"; import { useState, useEffect, useRef } from "react"; import { useForm } from "react-hook-form"; -import { CippBannerListCard } from "/src/components/CippCards/CippBannerListCard"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { CippHead } from "/src/components/CippComponents/CippHead"; -import { HeaderedTabbedLayout } from "/src/layouts/HeaderedTabbedLayout"; -import { ApiGetCall } from "/src/api/ApiCall"; -import { useSettings } from "/src/hooks/use-settings"; -import { CippApiDialog } from "/src/components/CippComponents/CippApiDialog"; -import { useDialog } from "/src/hooks/use-dialog"; +import { CippBannerListCard } from "../../../components/CippCards/CippBannerListCard"; +import CippButtonCard from "../../../components/CippCards/CippButtonCard"; +import { CippHead } from "../../../components/CippComponents/CippHead"; +import { HeaderedTabbedLayout } from "../../../layouts/HeaderedTabbedLayout"; +import { ApiGetCall } from "../../../api/ApiCall"; +import { useSettings } from "../../../hooks/use-settings"; +import { CippApiDialog } from "../../../components/CippComponents/CippApiDialog"; +import { useDialog } from "../../../hooks/use-dialog"; import tabOptions from "./tabOptions.json"; -import standardsData from "/src/data/standards.json"; +import standardsData from "../../../data/standards.json"; import { createDriftManagementActions } from "./driftManagementActions"; -import { ExecutiveReportButton } from "/src/components/ExecutiveReportButton"; +import { ExecutiveReportButton } from "../../../components/ExecutiveReportButton"; import { CippAutoComplete } from "../../../components/CippComponents/CippAutocomplete"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; const ManageDriftPage = () => { const router = useRouter(); diff --git a/src/pages/tenant/manage/edit.js b/src/pages/tenant/manage/edit.js index 8d66042e30e3..fdc18281a1f8 100644 --- a/src/pages/tenant/manage/edit.js +++ b/src/pages/tenant/manage/edit.js @@ -1,22 +1,22 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { HeaderedTabbedLayout } from "/src/layouts/HeaderedTabbedLayout"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { HeaderedTabbedLayout } from "../../../layouts/HeaderedTabbedLayout"; import { useForm, useFormState } from "react-hook-form"; -import { ApiGetCall, ApiPostCall } from "/src/api/ApiCall"; +import { ApiGetCall, ApiPostCall } from "../../../api/ApiCall"; import { useEffect } from "react"; import { useRouter } from "next/router"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; import { Stack, Box, Typography, Button, Card, CardContent } from "@mui/material"; import { Grid } from "@mui/system"; -import { CippPropertyListCard } from "/src/components/CippCards/CippPropertyListCard"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; -import { getCippFormatting } from "/src/utils/get-cipp-formatting"; -import CippCustomVariables from "/src/components/CippComponents/CippCustomVariables"; -import { CippOffboardingDefaultSettings } from "/src/components/CippComponents/CippOffboardingDefaultSettings"; -import { CippApiResults } from "/src/components/CippComponents/CippApiResults"; -import { useSettings } from "/src/hooks/use-settings"; +import { CippPropertyListCard } from "../../../components/CippCards/CippPropertyListCard"; +import CippButtonCard from "../../../components/CippCards/CippButtonCard"; +import { getCippFormatting } from "../../../utils/get-cipp-formatting"; +import CippCustomVariables from "../../../components/CippComponents/CippCustomVariables"; +import { CippOffboardingDefaultSettings } from "../../../components/CippComponents/CippOffboardingDefaultSettings"; +import { CippApiResults } from "../../../components/CippComponents/CippApiResults"; +import { useSettings } from "../../../hooks/use-settings"; import { Business, Save } from "@mui/icons-material"; import tabOptions from "./tabOptions.json"; -import { CippHead } from "/src/components/CippComponents/CippHead"; +import { CippHead } from "../../../components/CippComponents/CippHead"; const Page = () => { const router = useRouter(); diff --git a/src/pages/tenant/manage/history.js b/src/pages/tenant/manage/history.js index d0e37ec3a077..129fcad963b4 100644 --- a/src/pages/tenant/manage/history.js +++ b/src/pages/tenant/manage/history.js @@ -20,9 +20,9 @@ import { TimelineDot, TimelineOppositeContent, } from "@mui/lab"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { HeaderedTabbedLayout } from "/src/layouts/HeaderedTabbedLayout"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { HeaderedTabbedLayout } from "../../../layouts/HeaderedTabbedLayout"; +import { ApiGetCall } from "../../../api/ApiCall"; import { useRouter } from "next/router"; import { Policy, diff --git a/src/pages/tenant/manage/policies-deployed.js b/src/pages/tenant/manage/policies-deployed.js index c5c18aa1d5d2..d38f68d03698 100644 --- a/src/pages/tenant/manage/policies-deployed.js +++ b/src/pages/tenant/manage/policies-deployed.js @@ -1,4 +1,4 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import { useRouter } from "next/router"; import { Policy, Security, AdminPanelSettings, Devices, ExpandMore } from "@mui/icons-material"; import { @@ -10,12 +10,12 @@ import { AccordionDetails, Chip, } from "@mui/material"; -import { HeaderedTabbedLayout } from "/src/layouts/HeaderedTabbedLayout"; +import { HeaderedTabbedLayout } from "../../../layouts/HeaderedTabbedLayout"; import tabOptions from "./tabOptions.json"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; -import { CippHead } from "/src/components/CippComponents/CippHead"; -import { ApiGetCall } from "/src/api/ApiCall"; -import standardsData from "/src/data/standards.json"; +import { CippDataTable } from "../../../components/CippTable/CippDataTable"; +import { CippHead } from "../../../components/CippComponents/CippHead"; +import { ApiGetCall } from "../../../api/ApiCall"; +import standardsData from "../../../data/standards.json"; import { createDriftManagementActions } from "./driftManagementActions"; import { useSettings } from "../../../hooks/use-settings"; import { CippAutoComplete } from "../../../components/CippComponents/CippAutocomplete"; diff --git a/src/pages/tenant/manage/recover-policies.js b/src/pages/tenant/manage/recover-policies.js index 98d10ec5208a..16a68a469186 100644 --- a/src/pages/tenant/manage/recover-policies.js +++ b/src/pages/tenant/manage/recover-policies.js @@ -1,4 +1,4 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import { useRouter } from "next/router"; import { Policy, Restore, ExpandMore } from "@mui/icons-material"; import { @@ -14,15 +14,15 @@ import { import { Grid } from "@mui/system"; import { useState } from "react"; import { useForm } from "react-hook-form"; -import { HeaderedTabbedLayout } from "/src/layouts/HeaderedTabbedLayout"; +import { HeaderedTabbedLayout } from "../../../layouts/HeaderedTabbedLayout"; import tabOptions from "./tabOptions.json"; -import { CippDataTable } from "/src/components/CippTable/CippDataTable"; -import { CippHead } from "/src/components/CippComponents/CippHead"; -import { CippFormComponent } from "/src/components/CippComponents/CippFormComponent"; -import { ApiPostCall } from "/src/api/ApiCall"; -import { CippApiResults } from "/src/components/CippComponents/CippApiResults"; +import { CippDataTable } from "../../../components/CippTable/CippDataTable"; +import { CippHead } from "../../../components/CippComponents/CippHead"; +import { CippFormComponent } from "../../../components/CippComponents/CippFormComponent"; +import { ApiPostCall } from "../../../api/ApiCall"; +import { CippApiResults } from "../../../components/CippComponents/CippApiResults"; import { createDriftManagementActions } from "./driftManagementActions"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../../hooks/use-settings"; const RecoverPoliciesPage = () => { const router = useRouter(); diff --git a/src/pages/tenant/manage/user-defaults.js b/src/pages/tenant/manage/user-defaults.js index 85cccf57c0e3..96b9810a4ad9 100644 --- a/src/pages/tenant/manage/user-defaults.js +++ b/src/pages/tenant/manage/user-defaults.js @@ -1,11 +1,11 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { TabbedLayout } from "../../../layouts/TabbedLayout"; +import { CippTablePage } from "../../../components/CippComponents/CippTablePage.jsx"; import { Button } from "@mui/material"; import { Delete, Add } from "@mui/icons-material"; import { useDialog } from "../../../hooks/use-dialog"; import { CippApiDialog } from "../../../components/CippComponents/CippApiDialog"; -import countryList from "/src/data/countryList.json"; +import countryList from "../../../data/countryList.json"; import tabOptions from "./tabOptions.json"; import { useSettings } from "../../../hooks/use-settings"; diff --git a/src/pages/tenant/reports/application-consent/index.js b/src/pages/tenant/reports/application-consent/index.js index c6524f8345e6..3270740aa766 100644 --- a/src/pages/tenant/reports/application-consent/index.js +++ b/src/pages/tenant/reports/application-consent/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const simpleColumns = ["Tenant", "Name", "ApplicationID", "ObjectID", "Scope", "StartTime"]; diff --git a/src/pages/tenant/reports/index.js b/src/pages/tenant/reports/index.js index 095383995762..cb5872a4486b 100644 --- a/src/pages/tenant/reports/index.js +++ b/src/pages/tenant/reports/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; const Page = () => { const pageTitle = "Reports"; diff --git a/src/pages/tenant/reports/list-csp-licenses/index.jsx b/src/pages/tenant/reports/list-csp-licenses/index.jsx index e23c22114264..6cf2cacd9f44 100644 --- a/src/pages/tenant/reports/list-csp-licenses/index.jsx +++ b/src/pages/tenant/reports/list-csp-licenses/index.jsx @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import { MinusIcon, PlusIcon } from "@heroicons/react/24/outline"; import { DeleteForever, ShoppingCart } from "@mui/icons-material"; import { Button } from "@mui/material"; diff --git a/src/pages/tenant/reports/list-licenses/index.js b/src/pages/tenant/reports/list-licenses/index.js index c4de2000b4f8..35d61ea16158 100644 --- a/src/pages/tenant/reports/list-licenses/index.js +++ b/src/pages/tenant/reports/list-licenses/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; const Page = () => { const pageTitle = "Licences Report"; diff --git a/src/pages/tenant/standards/alignment/index.js b/src/pages/tenant/standards/alignment/index.js index 6ddd7a186223..1e7470d2dd44 100644 --- a/src/pages/tenant/standards/alignment/index.js +++ b/src/pages/tenant/standards/alignment/index.js @@ -1,6 +1,6 @@ -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { TabbedLayout } from "/src/layouts/TabbedLayout"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; import { Delete, Add } from "@mui/icons-material"; import { EyeIcon } from "@heroicons/react/24/outline"; import tabOptions from "../tabOptions.json"; diff --git a/src/pages/tenant/standards/bpa-report/builder.js b/src/pages/tenant/standards/bpa-report/builder.js index 5fe95c9b0691..3e7cf6f56475 100644 --- a/src/pages/tenant/standards/bpa-report/builder.js +++ b/src/pages/tenant/standards/bpa-report/builder.js @@ -1,4 +1,4 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { Box, Container, Typography, Button, IconButton, Stack, SvgIcon } from "@mui/material"; import { Grid } from "@mui/system"; import { useEffect, useState } from "react"; diff --git a/src/pages/tenant/standards/bpa-report/index.js b/src/pages/tenant/standards/bpa-report/index.js index 1c98aad23b69..4f88b19b630c 100644 --- a/src/pages/tenant/standards/bpa-report/index.js +++ b/src/pages/tenant/standards/bpa-report/index.js @@ -1,13 +1,13 @@ import { Button } from "@mui/material"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative. +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative. import Link from "next/link"; import { EyeIcon } from "@heroicons/react/24/outline"; import { CopyAll, Delete, Edit, AddBox, GitHub, Sync } from "@mui/icons-material"; -import { ApiGetCall } from "/src/api/ApiCall"; +import { ApiGetCall } from "../../../../api/ApiCall"; import { Stack } from "@mui/system"; -import { BPASyncDialog } from "/src/components/CippComponents/BPASyncDialog"; -import { useDialog } from "/src/hooks/use-dialog"; +import { BPASyncDialog } from "../../../../components/CippComponents/BPASyncDialog"; +import { useDialog } from "../../../../hooks/use-dialog"; const Page = () => { const pageTitle = "Best Practice Reports"; diff --git a/src/pages/tenant/standards/bpa-report/view.js b/src/pages/tenant/standards/bpa-report/view.js index 0af8c51a7011..f85fb633a3a3 100644 --- a/src/pages/tenant/standards/bpa-report/view.js +++ b/src/pages/tenant/standards/bpa-report/view.js @@ -1,4 +1,4 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { Box, Container, Typography, Button, Stack, SvgIcon, Skeleton, Chip, Alert } from "@mui/material"; import { Grid } from "@mui/system"; import Head from "next/head"; diff --git a/src/pages/tenant/standards/domains-analyser/index.js b/src/pages/tenant/standards/domains-analyser/index.js index 5f5d15186ae1..58ee11a13fb4 100644 --- a/src/pages/tenant/standards/domains-analyser/index.js +++ b/src/pages/tenant/standards/domains-analyser/index.js @@ -1,6 +1,6 @@ import { Button } from "@mui/material"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative. +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative. import Link from "next/link"; import { ApiGetCall } from "../../../../api/ApiCall"; import { useSettings } from "../../../../hooks/use-settings"; diff --git a/src/pages/tenant/standards/templates/index.js b/src/pages/tenant/standards/templates/index.js index 6b3c7c483f87..b23752c50d9b 100644 --- a/src/pages/tenant/standards/templates/index.js +++ b/src/pages/tenant/standards/templates/index.js @@ -1,7 +1,7 @@ import { Alert, Button } from "@mui/material"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative. -import { TabbedLayout } from "/src/layouts/TabbedLayout"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; // had to add an extra path here because I added an extra folder structure. We should switch to absolute pathing so we dont have to deal with relative. +import { TabbedLayout } from "../../../../layouts/TabbedLayout"; import Link from "next/link"; import { CopyAll, Delete, PlayArrow, AddBox, Edit, GitHub, ContentCopy } from "@mui/icons-material"; import { ApiGetCall, ApiPostCall } from "../../../../api/ApiCall"; @@ -9,9 +9,9 @@ import { Grid } from "@mui/system"; import { CippApiResults } from "../../../../components/CippComponents/CippApiResults"; import { EyeIcon } from "@heroicons/react/24/outline"; import tabOptions from "../tabOptions.json"; -import { useSettings } from "/src/hooks/use-settings.js"; +import { useSettings } from "../../../../hooks/use-settings.js"; import { CippPolicyImportDrawer } from "../../../../components/CippComponents/CippPolicyImportDrawer.jsx"; -import { PermissionButton } from "/src/utils/permissions.js"; +import { PermissionButton } from "../../../../utils/permissions.js"; const Page = () => { const oldStandards = ApiGetCall({ url: "/api/ListStandards", queryKey: "ListStandards-legacy" }); diff --git a/src/pages/tenant/standards/templates/template.jsx b/src/pages/tenant/standards/templates/template.jsx index 3263cf6a6720..f7dd53861b02 100644 --- a/src/pages/tenant/standards/templates/template.jsx +++ b/src/pages/tenant/standards/templates/template.jsx @@ -1,11 +1,11 @@ import { Box, Button, Container, Stack, Typography, SvgIcon, Skeleton } from "@mui/material"; import { Grid } from "@mui/system"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; import { useRouter } from "next/router"; import { Add, SaveRounded } from "@mui/icons-material"; import { useEffect, useState, useCallback, useMemo, useRef, lazy, Suspense } from "react"; -import standards from "/src/data/standards"; +import standards from "../../../../data/standards"; import CippStandardAccordion from "../../../../components/CippStandards/CippStandardAccordion"; // Lazy load the dialog to improve initial page load performance const CippStandardDialog = lazy(() => @@ -17,8 +17,8 @@ import { useDialog } from "../../../../hooks/use-dialog"; import { ApiGetCall } from "../../../../api/ApiCall"; import _ from "lodash"; import { createDriftManagementActions } from "../../manage/driftManagementActions"; -import { ActionsMenu } from "/src/components/actions-menu"; -import { useSettings } from "/src/hooks/use-settings"; +import { ActionsMenu } from "../../../../components/actions-menu"; +import { useSettings } from "../../../../hooks/use-settings"; import { CippHead } from "../../../../components/CippComponents/CippHead"; const Page = () => { diff --git a/src/pages/tenant/tools/appapproval/index.js b/src/pages/tenant/tools/appapproval/index.js index a18484cc85ce..b05b6938415d 100644 --- a/src/pages/tenant/tools/appapproval/index.js +++ b/src/pages/tenant/tools/appapproval/index.js @@ -1,7 +1,7 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippWizardConfirmation } from "/src/components/CippWizard/CippWizardConfirmation"; -import CippWizardPage from "/src/components/CippWizard/CippWizardPage.jsx"; -import { CippTenantStep } from "/src/components/CippWizard/CippTenantStep.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippWizardConfirmation } from "../../../../components/CippWizard/CippWizardConfirmation"; +import CippWizardPage from "../../../../components/CippWizard/CippWizardPage.jsx"; +import { CippTenantStep } from "../../../../components/CippWizard/CippTenantStep.jsx"; import { CippWizardAppApproval } from "../../../../components/CippWizard/CippWizardAppApproval"; import { Alert } from "@mui/material"; diff --git a/src/pages/tenant/tools/bpa-report-builder/index.js b/src/pages/tenant/tools/bpa-report-builder/index.js index 082890d4c7f8..337f594354ee 100644 --- a/src/pages/tenant/tools/bpa-report-builder/index.js +++ b/src/pages/tenant/tools/bpa-report-builder/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; const Page = () => { const pageTitle = "BPA Report Builder"; diff --git a/src/pages/tenant/tools/geoiplookup/index.js b/src/pages/tenant/tools/geoiplookup/index.js index 28f93d377573..162e93a3b5a1 100644 --- a/src/pages/tenant/tools/geoiplookup/index.js +++ b/src/pages/tenant/tools/geoiplookup/index.js @@ -1,6 +1,6 @@ import { Box, Button, Container } from "@mui/material"; import { Grid, Stack } from "@mui/system"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; import CippButtonCard from "../../../../components/CippCards/CippButtonCard"; import { Add, Delete, Search } from "@mui/icons-material"; diff --git a/src/pages/tenant/tools/graph-explorer/index.js b/src/pages/tenant/tools/graph-explorer/index.js index 0ef2f470f585..2ba20baa9332 100644 --- a/src/pages/tenant/tools/graph-explorer/index.js +++ b/src/pages/tenant/tools/graph-explorer/index.js @@ -1,9 +1,9 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; +import { CippTablePage } from "../../../../components/CippComponents/CippTablePage.jsx"; import CippGraphExplorerFilter from "../../../../components/CippTable/CippGraphExplorerFilter"; import { useState } from "react"; import { Grid } from "@mui/system"; -import { useSettings } from "/src/hooks/use-settings"; +import { useSettings } from "../../../../hooks/use-settings"; const Page = () => { const [apiFilter, setApiFilter] = useState([]); diff --git a/src/pages/tenant/tools/individual-domains/index.js b/src/pages/tenant/tools/individual-domains/index.js index d6de4f16eeef..99f7a4157dce 100644 --- a/src/pages/tenant/tools/individual-domains/index.js +++ b/src/pages/tenant/tools/individual-domains/index.js @@ -1,5 +1,5 @@ import { Box, Container } from "@mui/material"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { CippDomainCards } from "../../../../components/CippCards/CippDomainCards"; const Page = () => { diff --git a/src/pages/tenant/tools/tenantlookup/index.js b/src/pages/tenant/tools/tenantlookup/index.js index 08453771819d..aea206a02e98 100644 --- a/src/pages/tenant/tools/tenantlookup/index.js +++ b/src/pages/tenant/tools/tenantlookup/index.js @@ -1,6 +1,6 @@ import { Box, Button, Container, Typography, Skeleton, Link } from "@mui/material"; import { Grid } from "@mui/system"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; import CippButtonCard from "../../../../components/CippCards/CippButtonCard"; import { Search } from "@mui/icons-material"; diff --git a/src/pages/tools/breachlookup/index.js b/src/pages/tools/breachlookup/index.js index 53d9e62c071f..04aed11e72ed 100644 --- a/src/pages/tools/breachlookup/index.js +++ b/src/pages/tools/breachlookup/index.js @@ -10,17 +10,17 @@ import { Alert, } from "@mui/material"; import { Grid } from "@mui/system"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; import { useForm, useWatch } from "react-hook-form"; -import CippButtonCard from "/src/components/CippCards/CippButtonCard"; +import CippButtonCard from "../../../components/CippCards/CippButtonCard"; import { Search } from "@mui/icons-material"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { ApiGetCall } from "/src/api/ApiCall"; +import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; +import { ApiGetCall } from "../../../api/ApiCall"; import DOMPurify from "dompurify"; -import { getCippTranslation } from "/src/utils/get-cipp-translation"; +import { getCippTranslation } from "../../../utils/get-cipp-translation"; import { useRouter } from "next/router"; import { useEffect } from "react"; -import CippCsvExportButton from "/src/components/CippComponents/CippCsvExportButton"; +import CippCsvExportButton from "../../../components/CippComponents/CippCsvExportButton"; import { CippCopyToClipBoard } from "../../../components/CippComponents/CippCopyToClipboard"; const Page = () => { diff --git a/src/pages/tools/community-repos/index.js b/src/pages/tools/community-repos/index.js index beadf2237bf1..1d885b8647da 100644 --- a/src/pages/tools/community-repos/index.js +++ b/src/pages/tools/community-repos/index.js @@ -1,6 +1,6 @@ import { useState } from "react"; -import { Layout as DashboardLayout } from "/src/layouts"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../layouts"; +import { CippTablePage } from "../../../components/CippComponents/CippTablePage.jsx"; import { Button, Dialog, @@ -21,14 +21,14 @@ import { SvgIcon, } from "@mui/material"; import { MagnifyingGlassIcon, TrashIcon } from "@heroicons/react/24/outline"; -import { ApiPostCall } from "/src/api/ApiCall"; +import { ApiPostCall } from "../../../api/ApiCall"; import { useForm, FormProvider } from "react-hook-form"; import { Radio, RadioGroup, FormControlLabel } from "@mui/material"; -import { CippFormCondition } from "/src/components/CippComponents/CippFormCondition"; +import { CippFormCondition } from "../../../components/CippComponents/CippFormCondition"; import AddIcon from "@mui/icons-material/Add"; import { Box } from "@mui/system"; import { Add, AddBox, Close, ForkLeft, OpenInNew } from "@mui/icons-material"; -import { CippApiResults } from "/src/components/CippComponents/CippApiResults"; +import { CippApiResults } from "../../../components/CippComponents/CippApiResults"; import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; import { ApiGetCall } from "../../../api/ApiCall"; diff --git a/src/pages/tools/community-repos/repo.js b/src/pages/tools/community-repos/repo.js index 4fdb8ccd2849..96635f694393 100644 --- a/src/pages/tools/community-repos/repo.js +++ b/src/pages/tools/community-repos/repo.js @@ -1,8 +1,8 @@ import { useRouter } from "next/router"; -import { Layout as DashboardLayout } from "/src/layouts"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../layouts"; +import { CippTablePage } from "../../../components/CippComponents/CippTablePage.jsx"; import { useState, useEffect } from "react"; -import { ApiPostCall, ApiGetCall } from "/src/api/ApiCall"; +import { ApiPostCall, ApiGetCall } from "../../../api/ApiCall"; import { Button, Dialog, @@ -13,9 +13,9 @@ import { Skeleton, } from "@mui/material"; import { Grid } from "@mui/system"; -import CippJSONView from "/src/components/CippFormPages/CippJSONView"; +import CippJSONView from "../../../components/CippFormPages/CippJSONView"; import { EyeIcon } from "@heroicons/react/24/outline"; -import { CippAutoComplete } from "/src/components/CippComponents/CippAutocomplete"; +import { CippAutoComplete } from "../../../components/CippComponents/CippAutocomplete"; import React from "react"; import { CloudDownload } from "@mui/icons-material"; diff --git a/src/pages/tools/templatelib/index.jsx b/src/pages/tools/templatelib/index.jsx index 9b2fabb67bba..2822287dfa28 100644 --- a/src/pages/tools/templatelib/index.jsx +++ b/src/pages/tools/templatelib/index.jsx @@ -1,10 +1,10 @@ import { useEffect } from "react"; import { Divider, Typography, Alert, Chip } from "@mui/material"; import { useForm, useWatch } from "react-hook-form"; -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import CippFormPage from "/src/components/CippFormPages/CippFormPage"; -import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; -import { useSettings } from "/src/hooks/use-settings"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import CippFormPage from "../../../components/CippFormPages/CippFormPage"; +import CippFormComponent from "../../../components/CippComponents/CippFormComponent"; +import { useSettings } from "../../../hooks/use-settings"; import { CippFormTenantSelector } from "../../../components/CippComponents/CippFormTenantSelector"; import { Grid } from "@mui/system"; import { CippFormCondition } from "../../../components/CippComponents/CippFormCondition"; diff --git a/src/pages/tools/tenantbreachlookup/index.js b/src/pages/tools/tenantbreachlookup/index.js index 50b351e0e091..f1b59d8b663c 100644 --- a/src/pages/tools/tenantbreachlookup/index.js +++ b/src/pages/tools/tenantbreachlookup/index.js @@ -1,5 +1,5 @@ -import { Layout as DashboardLayout } from "/src/layouts/index.js"; -import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { Layout as DashboardLayout } from "../../../layouts/index.js"; +import { CippTablePage } from "../../../components/CippComponents/CippTablePage.jsx"; import { EyeIcon } from "@heroicons/react/24/outline"; import { Button } from "@mui/material"; import { Search } from "@mui/icons-material"; diff --git a/src/utils/get-cipp-signin-errorcode-translation.js b/src/utils/get-cipp-signin-errorcode-translation.js index 00f0074e05f5..b73e73aeac52 100644 --- a/src/utils/get-cipp-signin-errorcode-translation.js +++ b/src/utils/get-cipp-signin-errorcode-translation.js @@ -1,4 +1,4 @@ -import SignInErrorCodes from "/src/data/signinErrorCodes"; +import SignInErrorCodes from "../data/signinErrorCodes"; export const getSignInErrorCodeTranslation = (errorCode) => { if (SignInErrorCodes.hasOwnProperty(String(errorCode))) { diff --git a/src/utils/permissions.js b/src/utils/permissions.js index df66872101d4..46e6a539864a 100644 --- a/src/utils/permissions.js +++ b/src/utils/permissions.js @@ -1,5 +1,5 @@ import Button from "@mui/material/Button"; -import { usePermissions } from "/src/hooks/use-permissions.js"; +import { usePermissions } from "../hooks/use-permissions.js"; /** * Permission Helper Utilities * From cecfd266b12ff5454de064bbfeb8bd4727fc20f1 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Fri, 23 Jan 2026 12:45:37 +0100 Subject: [PATCH 15/46] migrate more import paths --- .../CippComponents/CippCentralSearch.jsx | 6 +++--- src/pages/dashboardv2/index.js | 12 ++++++------ .../identity/administration/users/user/index.jsx | 14 ++++++++------ 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/components/CippComponents/CippCentralSearch.jsx b/src/components/CippComponents/CippCentralSearch.jsx index 81bf241c6352..2f0252fcaf11 100644 --- a/src/components/CippComponents/CippCentralSearch.jsx +++ b/src/components/CippComponents/CippCentralSearch.jsx @@ -172,7 +172,7 @@ export const CippCentralSearch = ({ handleClose, open }) => { const filteredMainMenu = filterItemsByPermissionsAndRoles( allLeafItems, userPermissions, - userRoles + userRoles, ).map((item) => { const rawBreadcrumbs = buildBreadcrumbPath(nativeMenuItems, item.path) || []; // Remove the leaf item's own title to avoid duplicate when rendering @@ -250,7 +250,7 @@ export const CippCentralSearch = ({ handleClose, open }) => { const inTitle = leaf.title?.toLowerCase().includes(normalizedSearch); const inPath = leaf.path?.toLowerCase().includes(normalizedSearch); const inBreadcrumbs = leaf.breadcrumbs?.some((crumb) => - crumb?.toLowerCase().includes(normalizedSearch) + crumb?.toLowerCase().includes(normalizedSearch), ); // If there's no search value, show no results (you could change this logic) return normalizedSearch ? inTitle || inPath || inBreadcrumbs : false; @@ -267,7 +267,7 @@ export const CippCentralSearch = ({ handleClose, open }) => { ) : ( part - ) + ), ); }; diff --git a/src/pages/dashboardv2/index.js b/src/pages/dashboardv2/index.js index 6d4e5d5b24c1..1a169586fe21 100644 --- a/src/pages/dashboardv2/index.js +++ b/src/pages/dashboardv2/index.js @@ -80,7 +80,7 @@ const Page = () => { query: { ...router.query, reportId: reportIdValue.reportId.value }, }, undefined, - { shallow: true } + { shallow: true }, ); } }, [reportIdValue]); @@ -171,7 +171,7 @@ const Page = () => { useEffect(() => { if (currentTenantInfo.isSuccess) { const tenantLookup = currentTenantInfo.data?.find( - (tenant) => tenant.defaultDomainName === currentTenant + (tenant) => tenant.defaultDomainName === currentTenant, ); // Get filtered portals based on user preferences @@ -341,14 +341,14 @@ const Page = () => { @@ -361,14 +361,14 @@ const Page = () => { diff --git a/src/pages/identity/administration/users/user/index.jsx b/src/pages/identity/administration/users/user/index.jsx index ce2432eed52a..7bd6c01af1ff 100644 --- a/src/pages/identity/administration/users/user/index.jsx +++ b/src/pages/identity/administration/users/user/index.jsx @@ -19,7 +19,9 @@ import { useCippUserActions } from "../../../../../components/CippComponents/Cip import { EyeIcon, PencilIcon } from "@heroicons/react/24/outline"; import { CippDataTable } from "../../../../../components/CippTable/CippDataTable"; import dynamic from "next/dynamic"; -const CippMap = dynamic(() => import("../../../../../components/CippComponents/CippMap"), { ssr: false }); +const CippMap = dynamic(() => import("../../../../../components/CippComponents/CippMap"), { + ssr: false, +}); import { Button, Dialog, DialogTitle, DialogContent, IconButton } from "@mui/material"; import { Close } from "@mui/icons-material"; @@ -275,7 +277,7 @@ const Page = () => { ) { // Filter policies where result is "success" const appliedPolicies = signInData.appliedConditionalAccessPolicies.filter( - (policy) => policy.result === "success" + (policy) => policy.result === "success", ); if (appliedPolicies.length > 0) { @@ -420,7 +422,7 @@ const Page = () => { if (mfaDevices.length > 0) { // Exclude password authentication method const mfaDevicesFiltered = mfaDevices.filter( - (method) => method["@odata.type"] !== "#microsoft.graph.passwordAuthenticationMethod" + (method) => method["@odata.type"] !== "#microsoft.graph.passwordAuthenticationMethod", ); if (mfaDevicesFiltered.length > 0) { @@ -538,7 +540,7 @@ const Page = () => { }, ], data: userMemberOf?.filter( - (item) => item?.["@odata.type"] === "#microsoft.graph.group" + (item) => item?.["@odata.type"] === "#microsoft.graph.group", ), refreshFunction: refreshFunction, simpleColumns: ["displayName", "groupTypes", "securityEnabled", "mailEnabled"], @@ -558,7 +560,7 @@ const Page = () => { subtext: "List of roles the user is a member of", statusText: ` ${ userMemberOf?.filter( - (item) => item?.["@odata.type"] === "#microsoft.graph.directoryRole" + (item) => item?.["@odata.type"] === "#microsoft.graph.directoryRole", ).length } Role(s)`, statusColor: "info.main", @@ -566,7 +568,7 @@ const Page = () => { title: "Admin Roles", hideTitle: true, data: userMemberOf?.filter( - (item) => item?.["@odata.type"] === "#microsoft.graph.directoryRole" + (item) => item?.["@odata.type"] === "#microsoft.graph.directoryRole", ), simpleColumns: ["displayName", "description"], refreshFunction: refreshFunction, From 4c9366a6d7d2aa790fc9c7d557c289e0bc1c4550 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sat, 24 Jan 2026 22:26:08 -0500 Subject: [PATCH 16/46] Enhance partner tenant info display in deployment wizard Added partner tenant information panel to CippTenantModeDeploy, showing organization, user, and partner type details. Updated CIPPM365OAuthButton to improve button icon logic and validation. Extended CippTranslations with partner type labels for better UI clarity. --- .../CippComponents/CIPPM365OAuthButton.jsx | 42 +++--- .../CippComponents/CippTranslations.jsx | 7 + .../CippWizard/CippTenantModeDeploy.jsx | 127 ++++++++++++++---- 3 files changed, 131 insertions(+), 45 deletions(-) diff --git a/src/components/CippComponents/CIPPM365OAuthButton.jsx b/src/components/CippComponents/CIPPM365OAuthButton.jsx index 88e517a2139d..af192ad95421 100644 --- a/src/components/CippComponents/CIPPM365OAuthButton.jsx +++ b/src/components/CippComponents/CIPPM365OAuthButton.jsx @@ -1,5 +1,6 @@ import { useState, useEffect } from "react"; import { Alert, Button, Typography, CircularProgress, Box } from "@mui/material"; +import { Microsoft, Login, Refresh } from "@mui/icons-material"; import { ApiGetCall } from "../../api/ApiCall"; import { CippCopyToClipBoard } from "./CippCopyToClipboard"; @@ -32,6 +33,7 @@ export const CIPPM365OAuthButton = ({ const appIdInfo = ApiGetCall({ url: `/api/ExecListAppId`, + queryKey: "listAppId", waiting: true, }); @@ -66,8 +68,8 @@ export const CIPPM365OAuthButton = ({ // Request device code from our API endpoint const deviceCodeResponse = await fetch( `/api/ExecDeviceCodeLogon?operation=getDeviceCode&clientId=${appId}&scope=${encodeURIComponent( - scope - )}` + scope, + )}`, ); const deviceCodeData = await deviceCodeResponse.json(); @@ -129,7 +131,7 @@ export const CIPPM365OAuthButton = ({ const popup = window.open( "https://microsoft.com/devicelogin", "deviceLoginPopup", - `width=${width},height=${height},left=${left},top=${top}` + `width=${width},height=${height},left=${left},top=${top}`, ); // Start polling for token @@ -155,7 +157,7 @@ export const CIPPM365OAuthButton = ({ try { // Poll for token using our API endpoint const tokenResponse = await fetch( - `/api/ExecDeviceCodeLogon?operation=checkToken&clientId=${appId}&deviceCode=${deviceCodeInfo.device_code}` + `/api/ExecDeviceCodeLogon?operation=checkToken&clientId=${appId}&deviceCode=${deviceCodeInfo.device_code}`, ); const tokenData = await tokenResponse.json(); @@ -327,7 +329,7 @@ export const CIPPM365OAuthButton = ({ const popup = window.open( authUrl, "msalAuthPopup", - `width=${width},height=${height},left=${left},top=${top}` + `width=${width},height=${height},left=${left},top=${top}`, ); // Function to actually exchange the authorization code for tokens @@ -550,9 +552,9 @@ export const CIPPM365OAuthButton = ({
{!applicationId && !appIdInfo.isLoading && - appIdInfo?.data && // Only check if data is available + appIdInfo?.data?.applicationId && // Only check if applicationId is present in data !/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test( - appIdInfo?.data?.applicationId + appIdInfo?.data?.applicationId, ) && ( The Application ID is not valid. Please check your configuration. @@ -661,22 +663,26 @@ export const CIPPM365OAuthButton = ({ codeRetrievalInProgress || (!applicationId && !/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test( - appIdInfo?.data?.applicationId + appIdInfo?.data?.applicationId, )) } onClick={useDeviceCode ? handleDeviceCodeAuthentication : handleMsalAuthentication} color="primary" + startIcon={ + authInProgress || codeRetrievalInProgress ? ( + + ) : tokens.accessToken ? ( + + ) : ( + + ) + } > - {authInProgress || codeRetrievalInProgress ? ( - <> - - Authenticating... - - ) : deviceCodeInfo && useDeviceCode ? ( - "Authenticate with Code" - ) : ( - buttonText - )} + {authInProgress || codeRetrievalInProgress + ? "Authenticating..." + : deviceCodeInfo && useDeviceCode + ? "Authenticate with Code" + : buttonText}
); diff --git a/src/components/CippComponents/CippTranslations.jsx b/src/components/CippComponents/CippTranslations.jsx index 99d46a6e5182..eaffa47f71d3 100644 --- a/src/components/CippComponents/CippTranslations.jsx +++ b/src/components/CippComponents/CippTranslations.jsx @@ -52,4 +52,11 @@ export const CippTranslations = { includeTenantId: "Include Tenant ID in Notifications", logsToInclude: "Logs to Include in notifications", assignmentFilterManagementType: "Filter Type", + microsoftSupport: "Microsoft Support", + syndicatePartner: "Syndicate Partner", + breadthPartner: "Breadth Partner", + breadthPartnerDelegatedAdmin: "Breadth Partner (Delegated)", + resellerPartnerDelegatedAdmin: "Reseller", + valueAddedResellerPartnerDelegatedAdmin: "Indirect Reseller", + unknownFutureValue: "Unknown", }; diff --git a/src/components/CippWizard/CippTenantModeDeploy.jsx b/src/components/CippWizard/CippTenantModeDeploy.jsx index 8f8683af405e..477a0ed36ec2 100644 --- a/src/components/CippWizard/CippTenantModeDeploy.jsx +++ b/src/components/CippWizard/CippTenantModeDeploy.jsx @@ -1,10 +1,12 @@ import { useEffect } from "react"; -import { Stack, Box, Typography, Link } from "@mui/material"; +import { Stack, Box, Typography, Link, Chip, Skeleton, SvgIcon } from "@mui/material"; +import { Person, Apartment } from "@mui/icons-material"; import { CIPPM365OAuthButton } from "../CippComponents/CIPPM365OAuthButton"; import { CippApiResults } from "../CippComponents/CippApiResults"; -import { ApiPostCall } from "../../api/ApiCall"; +import { ApiPostCall, ApiGetCall } from "../../api/ApiCall"; import { CippWizardStepButtons } from "./CippWizardStepButtons"; import { CippTenantTable } from "./CippTenantTable"; +import { getCippTranslation } from "../../utils/get-cipp-translation"; export const CippTenantModeDeploy = (props) => { const { formControl, currentStep, onPreviousStep, onNextStep } = props; @@ -16,6 +18,13 @@ export const CippTenantModeDeploy = (props) => { const updateRefreshToken = ApiPostCall({ urlfromdata: true }); const addTenant = ApiPostCall({ urlfromdata: true }); + // Get partner tenant info using the same API call as CIPPM365OAuthButton + const partnerTenantInfo = ApiGetCall({ + url: `/api/ExecListAppId`, + queryKey: "listAppId", + waiting: true, + }); + useEffect(() => { if (updateRefreshToken.isSuccess) { formControl.setValue("GDAPAuth", true); @@ -55,23 +64,85 @@ export const CippTenantModeDeploy = (props) => { . - - - { - const updatedTokenData = { - ...tokenData, - tenantMode: "GDAP", - }; - updateRefreshToken.mutate({ - url: "/api/ExecUpdateRefreshToken", - data: updatedTokenData, - }); + {partnerTenantInfo.isLoading && ( + + + + )} + + {partnerTenantInfo?.data?.orgName && ( + + - + > + + + + + + + + {partnerTenantInfo.data.orgName} + + + {partnerTenantInfo.data.tenantId} + + + {partnerTenantInfo.data.authenticatedUserDisplayName && ( + + + + + + {partnerTenantInfo.data.authenticatedUserDisplayName} + + + {partnerTenantInfo.data.authenticatedUserPrincipalName} + + + )} + + + {partnerTenantInfo.data.isPartnerTenant ? ( + + ) : ( + + )} + + + + + )} + + + { + const updatedTokenData = { + ...tokenData, + tenantMode: "GDAP", + }; + updateRefreshToken.mutate({ + url: "/api/ExecUpdateRefreshToken", + data: updatedTokenData, + }); + }} + buttonText={ + partnerTenantInfo?.data?.orgName + ? "Change Partner Tenant" + : "Connect to Partner Tenant (Recommended)" + } + showSuccessAlert={false} + /> @@ -105,15 +176,17 @@ export const CippTenantModeDeploy = (props) => { - + + + Date: Sat, 24 Jan 2026 22:26:16 -0500 Subject: [PATCH 17/46] Remove redundant section headers from results components Eliminated the 'GDAP Details' and 'Permission Details' Typography headers from CippGDAPResults and CippPermissionResults components to streamline the UI and reduce unnecessary repetition. --- src/components/CippSettings/CippGDAPResults.jsx | 4 ---- src/components/CippSettings/CippPermissionResults.jsx | 3 --- 2 files changed, 7 deletions(-) diff --git a/src/components/CippSettings/CippGDAPResults.jsx b/src/components/CippSettings/CippGDAPResults.jsx index 5c381668c78a..89897fd278d0 100644 --- a/src/components/CippSettings/CippGDAPResults.jsx +++ b/src/components/CippSettings/CippGDAPResults.jsx @@ -149,10 +149,6 @@ export const CippGDAPResults = (props) => { }} extendedInfo={[]} > - - GDAP Details - - {results?.Results?.GDAPIssues?.length > 0 && ( <> { }} extendedInfo={[]} > - - Permission Details - {results?.Results?.Links.length > 0 && ( Date: Sat, 24 Jan 2026 22:42:09 -0500 Subject: [PATCH 18/46] Update react-dom and remove unused React import Upgraded react-dom from 19.1.1 to 19.2.3 and updated scheduler dependency accordingly. Also removed an unused import of React from CippTenantTable.jsx. --- package.json | 2 +- src/components/CippWizard/CippTenantTable.jsx | 1 - yarn.lock | 18 +++++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 69ceda7bc256..aa76e8c186f5 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "react-apexcharts": "1.7.0", "react-beautiful-dnd": "13.1.1", "react-copy-to-clipboard": "^5.1.0", - "react-dom": "19.1.1", + "react-dom": "19.2.3", "react-dropzone": "14.3.8", "react-error-boundary": "^6.1.0", "react-grid-layout": "^1.5.0", diff --git a/src/components/CippWizard/CippTenantTable.jsx b/src/components/CippWizard/CippTenantTable.jsx index 81c1ae4cde73..72cfe71f64f5 100644 --- a/src/components/CippWizard/CippTenantTable.jsx +++ b/src/components/CippWizard/CippTenantTable.jsx @@ -1,4 +1,3 @@ -import React from "react"; import { Button, SvgIcon } from "@mui/material"; import { CippTablePage } from "../CippComponents/CippTablePage.jsx"; import { Sync, Block, PlayArrow, RestartAlt, Delete, Add } from "@mui/icons-material"; diff --git a/yarn.lock b/yarn.lock index 4c905da26818..6f8601e5e565 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6616,12 +6616,12 @@ react-copy-to-clipboard@^5.1.0: copy-to-clipboard "^3.3.1" prop-types "^15.8.1" -react-dom@19.1.1: - version "19.1.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.1.1.tgz#2daa9ff7f3ae384aeb30e76d5ee38c046dc89893" - integrity sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw== +react-dom@19.2.3: + version "19.2.3" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.3.tgz#f0b61d7e5c4a86773889fcc1853af3ed5f215b17" + integrity sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg== dependencies: - scheduler "^0.26.0" + scheduler "^0.27.0" react-draggable@^4.0.3, react-draggable@^4.4.6: version "4.5.0" @@ -7166,10 +7166,10 @@ scheduler@0.25.0-rc-603e6108-20241029: resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.25.0-rc-603e6108-20241029.tgz#684dd96647e104d23e0d29a37f18937daf82df19" integrity sha512-pFwF6H1XrSdYYNLfOcGlM28/j8CGLu8IvdrxqhjWULe2bPcKiKW4CV+OWqR/9fT52mywx65l7ysNkjLKBda7eA== -scheduler@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.26.0.tgz#4ce8a8c2a2095f13ea11bf9a445be50c555d6337" - integrity sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA== +scheduler@^0.27.0: + version "0.27.0" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.27.0.tgz#0c4ef82d67d1e5c1e359e8fc76d3a87f045fe5bd" + integrity sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q== section-matter@^1.0.0: version "1.0.0" From 4dd5d07e8ab42ba7cc7645e46f3f71bf3353f0c1 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sat, 24 Jan 2026 22:50:53 -0500 Subject: [PATCH 19/46] Improve partner tenant connection UX in CippTenantModeDeploy Adds a refresh button for partner tenant info, updates guidance text to clarify partner tenant connection requirements, and improves loading and error states. Also disables connecting separate tenants until a partner tenant is connected, enhancing user flow and preventing misconfiguration. --- .../CippWizard/CippTenantModeDeploy.jsx | 212 +++++++++++++----- 1 file changed, 153 insertions(+), 59 deletions(-) diff --git a/src/components/CippWizard/CippTenantModeDeploy.jsx b/src/components/CippWizard/CippTenantModeDeploy.jsx index 477a0ed36ec2..0b56cd37fd65 100644 --- a/src/components/CippWizard/CippTenantModeDeploy.jsx +++ b/src/components/CippWizard/CippTenantModeDeploy.jsx @@ -1,6 +1,16 @@ import { useEffect } from "react"; -import { Stack, Box, Typography, Link, Chip, Skeleton, SvgIcon } from "@mui/material"; -import { Person, Apartment } from "@mui/icons-material"; +import { + Stack, + Box, + Typography, + Link, + Chip, + Skeleton, + SvgIcon, + IconButton, + Tooltip, +} from "@mui/material"; +import { Person, Apartment, Sync } from "@mui/icons-material"; import { CIPPM365OAuthButton } from "../CippComponents/CIPPM365OAuthButton"; import { CippApiResults } from "../CippComponents/CippApiResults"; import { ApiPostCall, ApiGetCall } from "../../api/ApiCall"; @@ -43,14 +53,26 @@ export const CippTenantModeDeploy = (props) => { {/* Partner Tenant (GDAP) */} - - Partner Tenant - + + + Partner Tenant + + + partnerTenantInfo.refetch()} + disabled={partnerTenantInfo.isLoading} + > + + + + Using GDAP is recommended for CIPP, however you can also authenticate to individual - tenants. It is still highly recommended to connect to your partner tenant first, even if - you are not a Microsoft CSP. This allows CIPP to send notifications, perform permission - checks, and update permissions when required. + tenants. It is required to connect to your partner tenant first, even if you are not a + Microsoft CSP. This is where the multi-tenant App Registration (CIPP-SAM) is installed. It + also allows CIPP to send notifications, perform permission checks, and update permissions + when required. Please remember to log onto a service account dedicated for CIPP. More info? Check out the{" "} @@ -64,13 +86,7 @@ export const CippTenantModeDeploy = (props) => { . - {partnerTenantInfo.isLoading && ( - - - - )} - - {partnerTenantInfo?.data?.orgName && ( + {(partnerTenantInfo.isLoading || partnerTenantInfo.isFetching) && ( { }} > - - - - - - - {partnerTenantInfo.data.orgName} - - - {partnerTenantInfo.data.tenantId} - - - {partnerTenantInfo.data.authenticatedUserDisplayName && ( + + + + + + + + + )} + + {!partnerTenantInfo.isLoading && + !partnerTenantInfo.isFetching && + partnerTenantInfo?.data?.orgName && ( + + + + - + - {partnerTenantInfo.data.authenticatedUserDisplayName} + {partnerTenantInfo.data.orgName} - {partnerTenantInfo.data.authenticatedUserPrincipalName} + {partnerTenantInfo.data.tenantId} - )} + {partnerTenantInfo.data.authenticatedUserDisplayName && ( + + + + + + {partnerTenantInfo.data.authenticatedUserDisplayName} + + + {partnerTenantInfo.data.authenticatedUserPrincipalName} + + + )} + + + {partnerTenantInfo.data.isPartnerTenant ? ( + + ) : ( + + )} + + + + )} + + {!partnerTenantInfo.isLoading && + !partnerTenantInfo.isFetching && + !partnerTenantInfo?.data?.orgName && ( + + - {partnerTenantInfo.data.isPartnerTenant ? ( - - ) : ( - - )} + + No partner tenant connected. Click the button below to authenticate with your + partner tenant. + - + - - )} + )} { buttonText={ partnerTenantInfo?.data?.orgName ? "Change Partner Tenant" - : "Connect to Partner Tenant (Recommended)" + : "Connect to Partner Tenant" } showSuccessAlert={false} /> @@ -157,22 +225,48 @@ export const CippTenantModeDeploy = (props) => { wrong tenant? Use the table below to remove it. + {!partnerTenantInfo?.data?.orgName && ( + + + Please connect to your partner tenant first before adding separate tenants. + + + )} + - { - const updatedTokenData = { - ...tokenData, - tenantMode: "perTenant", - }; - addTenant.mutate({ - url: "/api/ExecAddTenant", - data: updatedTokenData, - }); - }} - buttonText="Connect to Separate Tenants" - showSuccessAlert={false} - /> + + {!partnerTenantInfo?.data?.orgName && ( + + )} + + { + if (!partnerTenantInfo?.data?.orgName) return; + const updatedTokenData = { + ...tokenData, + tenantMode: "perTenant", + }; + addTenant.mutate({ + url: "/api/ExecAddTenant", + data: updatedTokenData, + }); + }} + buttonText="Connect to Separate Tenants" + showSuccessAlert={false} + /> + + From c7e527fbb38094cae0607c20dcf1a798f9272268 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sat, 24 Jan 2026 23:17:49 -0500 Subject: [PATCH 20/46] Add retry logic for AADSTS650051 in token exchange Implements retry mechanism with exponential backoff for the AADSTS650051 error (service principal already exists) during the token exchange process in CIPPM365OAuthButton. This improves reliability when encountering transient Azure AD errors. --- .../CippComponents/CIPPM365OAuthButton.jsx | 49 ++++++++++++++----- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/src/components/CippComponents/CIPPM365OAuthButton.jsx b/src/components/CippComponents/CIPPM365OAuthButton.jsx index af192ad95421..9230b5f52f57 100644 --- a/src/components/CippComponents/CIPPM365OAuthButton.jsx +++ b/src/components/CippComponents/CIPPM365OAuthButton.jsx @@ -358,20 +358,43 @@ export const CIPPM365OAuthButton = ({ }; // Make the token request through our API proxy to avoid origin header issues - const tokenResponse = await fetch(`/api/ExecTokenExchange`, { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ - tokenRequest, - tokenUrl: "https://login.microsoftonline.com/common/oauth2/v2.0/token", - tenantId: appId, // Pass the tenant ID to retrieve the correct client secret - }), - }); + // Retry logic for AADSTS650051 (service principal already exists) + let retryCount = 0; + const maxRetries = 3; + let tokenResponse; + let tokenData; + + while (retryCount <= maxRetries) { + tokenResponse = await fetch(`/api/ExecTokenExchange`, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify({ + tokenRequest, + tokenUrl: "https://login.microsoftonline.com/common/oauth2/v2.0/token", + tenantId: appId, // Pass the tenant ID to retrieve the correct client secret + }), + }); - // Parse the token response - const tokenData = await tokenResponse.json(); + // Parse the token response + tokenData = await tokenResponse.json(); + + // Check if it's the AADSTS650051 error (service principal already exists) + if ( + tokenData.error === "invalid_client" && + tokenData.error_description?.includes("AADSTS650051") + ) { + retryCount++; + if (retryCount <= maxRetries) { + // Wait before retrying (exponential backoff) + await new Promise((resolve) => setTimeout(resolve, 2000 * retryCount)); + continue; + } + } + // If no error or different error, break out of retry loop + break; + } // Check if the response contains an error if (tokenData.error) { From 37f8b1889fe27dcbdc9b2c5a74a89025b4e28730 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sat, 24 Jan 2026 23:24:19 -0500 Subject: [PATCH 21/46] Reorder CippApiResults components in tenant deploy Moved the CippApiResults for updateRefreshToken and addTenant to better align with their relevant sections in the CippTenantModeDeploy component. This improves the logical grouping and clarity of API result displays. --- src/components/CippWizard/CippTenantModeDeploy.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/CippWizard/CippTenantModeDeploy.jsx b/src/components/CippWizard/CippTenantModeDeploy.jsx index 0b56cd37fd65..aed2102a3bda 100644 --- a/src/components/CippWizard/CippTenantModeDeploy.jsx +++ b/src/components/CippWizard/CippTenantModeDeploy.jsx @@ -49,8 +49,6 @@ export const CippTenantModeDeploy = (props) => { return ( - - {/* Partner Tenant (GDAP) */} @@ -214,6 +212,8 @@ export const CippTenantModeDeploy = (props) => { + + {/* Per-Tenant */} @@ -270,6 +270,8 @@ export const CippTenantModeDeploy = (props) => { + + Date: Sat, 24 Jan 2026 23:25:41 -0500 Subject: [PATCH 22/46] Update CippTranslations.jsx --- src/components/CippComponents/CippTranslations.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CippComponents/CippTranslations.jsx b/src/components/CippComponents/CippTranslations.jsx index eaffa47f71d3..af96b19cd027 100644 --- a/src/components/CippComponents/CippTranslations.jsx +++ b/src/components/CippComponents/CippTranslations.jsx @@ -56,7 +56,7 @@ export const CippTranslations = { syndicatePartner: "Syndicate Partner", breadthPartner: "Breadth Partner", breadthPartnerDelegatedAdmin: "Breadth Partner (Delegated)", - resellerPartnerDelegatedAdmin: "Reseller", + resellerPartnerDelegatedAdmin: "Direct Reseller", valueAddedResellerPartnerDelegatedAdmin: "Indirect Reseller", unknownFutureValue: "Unknown", }; From 4932a136d5f1d302c3834dc9e0f75ac3257d33be Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sat, 24 Jan 2026 23:38:48 -0500 Subject: [PATCH 23/46] Improve appId refetch logic and add retry for AADSTS650051 Refactors appId refetching to only occur when applicationId is not already present, reducing unnecessary network calls. Adds retry logic with exponential backoff for the AADSTS650051 error during MSAL authentication, improving user experience when service principal consent issues occur. --- .../CippComponents/CIPPM365OAuthButton.jsx | 47 ++++++++++++++----- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/src/components/CippComponents/CIPPM365OAuthButton.jsx b/src/components/CippComponents/CIPPM365OAuthButton.jsx index 9230b5f52f57..9ee2076d1b05 100644 --- a/src/components/CippComponents/CIPPM365OAuthButton.jsx +++ b/src/components/CippComponents/CIPPM365OAuthButton.jsx @@ -37,10 +37,6 @@ export const CIPPM365OAuthButton = ({ waiting: true, }); - useEffect(() => { - appIdInfo.refetch(); - }, []); - const handleCloseError = () => { setAuthError(null); }; @@ -57,8 +53,10 @@ export const CIPPM365OAuthButton = ({ setCodeRetrievalInProgress(true); setAuthError(null); - // Refetch appId to ensure we have the latest - await appIdInfo.refetch(); + // Only refetch appId if not already present + if (!applicationId && !appIdInfo?.data?.applicationId) { + await appIdInfo.refetch(); + } try { // Get the application ID to use @@ -97,8 +95,10 @@ export const CIPPM365OAuthButton = ({ // Device code authentication function - opens popup and starts polling const handleDeviceCodeAuthentication = async () => { - // Refetch appId to ensure we have the latest - await appIdInfo.refetch(); + // Only refetch appId if not already present + if (!applicationId && !appIdInfo?.data?.applicationId) { + await appIdInfo.refetch(); + } if (!deviceCodeInfo) { // If we don't have a device code yet, retrieve it first @@ -265,7 +265,9 @@ export const CIPPM365OAuthButton = ({ }; // MSAL-like authentication function - const handleMsalAuthentication = async () => { + const handleMsalAuthentication = async (retryCount = 0) => { + const maxRetries = 3; + // Clear previous authentication state when starting a new authentication setAuthInProgress(true); setAuthError(null); @@ -279,10 +281,12 @@ export const CIPPM365OAuthButton = ({ onmicrosoftDomain: null, }); - // Refetch app ID info to ensure we have the latest - await appIdInfo.refetch(); + // Only refetch app ID if not already present + if (!applicationId && !appIdInfo?.data?.applicationId) { + await appIdInfo.refetch(); + } - // Get the application ID to use - now we're sure to have the latest after the await + // Get the application ID to use const appId = applicationId || appIdInfo?.data?.applicationId; // Generate MSAL-like authentication parameters @@ -527,7 +531,24 @@ export const CIPPM365OAuthButton = ({ const errorCode = urlParams.get("error"); const errorDescription = urlParams.get("error_description"); - // Set the error state + // Check if it's the AADSTS650051 error (service principal already exists during consent) + if ( + errorCode === "invalid_client" && + errorDescription?.includes("AADSTS650051") && + retryCount < maxRetries + ) { + // Close the popup + popup.close(); + setAuthInProgress(false); + + // Wait before retrying (exponential backoff) + setTimeout(() => { + handleMsalAuthentication(retryCount + 1); + }, 2000 * (retryCount + 1)); + return; + } + + // Set the error state for non-retryable errors const error = { errorCode: errorCode, errorMessage: errorDescription || "Unknown authentication error", From 8c23378bd31c067b69b25da89f871ae6ee167f6f Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sat, 24 Jan 2026 23:56:30 -0500 Subject: [PATCH 24/46] Add queryKey props to tenant components Set relatedQueryKeys for ApiPostCall in CippTenantModeDeploy to improve cache management. Added queryKey prop to CippTablePage in CippTenantTable for more consistent data fetching. --- src/components/CippWizard/CippTenantModeDeploy.jsx | 4 ++-- src/components/CippWizard/CippTenantTable.jsx | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/CippWizard/CippTenantModeDeploy.jsx b/src/components/CippWizard/CippTenantModeDeploy.jsx index aed2102a3bda..541ebde69201 100644 --- a/src/components/CippWizard/CippTenantModeDeploy.jsx +++ b/src/components/CippWizard/CippTenantModeDeploy.jsx @@ -25,8 +25,8 @@ export const CippTenantModeDeploy = (props) => { required: true, }); - const updateRefreshToken = ApiPostCall({ urlfromdata: true }); - const addTenant = ApiPostCall({ urlfromdata: true }); + const updateRefreshToken = ApiPostCall({ urlfromdata: true, relatedQueryKeys: ["listAppId"] }); + const addTenant = ApiPostCall({ urlfromdata: true, relatedQueryKeys: ["listTenants"] }); // Get partner tenant info using the same API call as CIPPM365OAuthButton const partnerTenantInfo = ApiGetCall({ diff --git a/src/components/CippWizard/CippTenantTable.jsx b/src/components/CippWizard/CippTenantTable.jsx index 72cfe71f64f5..8494aa558e19 100644 --- a/src/components/CippWizard/CippTenantTable.jsx +++ b/src/components/CippWizard/CippTenantTable.jsx @@ -115,6 +115,7 @@ export const CippTenantTable = ({ <> Date: Sun, 25 Jan 2026 00:16:37 -0500 Subject: [PATCH 25/46] Limit separate tenant scopes Passed a scope prop with required Microsoft Graph permissions to the ConnectToTenantsButton component in CippTenantModeDeploy. This enables the button to request the minimum necessary permissions during authentication. --- src/components/CippWizard/CippTenantModeDeploy.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/CippWizard/CippTenantModeDeploy.jsx b/src/components/CippWizard/CippTenantModeDeploy.jsx index 541ebde69201..56edf1907513 100644 --- a/src/components/CippWizard/CippTenantModeDeploy.jsx +++ b/src/components/CippWizard/CippTenantModeDeploy.jsx @@ -264,6 +264,7 @@ export const CippTenantModeDeploy = (props) => { }} buttonText="Connect to Separate Tenants" showSuccessAlert={false} + scope="https://graph.microsoft.com/DelegatedPermissionGrant.ReadWrite.All https://graph.microsoft.com/Directory.ReadWrite.All https://graph.microsoft.com/AppRoleAssignment.ReadWrite.All offline_access profile openid" /> From 111465cef592d5b2e8b56268b6a15e492ecf01a4 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sun, 25 Jan 2026 01:42:00 -0500 Subject: [PATCH 26/46] Update CippTenantModeDeploy.jsx --- src/components/CippWizard/CippTenantModeDeploy.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CippWizard/CippTenantModeDeploy.jsx b/src/components/CippWizard/CippTenantModeDeploy.jsx index 56edf1907513..4365cc2a8463 100644 --- a/src/components/CippWizard/CippTenantModeDeploy.jsx +++ b/src/components/CippWizard/CippTenantModeDeploy.jsx @@ -26,7 +26,7 @@ export const CippTenantModeDeploy = (props) => { }); const updateRefreshToken = ApiPostCall({ urlfromdata: true, relatedQueryKeys: ["listAppId"] }); - const addTenant = ApiPostCall({ urlfromdata: true, relatedQueryKeys: ["listTenants"] }); + const addTenant = ApiPostCall({ urlfromdata: true, relatedQueryKeys: ["tenants-table"] }); // Get partner tenant info using the same API call as CIPPM365OAuthButton const partnerTenantInfo = ApiGetCall({ From bd9b260f1cf3a605c5bc230de800f217dc5075e9 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sun, 25 Jan 2026 01:48:57 -0500 Subject: [PATCH 27/46] Add scope prop to AuthButton in CippTenantModeDeploy Sets required Microsoft Graph API scopes on the AuthButton component to enable necessary permissions for delegated permission grants, directory, and app role assignments. --- src/components/CippWizard/CippTenantModeDeploy.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/CippWizard/CippTenantModeDeploy.jsx b/src/components/CippWizard/CippTenantModeDeploy.jsx index 4365cc2a8463..b63259d456dd 100644 --- a/src/components/CippWizard/CippTenantModeDeploy.jsx +++ b/src/components/CippWizard/CippTenantModeDeploy.jsx @@ -208,6 +208,7 @@ export const CippTenantModeDeploy = (props) => { : "Connect to Partner Tenant" } showSuccessAlert={false} + scope="https://graph.microsoft.com/DelegatedPermissionGrant.ReadWrite.All https://graph.microsoft.com/Directory.ReadWrite.All https://graph.microsoft.com/AppRoleAssignment.ReadWrite.All offline_access profile openid" /> From df7a1a71985a0ac4a0de7639b75272ba6eaf8ee2 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Sun, 25 Jan 2026 02:09:20 -0500 Subject: [PATCH 28/46] Add authentication prompt to M365 OAuth button Introduces a promptBeforeAuth prop to CIPPM365OAuthButton, displaying a confirmation dialog before starting authentication. Updates CippTenantModeDeploy to use this feature, prompting users when changing the partner tenant to prevent accidental changes. --- .../CippComponents/CIPPM365OAuthButton.jsx | 47 +++++++++++++++++-- .../CippWizard/CippTenantModeDeploy.jsx | 5 ++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/src/components/CippComponents/CIPPM365OAuthButton.jsx b/src/components/CippComponents/CIPPM365OAuthButton.jsx index 9ee2076d1b05..9055fd2b2d04 100644 --- a/src/components/CippComponents/CIPPM365OAuthButton.jsx +++ b/src/components/CippComponents/CIPPM365OAuthButton.jsx @@ -3,6 +3,7 @@ import { Alert, Button, Typography, CircularProgress, Box } from "@mui/material" import { Microsoft, Login, Refresh } from "@mui/icons-material"; import { ApiGetCall } from "../../api/ApiCall"; import { CippCopyToClipBoard } from "./CippCopyToClipboard"; +import { CippApiDialog } from "./CippApiDialog"; export const CIPPM365OAuthButton = ({ onAuthSuccess, @@ -15,12 +16,14 @@ export const CIPPM365OAuthButton = ({ applicationId = null, autoStartDeviceLogon = false, validateServiceAccount = true, + promptBeforeAuth = false, }) => { const [authInProgress, setAuthInProgress] = useState(false); const [authError, setAuthError] = useState(null); const [deviceCodeInfo, setDeviceCodeInfo] = useState(null); const [codeRetrievalInProgress, setCodeRetrievalInProgress] = useState(false); const [isServiceAccount, setIsServiceAccount] = useState(true); + const [promptDialog, setPromptDialog] = useState({ open: false }); const [tokens, setTokens] = useState({ accessToken: null, refreshToken: null, @@ -542,9 +545,12 @@ export const CIPPM365OAuthButton = ({ setAuthInProgress(false); // Wait before retrying (exponential backoff) - setTimeout(() => { - handleMsalAuthentication(retryCount + 1); - }, 2000 * (retryCount + 1)); + setTimeout( + () => { + handleMsalAuthentication(retryCount + 1); + }, + 2000 * (retryCount + 1), + ); return; } @@ -699,6 +705,30 @@ export const CIPPM365OAuthButton = ({ ) : null} )} + + {promptBeforeAuth !== false && ( + setPromptDialog({ open: false }), + }} + api={{ + type: "POST", + confirmText: promptBeforeAuth, + noConfirm: false, + customFunction: () => { + setPromptDialog({ open: false }); + const authFunction = useDeviceCode + ? handleDeviceCodeAuthentication + : handleMsalAuthentication; + authFunction(); + }, + }} + fields={[]} + /> + )} +