Merge branch 'KelvinTegelaar:main' into main

.github/workflows/Check_for_Version_Update.yml

@@ -7,17 +7,17 @@ on:
 jobs:
   build:
     if: github.repository_owner == 'KelvinTegelaar'
-    name: 'Check for Version Update'
+    name: "Check for Version Update"
     runs-on: ubuntu-latest
     steps:
       - name: Check for Changed Files
         uses: brettcannon/check-for-changed-files@v1.1.0
         with:
-          file-pattern: version_latest.txt
-          failure-message: 'You have not updated version_latest.txt. This is a required file to update at each PR. Please sync your latest changes and update the version number.'
+          file-pattern: public/version.json
+          failure-message: "You have not updated version.json. This is a required file to update at each PR. Please sync your latest changes and update the version number."
       - name: Prevent changes to workflow files
         uses: DovnarAlexander/github-action-file-detection@v0.3.0
         with:
-          wildcard: '.github/workflows/*.yml'
+          wildcard: ".github/workflows/*.yml"
           exit_code_found: 1
           exit_code_not_found: 0

package.json

@@ -6,6 +6,7 @@
   "bugs": {
     "url": "https://github.com/KelvinTegelaar/CIPP/issues"
   },
+  "license": "AGPL-3.0",
   "engines": {
     "node": "^18.17.0"
   },

public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "7.0.5"
+  "version": "7.1.2"
 }

src/api/ApiCall.jsx

@@ -190,7 +190,11 @@ export function ApiGetCallWithPagination({
       return response.data;
     },
     getNextPageParam: (lastPage) => {
-      if (data?.noPagination || data?.manualPagination === false) {
+      if (
+        data?.noPagination ||
+        data?.manualPagination === false ||
+        data?.tenantFilter === "AllTenants"
+      ) {
         return undefined;
       }
       return lastPage?.Metadata?.nextLink ? { nextLink: lastPage.Metadata.nextLink } : undefined;

src/components/CippCards/CippBannerListCard.jsx

@@ -13,9 +13,10 @@ import {
 } from "@mui/material";
 import ChevronDownIcon from "@heroicons/react/24/outline/ChevronDownIcon";
 import { CippPropertyListCard } from "./CippPropertyListCard";
+import { CippDataTable } from "../CippTable/CippDataTable";
 
 export const CippBannerListCard = (props) => {
-  const { items = [], isCollapsible = false, isFetching = false, ...other } = props;
+  const { items = [], isCollapsible = false, isFetching = false, children, ...other } = props;
   const [expanded, setExpanded] = useState(null);
 
   const handleExpand = useCallback((itemId) => {
@@ -113,17 +114,19 @@ export const CippBannerListCard = (props) => {
 
                     {/* Right Side: Status and Expand Icon */}
                     <Stack alignItems="center" direction="row" spacing={2}>
-                      <Stack alignItems="center" direction="row" spacing={1}>
-                        <Box
-                          sx={{
-                            backgroundColor: statusColor,
-                            borderRadius: "50%",
-                            height: 8,
-                            width: 8,
-                          }}
-                        />
-                        <Typography variant="body2">{item.statusText}</Typography>
-                      </Stack>
+                      {item?.statusText && (
+                        <Stack alignItems="center" direction="row" spacing={1}>
+                          <Box
+                            sx={{
+                              backgroundColor: statusColor,
+                              borderRadius: "50%",
+                              height: 8,
+                              width: 8,
+                            }}
+                          />
+                          <Typography variant="body2">{item.statusText}</Typography>
+                        </Stack>
+                      )}
                       {isCollapsible && (
                         <IconButton onClick={() => handleExpand(item.id)}>
                           <SvgIcon
@@ -142,11 +145,18 @@ export const CippBannerListCard = (props) => {
                   {isCollapsible && (
                     <Collapse in={isExpanded}>
                       <Divider />
-                      <CippPropertyListCard
-                        propertyItems={item.propertyItems || []}
-                        layout="dual"
-                        isFetching={item.isFetching || false}
-                      />
+                      <Stack spacing={1}>
+                        {item?.propertyItems?.length > 0 && (
+                          <CippPropertyListCard
+                            propertyItems={item.propertyItems || []}
+                            layout="dual"
+                            isFetching={item.isFetching || false}
+                          />
+                        )}
+                        {item?.table && <CippDataTable {...item.table} />}
+                        {item?.children && <Box sx={{ pl: 3 }}>{item.children}</Box>}
+                        {item?.actionButton && <Box sx={{ pl: 3, pb: 2 }}>{item.actionButton}</Box>}
+                      </Stack>
                     </Collapse>
                   )}
                 </li>
@@ -174,8 +184,12 @@ CippBannerListCard.propTypes = {
       subtext: PropTypes.string,
       statusColor: PropTypes.string,
       statusText: PropTypes.string,
+      actionButton: PropTypes.element,
       propertyItems: PropTypes.array,
+      table: PropTypes.object,
+      actionButton: PropTypes.element,
       isFetching: PropTypes.bool,
+      children: PropTypes.node,
     })
   ).isRequired,
   isCollapsible: PropTypes.bool,