diff --git a/api/reviewer_api/auth.py b/api/reviewer_api/auth.py index 4464ae9d3..596b0d0f3 100644 --- a/api/reviewer_api/auth.py +++ b/api/reviewer_api/auth.py @@ -22,7 +22,7 @@ MinistryTeamWithKeycloackGroup, ProcessingTeamWithKeycloackGroup, IAOTeamWithKeycloackGroup, -) +) jwt = ( JwtManager() diff --git a/api/reviewer_api/utils/enums.py b/api/reviewer_api/utils/enums.py index 00f5682b1..9e291b74c 100644 --- a/api/reviewer_api/utils/enums.py +++ b/api/reviewer_api/utils/enums.py @@ -74,8 +74,11 @@ class MinistryTeamWithKeycloackGroup(Enum): ECC = "ECC Ministry Team" JED = "JED Ministry Team" COR = "COR Ministry Team" - HSG = "HSG Ministry Team", + HSG = "HSG Ministry Team" LSB = "LSB Ministry Team" + INF = "INF Ministry Team" + MCM = "MCM Ministry Team" + ECS = "ECS Ministry Team" @staticmethod def list(): diff --git a/archanddesign/images/AzureDocumentIntelligenceArch.jpg b/archanddesign/images/AzureDocumentIntelligenceArch.jpg new file mode 100644 index 000000000..3ee4881d2 Binary files /dev/null and b/archanddesign/images/AzureDocumentIntelligenceArch.jpg differ diff --git a/web/src/components/FOI/Home/Home.js b/web/src/components/FOI/Home/Home.js index 233fb64dc..d13ec32a6 100644 --- a/web/src/components/FOI/Home/Home.js +++ b/web/src/components/FOI/Home/Home.js @@ -109,7 +109,7 @@ function Home() { }); let doclist = []; - let requestInfo = _requestInfo.requestinfo; + let requestInfo = _requestInfo; getFOIS3DocumentPreSignedUrls( documentObjs, (newDocumentObjs) => { diff --git a/web/src/components/FOI/Home/Redlining.js b/web/src/components/FOI/Home/Redlining.js index 8b4d80b3e..1027ea285 100644 --- a/web/src/components/FOI/Home/Redlining.js +++ b/web/src/components/FOI/Home/Redlining.js @@ -67,6 +67,7 @@ import useSaveResponsePackage from "./CreateResponsePDF/useSaveResponsePackage"; import {ConfirmationModal} from "./ConfirmationModal"; import { FOIPPASectionsModal } from "./FOIPPASectionsModal"; import { NRWarningModal } from "./NRWarningModal"; +import Switch from "@mui/material/Switch"; import FeeOverrideModal from "./FeeOverrideModal"; const Redlining = React.forwardRef( @@ -182,6 +183,27 @@ const Redlining = React.forwardRef( enableSavingFinal, } = useSaveResponsePackage(); + const [isRedlineOpaque, setIsRedlineOpaque] = useState(localStorage.getItem('isRedlineOpaque') === 'true') + + useEffect(() => { + if (annotManager) { + let annotations = annotManager.getAnnotationsList(); + for (let annotation of annotations) { + if (annotation.Subject === 'Redact') { + annotation.FillDisplayColor = new docInstance.Core.Annotations.Color( + 255, + 255, + 255, + isRedlineOpaque ? alpha : 0 + ); + annotManager.redrawAnnotation(annotation) + } + } + localStorage.setItem('isRedlineOpaque', isRedlineOpaque) + } + + }, [isRedlineOpaque]) + useEffect(() => { let initializeWebViewer = async () => { let currentDocumentS3Url = currentDocument?.currentDocumentS3Url; @@ -261,6 +283,38 @@ const Redlining = React.forwardRef( 0, newCustomElement ); + + + const opacityToggle = { + type: 'customElement', + render: () => ( + <> + { + setIsRedlineOpaque(e.target.checked) + } + } + defaultChecked={isRedlineOpaque} + id="isRedlineOpaqueToggle" + > + + + + ) + }; + + header.headers.default.splice( + header.headers.default.length - 4, + 0, + opacityToggle + ); }); instance.UI.setHeaderItems(header => { @@ -1026,7 +1080,7 @@ const Redlining = React.forwardRef( `${currentLayer.redactionlayerid}` ); annotations[i].IsHoverable = false; - annotations[i].FillDisplayColor = new docInstance.Core.Annotations.Color(255, 255, 255, alpha); + annotations[i].FillDisplayColor = new docInstance.Core.Annotations.Color(255, 255, 255, isRedlineOpaque ? alpha : 0); }); setPageSelections(pageSelectionList); let annot = annots[0].children[0]; @@ -1526,7 +1580,7 @@ const Redlining = React.forwardRef( if (_annotation.Subject === "Redact") { _annotation.IsHoverable = false; _annotation.NoMove = true; - _annotation.FillDisplayColor = new annots.Color(255, 255, 255, alpha); + _annotation.FillDisplayColor = new annots.Color(255, 255, 255, isRedlineOpaque ? alpha : 0); if (_annotation.type === "fullPage") { _annotation.NoResize = true; @@ -2448,7 +2502,6 @@ const Redlining = React.forwardRef( return (
- {/* { modalOpen && */} - {/* } */} {redlineModalOpen &&