Merge pull request KelvinTegelaar#4775 from KelvinTegelaar/dev

Dev to release

Author: KelvinTegelaar

.vscode/tasks.json

@@ -10,6 +10,12 @@
       "type": "shell",
       "command": "azurite --location ../",
       "isBackground": true,
+      "options": {
+        "env": {
+          "LC_ALL": "en-US.UTF-8",
+          "LANG": "en-US"
+        }
+      },
       "problemMatcher": {
         "pattern": [
           {

cspell.json

@@ -30,6 +30,7 @@
     "Reshare",
     "Rewst",
     "Sherweb",
+    "superadmin",
     "Syncro",
     "TERRL",
     "unconfigured",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cipp",
-  "version": "8.4.2",
+  "version": "8.5.0",
   "author": "CIPP Contributors",
   "homepage": "https://cipp.app/",
   "bugs": {

public/permissionsList.json

@@ -7969,5 +7969,25 @@
     "userConsentDescription": "Allows the app to manage workforce integrations, to synchronize data from Microsoft Teams Shifts, on your behalf.",
     "userConsentDisplayName": "Read and write workforce integrations",
     "value": "WorkforceIntegration.ReadWrite.All"
+  },
+  {
+    "description": "Read and Modify Tenant-Acquired Telephone Number Details",
+    "displayName": "Read and Modify Tenant-Acquired Telephone Number Details",
+    "id": "424b07a8-1209-4d17-9fe4-9018a93a1024",
+    "isEnabled": true,
+    "Origin": "Delegated",
+    "userConsentDescription": "Allows the app to read and modify your tenant's acquired telephone number details on behalf of the signed-in admin user. Acquired telephone numbers may include attributes related to assigned object, emergency location, network site, etc.",
+    "userConsentDisplayName": "Allows the app to read and modify your tenant's acquired telephone number details on behalf of the signed-in admin user. Acquired telephone numbers may include attributes related to assigned object, emergency location, network site, etc.",
+    "value": "TeamsTelephoneNumber.ReadWrite.All"
+  },
+  {
+    "description": "Read and Modify Tenant-Acquired Telephone Number Details",
+    "displayName": "Read and Modify Tenant-Acquired Telephone Number Details",
+    "id": "0a42382f-155c-4eb1-9bdc-21548ccaa387",
+    "isEnabled": true,
+    "Origin": "Application",
+    "userConsentDescription": "Allows the app to read your tenant's acquired telephone number details, without a signed-in user. Acquired telephone numbers may include attributes related to assigned object, emergency location, network site, etc.",
+    "userConsentDisplayName": "Allows the app to read your tenant's acquired telephone number details, without a signed-in user. Acquired telephone numbers may include attributes related to assigned object, emergency location, network site, etc.",
+    "value": "TeamsTelephoneNumber.ReadWrite.All"
   }
 ]

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "8.4.2"
+  "version": "8.5.0"
 }

src/api/ApiCall.jsx

@@ -76,7 +76,25 @@ export function ApiGetCall(props) {
         if (relatedQueryKeys) {
           const clearKeys = Array.isArray(relatedQueryKeys) ? relatedQueryKeys : [relatedQueryKeys];
           setTimeout(() => {
-            clearKeys.forEach((key) => {
+            // Separate wildcard patterns from exact keys
+            const wildcardPatterns = clearKeys
+              .filter((key) => key.endsWith("*"))
+              .map((key) => key.slice(0, -1));
+            const exactKeys = clearKeys.filter((key) => !key.endsWith("*"));
+
+            // Use single predicate call for all wildcard patterns
+            if (wildcardPatterns.length > 0) {
+              queryClient.invalidateQueries({
+                predicate: (query) => {
+                  if (!query.queryKey || !query.queryKey[0]) return false;
+                  const queryKeyStr = String(query.queryKey[0]);
+                  return wildcardPatterns.some((pattern) => queryKeyStr.startsWith(pattern));
+                },
+              });
+            }
+
+            // Handle exact keys
+            exactKeys.forEach((key) => {
               queryClient.invalidateQueries({ queryKey: [key] });
             });
           }, 1000);
@@ -96,7 +114,25 @@ export function ApiGetCall(props) {
         if (relatedQueryKeys) {
           const clearKeys = Array.isArray(relatedQueryKeys) ? relatedQueryKeys : [relatedQueryKeys];
           setTimeout(() => {
-            clearKeys.forEach((key) => {
+            // Separate wildcard patterns from exact keys
+            const wildcardPatterns = clearKeys
+              .filter((key) => key.endsWith("*"))
+              .map((key) => key.slice(0, -1));
+            const exactKeys = clearKeys.filter((key) => !key.endsWith("*"));
+
+            // Use single predicate call for all wildcard patterns
+            if (wildcardPatterns.length > 0) {
+              queryClient.invalidateQueries({
+                predicate: (query) => {
+                  if (!query.queryKey || !query.queryKey[0]) return false;
+                  const queryKeyStr = String(query.queryKey[0]);
+                  return wildcardPatterns.some((pattern) => queryKeyStr.startsWith(pattern));
+                },
+              });
+            }
+
+            // Handle exact keys
+            exactKeys.forEach((key) => {
               queryClient.invalidateQueries({ queryKey: [key] });
             });
           }, 1000);
@@ -117,6 +153,7 @@ export function ApiGetCall(props) {
 
 export function ApiPostCall({ relatedQueryKeys, onResult }) {
   const queryClient = useQueryClient();
+
   const mutation = useMutation({
     mutationFn: async (props) => {
       const { url, data, bulkRequest } = props;
@@ -144,9 +181,43 @@ export function ApiPostCall({ relatedQueryKeys, onResult }) {
         const clearKeys = Array.isArray(relatedQueryKeys) ? relatedQueryKeys : [relatedQueryKeys];
         setTimeout(() => {
           if (relatedQueryKeys === "*") {
+            console.log("Invalidating all queries");
             queryClient.invalidateQueries();
           } else {
-            clearKeys.forEach((key) => {
+            // Separate wildcard patterns from exact keys
+            const wildcardPatterns = clearKeys
+              .filter((key) => key.endsWith("*"))
+              .map((key) => key.slice(0, -1));
+            const exactKeys = clearKeys.filter((key) => !key.endsWith("*"));
+
+            // Use single predicate call for all wildcard patterns
+            if (wildcardPatterns.length > 0) {
+              queryClient.invalidateQueries({
+                predicate: (query) => {
+                  if (!query.queryKey || !query.queryKey[0]) return false;
+                  const queryKeyStr = String(query.queryKey[0]);
+                  const matches = wildcardPatterns.some((pattern) =>
+                    queryKeyStr.startsWith(pattern)
+                  );
+
+                  // Debug logging for each query check
+                  if (matches) {
+                    console.log("Invalidating query:", {
+                      queryKey: query.queryKey,
+                      queryKeyStr,
+                      matchedPattern: wildcardPatterns.find((pattern) =>
+                        queryKeyStr.startsWith(pattern)
+                      ),
+                    });
+                  }
+
+                  return matches;
+                },
+              });
+            }
+
+            // Handle exact keys
+            exactKeys.forEach((key) => {
               queryClient.invalidateQueries({ queryKey: [key] });
             });
           }

src/components/CippCards/CippChartCard.jsx

@@ -93,12 +93,15 @@ export const CippChartCard = ({
   title,
   actions,
   onClick,
+  totalLabel = "Total",
+  customTotal,
 }) => {
   const [range, setRange] = useState("Last 7 days");
   const [barSeries, setBarSeries] = useState([]);
   const chartOptions = useChartOptions(labels, chartType);
   chartSeries = chartSeries.filter((item) => item !== null);
-  const total = chartSeries.reduce((acc, value) => acc + value, 0);
+  const calculatedTotal = chartSeries.reduce((acc, value) => acc + value, 0);
+  const total = customTotal !== undefined ? customTotal : calculatedTotal;
   useEffect(() => {
     if (chartType === "bar") {
       setBarSeries(
@@ -160,7 +163,7 @@ export const CippChartCard = ({
         >
           {labels.length > 0 && (
             <>
-              <Typography variant="h5">Total</Typography>
+              <Typography variant="h5">{totalLabel}</Typography>
               <Typography variant="h5">{isFetching ? "0" : total}</Typography>
             </>
           )}