Skip to content

Commit

Permalink
Merge pull request #941 from jay-hodgson/SWC-6839
Browse files Browse the repository at this point in the history
  • Loading branch information
jay-hodgson authored May 17, 2024
2 parents 358d61f + 0288bdf commit 2f96d8b
Show file tree
Hide file tree
Showing 71 changed files with 153 additions and 169 deletions.
2 changes: 1 addition & 1 deletion apps/SageAccountWeb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ _Staging_ branch is automatically deployed to https://staging.accounts.sagebione
- **OAuth Client ID**: If using an OAuth Client to connect, please provide your 'client ID'. This value will be used as your 'appId'.
3. Web Engineering will send you an 'appId'. To show the user a branded experience, the 'appId' should be given as a query parameter when you link to the OneSage website for sign-in or account registration (see below). You should also provide the 'redirectURL' query parameter.

_Note to Web Engineer:_ We are currently using [this Synapse Table](https://www.synapse.org/#!Synapse:syn45291362/tables/) as the data source.
_Note to Web Engineer:_ We are currently using [this Synapse Table](https://www.synapse.org/Synapse:syn45291362/tables/) as the data source.

## Entry points

Expand Down
2 changes: 1 addition & 1 deletion apps/SageAccountWeb/src/AppInitializer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function AppInitializer(props: { children?: React.ReactNode }) {
setRedirectURL(localStorageRedirectURL)
} else {
// fallback to Synapse.org
setRedirectURL('https://www.synapse.org/#!Profile:v/projects/all')
setRedirectURL('https://www.synapse.org/Profile:v/projects/all')
}
}, [appId])

Expand Down
2 changes: 1 addition & 1 deletion apps/SageAccountWeb/src/components/AccountCreatedPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const AccountCreatedPage = (props: AccountCreatedPageProps) => {
sx={{ padding: '10px', height: '100%' }}
onClick={() => {
window.location.assign(
`https://www.synapse.org/#!Team:${membershipInvitation.teamId}`,
`https://www.synapse.org/Team:${membershipInvitation.teamId}`,
)
}}
>
Expand Down
2 changes: 1 addition & 1 deletion apps/SageAccountWeb/src/components/JoinTeamPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const JoinTeamPage = (props: JoinTeamPageProps) => {

useEffect(() => {
if (redirectToTeamPage) {
window.location.href = `https://www.synapse.org/#!Team:${joinTeamToken?.teamId}`
window.location.href = `https://www.synapse.org/Team:${joinTeamToken?.teamId}`
}
}, [redirectToTeamPage])

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default function useMembershipInvitationTokenHandler():
},
secondaryButtonConfig: {
text: 'Team Page',
href: `https://www.synapse.org/#!Team:${membershipInvitation.teamId}`,
href: `https://www.synapse.org/Team:${membershipInvitation.teamId}`,
},
},
)
Expand Down
2 changes: 1 addition & 1 deletion apps/portals/e2e/explore.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ const expectCharts = async (
}

const expectSynapseProfileHref = (href: string) => {
expect(href).toMatch(/^https:\/\/www\.synapse\.org\/#!Profile:\d{6,}$/)
expect(href).toMatch(/^https:\/\/www\.synapse\.org\/Profile:\d{6,}$/)
}

const expectPeopleCards = async (page: Page) => {
Expand Down
6 changes: 3 additions & 3 deletions apps/portals/src/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ function Navbar() {
<Dropdown.Item
key={el.text}
className={`SRC-primary-background-color-hover SRC-nested-color ${borderBottomClass}`}
href={`https://www.synapse.org/#!Profile:${
href={`https://www.synapse.org/Profile:${
userProfile.ownerId
}${el.settingSubPath ? `/${el.settingSubPath}` : ''}`}
>
Expand All @@ -303,7 +303,7 @@ function Navbar() {
<Dropdown.Item
key="Settings"
className="SRC-primary-background-color-hover SRC-nested-color border-bottom-1"
href={`https://www.synapse.org/#!Profile:${userProfile.ownerId}/settings`}
href={`https://www.synapse.org/Profile:${userProfile.ownerId}/settings`}
>
Settings
</Dropdown.Item>
Expand All @@ -320,7 +320,7 @@ function Navbar() {

<a
className="user-loggedIn-mb" // mobile version, shows the user icon and name, no dropdown
href={`https://www.synapse.org/#!Profile:${userProfile.ownerId}/projects/all`}
href={`https://www.synapse.org/Profile:${userProfile.ownerId}/projects/all`}
>
<NavUserLink userProfile={userProfile} />
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { SynapseConfig } from 'types/portal-config'

export const results: SynapseConfig = {
name: 'Markdown',
// https://www.synapse.org/#!Synapse:syn12666371/wiki/595383
// https://www.synapse.org/Synapse:syn12666371/wiki/595383
props: {
ownerId: 'syn12666371',
wikiId: '595383',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const routes: GenericRoute[] = [
},
],
},
// https://www.synapse.org/#!Synapse:syn20717442/wiki/596047
// https://www.synapse.org/Synapse:syn20717442/wiki/596047
{
path: 'Contact Us',
exact: true,
Expand Down
Loading

0 comments on commit 2f96d8b

Please sign in to comment.