remove commented out code

uwcirg · Feb 4, 2025 · 8a40299 · 8a40299
1 parent 0366cfe
commit 8a40299
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 28 deletions.
diff --git a/src/server/API/appsettings.json b/src/server/API/appsettings.json
@@ -97,7 +97,7 @@
   },
   "Deidentification": {
     "Patient": {
-      "Enabled": true,
+      "Enabled": false,
       "DateShifting": {
         "Increment": "DAY",
         "LowerBound": -365,

diff --git a/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx b/src/ui-client/src/components/Attestation/CustomAttestationConfirmation.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 import { Button, Row, Col } from 'reactstrap';
 import { SessionType } from '../../models/Session'
 import { AppConfig, CustomAttestationType } from '../../models/Auth';
-import TextareaAutosize from 'react-textarea-autosize';
 
 interface Props {
     config?: AppConfig;
@@ -34,6 +33,9 @@ export default class CustomAttestationConfirmation extends React.PureComponent<P
         const showText = config && config.attestation.enabled;
         const useHtml = config.attestation.type && config.attestation.type === CustomAttestationType.Html;
         const skipModeSelection = config && config.attestation.skipModeSelection;
+        const nextButtonContainerColSize = skipModeSelection ? 12: 6;
+        const nextButtonContainerClass = skipModeSelection ? "" : "right";
+        const nextButtonText = skipModeSelection ? "Access the Data Exploration Tool" : "I Agree";
 
         return  (
             <div className={confirmationClass}>
@@ -56,16 +58,17 @@ export default class CustomAttestationConfirmation extends React.PureComponent<P
 
                 <div>
                     <Row className={`${c}-confirmation-settings`} key='1'>
-                        {/* <Col md={6} className="left">
+                        {!skipModeSelection && 
+                        <Col md={6} className="left">
                             {useDisplay} - {phiDisplay}
-                        </Col> */}
+                        </Col>}
                         {!(isSubmittingAttestation || hasAttested) &&
-                        <Col md={skipModeSelection ? 12: 6} className={`${skipModeSelection ? "" : "right"}`}>
+                        <Col md={nextButtonContainerColSize} className={nextButtonContainerClass}>
                             <Button 
                                 onClick={handleIAgreeClick} 
                                 tabIndex={-1}
                                 className="leaf-button leaf-button-primary">
-                                Access the Data Exploration Tool
+                                {nextButtonText}
                             </Button>
                             {!skipModeSelection &&
                             <Button 

diff --git a/src/ui-client/src/components/Header/UserButton.tsx b/src/ui-client/src/components/Header/UserButton.tsx
@@ -122,12 +122,6 @@ export default class UserButton extends React.PureComponent<Props> {
 
                         <div className={`${c}-option-divider`} />
 
-                        {/* {auth && auth.config && auth.config.authentication.logout.enabled && 
-                        <div className={`${c}-option ${c}-option-logout`} onClick={logoutClickHandler}>
-                            <FaDoorOpen className="myleaf-menu-icon myleaf-menu-icon-logout" />
-                            <span>Log Out</span>
-                        </div>
-                        } */}
                     </div>
                 </div>
             </NavItem>

diff --git a/src/ui-client/src/containers/Attestation/Attestation.tsx b/src/ui-client/src/containers/Attestation/Attestation.tsx
@@ -66,7 +66,6 @@ class Attestation extends React.PureComponent<Props, State> {
 
     constructor(props: Props) {
         super(props);
-        const {config} = props;
         this.state = {
             attestation: {
                 documentation: this.defaultDocumentation,
@@ -158,12 +157,6 @@ class Attestation extends React.PureComponent<Props, State> {
                     <div className={`${c}-nida-logo-wrapper`}>
                         <img alt='nida-logo' className={`${c}-nida-logo`} src={process.env.PUBLIC_URL + '/images/logos/orgs/nida.svg'} />
                     </div>
-                    {/* <div className={`${c}-iths-logo-wrapper`}>
-                        <img alt='iths-logo' className={`${c}-iths-logo`} src={process.env.PUBLIC_URL + '/images/logos/orgs/iths.png'} />
-                    </div>
-                    <div className={`${c}-cd2h-logo-wrapper`}>
-                        <img alt='cd2h-logo' className={`${c}-cd2h-logo`} src={process.env.PUBLIC_URL + '/images/logos/orgs/cd2h.png'} />
-                    </div> */}
 
                     {/* Optional instance logo row */}
                     {config && config.attestation.credits.enabled &&
@@ -188,14 +181,11 @@ class Attestation extends React.PureComponent<Props, State> {
                 </ModalHeader>
 
                 <div className={progressBarClasses.join(' ')} style={{ width: `${sessionLoadProgressPercent}%` }} />
-                {/* {userContext && !userContext.isPhiOkay && 
-                <div className={`${c}-deidentonly`}>
-                    <p>Participant data restricted to De-Identified mode only</p>
-                </div>
-                } */}
-                <div className={`${c}-deidentonly`}>
-                    <p>Participant data restricted to De-Identified mode only</p>
-                </div>
+                {(userContext && !userContext.isPhiOkay) && 
+                    <div className={`${c}-deidentonly`}>
+                        <p>Participant data restricted to De-Identified mode only</p>
+                    </div>
+                }
                 <ModalBody className={`${c}-body`}>
                     {auth.error && 
                     <div className={`${c}-error-text`}>

diff --git a/src/ui-client/src/containers/Header/Header.tsx b/src/ui-client/src/containers/Header/Header.tsx
@@ -90,7 +90,6 @@ class Header extends React.PureComponent<Props> {
                             federated={responders.size > 1}
                             imports={importState}
                             helpClickHandler={this.handleGetHelpClick}
-                            //logoutClickHandler={this.handleLogoutClick} 
                             myLeafModalToggleHandler={this.handleMyleafModalToggleClick}
                             user={user} 
                         />