[RW-3694][risk=no] Updated DUA content #2746

jaycarlton · 2019-10-24T19:57:45Z

Updated DUA content. Also broke a couple of things into separate classes.

Getting the formatting perfect is beyond the scope of this story, but I do need to see if someone can help me look for typos. The source document for the new DUA is here.

s-rubenstein

There's a number of whitespace issues, I offered some line break fixes, but you could also fix them by putting the explicit space character. I think &nbsp?

ui/src/app/pages/profile/data-use-agreement-content.tsx

ui/src/app/pages/profile/data-use-agreement-panel.tsx

s-rubenstein · 2019-10-24T20:39:28Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+    <div>By entering my initials next to each statement below, I agree to these terms:</div>
+    <InitialsAgreement onChange={(v) => this.setState({initialWork: v})} value={initialWork}>
+      My work may be logged and monitored by the <i>All of Us</i> Research Program to ensure
+      compliance with policies and procedures.


Before the ., , as well as the demonstration project charges

s-rubenstein · 2019-10-24T20:40:19Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+    </InitialsAgreement>
+    <InitialsAgreement onChange={(v) => this.setState({initialSanctions: v})}
+                       value={initialSanctions}>
+      I have read and understand the <i>All of Us</i> Research Program Sanctions for Privacy


The third initials is:

Access granted by the program in accordance with this agreement is exclusively for participation in _All of Us_ demonstration projects. At the conclusion of my participation in these activities, I understand that my access to the _All of Us_ data resources will be revoked and/or subject to customary access policies and procedures.

s-rubenstein · 2019-10-24T20:41:58Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+    </div>
+    <div>
+      {showSanctionModal &&
+      <SanctionModal onClose={() => this.setState({showSanctionModal: false})}/>}


The sanctions information seems different. I am seeing:

, including but not limited to: posting my name and affiliation on a publicly-accessible list of violators, and notifying the National Institutes of Health or other federal agencies of my actions. I understand that failure to comply with these terms may also carry additional financial, legal, or other repercussions.

s-rubenstein · 2019-10-24T20:42:39Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+                Controlled tier) <i>All of Us</i> data.
+              </IndentedListItem>
+              <IndentedListItem>
+                Post the name and affiliation of the violator on a public <i>All of Us</i>


There's a space issue here (same as before, with the placement of the newline affecting whitespace trimming)

andy7i

a few text differences found so far

andy7i · 2019-10-25T21:04:23Z

ui/src/app/pages/profile/data-use-agreement-content.tsx

+      </IndentedOrderedList>
+    </p>
+    <p>Please read this agreement carefully and completely before signing.</p>
+    <SecondHeader>As “Authorized Demonstration User” of the <AoUTitle/> data, I


should be As an

andy7i · 2019-10-25T21:05:06Z

ui/src/app/pages/profile/data-use-agreement-content.tsx

+    <SecondHeader>As “Authorized Demonstration User” of the <AoUTitle/> data, I
+      will:</SecondHeader>
+    <IndentedUnorderedList>
+      <li>read and adhere to the <AoUTitle/> <a target='_blank' href={CORE_VALUES_URL}>core values</a>.


link should be: https://allofus.nih.gov/about/core-values

andy7i · 2019-10-25T21:07:32Z

ui/src/app/pages/profile/data-use-agreement-content.tsx

+            <IndentedUnorderedList>
+              If I become aware of any information that directly identifies one or more
+              participants, I will notify the <AoUTitle/> immediately
+              using the automatic notification system.


appropriate process.

also, make this a list item

andy7i · 2019-10-25T21:07:39Z

ui/src/app/pages/profile/data-use-agreement-content.tsx

+            I will <strong>NOT</strong> attempt to re-identify research
+            participants or their relatives.
+            <br/>
+            If I unintentionally re-identify participants through the process of my work, I will


also, make this a list item

andy7i · 2019-10-25T21:13:28Z

ui/src/app/pages/profile/data-use-agreement-content.tsx

+            for any external data, files, or software that I upload into my Workspace.</IndentedListItem>
+          <IndentedListItem>I will <strong>NOT</strong> upload data or files containing personally identifiable
+            information (PII).</IndentedListItem>
+          <IndentedListItem>PII means information that can be used to distinguish or trace the identity of an individual


indent this

…t styling. fix line wrap

s-rubenstein · 2019-10-28T16:18:35Z

@andy7i should be good for another look.

andy7i

Some content questions, a couple nitpicks, and a couple general things:

Code formatting:

unused imports
several lines are longer than the allowed length

File organization:

DUA files are in profile folder. Recommend moving to a new folder like app/pages/data-use-agreement

andy7i · 2019-10-25T21:36:28Z

ui/src/app/pages/profile/data-use-agreement-content.tsx

+      </li>
+      <li>share the results of my demonstration project and all contents of my Workbench with the <AoUTitle/>. </li>
+      <li>My workbench and its contents may be made public for the benefit of all authorized users.</li>
+      <li>honor the contribution of those who take part in <i>All of Us</i> to my work


honor the contribution to my work of those who take part in All of Us

andy7i · 2019-10-28T17:57:49Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+      {showSanctionModal &&
+      <SanctionModal onClose={() => this.setState({showSanctionModal: false})}/>}
+    </div>
+    <DuaTextInput style={{marginTop: '0.5rem'}}


The doc has this line:

Authorized Demonstration User Signature

which we don't have. I'm not sure how we would add that in realistically. Might be worth letting them know.

andy7i · 2019-10-28T17:59:42Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+        onClick={() => this.submitDataUseAgreement(this.state.initialWork)}>Submit</Button>
+    </TooltipTrigger>
+  </FlexColumn>;
+}


the Terms and Definitions: section (at the bottom of the Alpha doc) is missing on our side.

andy7i · 2019-10-28T18:00:54Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+      participation in these activities, I understand that my access to the <i>All of Us</i> data
+      resources will be revoked and/or subject to customary access policies and procedures.
+    </InitialsAgreement>
+    <div><strong>I acknowledge that failure to comply with the terms of this agreement may result


nit: a bit of margin on top would be nice

andy7i · 2019-10-28T18:02:40Z

ui/src/app/pages/profile/data-use-agreement-styles.tsx

+import {styles as headerStyles} from '../../components/headers';
+import {TextInput} from '../../components/inputs';
+import colors from '../../styles/colors';
+import {reactStyles} from '../../utils';


unused imports and linter warnings to use absolute paths

andy7i · 2019-10-28T18:03:38Z

ui/src/app/pages/profile/data-use-agreement-styles.tsx

+    height: '100%',
+    color: colors.primary,
+  },
+  h2: {...headerStyles.h2, lineHeight: '24px', fontWeight: 600, fontSize: '16px'},


nit: using rem > px

andy7i · 2019-10-28T18:09:00Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+      <Button
+        style={{marginTop: '1rem', cursor: errors && 'not-allowed', padding: '0 1.3rem'}}
+        disabled={errors || submitting} data-test-id='submit-dua-button'
+        onClick={() => this.submitDataUseAgreement(this.state.initialWork)}>Submit</Button>


submitDataUseAgreement now takes submitDataUseAgreement(dataUseAgreementVersion, initials)

might need to merge in master to see this.

this looks ok actually

andy7i · 2019-10-28T18:10:03Z

ui/src/app/pages/profile/data-use-agreement-content.tsx

@@ -0,0 +1,216 @@
+import {BolderHeader, BoldHeader, styles as headerStyles} from 'app/components/headers';


styles is unused

andy7i · 2019-10-28T18:14:23Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+
+
+export const SanctionModal = (props) => {
+  return <Modal width={750}>


haven't tested this since I couldn't see it open locally.

that said, the width=750 bothers me

I'm not sure this is used, but don't want to pull it out as a release blocking thing.

andy7i · 2019-10-28T18:18:46Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+    </div>
+    <div>
+      {showSanctionModal &&
+      <SanctionModal onClose={() => this.setState({showSanctionModal: false})}/>}


I don't see Sanctions shown in the alpha DUA doc. Remove?

ericsong

Not sure if some of these comments need to be made. I indicated as such for the ones I'm unsure about and we should check with Karthik on those.

ericsong · 2019-10-28T18:23:08Z

ui/src/app/pages/profile/data-use-agreement-content.tsx

+              <IndentedListItem>
+                If I become aware of any information that directly identifies one or more
+                participants, I will notify the <AoUTitle/> immediately
+                using the automatic notification system.


"automatic notification system" should be "appropriate process"

ericsong · 2019-10-28T18:23:38Z

ui/src/app/pages/profile/data-use-agreement-content.tsx

+      <li>
+        <strong>NOT</strong> use <AoUTitle/> data or any external data, files, or software that I upload
+        into the Research Workbench for research that is discriminatory or stigmatizing of individuals, families,
+        groups, or communities. Please review the All of Us policy on stigmatizing research here.


bump on the link needed here. https://docs.google.com/document/d/1RGWCmujvunLRdlBTYpZArcben4QNFwOhp7mSDK3puC0/edit

ericsong · 2019-10-28T18:23:57Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+      <DuaTextInput placeholder='FIRST AND LAST NAME' style={{margin: '0 1ex'}}
+                    onChange={(v) => this.setState({name: v})} value={name}
+                    data-test-id='dua-name-input'/>
+      ("Authorized User") have


ericsong · 2019-10-28T18:24:14Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+    </div>
+    <div>By entering my initials next to each statement below, I agree to these terms:</div>
+    <InitialsAgreement onChange={(v) => this.setState({initialWork: v})} value={initialWork}>
+      My work may be logged, monitored, and audited by the <i>All of Us</i> Research Program to ensure


"My work may be logged" -> "My work will be logged"

ericsong · 2019-10-28T18:24:53Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+                  disabled value={this.props.profileState.profile.username}/>
+    <DuaTextInput style={{marginTop: '0.5rem'}}
+                  disabled value={this.props.profileState.profile.contactEmail}/>
+    <DuaTextInput style={{marginTop: '0.5rem'}}


The google doc has labels on these input fields. not sure if they're needed though?

ericsong · 2019-10-28T18:25:11Z

ui/src/app/pages/profile/data-use-agreement-panel.tsx

+        disabled={errors || submitting} data-test-id='submit-dua-button'
+        onClick={() => this.submitDataUseAgreement(this.state.initialWork)}>Submit</Button>
+    </TooltipTrigger>
+  </FlexColumn>;


The google doc also has a page for "Terms and Definitions". Do we need to add that?

Talked to Karthik, we do need that. Will add.

ericsong · 2019-10-28T18:26:57Z

ui/src/app/pages/profile/data-use-agreement-content.tsx

+        aggregate statistics that are more granular than buckets of 20 individuals without explicit approval from
+        the <AoUTitle/>.
+      </li>
+      <li><strong>NOT</strong> sell or distribute <AoUTitle/> data at any level of granularity for the purpose


not sure if needed but all of the "NOT"'s under the As “Authorized Demonstration User” of the All of Us Research Program data, I will: section has an underline

They don't. Jay checked with Dikshya on that

ericsong

Content looks good.

andy7i

1 fix then 👍

Notes:
Eric checked the content so I skimmed through the Terms and Conditions.
DUA files to be moved outside of this PR.

andy7i · 2019-10-28T20:49:09Z

ui/src/app/pages/profile/data-use-agreement-content.tsx

+
+    <SecondHeader>Terms and Definitions:</SecondHeader>
+    <IndentedUnorderedList>
+      <IndentedListItem>The <a href={{AOU_DEFINITION_URL}} target='_blank'><AoUTitle/></a> is a national longitudinal


this links to http://localhost:4200/[object%20Object] for me.

Already fixed! :D

calbach · 2019-10-28T23:16:14Z

Merging per slack discussion with Scout, tests finally caught up.

s-rubenstein reviewed Oct 24, 2019

View reviewed changes

jaycarlton changed the title ~~[RW-3694][risk=no]~~ [RW-3694][risk=no] Updated DUA content Oct 25, 2019

jaycarlton marked this pull request as ready for review October 25, 2019 20:16

jaycarlton requested a review from andy7i October 25, 2019 20:18

andy7i reviewed Oct 25, 2019

View reviewed changes

jaycarlton and others added 13 commits October 28, 2019 11:56

first batch of merge/format operations

1971b8a

pull out aou title & formatting into a separate element for consisten…

c322d5d

…t styling. fix line wrap

flex fixes

986a170

refactor a bit for navigability

6f0b716

progress

ff50ffc

fixup cyclic deps

9364270

fixes

d978bdc

fix missing import

dd9e8d3

more fixes

b0e1c2b

fixes

b7dff7d

fixes

8756b7d

Fix text

7d2fa40

Fix rebase issue

95ca2db

s-rubenstein force-pushed the jaycarlton/RW-3694 branch from 0aee19f to 95ca2db Compare October 28, 2019 16:11

s-rubenstein added 2 commits October 28, 2019 12:16

PR feedback

0d5fdd7

Fix DUA version

cf190b7

Fix tests

ed0834d

calbach mentioned this pull request Oct 28, 2019

[RW-2569][risk=low] Enable DUA in all environments #2763

Merged

andy7i reviewed Oct 28, 2019

View reviewed changes

Fix tests again

69a0e28

ericsong reviewed Oct 28, 2019

View reviewed changes

s-rubenstein added 3 commits October 28, 2019 15:29

PR feedback

8c1d72a

PR feedback

f4d2855

Move terms and definitions up

77e73df

Fix compilation issue

f293c82

ericsong approved these changes Oct 28, 2019

View reviewed changes

andy7i approved these changes Oct 28, 2019

View reviewed changes

calbach merged commit e166fa1 into master Oct 28, 2019

calbach deleted the jaycarlton/RW-3694 branch October 28, 2019 23:16

		@@ -0,0 +1,216 @@
		import {BolderHeader, BoldHeader, styles as headerStyles} from 'app/components/headers';



		export const SanctionModal = (props) => {
		return <Modal width={750}>

[RW-3694][risk=no] Updated DUA content #2746

[RW-3694][risk=no] Updated DUA content #2746

Uh oh!

Conversation

jaycarlton commented Oct 24, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

s-rubenstein left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

andy7i left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

s-rubenstein commented Oct 28, 2019

Uh oh!

andy7i left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ericsong left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

jaycarlton commented Oct 24, 2019 •

edited

Loading

andy7i left a comment •

edited

Loading