8000 [pull] main from KelvinTegelaar:main by pull[bot] · Pull Request #84 · inevat/CIPP · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
Unified Diff View
Unified
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cipp",
"version": "10.8.5",
"version": "10.9.0",
"author": "CIPP Contributors",
"homepage": "https://cipp.app/",
"bugs": {
Expand Down
4 changes: 2 additions & 2 deletions public/version.json
< 8000 template class="js-file-alert-template">
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "10.8.5"
}
"version": "10.9.0"
}
7 changes: 4 additions & 3 deletions src/api/ApiCall.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useDispatch } from "react-redux";
import { showToast } from "../store/toasts";
import { getCippError } from "../utils/get-cipp-error";
import { buildVersionedHeaders } from "../utils/cippVersion";
import { impersonationCacheParams } from "../utils/impersonation";

const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
const wildcardToRegExp = (pattern) =>
Expand Down Expand Up @@ -71,7 +72,7 @@ export function ApiGetCall(props) {
const element = data[i];
const response = await axios.get(url, {
signal: signal,
params: element,
params: { ...element, ...impersonationCacheParams() },
headers: await buildVersionedHeaders(),
});
results.push(response.data);
Expand Down Expand Up @@ -109,7 +110,7 @@ export function ApiGetCall(props) {
} else {
const response = await axios.get(url, {
signal: url === "/api/tenantFilter" ? null : signal,
params: data,
params: { ...data, ...impersonationCacheParams() },
headers: await buildVersionedHeaders(),
responseType: responseType,
});
Expand Down Expand Up @@ -292,7 +293,7 @@ export function ApiGetCallWithPagination({
queryFn: async ({ pageParam = null, signal }) => {
const response = await axios.get(url, {
signal: signal,
params: { ...data, ...pageParam },
params: { ...data, ...pageParam, ...impersonationCacheParams() },
headers: await buildVersionedHeaders(),
});
return response.data;
Expand Down
12 changes: 9 additions & 3 deletions src/components/BECRemediationReportButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import {
CircularProgress,
} from '@mui/material'
import { PictureAsPdf, Download, Close } from '@mui/icons-material'
import { PDFViewer, PDFDownloadLink } from '@react-pdf/renderer'
import { PDFDownloadLink } from '@react-pdf/renderer'
import { CippPdfPreview } from './CippPdf/CippPdfPreview'
import { useReportVariables } from './CippPdf/useReportVariables'
import { useBrandingSettings } from './CippPdf/useBrandingSettings'
import {
Expand Down Expand Up @@ -1268,15 +1269,20 @@ export const BECRemediationReportButton = ({ userData, becData, tenantName }) =>
</DialogTitle>
<DialogContent dividers sx={{ p: 0 }}>
{hasData && (
<PDFViewer width="100%" height="100%">
<CippPdfPreview
width="100%"
height="100%"
title={`BEC Remediation Report - ${tenantName}`}
fileName={`BEC_Remediation_Report_${tenantName}.pdf`}
>
<BECRemediationReportDocument
userData={userData}
becData={becData}
brandingSettings={brandingSettings}
tenantName={tenantName}
variables={variables}
/>
</PDFViewer>
</CippPdfPreview>
)}
</DialogContent>
<DialogActions>
Expand Down
2 changes: 1 addition & 1 deletion src/components/CippAllTenants/AllTenantsPrimitives.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ export const AllTenantsTrendChart = ({

/** Band heading that separates the dashboard into Portfolio / Security / Operations. */
export const AllTenantsBandHeading = ({ title, description }) => (
<Stack
<Stack useFlexGap
direction="row"
alignItems="baseline"
spacing={1.5}
Expand Down
Loading
Loading
0