Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[no ticket][risk=no] Consolidate Research Purpose Components #9056

Merged
merged 16 commits into from
Jan 24, 2025
Merged

[no ticket][risk=no] Consolidate Research Purpose Components #9056

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
253b50c
Added header to research purpose
evrii Jan 17, 2025
e67bf54
Moved workspace edit text to a common location.
evrii Jan 21, 2025
9759998
Make a common research purpose component.
evrii Jan 21, 2025
fab9da3
Have admin page use common research purpose component.
evrii Jan 21, 2025
a1bc3d6
Add styles necessary for admin research purpose section.
evrii Jan 21, 2025
600736f
Delete unused admin research purpose section.
evrii Jan 21, 2025
e349b36
Update imports
evrii Jan 21, 2025
3aa4176
Update imports
evrii Jan 21, 2025
244cf34
Update imports
evrii Jan 21, 2025
577687b
Have workspace about page utilize common research purpose component.
evrii Jan 21, 2025
1fb2bbf
Add transparency
evrii Jan 21, 2025
0577b5e
Cleanup
evrii Jan 21, 2025
4544466
Remove old ts ignore
evrii Jan 21, 2025
eaa767a
Split out research purpose and workspace-edit text files.
evrii Jan 21, 2025
f752777
Fix color
evrii Jan 21, 2025
99b7300
Cleanup
evrii Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ui/src/app/pages/workspace/research-purpose.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const styles = reactStyles({
borderRadius: '23px',
},
mainHeader: {
fontSize: '16px',
fontSize: '18px',
fontWeight: 600,
color: colors.primary,
marginBottom: '0.75rem',
Expand Down Expand Up @@ -100,7 +100,7 @@ export const ResearchPurpose = fp.flow(
return (
<FadeBox>
<div style={styles.mainHeader}>
Primary purpose of project
Research Use Statement Questions
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The edit button was floating near the name of the first question. It seems more intuitive to have it next to an overarching header

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This component is also largely similar to research-purpose-section (admin page). By moving the edit button away from the title of the first section, this becomes much easier to share.

<Clickable
disabled={!isOwner}
style={{
Expand All @@ -125,6 +125,7 @@ export const ResearchPurpose = fp.flow(
/>
</Clickable>
</div>
<div style={styles.sectionHeader}>Primary purpose of project</div>
<div style={styles.sectionContentContainer}>
{selectedResearchPurposeItems &&
selectedResearchPurposeItems.length > 0 && (
Expand Down