diff --git a/public/version.json b/public/version.json index 25841539a54b..dba87fa5d4c8 100644 --- a/public/version.json +++ b/public/version.json @@ -1,3 +1,3 @@ { - "version": "7.0.4" + "version": "7.0.5" } diff --git a/src/components/CippComponents/CippFormComponent.jsx b/src/components/CippComponents/CippFormComponent.jsx index 3115da235ad5..aa9329e66f85 100644 --- a/src/components/CippComponents/CippFormComponent.jsx +++ b/src/components/CippComponents/CippFormComponent.jsx @@ -225,6 +225,33 @@ export const CippFormComponent = (props) => { ); + case "select": + return ( + <> +
+ ( + field.onChange(value.value)} + /> + )} + /> +
+ + {get(errors, convertedName, {}).message} + + + ); + case "autoComplete": return ( <> diff --git a/src/components/CippWizard/CippWizardOffboarding.jsx b/src/components/CippWizard/CippWizardOffboarding.jsx index 42b2611a3e15..7d69817bcf52 100644 --- a/src/components/CippWizard/CippWizardOffboarding.jsx +++ b/src/components/CippWizard/CippWizardOffboarding.jsx @@ -300,6 +300,7 @@ export const CippWizardOffboarding = (props) => { onPreviousStep={onPreviousStep} onNextStep={onNextStep} formControl={formControl} + replacementBehaviour="removeNulls" /> ); diff --git a/src/components/CippWizard/CippWizardStepButtons.jsx b/src/components/CippWizard/CippWizardStepButtons.jsx index 87915ba3c0c2..7f5b0b264bc4 100644 --- a/src/components/CippWizard/CippWizardStepButtons.jsx +++ b/src/components/CippWizard/CippWizardStepButtons.jsx @@ -13,6 +13,7 @@ export const CippWizardStepButtons = (props) => { formControl, noNextButton = false, noSubmitButton = false, + replacementBehaviour, queryKeys, ...other } = props; @@ -20,7 +21,16 @@ export const CippWizardStepButtons = (props) => { const sendForm = ApiPostCall({ relatedQueryKeys: queryKeys }); const handleSubmit = () => { const values = formControl.getValues(); - sendForm.mutate({ url: postUrl, data: values }); + const newData = {}; + Object.keys(values).forEach((key) => { + const value = values[key]; + if (replacementBehaviour !== "removeNulls") { + newData[key] = value; + } else if (row[value] !== undefined) { + newData[key] = row[value]; + } + }); + sendForm.mutate({ url: postUrl, data: newData }); }; return ( diff --git a/src/data/M365Licenses.json b/src/data/M365Licenses.json index 560b3c13f04c..de1119503969 100644 --- a/src/data/M365Licenses.json +++ b/src/data/M365Licenses.json @@ -11431,6 +11431,94 @@ "Service_Plan_Id": "1346d5e6-15a6-4b88-9693-806ff7296a7a", "Service_Plans_Included_Friendly_Names": "Microsoft 365 Domestic Calling Plan - US (120 minutes)" }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "MESH_AVATARS_FOR_TEAMS", + "Service_Plan_Id": "dcf9d2f4-772e-4434-b757-77a453cfbc02", + "Service_Plans_Included_Friendly_Names": "Avatars for Teams" + }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "MESH_AVATARS_ADDITIONAL_FOR_TEAMS", + "Service_Plan_Id": "3efbd4ed-8958-4824-8389-1321f8730af8", + "Service_Plans_Included_Friendly_Names": "Avatars for Teams (additional)" + }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "RMS_S_ENTERPRISE", + "Service_Plan_Id": "bea4c11e-220a-4e6d-8eb8-8ea15d019f90", + "Service_Plans_Included_Friendly_Names": "Azure Rights Management" + }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "CDS_O365_P2", + "Service_Plan_Id": "95b76021-6a53-4741-ab8b-1d1f3d66a95a", + "Service_Plans_Included_Friendly_Names": "Common Data Service for Teams" + }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "EXCHANGE_S_ENTERPRISE", + "Service_Plan_Id": "efb87545-963c-4e0d-99df-69c6916d9eb0", + "Service_Plans_Included_Friendly_Names": "Exchange Online (Plan 2)" + }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "GRAPH_CONNECTORS_SEARCH_INDEX", + "Service_Plan_Id": "a6520331-d7d4-4276-95f5-15c0933bc757", + "Service_Plans_Included_Friendly_Names": "Graph Connectors Search with Index" + }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "MESH_IMMERSIVE_FOR_TEAMS", + "Service_Plan_Id": "f0ff6ac6-297d-49cd-be34-6dfef97f0c28", + "Service_Plans_Included_Friendly_Names": "Immersive spaces for Teams" + }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "ContentExplorer_Standard", + "Service_Plan_Id": "2b815d45-56e4-4e3a-b65c-66cb9175b560", + "Service_Plans_Included_Friendly_Names": "Information Protection and Governance Analytics – Standard" + }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "MIP_S_CLP1", + "Service_Plan_Id": "5136a095-5cf0-4aff-bec3-e84448b38ea5", + "Service_Plans_Included_Friendly_Names": "Information Protection for Office 365 - Standard" + }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "MYANALYTICS_P2", + "Service_Plan_Id": "33c4f319-9bdd-48d6-9c4d-410b750a4a5a", + "Service_Plans_Included_Friendly_Names": "Insights by MyAnalytics" + }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "OFFICESUBSCRIPTION", + "Service_Plan_Id": "43de0ff5-c92c-492b-9116-175376d08c38", + "Service_Plans_Included_Friendly_Names": "Microsoft 365 Apps for enterprise" + }, { "Product_Display_Name": "Microsoft 365 E3", "String_Id": "SPE_E3", @@ -11567,6 +11655,14 @@ "Service_Plan_Id": "31b4e2fc-4cd6-4e7d-9c1b-41407303bd66", "Service_Plans_Included_Friendly_Names": "Project for Office (Plan E3)" }, + { + "Product_Display_Name": "Microsoft 365 E3", + "String_Id": "SPE_E3", + "GUID": "05e9a617-0261-4cee-bb44-138d3ef5d965", + "Service_Plan_Name": "Bing_Chat_Enterprise", + "Service_Plan_Id": "0d0c0d31-fae7-41f2-b909-eaf4d7f26dba", + "Service_Plans_Included_Friendly_Names": "RETIRED - Commercial data protection for Microsoft Copilot" + }, { "Product_Display_Name": "Microsoft 365 E3", "String_Id": "SPE_E3", @@ -11735,6 +11831,406 @@ "Service_Plan_Id": "041fe683-03e4-45b6-b1af-c0cdc516daee", "Service_Plans_Included_Friendly_Names": "Power Virtual Agents for Office 365" }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "MESH_AVATARS_FOR_TEAMS", + "Service_Plan_Id": "dcf9d2f4-772e-4434-b757-77a453cfbc02", + "Service_Plans_Included_Friendly_Names": "Avatars for Teams" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "MESH_AVATARS_ADDITIONAL_FOR_TEAMS", + "Service_Plan_Id": "3efbd4ed-8958-4824-8389-1321f8730af8", + "Service_Plans_Included_Friendly_Names": "Avatars for Teams (additional)" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "RMS_S_ENTERPRISE", + "Service_Plan_Id": "bea4c11e-220a-4e6d-8eb8-8ea15d019f90", + "Service_Plans_Included_Friendly_Names": "Azure Rights Management" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "CDS_O365_P2", + "Service_Plan_Id": "95b76021-6a53-4741-ab8b-1d1f3d66a95a", + "Service_Plans_Included_Friendly_Names": "Common Data Service for Teams" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "EXCHANGE_S_ENTERPRISE", + "Service_Plan_Id": "efb87545-963c-4e0d-99df-69c6916d9eb0", + "Service_Plans_Included_Friendly_Names": "Exchange Online (Plan 2)" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "GRAPH_CONNECTORS_SEARCH_INDEX", + "Service_Plan_Id": "a6520331-d7d4-4276-95f5-15c0933bc757", + "Service_Plans_Included_Friendly_Names": "Graph Connectors Search with Index" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "MESH_IMMERSIVE_FOR_TEAMS", + "Service_Plan_Id": "f0ff6ac6-297d-49cd-be34-6dfef97f0c28", + "Service_Plans_Included_Friendly_Names": "Immersive spaces for Teams" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "ContentExplorer_Standard", + "Service_Plan_Id": "2b815d45-56e4-4e3a-b65c-66cb9175b560", + "Service_Plans_Included_Friendly_Names": "Information Protection and Governance Analytics – Standard" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "MIP_S_CLP1", + "Service_Plan_Id": "5136a095-5cf0-4aff-bec3-e84448b38ea5", + "Service_Plans_Included_Friendly_Names": "Information Protection for Office 365 - Standard" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "MYANALYTICS_P2", + "Service_Plan_Id": "33c4f319-9bdd-48d6-9c4d-410b750a4a5a", + "Service_Plans_Included_Friendly_Names": "Insights by MyAnalytics" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "OFFICESUBSCRIPTION", + "Service_Plan_Id": "43de0ff5-c92c-492b-9116-175376d08c38", + "Service_Plans_Included_Friendly_Names": "Microsoft 365 Apps for enterprise" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "M365_LIGHTHOUSE_CUSTOMER_PLAN1", + "Service_Plan_Id": "6f23d6a9-adbf-481c-8538-b4c095654487", + "Service_Plans_Included_Friendly_Names": "Microsoft 365 Lighthouse (Plan 1)" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "M365_LIGHTHOUSE_PARTNER_PLAN1", + "Service_Plan_Id": "d55411c9-cfff-40a9-87c7-240f14df7da5", + "Service_Plans_Included_Friendly_Names": "Microsoft 365 Lighthouse (Plan 2)" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "MICROSOFTBOOKINGS", + "Service_Plan_Id": "199a5c09-e0ca-4e37-8f7c-b05d533e1ea2", + "Service_Plans_Included_Friendly_Names": "Microsoft Bookings" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "CLIPCHAMP", + "Service_Plan_Id": "a1ace008-72f3-4ea0-8dac-33b3a23a2472", + "Service_Plans_Included_Friendly_Names": "Microsoft Clipchamp" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "MDE_LITE", + "Service_Plan_Id": "292cc034-7b7c-4950-aaf5-943befd3f1d4", + "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Endpoint Plan 1" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "FORMS_PLAN_E3", + "Service_Plan_Id": "2789c901-c14e-48ab-a76a-be334d9d793a", + "Service_Plans_Included_Friendly_Names": "Microsoft Forms (Plan E3)" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "KAIZALA_O365_P3", + "Service_Plan_Id": "aebd3021-9f8f-4bf8-bbe3-0ed2f4f047a1", + "Service_Plans_Included_Friendly_Names": "Microsoft Kaizala Pro" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "MICROSOFT_LOOP", + "Service_Plan_Id": "c4b8c31a-fb44-4c65-9837-a21f55fcabda", + "Service_Plans_Included_Friendly_Names": "Microsoft Loop" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "PROJECTWORKMANAGEMENT", + "Service_Plan_Id": "b737dad2-2f6c-4c65-90e3-ca563267e8b9", + "Service_Plans_Included_Friendly_Names": "Microsoft Planner" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "MICROSOFT_SEARCH", + "Service_Plan_Id": "94065c59-bc8e-4e8b-89e5-5138d471eaff", + "Service_Plans_Included_Friendly_Names": "Microsoft Search" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "Deskless", + "Service_Plan_Id": "8c7d2df8-86f0-4902-b2ed-a0458298f3b3", + "Service_Plans_Included_Friendly_Names": "Microsoft StaffHub" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "STREAM_O365_E3", + "Service_Plan_Id": "9e700747-8b1d-45e5-ab8d-ef187ceec156", + "Service_Plans_Included_Friendly_Names": "Microsoft Stream for Office 365 E3" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "INTUNE_O365", + "Service_Plan_Id": "882e1d05-acd1-4ccb-8708-6ee03664b117", + "Service_Plans_Included_Friendly_Names": "Mobile Device Management for Office 365" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "Nucleus", + "Service_Plan_Id": "db4d623d-b514-490b-b7ef-8885eee514de", + "Service_Plans_Included_Friendly_Names": "Nucleus" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "SHAREPOINTWAC", + "Service_Plan_Id": "e95bec33-7c88-4a70-8e19-b10bd9d0c014", + "Service_Plans_Included_Friendly_Names": "Office for the Web" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "PLACES_CORE", + "Service_Plan_Id": "1fe6227d-3e01-46d0-9510-0acad4ff6e94", + "Service_Plans_Included_Friendly_Names": "Places Core" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "PROJECT_O365_P2", + "Service_Plan_Id": "31b4e2fc-4cd6-4e7d-9c1b-41407303bd66", + "Service_Plans_Included_Friendly_Names": "Project for Office (Plan E3)" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "Bing_Chat_Enterprise", + "Service_Plan_Id": "0d0c0d31-fae7-41f2-b909-eaf4d7f26dba", + "Service_Plans_Included_Friendly_Names": "RETIRED - Commercial data protection for Microsoft Copilot" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "SHAREPOINTENTERPRISE", + "Service_Plan_Id": "5dbe027f-2339-4123-9542-606e4d348a72", + "Service_Plans_Included_Friendly_Names": "SharePoint (Plan 2)" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "MCOSTANDARD", + "Service_Plan_Id": "0feaeb32-d00e-4d66-bd5a-43b5b83db82c", + "Service_Plans_Included_Friendly_Names": "Skype for Business Online (Plan 2)" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "SWAY", + "Service_Plan_Id": "a23b959c-7ce8-4e57-9140-b90eb88a9e97", + "Service_Plans_Included_Friendly_Names": "Sway" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "BPOS_S_TODO_2", + "Service_Plan_Id": "c87f142c-d1e9-4363-8630-aaea9c4d9ae5", + "Service_Plans_Included_Friendly_Names": "To-Do (Plan 2)" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "VIVAENGAGE_CORE", + "Service_Plan_Id": "a82fbf69-b4d7-49f4-83a6-915b2cf354f4", + "Service_Plans_Included_Friendly_Names": "Viva Engage Core" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "VIVA_LEARNING_SEEDED", + "Service_Plan_Id": "b76fb638-6ba6-402a-b9f9-83d28acb3d86", + "Service_Plans_Included_Friendly_Names": "Viva Learning Seeded" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "WHITEBOARD_PLAN2", + "Service_Plan_Id": "94a54592-cd8b-425e-87c6-97868b000b91", + "Service_Plans_Included_Friendly_Names": "Whiteboard (Plan 2)" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "YAMMER_ENTERPRISE", + "Service_Plan_Id": "7547a3fe-08ee-4ccb-b430-5077c5041653", + "Service_Plans_Included_Friendly_Names": "Yammer Enterprise" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "UNIVERSAL_PRINT_01", + "Service_Plan_Id": "795f6fe0-cc4d-4773-b050-5dde4dc704c9", + "Service_Plans_Included_Friendly_Names": "Universal Print" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "WIN10_PRO_ENT_SUB", + "Service_Plan_Id": "21b439ba-a0ca-424f-a6cc-52f954a5b111", + "Service_Plans_Included_Friendly_Names": "Windows 10/11 Enterprise (Original)" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "Windows_Autopatch", + "Service_Plan_Id": "9a6eeb79-0b4b-4bf0-9808-39d99a2cd5a3", + "Service_Plans_Included_Friendly_Names": "Windows Autopatch" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "WINDOWSUPDATEFORBUSINESS_DEPLOYMENTSERVICE", + "Service_Plan_Id": "7bf960f6-2cd9-443a-8046-5dbff9558365", + "Service_Plans_Included_Friendly_Names": "Windows Update for Business Deployment Service" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "RMS_S_PREMIUM", + "Service_Plan_Id": "6c57d4b6-3b23-47a5-9bc9-69f17b4947b3", + "Service_Plans_Included_Friendly_Names": "Azure Information Protection Premium P1" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "DYN365_CDS_O365_P2", + "Service_Plan_Id": "4ff01e01-1ba7-4d71-8cf8-ce96c3bbcf14", + "Service_Plans_Included_Friendly_Names": "Common Data Service" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "MFA_PREMIUM", + "Service_Plan_Id": "8a256a2b-b617-496d-b51b-e76466e88db0", + "Service_Plans_Included_Friendly_Names": "Microsoft Azure Multi-Factor Authentication" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "ADALLOM_S_DISCOVERY", + "Service_Plan_Id": "932ad362-64a8-4783-9106-97849a1a30b9", + "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Cloud Apps Discovery" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "AAD_PREMIUM", + "Service_Plan_Id": "41781fb2-bc02-4b7c-bd55-b576c07bb09d", + "Service_Plans_Included_Friendly_Names": "Microsoft Entra ID P1" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "INTUNE_A", + "Service_Plan_Id": "c1ec4a95-1f05-45b3-a911-aa3fa01094f5", + "Service_Plans_Included_Friendly_Names": "Microsoft Intune Plan 1" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "POWERAPPS_O365_P2", + "Service_Plan_Id": "c68f8d98-5534-41c8-bf36-22fa496fa792", + "Service_Plans_Included_Friendly_Names": "Power Apps for Office 365" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "FLOW_O365_P2", + "Service_Plan_Id": "76846ad7-7776-4c40-a281-a386362dd1b9", + "Service_Plans_Included_Friendly_Names": "Power Automate for Office 365" + }, + { + "Product_Display_Name": "Microsoft 365 E3 (no Teams)", + "String_Id": "Microsoft_365_E3_(no_Teams)", + "GUID": "dcf0408c-aaec-446c-afd4-43e3683943ea", + "Service_Plan_Name": "POWER_VIRTUAL_AGENTS_O365_P2", + "Service_Plan_Id": "041fe683-03e4-45b6-b1af-c0cdc516daee", + "Service_Plans_Included_Friendly_Names": "Power Virtual Agents for Office 365" + }, { "Product_Display_Name": "Microsoft 365 E3 EEA (no Teams)", "String_Id": "O365_w/o Teams Bundle_M3", @@ -25495,6 +25991,22 @@ "Service_Plan_Id": "f20fedf3-f3c3-43c3-8267-2bfdd51c0939", "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Office 365 (Plan 1)" }, + { + "Product_Display_Name": "Microsoft Defender for Office 365 (Plan 1) Student", + "String_Id": "ATP_ENTERPRISE_STUDENT", + "GUID": "917fb2b4-f71c-43a1-8edc-75532b554bb5", + "Service_Plan_Name": "ATP_ENTERPRISE ", + "Service_Plan_Id": "f20fedf3-f3c3-43c3-8267-2bfdd51c0939", + "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Office 365 (Plan 1)" + }, + { + "Product_Display_Name": "Microsoft Defender for Office 365 (Plan 1) Student use benefit", + "String_Id": "ATP_ENTERPRISE_STUDENTS_USE_BENEFIT", + "GUID": "a237b6d8-572e-4839-bffd-7786d32a5d0e", + "Service_Plan_Name": "ATP_ENTERPRISE ", + "Service_Plan_Id": "f20fedf3-f3c3-43c3-8267-2bfdd51c0939", + "Service_Plans_Included_Friendly_Names": "Microsoft Defender for Office 365 (Plan 1)" + }, { "Product_Display_Name": "Microsoft Defender for Office 365 (Plan 2) GCC", "String_Id": "THREAT_INTELLIGENCE_GOV", @@ -30800,76 +31312,212 @@ "Service_Plans_Included_Friendly_Names": "Viva Engage Core" }, { - "Product_Display_Name": "Office 365 E1 EEA (no Teams)", - "String_Id": "Office_365_w/o_Teams_Bundle_E1", - "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", - "Service_Plan_Name": "VIVA_LEARNING_SEEDED", - "Service_Plan_Id": "b76fb638-6ba6-402a-b9f9-83d28acb3d86", - "Service_Plans_Included_Friendly_Names": "Viva Learning Seeded" + "Product_Display_Name": "Office 365 E1 EEA (no Teams)", + "String_Id": "Office_365_w/o_Teams_Bundle_E1", + "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", + "Service_Plan_Name": "VIVA_LEARNING_SEEDED", + "Service_Plan_Id": "b76fb638-6ba6-402a-b9f9-83d28acb3d86", + "Service_Plans_Included_Friendly_Names": "Viva Learning Seeded" + }, + { + "Product_Display_Name": "Office 365 E1 EEA (no Teams)", + "String_Id": "Office_365_w/o_Teams_Bundle_E1", + "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", + "Service_Plan_Name": "WHITEBOARD_PLAN1", + "Service_Plan_Id": "b8afc642-032e-4de5-8c0a-507a7bba7e5d", + "Service_Plans_Included_Friendly_Names": "Whiteboard (Plan 1)" + }, + { + "Product_Display_Name": "Office 365 E1 EEA (no Teams)", + "String_Id": "Office_365_w/o_Teams_Bundle_E1", + "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", + "Service_Plan_Name": "YAMMER_ENTERPRISE", + "Service_Plan_Id": "7547a3fe-08ee-4ccb-b430-5077c5041653", + "Service_Plans_Included_Friendly_Names": "Yammer Enterprise" + }, + { + "Product_Display_Name": "Office 365 E1 EEA (no Teams)", + "String_Id": "Office_365_w/o_Teams_Bundle_E1", + "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", + "Service_Plan_Name": "DYN365_CDS_O365_P1", + "Service_Plan_Id": "40b010bb-0b69-4654-ac5e-ba161433f4b4", + "Service_Plans_Included_Friendly_Names": "Common Data Service" + }, + { + "Product_Display_Name": "Office 365 E1 EEA (no Teams)", + "String_Id": "Office_365_w/o_Teams_Bundle_E1", + "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", + "Service_Plan_Name": "RMS_S_BASIC", + "Service_Plan_Id": "31cf2cfc-6b0d-4adc-a336-88b724ed8122", + "Service_Plans_Included_Friendly_Names": "Microsoft Azure Rights Management Service" + }, + { + "Product_Display_Name": "Office 365 E1 EEA (no Teams)", + "String_Id": "Office_365_w/o_Teams_Bundle_E1", + "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", + "Service_Plan_Name": "STREAM_O365_E1", + "Service_Plan_Id": "743dd19e-1ce3-4c62-a3ad-49ba8f63a2f6", + "Service_Plans_Included_Friendly_Names": "Microsoft Stream for Office 365 E1" + }, + { + "Product_Display_Name": "Office 365 E1 EEA (no Teams)", + "String_Id": "Office_365_w/o_Teams_Bundle_E1", + "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", + "Service_Plan_Name": "POWERAPPS_O365_P1", + "Service_Plan_Id": "92f7a6f3-b89b-4bbd-8c30-809e6da5ad1c", + "Service_Plans_Included_Friendly_Names": "Power Apps for Office 365" + }, + { + "Product_Display_Name": "Office 365 E1 EEA (no Teams)", + "String_Id": "Office_365_w/o_Teams_Bundle_E1", + "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", + "Service_Plan_Name": "FLOW_O365_P1", + "Service_Plan_Id": "0f9b09cb-62d1-4ff4-9129-43f4996f83f4", + "Service_Plans_Included_Friendly_Names": "Power Automate for Office 365" + }, + { + "Product_Display_Name": "Office 365 E1 EEA (no Teams)", + "String_Id": "Office_365_w/o_Teams_Bundle_E1", + "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", + "Service_Plan_Name": "POWER_VIRTUAL_AGENTS_O365_P1", + "Service_Plan_Id": "0683001c-0492-4d59-9515-d9a6426b5813", + "Service_Plans_Included_Friendly_Names": "Power Virtual Agents for Office 365" + }, + { + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "CDS_O365_P1", + "Service_Plan_Id": "bed136c6-b799-4462-824d-fc045d3a9d25", + "Service_Plans_Included_Friendly_Names": "Common Data Service for Teams" + }, + { + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "EXCHANGE_S_STANDARD", + "Service_Plan_Id": "9aaf7827-d63c-4b61-89c3-182f06f82e5c", + "Service_Plans_Included_Friendly_Names": "Exchange Online (Plan 1)" + }, + { + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "GRAPH_CONNECTORS_SEARCH_INDEX", + "Service_Plan_Id": "a6520331-d7d4-4276-95f5-15c0933bc757", + "Service_Plans_Included_Friendly_Names": "Graph Connectors Search with Index" + }, + { + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "MYANALYTICS_P2", + "Service_Plan_Id": "33c4f319-9bdd-48d6-9c4d-410b750a4a5a", + "Service_Plans_Included_Friendly_Names": "Insights by MyAnalytics" + }, + { + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "MICROSOFTBOOKINGS", + "Service_Plan_Id": "199a5c09-e0ca-4e37-8f7c-b05d533e1ea2", + "Service_Plans_Included_Friendly_Names": "Microsoft Bookings" + }, + { + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "FORMS_PLAN_E1_AR_GCCHIGH", + "Service_Plan_Id": "9c37c053-dfe3-4421-b6d4-bac8b86d42bd", + "Service_Plans_Included_Friendly_Names": "Microsoft Forms (Plan E1) for GCCHigh" + }, + { + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "PROJECTWORKMANAGEMENT", + "Service_Plan_Id": "b737dad2-2f6c-4c65-90e3-ca563267e8b9", + "Service_Plans_Included_Friendly_Names": "Microsoft Planner" + }, + { + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "MICROSOFT_SEARCH_GCCH", + "Service_Plan_Id": "fc9f7921-4ca5-42c6-8533-1b84c4ee496b", + "Service_Plans_Included_Friendly_Names": "Microsoft Search for Arlington" + }, + { + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "TEAMS_AR_GCCHIGH", + "Service_Plan_Id": "9953b155-8aef-4c56-92f3-72b0487fce41", + "Service_Plans_Included_Friendly_Names": "Microsoft Teams for GCCHigh" + }, + { + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "SHAREPOINTWAC", + "Service_Plan_Id": "e95bec33-7c88-4a70-8e19-b10bd9d0c014", + "Service_Plans_Included_Friendly_Names": "Office for the Web" + }, + { + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "OFFICEMOBILE_SUBSCRIPTION", + "Service_Plan_Id": "c63d4d19-e8cb-460e-b37c-4d6c34603745", + "Service_Plans_Included_Friendly_Names": "Office Mobile Apps for Office 365" }, { - "Product_Display_Name": "Office 365 E1 EEA (no Teams)", - "String_Id": "Office_365_w/o_Teams_Bundle_E1", - "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", - "Service_Plan_Name": "WHITEBOARD_PLAN1", - "Service_Plan_Id": "b8afc642-032e-4de5-8c0a-507a7bba7e5d", - "Service_Plans_Included_Friendly_Names": "Whiteboard (Plan 1)" + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "SHAREPOINTSTANDARD", + "Service_Plan_Id": "c7699d2e-19aa-44de-8edf-1736da088ca1", + "Service_Plans_Included_Friendly_Names": "SharePoint (Plan 1)" }, { - "Product_Display_Name": "Office 365 E1 EEA (no Teams)", - "String_Id": "Office_365_w/o_Teams_Bundle_E1", - "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", - "Service_Plan_Name": "YAMMER_ENTERPRISE", - "Service_Plan_Id": "7547a3fe-08ee-4ccb-b430-5077c5041653", - "Service_Plans_Included_Friendly_Names": "Yammer Enterprise" + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "MCOSTANDARD", + "Service_Plan_Id": "0feaeb32-d00e-4d66-bd5a-43b5b83db82c", + "Service_Plans_Included_Friendly_Names": "Skype for Business Online (Plan 2)" }, { - "Product_Display_Name": "Office 365 E1 EEA (no Teams)", - "String_Id": "Office_365_w/o_Teams_Bundle_E1", - "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", "Service_Plan_Name": "DYN365_CDS_O365_P1", "Service_Plan_Id": "40b010bb-0b69-4654-ac5e-ba161433f4b4", "Service_Plans_Included_Friendly_Names": "Common Data Service" }, { - "Product_Display_Name": "Office 365 E1 EEA (no Teams)", - "String_Id": "Office_365_w/o_Teams_Bundle_E1", - "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", - "Service_Plan_Name": "RMS_S_BASIC", - "Service_Plan_Id": "31cf2cfc-6b0d-4adc-a336-88b724ed8122", - "Service_Plans_Included_Friendly_Names": "Microsoft Azure Rights Management Service" - }, - { - "Product_Display_Name": "Office 365 E1 EEA (no Teams)", - "String_Id": "Office_365_w/o_Teams_Bundle_E1", - "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", "Service_Plan_Name": "STREAM_O365_E1", "Service_Plan_Id": "743dd19e-1ce3-4c62-a3ad-49ba8f63a2f6", "Service_Plans_Included_Friendly_Names": "Microsoft Stream for Office 365 E1" }, { - "Product_Display_Name": "Office 365 E1 EEA (no Teams)", - "String_Id": "Office_365_w/o_Teams_Bundle_E1", - "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", - "Service_Plan_Name": "POWERAPPS_O365_P1", - "Service_Plan_Id": "92f7a6f3-b89b-4bbd-8c30-809e6da5ad1c", - "Service_Plans_Included_Friendly_Names": "Power Apps for Office 365" - }, - { - "Product_Display_Name": "Office 365 E1 EEA (no Teams)", - "String_Id": "Office_365_w/o_Teams_Bundle_E1", - "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", - "Service_Plan_Name": "FLOW_O365_P1", - "Service_Plan_Id": "0f9b09cb-62d1-4ff4-9129-43f4996f83f4", - "Service_Plans_Included_Friendly_Names": "Power Automate for Office 365" + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "POWERAPPS_O365_P1_GCCHIGH", + "Service_Plan_Id": "3913e44e-824e-490c-a182-82785d769b45", + "Service_Plans_Included_Friendly_Names": "Power Apps for Office 365 for GCCHigh" }, { - "Product_Display_Name": "Office 365 E1 EEA (no Teams)", - "String_Id": "Office_365_w/o_Teams_Bundle_E1", - "GUID": "b57282e3-65bd-4252-9502-c0eae1e5ab7f", - "Service_Plan_Name": "POWER_VIRTUAL_AGENTS_O365_P1", - "Service_Plan_Id": "0683001c-0492-4d59-9515-d9a6426b5813", - "Service_Plans_Included_Friendly_Names": "Power Virtual Agents for Office 365" + "Product_Display_Name": "Office 365 E1_USGOV_GCCHIGH", + "String_Id": "STANDARDPACK_USGOV_GCCHIGH", + "GUID": "f698ca06-024f-4562-b029-9cb1f1e02646", + "Service_Plan_Name": "FLOW_O365_P1_GCCHIGH", + "Service_Plan_Id": "e923bad8-588e-44d5-acd0-b226daa7b4de", + "Service_Plans_Included_Friendly_Names": "Power Automate for Office 365 for GCCHigh" }, { "Product_Display_Name": "Office 365 E2", @@ -31271,6 +31919,310 @@ "Service_Plan_Id": "041fe683-03e4-45b6-b1af-c0cdc516daee", "Service_Plans_Included_Friendly_Names": "Power Virtual Agents for Office 365" }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "MESH_AVATARS_FOR_TEAMS", + "Service_Plan_Id": "dcf9d2f4-772e-4434-b757-77a453cfbc02", + "Service_Plans_Included_Friendly_Names": "Avatars for Teams" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "MESH_AVATARS_ADDITIONAL_FOR_TEAMS", + "Service_Plan_Id": "3efbd4ed-8958-4824-8389-1321f8730af8", + "Service_Plans_Included_Friendly_Names": "Avatars for Teams (additional)" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "RMS_S_ENTERPRISE", + "Service_Plan_Id": "bea4c11e-220a-4e6d-8eb8-8ea15d019f90", + "Service_Plans_Included_Friendly_Names": "Azure Rights Management" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "CDS_O365_P2", + "Service_Plan_Id": "95b76021-6a53-4741-ab8b-1d1f3d66a95a", + "Service_Plans_Included_Friendly_Names": "Common Data Service for Teams" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "EXCHANGE_S_ENTERPRISE", + "Service_Plan_Id": "efb87545-963c-4e0d-99df-69c6916d9eb0", + "Service_Plans_Included_Friendly_Names": "Exchange Online (Plan 2)" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "GRAPH_CONNECTORS_SEARCH_INDEX", + "Service_Plan_Id": "a6520331-d7d4-4276-95f5-15c0933bc757", + "Service_Plans_Included_Friendly_Names": "Graph Connectors Search with Index" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "MESH_IMMERSIVE_FOR_TEAMS", + "Service_Plan_Id": "f0ff6ac6-297d-49cd-be34-6dfef97f0c28", + "Service_Plans_Included_Friendly_Names": "Immersive spaces for Teams" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "ContentExplorer_Standard", + "Service_Plan_Id": "2b815d45-56e4-4e3a-b65c-66cb9175b560", + "Service_Plans_Included_Friendly_Names": "Information Protection and Governance Analytics – Standard" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "MIP_S_CLP1", + "Service_Plan_Id": "5136a095-5cf0-4aff-bec3-e84448b38ea5", + "Service_Plans_Included_Friendly_Names": "Information Protection for Office 365 - Standard" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "MYANALYTICS_P2", + "Service_Plan_Id": "33c4f319-9bdd-48d6-9c4d-410b750a4a5a", + "Service_Plans_Included_Friendly_Names": "Insights by MyAnalytics" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "OFFICESUBSCRIPTION", + "Service_Plan_Id": "43de0ff5-c92c-492b-9116-175376d08c38", + "Service_Plans_Included_Friendly_Names": "Microsoft 365 Apps for enterprise" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "M365_LIGHTHOUSE_CUSTOMER_PLAN1", + "Service_Plan_Id": "6f23d6a9-adbf-481c-8538-b4c095654487", + "Service_Plans_Included_Friendly_Names": "Microsoft 365 Lighthouse (Plan 1)" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "MICROSOFTBOOKINGS", + "Service_Plan_Id": "199a5c09-e0ca-4e37-8f7c-b05d533e1ea2", + "Service_Plans_Included_Friendly_Names": "Microsoft Bookings" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "CLIPCHAMP", + "Service_Plan_Id": "a1ace008-72f3-4ea0-8dac-33b3a23a2472", + "Service_Plans_Included_Friendly_Names": "Microsoft Clipchamp" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "FORMS_PLAN_E3", + "Service_Plan_Id": "2789c901-c14e-48ab-a76a-be334d9d793a", + "Service_Plans_Included_Friendly_Names": "Microsoft Forms (Plan E3)" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "KAIZALA_O365_P3", + "Service_Plan_Id": "aebd3021-9f8f-4bf8-bbe3-0ed2f4f047a1", + "Service_Plans_Included_Friendly_Names": "Microsoft Kaizala Pro" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "PROJECTWORKMANAGEMENT", + "Service_Plan_Id": "b737dad2-2f6c-4c65-90e3-ca563267e8b9", + "Service_Plans_Included_Friendly_Names": "Microsoft Planner" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "MICROSOFT_SEARCH", + "Service_Plan_Id": "94065c59-bc8e-4e8b-89e5-5138d471eaff", + "Service_Plans_Included_Friendly_Names": "Microsoft Search" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "Deskless", + "Service_Plan_Id": "8c7d2df8-86f0-4902-b2ed-a0458298f3b3", + "Service_Plans_Included_Friendly_Names": "Microsoft StaffHub" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "STREAM_O365_E3", + "Service_Plan_Id": "9e700747-8b1d-45e5-ab8d-ef187ceec156", + "Service_Plans_Included_Friendly_Names": "Microsoft Stream for Office 365 E3" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "INTUNE_O365", + "Service_Plan_Id": "882e1d05-acd1-4ccb-8708-6ee03664b117", + "Service_Plans_Included_Friendly_Names": "Mobile Device Management for Office 365" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "Nucleus", + "Service_Plan_Id": "db4d623d-b514-490b-b7ef-8885eee514de", + "Service_Plans_Included_Friendly_Names": "Nucleus" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "SHAREPOINTWAC", + "Service_Plan_Id": "e95bec33-7c88-4a70-8e19-b10bd9d0c014", + "Service_Plans_Included_Friendly_Names": "Office for the Web" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "PLACES_CORE", + "Service_Plan_Id": "1fe6227d-3e01-46d0-9510-0acad4ff6e94", + "Service_Plans_Included_Friendly_Names": "Places Core" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "PROJECT_O365_P2", + "Service_Plan_Id": "31b4e2fc-4cd6-4e7d-9c1b-41407303bd66", + "Service_Plans_Included_Friendly_Names": "Project for Office (Plan E3)" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "Bing_Chat_Enterprise", + "Service_Plan_Id": "0d0c0d31-fae7-41f2-b909-eaf4d7f26dba", + "Service_Plans_Included_Friendly_Names": "RETIRED - Commercial data protection for Microsoft Copilot" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "SHAREPOINTENTERPRISE", + "Service_Plan_Id": "5dbe027f-2339-4123-9542-606e4d348a72", + "Service_Plans_Included_Friendly_Names": "SharePoint (Plan 2)" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "MCOSTANDARD", + "Service_Plan_Id": "0feaeb32-d00e-4d66-bd5a-43b5b83db82c", + "Service_Plans_Included_Friendly_Names": "Skype for Business Online (Plan 2)" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "SWAY", + "Service_Plan_Id": "a23b959c-7ce8-4e57-9140-b90eb88a9e97", + "Service_Plans_Included_Friendly_Names": "Sway" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "BPOS_S_TODO_2", + "Service_Plan_Id": "c87f142c-d1e9-4363-8630-aaea9c4d9ae5", + "Service_Plans_Included_Friendly_Names": "To-Do (Plan 2)" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "VIVAENGAGE_CORE", + "Service_Plan_Id": "a82fbf69-b4d7-49f4-83a6-915b2cf354f4", + "Service_Plans_Included_Friendly_Names": "Viva Engage Core" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "VIVA_LEARNING_SEEDED", + "Service_Plan_Id": "b76fb638-6ba6-402a-b9f9-83d28acb3d86", + "Service_Plans_Included_Friendly_Names": "Viva Learning Seeded" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "WHITEBOARD_PLAN2", + "Service_Plan_Id": "94a54592-cd8b-425e-87c6-97868b000b91", + "Service_Plans_Included_Friendly_Names": "Whiteboard (Plan 2)" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "YAMMER_ENTERPRISE", + "Service_Plan_Id": "7547a3fe-08ee-4ccb-b430-5077c5041653", + "Service_Plans_Included_Friendly_Names": "Yammer Enterprise" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "DYN365_CDS_O365_P2", + "Service_Plan_Id": "4ff01e01-1ba7-4d71-8cf8-ce96c3bbcf14", + "Service_Plans_Included_Friendly_Names": "Common Data Service" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "POWERAPPS_O365_P2", + "Service_Plan_Id": "c68f8d98-5534-41c8-bf36-22fa496fa792", + "Service_Plans_Included_Friendly_Names": "Power Apps for Office 365" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "FLOW_O365_P2", + "Service_Plan_Id": "76846ad7-7776-4c40-a281-a386362dd1b9", + "Service_Plans_Included_Friendly_Names": "Power Automate for Office 365" + }, + { + "Product_Display_Name": "Office 365 E3 (no Teams)", + "String_Id": "Office_365_E3_(no_Teams)", + "GUID": "46c3a859-c90d-40b3-9551-6178a48d5c18", + "Service_Plan_Name": "POWER_VIRTUAL_AGENTS_O365_P2", + "Service_Plan_Id": "041fe683-03e4-45b6-b1af-c0cdc516daee", + "Service_Plans_Included_Friendly_Names": "Power Virtual Agents for Office 365" + }, { "Product_Display_Name": "Office 365 E3 EEA (no Teams)", "String_Id": "O365_w/o_Teams_Bundle_E3", @@ -36512,7 +37464,7 @@ "Service_Plans_Included_Friendly_Names": "Power Automate for Power Apps per User Plan" }, { - "Product_Display_Name": "Power Apps per user plan", + "Product_Display_Name": "Power Apps Premium", "String_Id": "POWERAPPS_PER_USER", "GUID": "b30411f5-fea1-4a59-9ad9-3db7c7ead579", "Service_Plan_Name": "DYN365_CDS_P2", @@ -36520,7 +37472,7 @@ "Service_Plans_Included_Friendly_Names": "Common Data Service - P2" }, { - "Product_Display_Name": "Power Apps per user plan", + "Product_Display_Name": "Power Apps Premium", "String_Id": "POWERAPPS_PER_USER", "GUID": "b30411f5-fea1-4a59-9ad9-3db7c7ead579", "Service_Plan_Name": "EXCHANGE_S_FOUNDATION", @@ -36528,7 +37480,7 @@ "Service_Plans_Included_Friendly_Names": "Exchange Foundation" }, { - "Product_Display_Name": "Power Apps per user plan", + "Product_Display_Name": "Power Apps Premium", "String_Id": "POWERAPPS_PER_USER", "GUID": "b30411f5-fea1-4a59-9ad9-3db7c7ead579", "Service_Plan_Name": "POWERAPPS_PER_USER", @@ -36536,7 +37488,7 @@ "Service_Plans_Included_Friendly_Names": "Power Apps per User Plan" }, { - "Product_Display_Name": "Power Apps per user plan", + "Product_Display_Name": "Power Apps Premium", "String_Id": "POWERAPPS_PER_USER", "GUID": "b30411f5-fea1-4a59-9ad9-3db7c7ead579", "Service_Plan_Name": "Flow_PowerApps_PerUser", @@ -36544,7 +37496,7 @@ "Service_Plans_Included_Friendly_Names": "Power Automate for Power Apps per User Plan" }, { - "Product_Display_Name": "Power Apps per user plan for Government", + "Product_Display_Name": "Power Apps Premium for Government", "String_Id": "POWERAPPS_PER_USER_GCC", "GUID": "8e4c6baa-f2ff-4884-9c38-93785d0d7ba1", "Service_Plan_Name": "CDSAICAPACITY_PERUSER", @@ -36552,7 +37504,7 @@ "Service_Plans_Included_Friendly_Names": "AI Builder capacity Per User add-on" }, { - "Product_Display_Name": "Power Apps per user plan for Government", + "Product_Display_Name": "Power Apps Premium for Government", "String_Id": "POWERAPPS_PER_USER_GCC", "GUID": "8e4c6baa-f2ff-4884-9c38-93785d0d7ba1", "Service_Plan_Name": "CDSAICAPACITY_PERUSER_NEW", @@ -36560,7 +37512,7 @@ "Service_Plans_Included_Friendly_Names": "AI Builder capacity Per User add-on" }, { - "Product_Display_Name": "Power Apps per user plan for Government", + "Product_Display_Name": "Power Apps Premium for Government", "String_Id": "POWERAPPS_PER_USER_GCC", "GUID": "8e4c6baa-f2ff-4884-9c38-93785d0d7ba1", "Service_Plan_Name": "DYN365_CDS_P2_GOV", @@ -36568,7 +37520,7 @@ "Service_Plans_Included_Friendly_Names": "Common Data Service for Government" }, { - "Product_Display_Name": "Power Apps per user plan for Government", + "Product_Display_Name": "Power Apps Premium for Government", "String_Id": "POWERAPPS_PER_USER_GCC", "GUID": "8e4c6baa-f2ff-4884-9c38-93785d0d7ba1", "Service_Plan_Name": "EXCHANGE_S_FOUNDATION_GOV", @@ -36576,7 +37528,7 @@ "Service_Plans_Included_Friendly_Names": "Exchange Foundation for Government" }, { - "Product_Display_Name": "Power Apps per user plan for Government", + "Product_Display_Name": "Power Apps Premium for Government", "String_Id": "POWERAPPS_PER_USER_GCC", "GUID": "8e4c6baa-f2ff-4884-9c38-93785d0d7ba1", "Service_Plan_Name": "POWERAPPS_PER_USER_GCC", @@ -36584,7 +37536,7 @@ "Service_Plans_Included_Friendly_Names": "Power Apps per User Plan for Government" }, { - "Product_Display_Name": "Power Apps per user plan for Government", + "Product_Display_Name": "Power Apps Premium for Government", "String_Id": "POWERAPPS_PER_USER_GCC", "GUID": "8e4c6baa-f2ff-4884-9c38-93785d0d7ba1", "Service_Plan_Name": "Flow_PowerApps_PerUser_GCC", @@ -38488,7 +39440,7 @@ "Service_Plans_Included_Friendly_Names": "SWAY" }, { - "Product_Display_Name": "Project Plan 1", + "Product_Display_Name": "Planner Plan 1", "String_Id": "PROJECT_P1", "GUID": "beb6439c-caad-48d3-bf46-0c82871e12be", "Service_Plan_Name": "DYN365_CDS_FOR_PROJECT_P1", @@ -38496,7 +39448,7 @@ "Service_Plans_Included_Friendly_Names": "COMMON DATA SERVICE FOR PROJECT P1" }, { - "Product_Display_Name": "Project Plan 1", + "Product_Display_Name": "Planner Plan 1", "String_Id": "PROJECT_P1", "GUID": "beb6439c-caad-48d3-bf46-0c82871e12be", "Service_Plan_Name": "EXCHANGE_S_FOUNDATION", @@ -38504,7 +39456,7 @@ "Service_Plans_Included_Friendly_Names": "EXCHANGE FOUNDATION" }, { - "Product_Display_Name": "Project Plan 1", + "Product_Display_Name": "Planner Plan 1", "String_Id": "PROJECT_P1", "GUID": "beb6439c-caad-48d3-bf46-0c82871e12be", "Service_Plan_Name": "Power_Automate_For_Project_P1", @@ -38512,7 +39464,7 @@ "Service_Plans_Included_Friendly_Names": "POWER AUTOMATE FOR PROJECT P1" }, { - "Product_Display_Name": "Project Plan 1", + "Product_Display_Name": "Planner Plan 1", "String_Id": "PROJECT_P1", "GUID": "beb6439c-caad-48d3-bf46-0c82871e12be", "Service_Plan_Name": "PROJECT_ESSENTIALS", @@ -38520,7 +39472,7 @@ "Service_Plans_Included_Friendly_Names": "PROJECT ONLINE ESSENTIALS" }, { - "Product_Display_Name": "Project Plan 1", + "Product_Display_Name": "Planner Plan 1", "String_Id": "PROJECT_P1", "GUID": "beb6439c-caad-48d3-bf46-0c82871e12be", "Service_Plan_Name": "PROJECT_P1", @@ -38528,7 +39480,7 @@ "Service_Plans_Included_Friendly_Names": "PROJECT P1" }, { - "Product_Display_Name": "Project Plan 1", + "Product_Display_Name": "Planner Plan 1", "String_Id": "PROJECT_P1", "GUID": "beb6439c-caad-48d3-bf46-0c82871e12be", "Service_Plan_Name": "SHAREPOINTSTANDARD", @@ -38584,7 +39536,7 @@ "Service_Plans_Included_Friendly_Names": "SHAREPOINT STANDARD" }, { - "Product_Display_Name": "Project Plan 3", + "Product_Display_Name": "Planner and Project Plan 3", "String_Id": "PROJECTPROFESSIONAL", "GUID": "53818b1b-4a27-454b-8896-0dba576410e6", "Service_Plan_Name": "DYN365_CDS_PROJECT", @@ -38592,7 +39544,7 @@ "Service_Plans_Included_Friendly_Names": "Common Data Service for Project" }, { - "Product_Display_Name": "Project Plan 3", + "Product_Display_Name": "Planner and Project Plan 3", "String_Id": "PROJECTPROFESSIONAL", "GUID": "53818b1b-4a27-454b-8896-0dba576410e6", "Service_Plan_Name": "EXCHANGE_S_FOUNDATION", @@ -38600,7 +39552,7 @@ "Service_Plans_Included_Friendly_Names": "Exchange Foundation" }, { - "Product_Display_Name": "Project Plan 3", + "Product_Display_Name": "Planner and Project Plan 3", "String_Id": "PROJECTPROFESSIONAL", "GUID": "53818b1b-4a27-454b-8896-0dba576410e6", "Service_Plan_Name": "FLOW_FOR_PROJECT", @@ -38608,7 +39560,7 @@ "Service_Plans_Included_Friendly_Names": "Flow for Project" }, { - "Product_Display_Name": "Project Plan 3", + "Product_Display_Name": "Planner and Project Plan 3", "String_Id": "PROJECTPROFESSIONAL", "GUID": "53818b1b-4a27-454b-8896-0dba576410e6", "Service_Plan_Name": "SHAREPOINTWAC", @@ -38616,7 +39568,7 @@ "Service_Plans_Included_Friendly_Names": "Office for the web" }, { - "Product_Display_Name": "Project Plan 3", + "Product_Display_Name": "Planner and Project Plan 3", "String_Id": "PROJECTPROFESSIONAL", "GUID": "53818b1b-4a27-454b-8896-0dba576410e6", "Service_Plan_Name": "PROJECT_CLIENT_SUBSCRIPTION", @@ -38624,7 +39576,7 @@ "Service_Plans_Included_Friendly_Names": "Project Online Desktop Client" }, { - "Product_Display_Name": "Project Plan 3", + "Product_Display_Name": "Planner and Project Plan 3", "String_Id": "PROJECTPROFESSIONAL", "GUID": "53818b1b-4a27-454b-8896-0dba576410e6", "Service_Plan_Name": "SHAREPOINT_PROJECT", @@ -38632,7 +39584,7 @@ "Service_Plans_Included_Friendly_Names": "Project Online Service" }, { - "Product_Display_Name": "Project Plan 3", + "Product_Display_Name": "Planner and Project Plan 3", "String_Id": "PROJECTPROFESSIONAL", "GUID": "53818b1b-4a27-454b-8896-0dba576410e6", "Service_Plan_Name": "PROJECT_PROFESSIONAL", @@ -38640,7 +39592,7 @@ "Service_Plans_Included_Friendly_Names": "Project P3" }, { - "Product_Display_Name": "Project Plan 3", + "Product_Display_Name": "Planner and Project Plan 3", "String_Id": "PROJECTPROFESSIONAL", "GUID": "53818b1b-4a27-454b-8896-0dba576410e6", "Service_Plan_Name": "SHAREPOINTENTERPRISE", @@ -39592,7 +40544,7 @@ "Service_Plans_Included_Friendly_Names": "Visio Web App" }, { - "Product_Display_Name": "Visio Online Plan 1", + "Product_Display_Name": "Visio Plan 1", "String_Id": "VISIOONLINE_PLAN1", "GUID": "4b244418-9658-4451-a2b8-b5e2b364e9bd", "Service_Plan_Name": "EXCHANGE_S_FOUNDATION", @@ -39600,7 +40552,7 @@ "Service_Plans_Included_Friendly_Names": "EXCHANGE FOUNDATION" }, { - "Product_Display_Name": "Visio Online Plan 1", + "Product_Display_Name": "Visio Plan 1", "String_Id": "VISIOONLINE_PLAN1", "GUID": "4b244418-9658-4451-a2b8-b5e2b364e9bd", "Service_Plan_Name": "ONEDRIVE_BASIC", @@ -39608,7 +40560,7 @@ "Service_Plans_Included_Friendly_Names": "ONEDRIVE FOR BUSINESS BASIC" }, { - "Product_Display_Name": "Visio Online Plan 1", + "Product_Display_Name": "Visio Plan 1", "String_Id": "VISIOONLINE_PLAN1", "GUID": "4b244418-9658-4451-a2b8-b5e2b364e9bd", "Service_Plan_Name": "VISIOONLINE", @@ -39616,7 +40568,7 @@ "Service_Plans_Included_Friendly_Names": "VISIO WEB APP" }, { - "Product_Display_Name": "Visio Online Plan 2", + "Product_Display_Name": "Visio Plan 2", "String_Id": "VISIOCLIENT", "GUID": "c5928f49-12ba-48f7-ada3-0d743a3601d5", "Service_Plan_Name": "EXCHANGE_S_FOUNDATION", @@ -39624,7 +40576,7 @@ "Service_Plans_Included_Friendly_Names": "EXCHANGE FOUNDATION" }, { - "Product_Display_Name": "Visio Online Plan 2", + "Product_Display_Name": "Visio Plan 2", "String_Id": "VISIOCLIENT", "GUID": "c5928f49-12ba-48f7-ada3-0d743a3601d5", "Service_Plan_Name": "ONEDRIVE_BASIC", @@ -39632,7 +40584,7 @@ "Service_Plans_Included_Friendly_Names": "ONEDRIVE FOR BUSINESS BASIC" }, { - "Product_Display_Name": "Visio Online Plan 2", + "Product_Display_Name": "Visio Plan 2", "String_Id": "VISIOCLIENT", "GUID": "c5928f49-12ba-48f7-ada3-0d743a3601d5", "Service_Plan_Name": "VISIO_CLIENT_SUBSCRIPTION", @@ -39640,7 +40592,7 @@ "Service_Plans_Included_Friendly_Names": "VISIO DESKTOP APP" }, { - "Product_Display_Name": "Visio Online Plan 2", + "Product_Display_Name": "Visio Plan 2", "String_Id": "VISIOCLIENT", "GUID": "c5928f49-12ba-48f7-ada3-0d743a3601d5", "Service_Plan_Name": "VISIOONLINE", diff --git a/src/data/alerts.json b/src/data/alerts.json index 0648464c74ff..e503a0bbf800 100644 --- a/src/data/alerts.json +++ b/src/data/alerts.json @@ -80,6 +80,11 @@ "label": "Alert on expiring application secrets", "recommendedRunInterval": "1d" }, + { + "name": "AppleTerms", + "label": "Alert on new Apple Business Manager terms", + "recommendedRunInterval": "30d" + }, { "name": "ApnCertExpiry", "label": "Alert on expiring APN certificates", diff --git a/src/data/standards.json b/src/data/standards.json index ce2779301a2c..c50f45b20e68 100644 --- a/src/data/standards.json +++ b/src/data/standards.json @@ -90,7 +90,7 @@ "label": "Hide self-service password reset" }, { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Visual Template", "name": "standards.Branding.layoutTemplateType", @@ -193,7 +193,7 @@ "helpText": "Enables and sets Idle session timeout for Microsoft 365 to 1 hour. This policy affects most M365 web apps", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.ActivityBasedTimeout.timeout", @@ -293,7 +293,7 @@ "docsDescription": "Sets the Authenticator Lite state to enabled. This allows users to use the Authenticator Lite built into the Outlook app instead of the full Authenticator app.", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.PWcompanionAppAllowedState.state", @@ -362,7 +362,7 @@ "docsDescription": "Enables Temporary Password generation for the tenant.", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select TAP Lifetime", "name": "standards.TAP.config", @@ -404,7 +404,7 @@ "helpText": "Sets the state of the Cross-tenant access setting to trust external MFA. This allows guest users to use their home tenant MFA to access your tenant.", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.ExternalMFATrusted.state", @@ -466,7 +466,7 @@ "docsDescription": "Sets the state of the registration campaign for the tenant. If enabled nudges users to set up the Microsoft Authenticator during sign-in.", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.NudgeMFA.state", @@ -772,7 +772,7 @@ "docsDescription": "Sets the global quarantine notification interval for the tenant. This is the time between the quarantine notification emails are sent out to users. Default is 24 hours.", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.GlobalQuarantineNotifications.NotificationInterval", @@ -819,7 +819,7 @@ "docsDescription": "Sets the default Focused Inbox state for the tenant. This can be overridden by the user in their Outlook settings. For more information, see [Microsoft's documentation.](https://support.microsoft.com/en-us/office/focused-inbox-for-outlook-f445ad7f-02f4-4294-a82e-71d8964e3978)", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.FocusedInbox.state", @@ -849,7 +849,7 @@ "docsDescription": "Sets the default state for Cloud Message Recall for the tenant. By default this is enabled. You can read more about the feature [here.](https://techcommunity.microsoft.com/t5/exchange-team-blog/cloud-based-message-recall-in-exchange-online/ba-p/3744714)", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.CloudMessageRecall.state", @@ -916,7 +916,7 @@ "docsDescription": "Adds or removes indicators to e-mail messages received from external senders in Outlook. You can read more about this feature on [Microsoft's Exchange Team Blog.](https://techcommunity.microsoft.com/t5/exchange-team-blog/native-external-sender-callouts-on-email-in-outlook/ba-p/2250098)", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.SpoofWarn.state", @@ -965,7 +965,7 @@ "helpText": "Sets the default state for automatically turning meetings into Teams meetings for the tenant. This can be overridden by the user in Outlook.", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.TeamsMeetingsByDefault.state", @@ -1075,7 +1075,7 @@ }, "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select Sharing Level", "name": "standards.calDefault.permissionlevel", @@ -1166,7 +1166,7 @@ "helpText": "Sets the shorten meetings settings on a tenant level. This will shorten meetings by the selected amount of minutes. Valid values are 0 to 29. Short meetings are under 60 minutes, long meetings are over 60 minutes.", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.ShortenMeetings.ShortenEventScopeDefault", @@ -1212,7 +1212,7 @@ "docsDescription": "", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.Bookings.state", @@ -1298,7 +1298,7 @@ "docsDescription": "Set the state of the built-in Report button in Outlook. This gives the users the ability to report emails as spam or phish.", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select value", "name": "standards.UserSubmissions.state", @@ -1446,7 +1446,7 @@ "default": true }, { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "If the message is detected as spoof by spoof intelligence", "name": "standards.AntiPhishPolicy.AuthenticationFailAction", @@ -1462,7 +1462,7 @@ ] }, { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Quarantine policy for Spoof", "name": "standards.AntiPhishPolicy.SpoofQuarantineTag", @@ -1482,7 +1482,7 @@ ] }, { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "If a message is detected as user impersonation", "name": "standards.AntiPhishPolicy.TargetedUserProtectionAction", @@ -1502,7 +1502,7 @@ ] }, { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Quarantine policy for user impersonation", "name": "standards.AntiPhishPolicy.TargetedUserQuarantineTag", @@ -1522,7 +1522,7 @@ ] }, { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "If a message is detected as domain impersonation", "name": "standards.AntiPhishPolicy.TargetedDomainProtectionAction", @@ -1542,7 +1542,7 @@ ] }, { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Quarantine policy for domain impersonation", "name": "standards.AntiPhishPolicy.TargetedDomainQuarantineTag", @@ -1562,7 +1562,7 @@ ] }, { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "If Mailbox Intelligence detects an impersonated user", "name": "standards.AntiPhishPolicy.MailboxIntelligenceProtectionAction", @@ -1582,7 +1582,7 @@ ] }, { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Apply quarantine policy", "name": "standards.AntiPhishPolicy.MailboxIntelligenceQuarantineTag", @@ -1621,7 +1621,7 @@ "helpText": "This creates a Safe Attachment policy", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Action", "name": "standards.SafeAttachmentPolicy.Action", @@ -1641,7 +1641,7 @@ ] }, { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "QuarantineTag", "name": "standards.SafeAttachmentPolicy.QuarantineTag", @@ -1705,7 +1705,7 @@ "helpText": "This creates a Malware filter policy that enables the default File filter and Zero-hour auto purge for malware.", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "FileTypeAction", "name": "standards.MalwareFilterPolicy.FileTypeAction", @@ -1727,7 +1727,7 @@ "label": "Optional File Types, Comma separated" }, { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "QuarantineTag", "name": "standards.MalwareFilterPolicy.QuarantineTag", @@ -2121,7 +2121,7 @@ "docsDescription": "When a OneDrive user gets deleted, the personal SharePoint site is saved for selected amount of time that data can be retrieved from it.", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "name": "standards.DeletedUserRentention.Days", "label": "Retention time (Default 30 days)", @@ -2363,7 +2363,7 @@ "helpText": "Sets the default sharing level for OneDrive and SharePoint. This is a tenant wide setting and overrules any settings set on the site level", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "label": "Select Sharing Level", "name": "standards.sharingCapability.Level", @@ -2468,7 +2468,7 @@ "helpText": "Restricts sharing to only users with the specified domain. This is useful for organizations that only want to share with their own domain.", "addedComponent": [ { - "type": "autoComplete", + "type": "select", "multiple": false, "name": "standards.sharingDomainRestriction.Mode", "label": "Limit external sharing by domains", @@ -2769,16 +2769,16 @@ "label": "Read Receipts Enabled Type", "options": [ { - "label": "User controlled", - "value": "UserPreference" + "label": "User controlled", + "value": "UserPreference" }, { - "label": "Turned on for everyone", - "value": "Everyone" + "label": "Turned on for everyone", + "value": "Everyone" }, { - "label": "Turned off for everyone", - "value": "None" + "label": "Turned off for everyone", + "value": "None" } ] }, diff --git a/src/pages/identity/reports/inactive-users-report/index.js b/src/pages/identity/reports/inactive-users-report/index.js index af1dd1a1ff05..8764ec1236c1 100644 --- a/src/pages/identity/reports/inactive-users-report/index.js +++ b/src/pages/identity/reports/inactive-users-report/index.js @@ -1,17 +1,66 @@ import { Layout as DashboardLayout } from "/src/layouts/index.js"; import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; +import { EyeIcon, TrashIcon } from "@heroicons/react/24/outline"; +import { Edit, Block } from "@mui/icons-material"; const Page = () => { const pageTitle = "Inactive users (6 months)"; const apiUrl = "/api/ListInactiveAccounts"; - const actions = []; + const actions = [ + { + label: "View User", + link: "/identity/administration/users/user?userId=[azureAdUserId]", + multiPost: false, + icon: , + color: "success", + }, + { + label: "Edit User", + link: "/identity/administration/users/user/edit?userId=[azureAdUserId]", + icon: , + color: "success", + target: "_self", + }, + { + label: "Block Sign In", + type: "GET", + icon: , + url: "/api/ExecDisableUser", + data: { ID: "azureAdUserId" }, + confirmText: "Are you sure you want to block the sign-in for this user?", + multiPost: false, + }, + { + label: "Delete User", + type: "GET", + icon: , + url: "/api/RemoveUser", + data: { ID: "azureAdUserId" }, + confirmText: "Are you sure you want to delete this user?", + multiPost: false, + }, + ]; - const offCanvas = null; + const offCanvas = { + extendedInfoFields: [ + "tenantDisplayName", + "displayName", + "userPrincipalName", + "userType", + "createdDateTime", + "lastSignInDateTime", + "lastNonInteractiveSignInDateTime", + "numberOfAssignedLicenses", + "lastRefreshedDateTime", + ], + actions: actions, + }; const simpleColumns = [ "tenantDisplayName", "userPrincipalName", "displayName", + "lastSignInDateTime", "lastNonInteractiveSignInDateTime", "numberOfAssignedLicenses", "lastRefreshedDateTime", diff --git a/src/pages/teams-share/onedrive/index.js b/src/pages/teams-share/onedrive/index.js index 00cc966ec442..c14fd268acb2 100644 --- a/src/pages/teams-share/onedrive/index.js +++ b/src/pages/teams-share/onedrive/index.js @@ -11,14 +11,28 @@ const Page = () => { url: "/api/ExecSharePointPerms", data: { UPN: "ownerPrincipalName", + URL: "webUrl", RemovePermission: false, }, confirmText: "Select the User to add to this user's OneDrive permissions", - dropdown: { - url: "/api/listUsers", - labelField: "displayName", - valueField: "userPrincipalName", - }, + fields: [ + { + type: "autoComplete", + name: "onedriveAccessUser", + label: "Select User", + multiple: false, + creatable: false, + api: { + url: "/api/listUsers", + labelField: (onedriveAccessUser) => + `${onedriveAccessUser.displayName} (${onedriveAccessUser.userPrincipalName})`, + valueField: "userPrincipalName", + addedField: { + displayName: "displayName", + }, + }, + }, + ], }, { label: "Remove permissions from OneDrive", @@ -26,15 +40,28 @@ const Page = () => { url: "/api/ExecSharePointPerms", data: { UPN: "ownerPrincipalName", - TenantFilter: "TenantFilter", + URL: "webUrl", RemovePermission: true, }, confirmText: "Select the User to remove from this user's OneDrive permissions", - dropdown: { - url: "/api/listUsers?TenantFilter=TenantFilter", - labelField: "displayName", - valueField: "userPrincipalName", - }, + fields: [ + { + type: "autoComplete", + name: "onedriveAccessUser", + label: "Select User", + multiple: false, + creatable: false, + api: { + url: "/api/listUsers", + labelField: (onedriveAccessUser) => + `${onedriveAccessUser.displayName} (${onedriveAccessUser.userPrincipalName})`, + valueField: "userPrincipalName", + addedField: { + displayName: "displayName", + }, + }, + }, + ], }, ]; diff --git a/src/pages/teams-share/teams/business-voice/index.js b/src/pages/teams-share/teams/business-voice/index.js index d4ea31c1df87..725a2a8a5331 100644 --- a/src/pages/teams-share/teams/business-voice/index.js +++ b/src/pages/teams-share/teams/business-voice/index.js @@ -12,16 +12,24 @@ const Page = () => { url: "/api/ExecTeamsVoicePhoneNumberAssignment", data: { PhoneNumber: "TelephoneNumber", - TenantFilter: "TenantFilter", PhoneNumberType: "NumberType", locationOnly: false, }, - modalDropdown: { - url: "/api/listUsers?TenantFilter=TenantFilter", - labelField: "displayName", - valueField: "userPrincipalName", - }, - confirmText: "Select the User to assign.", + fields: [ + { + type: "autoComplete", + name: "input", + label: "Select User", + multiple: false, + creatable: false, + api: { + url: "/api/listUsers", + labelField: (input) => `${input.displayName} (${input.userPrincipalName})`, + valueField: "userPrincipalName", + }, + }, + ], + confirmText: "Select the User to assign the phone number to.", }, { label: "Unassign User", @@ -29,7 +37,6 @@ const Page = () => { url: "/api/ExecRemoveTeamsVoicePhoneNumberAssignment", data: { PhoneNumber: "TelephoneNumber", - TenantFilter: "TenantFilter", AssignedTo: "AssignedTo", PhoneNumberType: "NumberType", }, @@ -41,14 +48,20 @@ const Page = () => { url: "/api/ExecTeamsVoicePhoneNumberAssignment", data: { PhoneNumber: "TelephoneNumber", - TenantFilter: "TenantFilter", locationOnly: true, }, - modalDropdown: { - url: "/api/ListTeamsLisLocation?TenantFilter=TenantFilter", - labelField: "Description", - valueField: "LocationId", - }, + fields: [ + { + type: "autoComplete", + name: "input", + label: "Emergency Location", + api: { + url: "/api/ListTeamsLisLocation", + labelField: "Description", + valueField: "LocationId", + }, + }, + ], confirmText: "Select the Emergency Location.", }, ]; diff --git a/src/pages/tenant/administration/alert-configuration/alert.jsx b/src/pages/tenant/administration/alert-configuration/alert.jsx index ab3d4d6130ae..b724fce1b022 100644 --- a/src/pages/tenant/administration/alert-configuration/alert.jsx +++ b/src/pages/tenant/administration/alert-configuration/alert.jsx @@ -206,12 +206,21 @@ const AlertWizard = () => { }; const handleScriptSubmit = (values) => { + const getInputParams = () => { + if (values.command.value.requiresInput) { + return { + [values.command.value.inputName]: values[values.command.value.inputName], + }; + } + return {}; + }; + const postObject = { RowKey: router.query.clone ? undefined : router.query.id ? router.query.id : undefined, tenantFilter: values.tenantFilter?.value, Name: `${values.tenantFilter.value}: ${values.command.label}`, Command: { value: `Get-CIPPAlert${values.command.value.name}` }, - Parameters: {}, + Parameters: getInputParams(), ScheduledTime: Math.floor(new Date().getTime() / 1000) + 60, Recurrence: values.recurrence, PostExecution: values.postExecution, diff --git a/src/pages/tenant/administration/app-consent-requests/index.js b/src/pages/tenant/administration/app-consent-requests/index.js index 8e51c9854c57..f3237e9345f6 100644 --- a/src/pages/tenant/administration/app-consent-requests/index.js +++ b/src/pages/tenant/administration/app-consent-requests/index.js @@ -1,4 +1,4 @@ -import { useState, useEffect } from "react"; +import { useState, useEffect, use } from "react"; import { Layout as DashboardLayout } from "/src/layouts/index.js"; import { CippTablePage } from "/src/components/CippComponents/CippTablePage.jsx"; import { @@ -12,6 +12,7 @@ import { import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; import { useForm } from "react-hook-form"; import CippFormComponent from "/src/components/CippComponents/CippFormComponent"; +import { useSettings } from "/src/hooks/use-settings"; const simpleColumns = [ "Tenant", @@ -27,6 +28,7 @@ const apiUrl = "/api/ListAppConsentRequests"; const pageTitle = "App Consent Requests"; const Page = () => { + const tenantFilter = useSettings().currentTenant; const formControl = useForm({ defaultValues: { requestStatus: "All", @@ -89,6 +91,14 @@ const Page = () => { title={pageTitle} apiUrl={apiUrl} simpleColumns={simpleColumns} + filters={[ + // Filter for showing only pending requests + { + filterName: "Pending requests", + value: [{ id: "requestStatus", value: "Pending" }], + type: "column", + }, + ]} queryKey={`AppConsentRequests-${JSON.stringify(filterParams)}`} apiData={{ ...filterParams, @@ -103,23 +113,23 @@ const Page = () => { "reviewedBy", // Reviewed by "reviewedJustification", // Reviewed Reason ], - actions: [ - { - label: "Review in Entra", - link: `https://entra.microsoft.com/[TenantFilter]/#view/Microsoft_AAD_IAM/StartboardApplicationsMenuBlade/~/AccessRequests`, - color: "info", - target: "_blank", - external: true, - }, - { - label: "Approve in Entra", - link: "[consentUrl]", - color: "info", - target: "_blank", - external: true, - }, - ], }} + actions={[ + { + label: "Review in Entra", + link: `https://entra.microsoft.com/${tenantFilter}/#view/Microsoft_AAD_IAM/StartboardApplicationsMenuBlade/~/AccessRequests`, + color: "info", + target: "_blank", + external: true, + }, + { + label: "Approve in Entra", + link: "[consentUrl]", + color: "info", + target: "_blank", + external: true, + }, + ]} /> ); }; diff --git a/src/pages/tenant/gdap-management/onboarding/start.js b/src/pages/tenant/gdap-management/onboarding/start.js index 1b22dd4683e9..e04846851b4d 100644 --- a/src/pages/tenant/gdap-management/onboarding/start.js +++ b/src/pages/tenant/gdap-management/onboarding/start.js @@ -205,8 +205,8 @@ const Page = () => { }); var missingDefaults = []; - relationshipRoles.forEach((role) => { - if (!cippDefaults?.find((defaultRole) => defaultRole.value === role.roleDefinitionId)) { + cippDefaults.forEach((defaultRole) => { + if (!relationshipRoles?.find((role) => defaultRole.value === role.roleDefinitionId)) { missingDefaults.push(role); } });