Skip to content

Commit

Permalink
Merge branch 'develop' into watch-src-files
Browse files Browse the repository at this point in the history
  • Loading branch information
@nickgros
nickgros authored Jan 24, 2025
2 parents 46555ba + 2b0954f commit 89d7edf
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 35 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"react-transition-group": "2.6.0",
"sass": "^1.63.6",
"spark-md5": "^3.0.2",
"synapse-react-client": "3.3.36",
"synapse-react-client": "3.3.37",
"universal-cookie": "^4.0.4",
"xss": "^1.0.15"
},
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
</executions>

<configuration>
<nodeVersion>v18.16.0</nodeVersion>
<nodeVersion>v20.18.2</nodeVersion>
<yarnVersion>v1.22.17</yarnVersion>
</configuration>
</plugin>
Expand Down
16 changes: 8 additions & 8 deletions .../resources/org/sagebionetworks/web/client/widget/profile/UserProfileWidgetViewImpl.ui.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,27 @@
paddingRight="50"
>
<MUI:Grid container="true">
<MUI:Grid md="12" lg="6">
<MUI:Grid xs="6" md="12" lg="6">
<b:FormGroup>
<b:FormLabel for="firstName">First Name</b:FormLabel>
<bh:Paragraph ui:field="firstNameRenderer" />
</b:FormGroup>
</MUI:Grid>
<MUI:Grid md="12" lg="6">
<MUI:Grid xs="6" md="12" lg="6">
<b:FormGroup>
<b:FormLabel for="lastName">Last Name</b:FormLabel>
<bh:Paragraph ui:field="lastNameRenderer" />
</b:FormGroup>
</MUI:Grid>
</MUI:Grid>
<MUI:Grid container="true">
<MUI:Grid md="12" lg="6">
<MUI:Grid xs="6" md="12" lg="6">
<b:FormGroup>
<b:FormLabel for="currentPosition">Current Position</b:FormLabel>
<bh:Paragraph ui:field="currentPositionRenderer" />
</b:FormGroup>
</MUI:Grid>
<MUI:Grid md="12" lg="6">
<MUI:Grid xs="6" md="12" lg="6">
<b:FormGroup>
<b:FormLabel for="currentAffiliation">
Current Affiliation
Expand All @@ -69,14 +69,14 @@
</MUI:Grid>
</MUI:Grid>
<MUI:Grid container="true">
<MUI:Grid md="12" lg="6">
<MUI:Grid xs="6" md="12" lg="6">
<b:FormGroup ui:field="usernameFormGroup">
<b:FormLabel for="username">Username</b:FormLabel>
<bh:Paragraph ui:field="usernameRenderer" />
<b:HelpBlock ui:field="usernameHelpBlock" />
</b:FormGroup>
</MUI:Grid>
<MUI:Grid md="12" lg="6">
<MUI:Grid xs="6" md="12" lg="6">
<b:FormGroup ui:field="linkFormGroup">
<b:FormLabel for="link">Website</b:FormLabel>
<bh:Div>
Expand All @@ -87,13 +87,13 @@
</MUI:Grid>
</MUI:Grid>
<MUI:Grid container="true">
<MUI:Grid md="12" lg="6">
<MUI:Grid xs="6" md="12" lg="6">
<b:FormGroup>
<b:FormLabel for="industry">Industry/Discipline</b:FormLabel>
<bh:Paragraph ui:field="industryRenderer" />
</b:FormGroup>
</MUI:Grid>
<MUI:Grid md="12" lg="6">
<MUI:Grid xs="6" md="12" lg="6">
<b:FormGroup>
<b:FormLabel for="location">City, Country</b:FormLabel>
<bh:Paragraph ui:field="locationRenderer" />
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/sass/_core.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3757,9 +3757,9 @@ div.border {
grid-template-columns: 120px auto;
grid-template-rows: 140px auto auto;
.profileImageContainer {
grid-column: 1 / span 1;
grid-column: 1 / 2;
grid-row: 1 / span 1;
justify-self: end;
justify-self: center;
}
.profileFormContainer {
grid-column: 1 / span 2;
Expand Down
56 changes: 33 additions & 23 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1387,11 +1387,6 @@
classcat "^5.0.3"
zustand "^4.4.1"

"@remix-run/[email protected]":
version "1.20.0"
resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.20.0.tgz#03554155b45d8b529adf635b2f6ad1165d70d8b4"
integrity sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==

"@restart/context@^2.1.4":
version "2.1.4"
resolved "https://registry.yarnpkg.com/@restart/context/-/context-2.1.4.tgz#a99d87c299a34c28bd85bb489cb07bfd23149c02"
Expand Down Expand Up @@ -2057,6 +2052,11 @@
resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.3.3.tgz#85bc74ba782fb7aa3a514d11767832b0e3bc6803"
integrity sha512-LKVP3cgXBT9RYj+t+9FDKwS5tdI+rPBXaNSkma7hvqy35lc7mAokC2zsqWJH0LaqIt3B962nuYI77hsJoT1gow==

"@types/cookie@^0.6.0":
version "0.6.0"
resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.6.0.tgz#eac397f28bf1d6ae0ae081363eca2f425bedf0d5"
integrity sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==

"@types/d3-array@*":
version "3.2.1"
resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-3.2.1.tgz#1f6658e3d2006c4fceac53fde464166859f8b8c5"
Expand Down Expand Up @@ -3119,6 +3119,11 @@ cookie@^0.4.0:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==

cookie@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.0.2.tgz#27360701532116bd3f1f9416929d176afe1e4610"
integrity sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==

core-js@^3.19.2:
version "3.37.1"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.1.tgz#d21751ddb756518ac5a00e4d66499df981a62db9"
Expand Down Expand Up @@ -6201,20 +6206,15 @@ react-reflex@^4.2.6:
prop-types "^15.5.8"
react-measure "^2.0.2"

react-router-dom@^6.27.0:
version "6.27.0"
resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.27.0.tgz#8d7972a425fd75f91c1e1ff67e47240c5752dc3f"
integrity sha512-+bvtFWMC0DgAFrfKXKG9Fc+BcXWRUO1aJIihbB79xaeq0v5UzfvnM5houGUm1Y461WVRcgAQ+Clh5rdb1eCx4g==
dependencies:
"@remix-run/router" "1.20.0"
react-router "6.27.0"

[email protected]:
version "6.27.0"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.27.0.tgz#db292474926c814c996c0ff3ef0162d1f9f60ed4"
integrity sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw==
react-router@^7.1.1:
version "7.1.3"
resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.1.3.tgz#6c15c28838b799cb3058943e8e8015dbd6c16c7b"
integrity sha512-EezYymLY6Guk/zLQ2vRA8WvdUhWFEj5fcE3RfWihhxXBW7+cd1LsIiA3lmx+KCmneAGQuyBv820o44L2+TtkSA==
dependencies:
"@remix-run/router" "1.20.0"
"@types/cookie" "^0.6.0"
cookie "^1.0.1"
set-cookie-parser "^2.6.0"
turbo-stream "2.4.0"

react-select@^5.8.0:
version "5.8.0"
Expand Down Expand Up @@ -6666,6 +6666,11 @@ set-blocking@^2.0.0:
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==

set-cookie-parser@^2.6.0:
version "2.7.1"
resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz#3016f150072202dfbe90fadee053573cc89d2943"
integrity sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==

set-function-length@^1.2.1:
version "1.2.2"
resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
Expand Down Expand Up @@ -7060,10 +7065,10 @@ svg-path-sdf@^1.1.3:
parse-svg-path "^0.1.2"
svg-path-bounds "^1.0.1"

[email protected].36:
version "3.3.36"
resolved "https://registry.yarnpkg.com/synapse-react-client/-/synapse-react-client-3.3.36.tgz#ee22dc5e4ee0f513a29d2f09f251d0da46212689"
integrity sha512-FKK6Ilqsfb2K3G/Q5aBHpo5LP7+0z+jx9bZss9ZJcHjGBs824NPmqCJJ+ZpxVUDJrdK9SKQWkY9yRJS6tVyRKA==
[email protected].37:
version "3.3.37"
resolved "https://registry.yarnpkg.com/synapse-react-client/-/synapse-react-client-3.3.37.tgz#e34e5aabf12eb2282486251f8dacdc295b975403"
integrity sha512-CloAdSefh4P7DYSYGkqRE3XRukNmXjA1fg949ZsRhcqCAb7lVQcy7Vumw8YXiJsCPIuyoTx1qGynY3AWjEsTrw==
dependencies:
"@apidevtools/json-schema-ref-parser" "^9.1.2"
"@aws-sdk/client-s3" "^3.682.0"
Expand Down Expand Up @@ -7136,7 +7141,7 @@ [email protected]:
react-plotly.js "^2.6.0"
react-popper "^2.3.0"
react-reflex "^4.2.6"
react-router-dom "^6.27.0"
react-router "^7.1.1"
react-select "^5.8.0"
react-sizeme "^3.0.2"
react-switch "^7.0.0"
Expand Down Expand Up @@ -7258,6 +7263,11 @@ tslib@^2.3.0, tslib@^2.6.2:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==

[email protected]:
version "2.4.0"
resolved "https://registry.yarnpkg.com/turbo-stream/-/turbo-stream-2.4.0.tgz#1e4fca6725e90fa14ac4adb782f2d3759a5695f0"
integrity sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==

type-check@^0.4.0, type-check@~0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
Expand Down

0 comments on commit 89d7edf

Please sign in to comment.