diff --git a/.github/workflows/cipp_dev_build.yml b/.github/workflows/cipp_dev_build.yml index 834f1995b668..dad0dbebe307 100644 --- a/.github/workflows/cipp_dev_build.yml +++ b/.github/workflows/cipp_dev_build.yml @@ -18,10 +18,17 @@ jobs: uses: actions/checkout@v4.2.2 # Set up Node.js + - name: Get Node version + id: get_node_version + run: | + node_raw_version=$(node -p "require('./package.json').engines.node") + node_sanitized_version=$(echo $node_raw_version | sed -E 's/[^0-9.]+//g') + echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT + - name: Set up Node.js uses: actions/setup-node@v4.2.0 with: - node-version: '20.18.1' + node-version: ${{ steps.get_node_version.outputs.node_version }} # Install dependencies - name: Install Dependencies diff --git a/.github/workflows/cipp_frontend_build.yml b/.github/workflows/cipp_frontend_build.yml index 3d6d1c79550e..76a7dbb2fbbf 100644 --- a/.github/workflows/cipp_frontend_build.yml +++ b/.github/workflows/cipp_frontend_build.yml @@ -18,10 +18,17 @@ jobs: uses: actions/checkout@v4.2.2 # Set up Node.js + - name: Get Node version + id: get_node_version + run: | + node_raw_version=$(node -p "require('./package.json').engines.node") + node_sanitized_version=$(echo $node_raw_version | sed -E 's/[^0-9.]+//g') + echo "node_version=$node_sanitized_version" >> $GITHUB_OUTPUT + - name: Set up Node.js uses: actions/setup-node@v4.2.0 with: - node-version: '20.18.1' + node-version: ${{ steps.get_node_version.outputs.node_version }} # Install dependencies - name: Install Dependencies diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml new file mode 100644 index 000000000000..01fd002acea0 --- /dev/null +++ b/.github/workflows/dev_deploy.yml @@ -0,0 +1,41 @@ +name: CIPP Development Frontend CI/CD + +on: + push: + branches: + - dev + +jobs: + build_and_deploy_job: + if: github.event.repository.fork == false && github.event_name == 'push' + runs-on: ubuntu-latest + name: Build and Deploy Job + steps: + - uses: actions/checkout@v4 + with: + submodules: true + - name: Build And Deploy + id: builddeploy + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_MOSS_0A047A40F }} # change this to your repository secret name + repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) + action: 'upload' + ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### + # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig + app_location: '/' # App source code path + api_location: '' # Api source code path - optional + output_location: 'out' # Built app content directory - optional + ###### End of Repository/Build Configurations ###### + + close_pull_request_job: + if: github.event.repository.fork == false && github.event_name == 'pull_request' && github.event.action == 'closed' + runs-on: ubuntu-latest + name: Close Pull Request Job + steps: + - name: Close Pull Request + id: closepullrequest + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_AMBITIOUS_MOSS_0A047A40F }} # change this to your repository secret name + action: 'close' diff --git a/package.json b/package.json index 13dac459bf3f..87d502b493e1 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "license": "AGPL-3.0", "engines": { - "node": "^20.18.1" + "node": "^22.13.0" }, "repository": { "type": "git", diff --git a/public/version.json b/public/version.json index 542517aee22f..712c1fd057e1 100644 --- a/public/version.json +++ b/public/version.json @@ -1,3 +1,3 @@ { - "version": "7.2.3" + "version": "7.3.0" } diff --git a/src/api/ApiCall.jsx b/src/api/ApiCall.jsx index fa953247204c..e7feb6f5748f 100644 --- a/src/api/ApiCall.jsx +++ b/src/api/ApiCall.jsx @@ -3,7 +3,6 @@ import axios, { isAxiosError } from "axios"; import { useDispatch } from "react-redux"; import { showToast } from "../store/toasts"; import { getCippError } from "../utils/get-cipp-error"; -import { useRouter } from "next/router"; export function ApiGetCall(props) { const { @@ -16,6 +15,8 @@ export function ApiGetCall(props) { bulkRequest = false, toast = false, onResult, + staleTime = 600000, // 10 minutes + refetchOnWindowFocus = false, } = props; const queryClient = useQueryClient(); const dispatch = useDispatch(); @@ -27,6 +28,12 @@ export function ApiGetCall(props) { returnRetry = false; } if (isAxiosError(error) && HTTP_STATUS_TO_NOT_RETRY.includes(error.response?.status ?? 0)) { + if ( + error.response?.status === 302 && + error.response?.headers.get("location").includes("/.auth/login/aad") + ) { + queryClient.invalidateQueries({ queryKey: ["authmecipp"] }); + } returnRetry = false; } if (returnRetry === false && toast) { @@ -93,8 +100,8 @@ export function ApiGetCall(props) { return response.data; } }, - staleTime: 600000, // 10 minutes - refetchOnWindowFocus: false, + staleTime: staleTime, + refetchOnWindowFocus: refetchOnWindowFocus, retry: retryFn, }); return queryInfo; diff --git a/src/components/CippCards/CippPageCard.jsx b/src/components/CippCards/CippPageCard.jsx index 9c1e1bce81b7..72f44a95b09b 100644 --- a/src/components/CippCards/CippPageCard.jsx +++ b/src/components/CippCards/CippPageCard.jsx @@ -2,6 +2,7 @@ import { useRouter } from "next/router"; import { Box, Container, Stack, Button, SvgIcon, Typography, Card } from "@mui/material"; import ArrowLeftIcon from "@mui/icons-material/ArrowLeft"; import Head from "next/head"; +import { CippHead } from "../CippComponents/CippHead"; const CippPageCard = (props) => { const { title, @@ -20,9 +21,7 @@ const CippPageCard = (props) => { return ( <> - - {title} - + { value={isFetching ? : user?.jobTitle || "N/A"} /> : user?.department || "N/A"} /> + : user?.manager?.displayName || "N/A"} + /> { } else { newData[key] = value; } + } else if (typeof value === 'boolean') { + newData[key] = value; } else if (typeof value === "object" && value !== null) { const processedValue = processActionData(value, row, replacementBehaviour); if (replacementBehaviour !== "removeNulls" || Object.keys(processedValue).length > 0) { @@ -273,20 +275,32 @@ export const CippApiDialog = (props) => { .reduce((acc, key) => (acc && acc[key] !== undefined ? acc[key] : undefined), obj); }; - // Handling link navigation - if (api.link) { + // Handling external link navigation + useEffect(() => { + if (api.link && createDialog.open) { + const linkWithRowData = api.link.replace(/\[([^\]]+)\]/g, (_, key) => { + return getNestedValue(row, key) || `[${key}]`; + }); + + if (!linkWithRowData.startsWith("/")) { + window.open(linkWithRowData, api.target || "_blank"); + createDialog.handleClose(); + } + } + }, [api.link, createDialog.open]); + + // Handling internal link navigation + if (api.link && createDialog.open) { const linkWithRowData = api.link.replace(/\[([^\]]+)\]/g, (_, key) => { return getNestedValue(row, key) || `[${key}]`; }); if (linkWithRowData.startsWith("/")) { router.push(linkWithRowData, undefined, { shallow: true }); - } else { - window.open(linkWithRowData, api.target || "_blank"); + createDialog.handleClose(); } - - return null; } + useEffect(() => { if (api.noConfirm) { formHook.handleSubmit(onSubmit)(); // Submits the form on mount diff --git a/src/components/CippComponents/CippCentralSearch.jsx b/src/components/CippComponents/CippCentralSearch.jsx index c710a8d2d49b..6a90c4e35b9d 100644 --- a/src/components/CippComponents/CippCentralSearch.jsx +++ b/src/components/CippComponents/CippCentralSearch.jsx @@ -9,6 +9,7 @@ import { Grid, Card, CardContent, + CardActionArea, Typography, Box, } from "@mui/material"; @@ -107,15 +108,19 @@ export const CippCentralSearch = ({ handleClose, open }) => { handleCardClick(item.path)} + sx={{ height: "100%" }} > - - {highlightMatch(item.title)} - - Path: {highlightMatch(item.path)} - - + handleCardClick(item.path)} + aria-label={`Navigate to ${item.title}`} + > + + {highlightMatch(item.title)} + + Path: {highlightMatch(item.path)} + + + ))} diff --git a/src/components/CippComponents/CippFormComponent.jsx b/src/components/CippComponents/CippFormComponent.jsx index c353ac89f71b..5ba298a7be3e 100644 --- a/src/components/CippComponents/CippFormComponent.jsx +++ b/src/components/CippComponents/CippFormComponent.jsx @@ -43,6 +43,7 @@ export const CippFormComponent = (props) => { name, // The name that may have bracket notation label, labelLocation = "behind", // Default location for switches + defaultValue, ...other } = props; const { errors } = useFormState({ control: formControl.control }); @@ -121,6 +122,7 @@ export const CippFormComponent = (props) => { {...other} {...formControl.register(convertedName, { ...validators })} label={label} + defaultValue={defaultValue} /> @@ -156,6 +158,7 @@ export const CippFormComponent = (props) => { {...other} {...formControl.register(convertedName, { ...validators })} label={label} + defaultValue={defaultValue} /> @@ -171,6 +174,7 @@ export const CippFormComponent = (props) => { renderSwitchWithLabel( { - let { field, compareType = "is", compareValue, children, formControl } = props; + let { + field, + compareType = "is", + compareValue, + action = "hide", + children, + formControl, + disabled = false, + } = props; if ( field === undefined || @@ -22,17 +31,43 @@ export const CippFormCondition = (props) => { compareValue = compareValue.value; } + const disableChildren = (children) => { + return React.Children.map(children, (child) => { + if (React.isValidElement(child)) { + if (child.props?.children) { + return React.cloneElement(child, { + children: disableChildren(child.props.children), + disabled: true, + }); + } else { + return React.cloneElement(child, { disabled: true }); + } + } + return child; + }); + }; + + if (disabled) { + return disableChildren(children); + } + switch (compareType) { case "regex": if (watcher?.match(new RegExp(compareValue))) { return children; } + if (action === "disable") { + return disableChildren(children); + } return null; case "is": // Deep comparison for objects and arrays if (isEqual(watcher, compareValue)) { return children; } + if (action === "disable") { + return disableChildren(children); + } return null; case "isNot": @@ -40,6 +75,9 @@ export const CippFormCondition = (props) => { if (!isEqual(watcher, compareValue)) { return children; } + if (action === "disable") { + return disableChildren(children); + } return null; case "contains": @@ -55,6 +93,9 @@ export const CippFormCondition = (props) => { // Check if object contains the key return children; } + if (action === "disable") { + return disableChildren(children); + } return null; case "doesNotContain": @@ -73,6 +114,9 @@ export const CippFormCondition = (props) => { // Check if object does not contain the key return children; } + if (action === "disable") { + return disableChildren(children); + } return null; case "greaterThan": @@ -83,6 +127,9 @@ export const CippFormCondition = (props) => { ) { return children; } + if (action === "disable") { + return disableChildren(children); + } return null; case "lessThan": @@ -93,6 +140,9 @@ export const CippFormCondition = (props) => { ) { return children; } + if (action === "disable") { + return disableChildren(children); + } return null; case "arrayLength": @@ -103,12 +153,18 @@ export const CippFormCondition = (props) => { ) { return children; } + if (action === "disable") { + return disableChildren(children); + } return null; case "hasValue": if (watcher !== undefined && watcher !== null && watcher !== "") { return children; } + if (action === "disable") { + return disableChildren(children); + } return null; /* @@ -119,6 +175,9 @@ export const CippFormCondition = (props) => { if (Array.isArray(watcher) && watcher.some((item) => item?.label === compareValue)) { return children; } + if (action === "disable") { + return disableChildren(children); + } return null; case "labelContains": @@ -129,6 +188,9 @@ export const CippFormCondition = (props) => { ) { return children; } + if (action === "disable") { + return disableChildren(children); + } return null; case "valueEq": @@ -136,6 +198,9 @@ export const CippFormCondition = (props) => { if (Array.isArray(watcher) && watcher.some((item) => item?.value === compareValue)) { return children; } + if (action === "disable") { + return disableChildren(children); + } return null; case "valueContains": @@ -146,9 +211,15 @@ export const CippFormCondition = (props) => { ) { return children; } + if (action === "disable") { + return disableChildren(children); + } return null; default: + if (action === "disable") { + return disableChildren(children); + } return null; } }; diff --git a/src/components/CippComponents/CippHead.jsx b/src/components/CippComponents/CippHead.jsx new file mode 100644 index 000000000000..f48eb6b09321 --- /dev/null +++ b/src/components/CippComponents/CippHead.jsx @@ -0,0 +1,11 @@ +import Head from "next/head"; +import { useSettings } from "../../hooks/use-settings"; + +export const CippHead = ({ title }) => { + const tenant = useSettings().currentTenant; + return ( + + {tenant ? `${title} - ${tenant}` : title} + + ); +}; diff --git a/src/components/CippComponents/CippSettingsSideBar.jsx b/src/components/CippComponents/CippSettingsSideBar.jsx index 14c3ede87846..cb08993a8ea1 100644 --- a/src/components/CippComponents/CippSettingsSideBar.jsx +++ b/src/components/CippComponents/CippSettingsSideBar.jsx @@ -21,6 +21,9 @@ export const CippSettingsSideBar = (props) => { const currentUser = ApiGetCall({ url: "/.auth/me", + queryKey: "authmecipp", + staleTime: 120000, + refetchOnWindowFocus: true, }); const saveSettingsPost = ApiPostCall({ diff --git a/src/components/CippComponents/CippTablePage.jsx b/src/components/CippComponents/CippTablePage.jsx index 61f5e89cac86..37a3a9d44ccc 100644 --- a/src/components/CippComponents/CippTablePage.jsx +++ b/src/components/CippComponents/CippTablePage.jsx @@ -3,6 +3,7 @@ import { Box, Container, Stack } from "@mui/system"; import Head from "next/head"; import { CippDataTable } from "../CippTable/CippDataTable"; import { useSettings } from "../../hooks/use-settings"; +import { CippHead } from "./CippHead"; export const CippTablePage = (props) => { const { @@ -28,9 +29,7 @@ export const CippTablePage = (props) => { const tenant = useSettings().currentTenant; return ( <> - - {title} - + diff --git a/src/components/CippComponents/CippTenantSelector.jsx b/src/components/CippComponents/CippTenantSelector.jsx index 4471a2442415..9db78af9b6b4 100644 --- a/src/components/CippComponents/CippTenantSelector.jsx +++ b/src/components/CippComponents/CippTenantSelector.jsx @@ -58,6 +58,7 @@ export const CippTenantSelector = (props) => { settings.handleUpdate({ currentTenant: currentTenant.value, }); + //if we have a tenantfilter, we add the tenantfilter to the title of the tab/page so its "Tenant - original title". } }, [currentTenant?.value]); diff --git a/src/components/CippComponents/CippUserActions.jsx b/src/components/CippComponents/CippUserActions.jsx index 93e6d991adb6..b443b4bcb856 100644 --- a/src/components/CippComponents/CippUserActions.jsx +++ b/src/components/CippComponents/CippUserActions.jsx @@ -53,7 +53,7 @@ export const CippUserActions = () => { //tested label: "Create Temporary Access Password", - type: "GET", + type: "POST", icon: , url: "/api/ExecCreateTAP", data: { ID: "userPrincipalName" }, @@ -63,7 +63,7 @@ export const CippUserActions = () => { { //tested label: "Re-require MFA registration", - type: "GET", + type: "POST", icon: , url: "/api/ExecResetMFA", data: { ID: "userPrincipalName" }, @@ -107,26 +107,26 @@ export const CippUserActions = () => { { //tested label: "Convert to Shared Mailbox", - type: "GET", + type: "POST", icon: , - url: "/api/ExecConvertToSharedMailbox", - data: { ID: "userPrincipalName" }, + url: "/api/ExecConvertMailbox", + data: { ID: "userPrincipalName", MailboxType: "!Shared" }, confirmText: "Are you sure you want to convert this user to a shared mailbox?", multiPost: false, }, { label: "Convert to User Mailbox", - type: "GET", + type: "POST", icon: , - url: "/api/ExecConvertToSharedMailbox", - data: { ID: "userPrincipalName", ConvertToUser: true }, + url: "/api/ExecConvertMailbox", + data: { ID: "userPrincipalName", MailboxType: "!Regular" }, confirmText: "Are you sure you want to convert this user to a user mailbox?", multiPost: false, }, { //tested label: "Enable Online Archive", - type: "GET", + type: "POST", icon: , url: "/api/ExecEnableArchive", data: { ID: "userPrincipalName" }, @@ -237,7 +237,7 @@ export const CippUserActions = () => { }, { label: "Block Sign In", - type: "GET", + type: "POST", icon: , url: "/api/ExecDisableUser", data: { ID: "id" }, @@ -247,7 +247,7 @@ export const CippUserActions = () => { }, { label: "Unblock Sign In", - type: "GET", + type: "POST", icon: , url: "/api/ExecDisableUser", data: { ID: "id", Enable: true }, @@ -257,7 +257,7 @@ export const CippUserActions = () => { }, { label: "Reset Password (Must Change)", - type: "GET", + type: "POST", icon: , url: "/api/ExecResetPass", data: { @@ -271,7 +271,7 @@ export const CippUserActions = () => { }, { label: "Reset Password", - type: "GET", + type: "POST", icon: , url: "/api/ExecResetPass", data: { @@ -296,7 +296,7 @@ export const CippUserActions = () => { }, { label: "Revoke all user sessions", - type: "GET", + type: "POST", icon: , url: "/api/ExecRevokeSessions", data: { ID: "id", Username: "userPrincipalName" }, @@ -305,7 +305,7 @@ export const CippUserActions = () => { }, { label: "Delete User", - type: "GET", + type: "POST", icon: , url: "/api/RemoveUser", data: { ID: "id" }, diff --git a/src/components/CippFormPages/CippAddEditUser.jsx b/src/components/CippFormPages/CippAddEditUser.jsx index f772ae0e8e0e..5087d40456fa 100644 --- a/src/components/CippFormPages/CippAddEditUser.jsx +++ b/src/components/CippFormPages/CippAddEditUser.jsx @@ -64,7 +64,7 @@ const CippAddEditUser = (props) => { InputProps={{ endAdornment: @, }} - name="mailNickname" + name="username" formControl={formControl} /> @@ -291,7 +291,17 @@ const CippAddEditUser = (props) => { multiple={false} /> - {/* Schedule User Creation */} + {userSettingsDefaults?.userAttributes?.some((attribute) => attribute.value === "sponsor") && ( + + + + )} { multiple={false} /> + {formType === "edit" && ( + + + + )} + {/* Schedule User Creation */} {formType === "add" && ( { const { @@ -86,9 +87,7 @@ const CippFormPage = (props) => { }; return ( <> - - {title} - + { {addedButtons && addedButtons} + color="muted" + style={{ paddingLeft: 0 }} + size="small" + href={`https://entra.microsoft.com/${userSettingsDefaults.currentTenant}/#view/Microsoft_AAD_UsersAndTenants/UserProfileMenuBlade/~/overview/userId/${userId}`} + target="_blank" + rel="noopener noreferrer" + > + View in Entra + ), }, ] @@ -189,7 +189,7 @@ const Page = () => { const mailboxRuleActions = [ { label: "Remove Mailbox Rule", - type: "GET", + type: "POST", icon: , url: "/api/ExecRemoveMailboxRule", data: { diff --git a/src/pages/identity/reports/inactive-users-report/index.js b/src/pages/identity/reports/inactive-users-report/index.js index 8764ec1236c1..b3bd18ea373a 100644 --- a/src/pages/identity/reports/inactive-users-report/index.js +++ b/src/pages/identity/reports/inactive-users-report/index.js @@ -23,7 +23,7 @@ const Page = () => { }, { label: "Block Sign In", - type: "GET", + type: "POST", icon: , url: "/api/ExecDisableUser", data: { ID: "azureAdUserId" }, @@ -32,7 +32,7 @@ const Page = () => { }, { label: "Delete User", - type: "GET", + type: "POST", icon: , url: "/api/RemoveUser", data: { ID: "azureAdUserId" }, diff --git a/src/pages/license.js b/src/pages/license.js new file mode 100644 index 000000000000..442aede25829 --- /dev/null +++ b/src/pages/license.js @@ -0,0 +1,714 @@ +import { Container } from "@mui/system"; +import { Layout as DashboardLayout } from "/src/layouts/index.js"; +import { Link } from "@mui/material"; + +const Page = () => { + const pageTitle = "License"; + + return ( + +

GNU AFFERO GENERAL PUBLIC LICENSE

+

Version 3, 19 November 2007

+ +

+ Copyright © 2007 Free Software Foundation, Inc. < + https://fsf.org/> +
+ Everyone is permitted to copy and distribute verbatim copies of this license document, but + changing it is not allowed. +

+ +

Preamble

+ +

+ The GNU Affero General Public License is a free, copyleft license for software and other + kinds of works, specifically designed to ensure cooperation with the community in the case + of network server software. +

+ +

+ The licenses for most software and other practical works are designed to take away your + freedom to share and change the works. By contrast, our General Public Licenses are intended + to guarantee your freedom to share and change all versions of a program--to make sure it + remains free software for all its users. +

+ +

+ When we speak of free software, we are referring to freedom, not price. Our General Public + Licenses are designed to make sure that you have the freedom to distribute copies of free + software (and charge for them if you wish), that you receive source code or can get it if + you want it, that you can change the software or use pieces of it in new free programs, and + that you know you can do these things. +

+ +

+ Developers that use our General Public Licenses protect your rights with two steps: (1) + assert copyright on the software, and (2) offer you this License which gives you legal + permission to copy, distribute and/or modify the software. +

+ +

+ A secondary benefit of defending all users' freedom is that improvements made in + alternate versions of the program, if they receive widespread use, become available for + other developers to incorporate. Many developers of free software are heartened and + encouraged by the resulting cooperation. However, in the case of software used on network + servers, this result may fail to come about. The GNU General Public License permits making a + modified version and letting the public access it on a server without ever releasing its + source code to the public. +

+ +

+ The GNU Affero General Public License is designed specifically to ensure that, in such + cases, the modified source code becomes available to the community. It requires the operator + of a network server to provide the source code of the modified version running there to the + users of that server. Therefore, public use of a modified version, on a publicly accessible + server, gives the public access to the source code of the modified version. +

+ +

+ An older license, called the Affero General Public License and published by Affero, was + designed to accomplish similar goals. This is a different license, not a version of the + Affero GPL, but Affero has released a new version of the Affero GPL which permits + relicensing under this license. +

+ +

The precise terms and conditions for copying, distribution and modification follow.

+ +

TERMS AND CONDITIONS

+ +

0. Definitions.

+ +

"This License" refers to version 3 of the GNU Affero General Public License.

+ +

+ "Copyright" also means copyright-like laws that apply to other kinds of works, + such as semiconductor masks. +

+ +

+ "The Program" refers to any copyrightable work licensed under this License. Each + licensee is addressed as "you". "Licensees" and "recipients" + may be individuals or organizations. +

+ +

+ To "modify" a work means to copy from or adapt all or part of the work in a + fashion requiring copyright permission, other than the making of an exact copy. The + resulting work is called a "modified version" of the earlier work or a work + "based on" the earlier work. +

+ +

+ A "covered work" means either the unmodified Program or a work based on the + Program. +

+ +

+ To "propagate" a work means to do anything with it that, without permission, would + make you directly or secondarily liable for infringement under applicable copyright law, + except executing it on a computer or modifying a private copy. Propagation includes copying, + distribution (with or without modification), making available to the public, and in some + countries other activities as well. +

+ +

+ To "convey" a work means any kind of propagation that enables other parties to + make or receive copies. Mere interaction with a user through a computer network, with no + transfer of a copy, is not conveying. +

+ +

+ An interactive user interface displays "Appropriate Legal Notices" to the extent + that it includes a convenient and prominently visible feature that (1) displays an + appropriate copyright notice, and (2) tells the user that there is no warranty for the work + (except to the extent that warranties are provided), that licensees may convey the work + under this License, and how to view a copy of this License. If the interface presents a list + of user commands or options, such as a menu, a prominent item in the list meets this + criterion. +

+ +

1. Source Code.

+ +

+ The "source code" for a work means the preferred form of the work for making + modifications to it. "Object code" means any non-source form of a work. +

+ +

+ A "Standard Interface" means an interface that either is an official standard + defined by a recognized standards body, or, in the case of interfaces specified for a + particular programming language, one that is widely used among developers working in that + language. +

+ +

+ The "System Libraries" of an executable work include anything, other than the work + as a whole, that (a) is included in the normal form of packaging a Major Component, but + which is not part of that Major Component, and (b) serves only to enable use of the work + with that Major Component, or to implement a Standard Interface for which an implementation + is available to the public in source code form. A "Major Component", in this + context, means a major essential component (kernel, window system, and so on) of the + specific operating system (if any) on which the executable work runs, or a compiler used to + produce the work, or an object code interpreter used to run it. +

+ +

+ The "Corresponding Source" for a work in object code form means all the source + code needed to generate, install, and (for an executable work) run the object code and to + modify the work, including scripts to control those activities. However, it does not include + the work's System Libraries, or general-purpose tools or generally available free + programs which are used unmodified in performing those activities but which are not part of + the work. For example, Corresponding Source includes interface definition files associated + with source files for the work, and the source code for shared libraries and dynamically + linked subprograms that the work is specifically designed to require, such as by intimate + data communication or control flow between those subprograms and other parts of the work. +

+ +

+ The Corresponding Source need not include anything that users can regenerate automatically + from other parts of the Corresponding Source. +

+ +

The Corresponding Source for a work in source code form is that same work.

+ +

2. Basic Permissions.

+ +

+ All rights granted under this License are granted for the term of copyright on the Program, + and are irrevocable provided the stated conditions are met. This License explicitly affirms + your unlimited permission to run the unmodified Program. The output from running a covered + work is covered by this License only if the output, given its content, constitutes a covered + work. This License acknowledges your rights of fair use or other equivalent, as provided by + copyright law. +

+ +

+ You may make, run and propagate covered works that you do not convey, without conditions so + long as your license otherwise remains in force. You may convey covered works to others for + the sole purpose of having them make modifications exclusively for you, or provide you with + facilities for running those works, provided that you comply with the terms of this License + in conveying all material for which you do not control copyright. Those thus making or + running the covered works for you must do so exclusively on your behalf, under your + direction and control, on terms that prohibit them from making any copies of your + copyrighted material outside their relationship with you. +

+ +

+ Conveying under any other circumstances is permitted solely under the conditions stated + below. Sublicensing is not allowed; section 10 makes it unnecessary. +

+ +

3. Protecting Users' Legal Rights From Anti-Circumvention Law.

+ +

+ No covered work shall be deemed part of an effective technological measure under any + applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted + on 20 December 1996, or similar laws prohibiting or restricting circumvention of such + measures. +

+ +

+ When you convey a covered work, you waive any legal power to forbid circumvention of + technological measures to the extent such circumvention is effected by exercising rights + under this License with respect to the covered work, and you disclaim any intention to limit + operation or modification of the work as a means of enforcing, against the work's + users, your or third parties' legal rights to forbid circumvention of technological + measures. +

+ +

4. Conveying Verbatim Copies.

+ +

+ You may convey verbatim copies of the Program's source code as you receive it, in any + medium, provided that you conspicuously and appropriately publish on each copy an + appropriate copyright notice; keep intact all notices stating that this License and any + non-permissive terms added in accord with section 7 apply to the code; keep intact all + notices of the absence of any warranty; and give all recipients a copy of this License along + with the Program. +

+ +

+ You may charge any price or no price for each copy that you convey, and you may offer + support or warranty protection for a fee. +

+ +

5. Conveying Modified Source Versions.

+ +

+ You may convey a work based on the Program, or the modifications to produce it from the + Program, in the form of source code under the terms of section 4, provided that you also + meet all of these conditions: +

+ +
    +
  • + a) The work must carry prominent notices stating that you modified it, and giving a + relevant date. +
    • + +
  • + b) The work must carry prominent notices stating that it is released under this License + and any conditions added under section 7. This requirement modifies the requirement in + section 4 to "keep intact all notices". +
    • + +
  • + c) You must license the entire work, as a whole, under this License to anyone who comes + into possession of a copy. This License will therefore apply, along with any applicable + section 7 additional terms, to the whole of the work, and all its parts, regardless of how + they are packaged. This License gives no permission to license the work in any other way, + but it does not invalidate such permission if you have separately received it. +
    • + +
  • + d) If the work has interactive user interfaces, each must display Appropriate Legal + Notices; however, if the Program has interactive interfaces that do not display + Appropriate Legal Notices, your work need not make them do so. +
    • +
+ +

+ A compilation of a covered work with other separate and independent works, which are not by + their nature extensions of the covered work, and which are not combined with it such as to + form a larger program, in or on a volume of a storage or distribution medium, is called an + "aggregate" if the compilation and its resulting copyright are not used to limit + the access or legal rights of the compilation's users beyond what the individual works + permit. Inclusion of a covered work in an aggregate does not cause this License to apply to + the other parts of the aggregate. +

+ +

6. Conveying Non-Source Forms.

+ +

+ You may convey a covered work in object code form under the terms of sections 4 and 5, + provided that you also convey the machine-readable Corresponding Source under the terms of + this License, in one of these ways: +

+ +
    +
  • + a) Convey the object code in, or embodied in, a physical product (including a physical + distribution medium), accompanied by the Corresponding Source fixed on a durable physical + medium customarily used for software interchange. +
    • + +
  • + b) Convey the object code in, or embodied in, a physical product (including a physical + distribution medium), accompanied by a written offer, valid for at least three years and + valid for as long as you offer spare parts or customer support for that product model, to + give anyone who possesses the object code either (1) a copy of the Corresponding Source + for all the software in the product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no more than your reasonable + cost of physically performing this conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. +
    • + +
  • + c) Convey individual copies of the object code with a copy of the written offer to provide + the Corresponding Source. This alternative is allowed only occasionally and + noncommercially, and only if you received the object code with such an offer, in accord + with subsection 6b. +
    • + +
  • + d) Convey the object code by offering access from a designated place (gratis or for a + charge), and offer equivalent access to the Corresponding Source in the same way through + the same place at no further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to copy the object code is a + network server, the Corresponding Source may be on a different server (operated by you or + a third party) that supports equivalent copying facilities, provided you maintain clear + directions next to the object code saying where to find the Corresponding Source. + Regardless of what server hosts the Corresponding Source, you remain obligated to ensure + that it is available for as long as needed to satisfy these requirements. +
    • + +
  • + e) Convey the object code using peer-to-peer transmission, provided you inform other peers + where the object code and Corresponding Source of the work are being offered to the + general public at no charge under subsection 6d. +
    • +
+ +

+ A separable portion of the object code, whose source code is excluded from the Corresponding + Source as a System Library, need not be included in conveying the object code work. +

+ +

+ A "User Product" is either (1) a "consumer product", which means any + tangible personal property which is normally used for personal, family, or household + purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining + whether a product is a consumer product, doubtful cases shall be resolved in favor of + coverage. For a particular product received by a particular user, "normally used" + refers to a typical or common use of that class of product, regardless of the status of the + particular user or of the way in which the particular user actually uses, or expects or is + expected to use, the product. A product is a consumer product regardless of whether the + product has substantial commercial, industrial or non-consumer uses, unless such uses + represent the only significant mode of use of the product. +

+ +

+ "Installation Information" for a User Product means any methods, procedures, + authorization keys, or other information required to install and execute modified versions + of a covered work in that User Product from a modified version of its Corresponding Source. + The information must suffice to ensure that the continued functioning of the modified object + code is in no case prevented or interfered with solely because modification has been made. +

+ +

+ If you convey an object code work under this section in, or with, or specifically for use + in, a User Product, and the conveying occurs as part of a transaction in which the right of + possession and use of the User Product is transferred to the recipient in perpetuity or for + a fixed term (regardless of how the transaction is characterized), the Corresponding Source + conveyed under this section must be accompanied by the Installation Information. But this + requirement does not apply if neither you nor any third party retains the ability to install + modified object code on the User Product (for example, the work has been installed in ROM). +

+ +

+ The requirement to provide Installation Information does not include a requirement to + continue to provide support service, warranty, or updates for a work that has been modified + or installed by the recipient, or for the User Product in which it has been modified or + installed. Access to a network may be denied when the modification itself materially and + adversely affects the operation of the network or violates the rules and protocols for + communication across the network. +

+ +

+ Corresponding Source conveyed, and Installation Information provided, in accord with this + section must be in a format that is publicly documented (and with an implementation + available to the public in source code form), and must require no special password or key + for unpacking, reading or copying. +

+ +

7. Additional Terms.

+ +

+ "Additional permissions" are terms that supplement the terms of this License by + making exceptions from one or more of its conditions. Additional permissions that are + applicable to the entire Program shall be treated as though they were included in this + License, to the extent that they are valid under applicable law. If additional permissions + apply only to part of the Program, that part may be used separately under those permissions, + but the entire Program remains governed by this License without regard to the additional + permissions. +

+ +

+ When you convey a copy of a covered work, you may at your option remove any additional + permissions from that copy, or from any part of it. (Additional permissions may be written + to require their own removal in certain cases when you modify the work.) You may place + additional permissions on material, added by you to a covered work, for which you have or + can give appropriate copyright permission. +

+ +

+ Notwithstanding any other provision of this License, for material you add to a covered work, + you may (if authorized by the copyright holders of that material) supplement the terms of + this License with terms: +

+ +
    +
  • + a) Disclaiming warranty or limiting liability differently from the terms of sections 15 + and 16 of this License; or +
    • + +
  • + b) Requiring preservation of specified reasonable legal notices or author attributions in + that material or in the Appropriate Legal Notices displayed by works containing it; or +
    • + +
  • + c) Prohibiting misrepresentation of the origin of that material, or requiring that + modified versions of such material be marked in reasonable ways as different from the + original version; or +
    • + +
  • + d) Limiting the use for publicity purposes of names of licensors or authors of the + material; or +
    • + +
  • + e) Declining to grant rights under trademark law for use of some trade names, trademarks, + or service marks; or +
    • + +
  • + f) Requiring indemnification of licensors and authors of that material by anyone who + conveys the material (or modified versions of it) with contractual assumptions of + liability to the recipient, for any liability that these contractual assumptions directly + impose on those licensors and authors. +
    • +
+ +

+ All other non-permissive additional terms are considered "further restrictions" + within the meaning of section 10. If the Program as you received it, or any part of it, + contains a notice stating that it is governed by this License along with a term that is a + further restriction, you may remove that term. If a license document contains a further + restriction but permits relicensing or conveying under this License, you may add to a + covered work material governed by the terms of that license document, provided that the + further restriction does not survive such relicensing or conveying. +

+ +

+ If you add terms to a covered work in accord with this section, you must place, in the + relevant source files, a statement of the additional terms that apply to those files, or a + notice indicating where to find the applicable terms. +

+ +

+ Additional terms, permissive or non-permissive, may be stated in the form of a separately + written license, or stated as exceptions; the above requirements apply either way. +

+ +

8. Termination.

+ +

+ You may not propagate or modify a covered work except as expressly provided under this + License. Any attempt otherwise to propagate or modify it is void, and will automatically + terminate your rights under this License (including any patent licenses granted under the + third paragraph of section 11). +

+ +

+ However, if you cease all violation of this License, then your license from a particular + copyright holder is reinstated (a) provisionally, unless and until the copyright holder + explicitly and finally terminates your license, and (b) permanently, if the copyright holder + fails to notify you of the violation by some reasonable means prior to 60 days after the + cessation. +

+ +

+ Moreover, your license from a particular copyright holder is reinstated permanently if the + copyright holder notifies you of the violation by some reasonable means, this is the first + time you have received notice of violation of this License (for any work) from that + copyright holder, and you cure the violation prior to 30 days after your receipt of the + notice. +

+ +

+ Termination of your rights under this section does not terminate the licenses of parties who + have received copies or rights from you under this License. If your rights have been + terminated and not permanently reinstated, you do not qualify to receive new licenses for + the same material under section 10. +

+ +

9. Acceptance Not Required for Having Copies.

+ +

+ You are not required to accept this License in order to receive or run a copy of the + Program. Ancillary propagation of a covered work occurring solely as a consequence of using + peer-to-peer transmission to receive a copy likewise does not require acceptance. However, + nothing other than this License grants you permission to propagate or modify any covered + work. These actions infringe copyright if you do not accept this License. Therefore, by + modifying or propagating a covered work, you indicate your acceptance of this License to do + so. +

+ +

10. Automatic Licensing of Downstream Recipients.

+ +

+ Each time you convey a covered work, the recipient automatically receives a license from the + original licensors, to run, modify and propagate that work, subject to this License. You are + not responsible for enforcing compliance by third parties with this License. +

+ +

+ An "entity transaction" is a transaction transferring control of an organization, + or substantially all assets of one, or subdividing an organization, or merging + organizations. If propagation of a covered work results from an entity transaction, each + party to that transaction who receives a copy of the work also receives whatever licenses to + the work the party's predecessor in interest had or could give under the previous + paragraph, plus a right to possession of the Corresponding Source of the work from the + predecessor in interest, if the predecessor has it or can get it with reasonable efforts. +

+ +

+ You may not impose any further restrictions on the exercise of the rights granted or + affirmed under this License. For example, you may not impose a license fee, royalty, or + other charge for exercise of rights granted under this License, and you may not initiate + litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent + claim is infringed by making, using, selling, offering for sale, or importing the Program or + any portion of it. +

+ +

11. Patents.

+ +

+ A "contributor" is a copyright holder who authorizes use under this License of the + Program or a work on which the Program is based. The work thus licensed is called the + contributor's "contributor version". +

+ +

+ A contributor's "essential patent claims" are all patent claims owned or + controlled by the contributor, whether already acquired or hereafter acquired, that would be + infringed by some manner, permitted by this License, of making, using, or selling its + contributor version, but do not include claims that would be infringed only as a consequence + of further modification of the contributor version. For purposes of this definition, + "control" includes the right to grant patent sublicenses in a manner consistent + with the requirements of this License. +

+ +

+ Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under + the contributor's essential patent claims, to make, use, sell, offer for sale, import + and otherwise run, modify and propagate the contents of its contributor version. +

+ +

+ In the following three paragraphs, a "patent license" is any express agreement or + commitment, however denominated, not to enforce a patent (such as an express permission to + practice a patent or covenant not to sue for patent infringement). To "grant" such + a patent license to a party means to make such an agreement or commitment not to enforce a + patent against the party. +

+ +

+ If you convey a covered work, knowingly relying on a patent license, and the Corresponding + Source of the work is not available for anyone to copy, free of charge and under the terms + of this License, through a publicly available network server or other readily accessible + means, then you must either (1) cause the Corresponding Source to be so available, or (2) + arrange to deprive yourself of the benefit of the patent license for this particular work, + or (3) arrange, in a manner consistent with the requirements of this License, to extend the + patent license to downstream recipients. "Knowingly relying" means you have actual + knowledge that, but for the patent license, your conveying the covered work in a country, or + your recipient's use of the covered work in a country, would infringe one or more + identifiable patents in that country that you have reason to believe are valid. +

+ +

+ If, pursuant to or in connection with a single transaction or arrangement, you convey, or + propagate by procuring conveyance of, a covered work, and grant a patent license to some of + the parties receiving the covered work authorizing them to use, propagate, modify or convey + a specific copy of the covered work, then the patent license you grant is automatically + extended to all recipients of the covered work and works based on it. +

+ +

+ A patent license is "discriminatory" if it does not include within the scope of + its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or + more of the rights that are specifically granted under this License. You may not convey a + covered work if you are a party to an arrangement with a third party that is in the business + of distributing software, under which you make payment to the third party based on the + extent of your activity of conveying the work, and under which the third party grants, to + any of the parties who would receive the covered work from you, a discriminatory patent + license (a) in connection with copies of the covered work conveyed by you (or copies made + from those copies), or (b) primarily for and in connection with specific products or + compilations that contain the covered work, unless you entered into that arrangement, or + that patent license was granted, prior to 28 March 2007. +

+ +

+ Nothing in this License shall be construed as excluding or limiting any implied license or + other defenses to infringement that may otherwise be available to you under applicable + patent law. +

+ +

12. No Surrender of Others' Freedom.

+ +

+ If conditions are imposed on you (whether by court order, agreement or otherwise) that + contradict the conditions of this License, they do not excuse you from the conditions of + this License. If you cannot convey a covered work so as to satisfy simultaneously your + obligations under this License and any other pertinent obligations, then as a consequence + you may not convey it at all. For example, if you agree to terms that obligate you to + collect a royalty for further conveying from those to whom you convey the Program, the only + way you could satisfy both those terms and this License would be to refrain entirely from + conveying the Program. +

+ +

+ 13. Remote Network Interaction; Use with the GNU General Public License. +

+ +

+ Notwithstanding any other provision of this License, if you modify the Program, your + modified version must prominently offer all users interacting with it remotely through a + computer network (if your version supports such interaction) an opportunity to receive the + Corresponding Source of your version by providing access to the Corresponding Source from a + network server at no charge, through some standard or customary means of facilitating + copying of software. This Corresponding Source shall include the Corresponding Source for + any work covered by version 3 of the GNU General Public License that is incorporated + pursuant to the following paragraph. +

+ +

+ Notwithstanding any other provision of this License, you have permission to link or combine + any covered work with a work licensed under version 3 of the GNU General Public License into + a single combined work, and to convey the resulting work. The terms of this License will + continue to apply to the part which is the covered work, but the work with which it is + combined will remain governed by version 3 of the GNU General Public License. +

+ +

14. Revised Versions of this License.

+ +

+ The Free Software Foundation may publish revised and/or new versions of the GNU Affero + General Public License from time to time. Such new versions will be similar in spirit to the + present version, but may differ in detail to address new problems or concerns. +

+ +

+ Each version is given a distinguishing version number. If the Program specifies that a + certain numbered version of the GNU Affero General Public License "or any later + version" applies to it, you have the option of following the terms and conditions + either of that numbered version or of any later version published by the Free Software + Foundation. If the Program does not specify a version number of the GNU Affero General + Public License, you may choose any version ever published by the Free Software Foundation. +

+ +

+ If the Program specifies that a proxy can decide which future versions of the GNU Affero + General Public License can be used, that proxy's public statement of acceptance of a + version permanently authorizes you to choose that version for the Program. +

+ +

+ Later license versions may give you additional or different permissions. However, no + additional obligations are imposed on any author or copyright holder as a result of your + choosing to follow a later version. +

+ +

15. Disclaimer of Warranty.

+ +

+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN + OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM + "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT + NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. + SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR + OR CORRECTION. +

+ +

16. Limitation of Liability.

+ +

+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT + HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE + LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL + DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO + LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES + OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR + OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +

+ +

17. Interpretation of Sections 15 and 16.

+ +

+ If the disclaimer of warranty and limitation of liability provided above cannot be given + local legal effect according to their terms, reviewing courts shall apply local law that + most closely approximates an absolute waiver of all civil liability in connection with the + Program, unless a warranty or assumption of liability accompanies a copy of the Program in + return for a fee. +

+ + ); +}; + +Page.getLayout = (page) => {page}; + +export default Page; diff --git a/src/pages/teams-share/sharepoint/index.js b/src/pages/teams-share/sharepoint/index.js index 5b15705536f9..eaaec4d56a05 100644 --- a/src/pages/teams-share/sharepoint/index.js +++ b/src/pages/teams-share/sharepoint/index.js @@ -129,7 +129,7 @@ const Page = () => { url: "/api/listUsers", labelField: (user) => `${user.displayName} (${user.userPrincipalName})`, valueField: "userPrincipalName", - addedFields: { + addedField: { id: "id", }, }, diff --git a/src/pages/tenant/administration/alert-configuration/index.js b/src/pages/tenant/administration/alert-configuration/index.js index 1544d84c8e39..41f76c7dac2e 100644 --- a/src/pages/tenant/administration/alert-configuration/index.js +++ b/src/pages/tenant/administration/alert-configuration/index.js @@ -24,7 +24,7 @@ const Page = () => { }, { label: "Delete Alert", - type: "GET", + type: "POST", url: "/api/RemoveQueuedAlert", data: { ID: "RowKey", diff --git a/src/pages/tenant/administration/tenants/index.js b/src/pages/tenant/administration/tenants/index.js index 1fba7f387944..ee07d9b30096 100644 --- a/src/pages/tenant/administration/tenants/index.js +++ b/src/pages/tenant/administration/tenants/index.js @@ -6,28 +6,6 @@ import { useEffect } from "react"; const Page = () => { //this page is special and requires us to craft the columns and DashboardLayout const pageTitle = "Tenants"; - const tenantData = ApiGetCall({ - url: "/api/listTenants", - queryKey: "ListTenants", - }); - - useEffect(() => { - if (tenantData.isSuccess) { - tenantData.data.forEach((tenant) => { - Object.assign(tenant, { - portal_m365: `https://admin.microsoft.com/Partner/BeginClientSession.aspx?CTID=${tenant.customerId}&CSDEST=o365admincenter`, - portal_exchange: `https://admin.exchange.microsoft.com/?landingpage=homepage&form=mac_sidebar&delegatedOrg=${tenant.defaultDomainName}`, - portal_entra: `https://entra.microsoft.com/${tenant.defaultDomainName}`, - portal_teams: `https://admin.teams.microsoft.com/?delegatedOrg=${tenant.defaultDomainName}`, - portal_azure: `https://portal.azure.com/${tenant.defaultDomainName}`, - portal_intune: `https://intune.microsoft.com/${tenant.defaultDomainName}`, - portal_security: `https://security.microsoft.com/?tid=${tenant.customerId}`, - portal_compliance: `https://purview.microsoft.com/?tid=${tenant.customerId}`, - portal_sharepoint: `https://admin.microsoft.com/Partner/beginclientsession.aspx?CTID=${tenant.customerId}&CSDEST=SharePoint`, - }); - }); - } - }, [tenantData.isSuccess]); const simpleColumns = [ "displayName", @@ -46,7 +24,12 @@ const Page = () => { title={pageTitle} tenantInTitle={false} simpleColumns={simpleColumns} - data={tenantData.data} + apiUrl="/api/ListTenants" + queryKey="TenantListPage" + apiData={{ + Mode: "TenantList", + tenantFilter: null, + }} /> ); }; diff --git a/src/pages/tenant/conditional/list-named-locations/index.js b/src/pages/tenant/conditional/list-named-locations/index.js index 834efd07eb32..a53610c35926 100644 --- a/src/pages/tenant/conditional/list-named-locations/index.js +++ b/src/pages/tenant/conditional/list-named-locations/index.js @@ -11,7 +11,7 @@ const Page = () => { const actions = [ { label: "Add location to named location", - type: "GET", + type: "POST", url: "/api/ExecNamedLocation", icon: , data: { diff --git a/src/pages/tenant/conditional/list-policies/index.js b/src/pages/tenant/conditional/list-policies/index.js index df42715f9801..8c021df61319 100644 --- a/src/pages/tenant/conditional/list-policies/index.js +++ b/src/pages/tenant/conditional/list-policies/index.js @@ -32,40 +32,46 @@ const Page = () => { }, { label: "Enable policy", - type: "GET", - url: "/api/EditCAPolicy?State=Enabled", + type: "POST", + url: "/api/EditCAPolicy", data: { GUID: "id", + State: "!Enabled", }, confirmText: "Are you sure you want to enable this policy?", + condition: (row) => row.state !== "enabled", icon: , color: "info", }, { label: "Disable policy", - type: "GET", - url: "/api/EditCAPolicy?State=Disabled", + type: "POST", + url: "/api/EditCAPolicy", data: { GUID: "id", + State: "!Disabled", }, confirmText: "Are you sure you want to disable this policy?", + condition: (row) => row.state !== "disabled", icon: , color: "info", }, { label: "Set policy to report only", - type: "GET", - url: "/api/EditCAPolicy?State=enabledForReportingButNotEnforced", + type: "POST", + url: "/api/EditCAPolicy", data: { GUID: "id", + State: "!enabledForReportingButNotEnforced", }, confirmText: "Are you sure you want to set this policy to report only?", + condition: (row) => row.state !== "enabledForReportingButNotEnforced", icon: , color: "info", }, { label: "Delete policy", - type: "GET", + type: "POST", url: "/api/RemoveCAPolicy", data: { GUID: "id", diff --git a/src/pages/tenant/conditional/list-template/index.js b/src/pages/tenant/conditional/list-template/index.js index 8db07cbdca14..96a5f601ebb4 100644 --- a/src/pages/tenant/conditional/list-template/index.js +++ b/src/pages/tenant/conditional/list-template/index.js @@ -58,7 +58,7 @@ const Page = () => { }, { label: "Delete Template", - type: "GET", + type: "POST", url: "/api/RemoveCATemplate", icon: , data: { ID: "GUID" }, diff --git a/src/pages/tenant/gdap-management/onboarding/start.js b/src/pages/tenant/gdap-management/onboarding/start.js index cb6a58d3d675..e63e53ba63a9 100644 --- a/src/pages/tenant/gdap-management/onboarding/start.js +++ b/src/pages/tenant/gdap-management/onboarding/start.js @@ -53,12 +53,9 @@ const Page = () => { data: { TenantFilter: "", Endpoint: "tenantRelationships/delegatedAdminRelationships", - $filter: - "(status eq 'active' or status eq 'approvalPending') and not startsWith(displayName,'MLT_')", }, queryKey: "GDAPRelationshipOnboarding", }); - const onboardingList = ApiGetCallWithPagination({ url: "/api/ListTenantOnboarding", queryKey: "ListTenantOnboarding", @@ -108,7 +105,11 @@ const Page = () => { (relationship) => relationship?.id === queryId ); - if (relationship) { + if ( + relationship && + (relationship?.status === "active" || relationship?.status === "approvalPending") && + !relationship?.customer?.displayName.startsWith("MLT_") + ) { formValue = { label: (relationship?.customer?.displayName ?? "Pending Invite") + diff --git a/src/pages/tenant/standards/bpa-report/builder.js b/src/pages/tenant/standards/bpa-report/builder.js index 16b1c4e9ecc9..e36427aaa479 100644 --- a/src/pages/tenant/standards/bpa-report/builder.js +++ b/src/pages/tenant/standards/bpa-report/builder.js @@ -4,19 +4,14 @@ import { Container, Typography, Button, - FormControl, - InputLabel, - Select, - MenuItem, Grid, IconButton, Stack, SvgIcon, } from "@mui/material"; import { useEffect, useState } from "react"; -import Head from "next/head"; import DeleteIcon from "@mui/icons-material/Delete"; -import { useForm } from "react-hook-form"; +import { useForm, useWatch } from "react-hook-form"; import CippButtonCard from "../../../../components/CippCards/CippButtonCard"; import CippFormComponent from "../../../../components/CippComponents/CippFormComponent"; import { ArrowLeftIcon } from "@mui/x-date-pickers"; @@ -24,6 +19,8 @@ import { useRouter } from "next/router"; import { CippFormCondition } from "../../../../components/CippComponents/CippFormCondition"; import { ApiGetCall, ApiPostCall } from "../../../../api/ApiCall"; import { CippApiResults } from "../../../../components/CippComponents/CippApiResults"; +import { CippHead } from "../../../../components/CippComponents/CippHead"; +import { Add, Save } from "@mui/icons-material"; const Page = () => { const router = useRouter(); @@ -54,18 +51,28 @@ const Page = () => { template.name = `${template.name} (Clone)`; } setLayoutMode(template.style); - //if the template style is tenant, create enough cards to hold the frontend fields - if (template.style === "Tenant") { - setBlockCards( - template.Fields.map((field, index) => { - return { - id: `block-${index}`, - }; - }) - ); - } + setBlockCards( + template.Fields.map((field, index) => { + return { + id: `block-${index}`, + }; + }) + ); + + const convertedTemplate = { + ...template, + Fields: template.Fields.map((field) => ({ + ...field, + ExtractFields: field.ExtractFields + ? field.ExtractFields.map((ef) => ({ + label: ef, + value: ef, + })) + : [], + })), + }; - formControl.reset(template); + formControl.reset(convertedTemplate); } } }, [bpaTemplateList.isSuccess]); @@ -151,10 +158,9 @@ const Page = () => { addBPATemplate.mutate({ url: "/api/AddBPATemplate", data: cleanedData }); }; - const handleLayoutModeChange = (event) => { - const newMode = event.target.value; + const handleLayoutModeChange = (newMode) => { setLayoutMode(newMode); - formControl.setValue("style", newMode); + //formControl.setValue("style", newMode); // Reset cards based on the layout mode if (newMode === "Table") { @@ -174,12 +180,18 @@ const Page = () => { } }; + const style = useWatch({ control: formControl.control, name: "style" }); + + useEffect(() => { + if (style && style !== layoutMode) { + handleLayoutModeChange(style); + } + }, [style]); + const onSubmit = (data) => {}; return ( <> - - {pageTitle} - + { - } title="Report Settings" > - + {/* First item for Report Name and Layout Mode */} - - Layout Mode - - + - - {/* Third item for Buttons */} - {layoutMode === "Tenant" && ( - - - - - - )} - {/* Canvas Area */} - - Canvas - + + Fields + + {blockCards.map((block, index) => ( @@ -270,16 +270,16 @@ const Page = () => { key={block.id} > handleRemoveBlock(block.id)} // Remove block on click - > - - - ) + handleRemoveBlock(block.id)} // Remove block on click + > + + } > {/* Form inside each card */} @@ -311,7 +311,8 @@ const Page = () => { @@ -351,7 +352,7 @@ const Page = () => { @@ -478,13 +479,17 @@ const Page = () => { type="autoComplete" formControl={formControl} multiple={false} - api={{ - queryKey: `ListBPA`, - url: "/api/ListBPA", - dataKey: "Keys", - labelField: (option) => `${option}`, - valueField: (option) => `${option}`, - }} + options={ + bpaTemplateList.data + ?.flatMap( + (template) => template.Fields?.map((field) => field.name) ?? [] + ) + .filter( + (value, index, self) => value && self.indexOf(value) === index + ) + .map((field) => ({ label: field, value: field })) + .sort((a, b) => a.label.localeCompare(b.label)) ?? [] + } /> diff --git a/src/pages/tenant/standards/bpa-report/index.js b/src/pages/tenant/standards/bpa-report/index.js index d80e5eb5ae1c..7de229b882b7 100644 --- a/src/pages/tenant/standards/bpa-report/index.js +++ b/src/pages/tenant/standards/bpa-report/index.js @@ -81,7 +81,7 @@ const Page = () => { }, { label: "Delete Template", - type: "GET", + type: "POST", url: "/api/RemoveBPATemplate", data: { TemplateName: "Name", diff --git a/src/pages/unauthenticated.js b/src/pages/unauthenticated.js index 6c06e2ca3a80..c9999fa4c155 100644 --- a/src/pages/unauthenticated.js +++ b/src/pages/unauthenticated.js @@ -8,7 +8,9 @@ import { useState, useEffect } from "react"; const Page = () => { const orgData = ApiGetCall({ url: "/.auth/me", - queryKey: "me", + queryKey: "authmecipp", + staleTime: 120000, + refetchOnWindowFocus: true, }); const blockedRoles = ["anonymous", "authenticated"]; const [userRoles, setUserRoles] = useState([]); @@ -48,10 +50,10 @@ const Page = () => { 0 ? "Return" : "Login"} - link={userRoles.length > 0 ? "/" : "/.auth/login/aad"} + linkText={userRoles.length > 0 ? "Return to Home" : "Login"} + link={userRoles.length > 0 ? "/" : `/.auth/login/aad?post_login_redirect_uri=${encodeURIComponent(window.location.href)}`} /> )} diff --git a/src/utils/get-cipp-formatting.js b/src/utils/get-cipp-formatting.js index 3d6841d267b4..25b1cd58c7ec 100644 --- a/src/utils/get-cipp-formatting.js +++ b/src/utils/get-cipp-formatting.js @@ -219,7 +219,7 @@ export const getCippFormatting = (data, cellName, type, canReceive) => { } } - if (cellName === "ClientId") { + if (cellName === "ClientId" || cellName === "role") { return isText ? data : ; }