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

fix: use router-based links to project manager #7271

Merged
merged 11 commits into from
Apr 23, 2021
Merged

fix: use router-based links to project manager #7271

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e86d007
use router-based links to project manager
beyackle Apr 22, 2021
5acd1a0
Merge branch 'main' into beyackle/7225_packageLink
beyackle Apr 22, 2021
e084deb
Merge branch 'main' into beyackle/7225_packageLink
a-b-r-o-w-n Apr 22, 2021
3c3077d
fix unit test
beyackle Apr 22, 2021
3b7db05
Update AdapterSettings.test.tsx
beyackle Apr 22, 2021
9ba5b50
Merge branch 'main' into beyackle/7225_packageLink
beyackle Apr 22, 2021
1e0e21d
Merge branch 'main' into beyackle/7225_packageLink
beyackle Apr 22, 2021
7eeeb98
Merge branch 'main' into beyackle/7225_packageLink
beyackle Apr 22, 2021
0160db4
Merge branch 'main' into beyackle/7225_packageLink
hatpick Apr 23, 2021
b96fc33
Merge branch 'main' into beyackle/7225_packageLink
tdurnford Apr 23, 2021
80c0d7d
Merge branch 'main' into beyackle/7225_packageLink
a-b-r-o-w-n Apr 23, 2021
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
10 changes: 4 additions & 6 deletions Composer/packages/client/src/pages/botProject/adapters/AdapterSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { useEffect, useRef } from 'react';
import formatMessage from 'format-message';
import { Stack } from 'office-ui-fabric-react/lib/Stack';
import { Link } from 'office-ui-fabric-react/lib/Link';
import { Link as RouterLink } from '@reach/router';

import { title, subtitle, subtext } from '../styles';
import { navigateTo } from '../../../utils/navigation';

import ExternalAdapterSettings from './ExternalAdapterSettings';
import ABSChannels from './ABSChannels';
Expand Down Expand Up @@ -54,14 +54,12 @@ const AdapterSection = ({ projectId, scrollToSectionId }: Props) => {
'Find and install more external services to your bot project in <a>package manager</a>. For further guidance, see documentation for <a2>adding external connections.</a2>',
{
a: ({ children }) => (
<Link
<RouterLink
key="package-adapter-settings-page"
onClick={() => {
navigateTo(`/bot/${projectId}/plugin/package-manager/package-manager`);
}}
to={`/bot/${projectId}/plugin/package-manager/package-manager`}
>
{children}
</Link>
</RouterLink>
),
a2: ({ children }) => (
<Link
Expand Down
7 changes: 3 additions & 4 deletions Composer/packages/client/src/pages/botProject/adapters/ExternalAdapterSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import formatMessage from 'format-message';
import { useRecoilValue } from 'recoil';
import { BotSchemas, DialogSetting } from '@bfc/shared';
import { Link } from 'office-ui-fabric-react/lib/Link';
import { Link as RouterLink } from '@reach/router';
import { Toggle } from 'office-ui-fabric-react/lib/Toggle';
import { JSONSchema7 } from '@botframework-composer/types';
import { AdapterRecord } from '@botframework-composer/types/src';

import { useRouterCache } from '../../../utils/hooks';
import { schemasState, settingsState, dispatcherState } from '../../../recoilModel';
import { subtitle, tableHeaderRow, tableRow, tableRowItem, tableColumnHeader, columnSizes } from '../styles';

Expand All @@ -35,7 +35,6 @@ const ExternalAdapterSettings = (props: Props) => {
const schemas = useRecoilValue<BotSchemas>(schemasState(projectId));
const currentSettings = useRecoilValue<DialogSetting>(settingsState(projectId));
const { setSettings } = useRecoilValue(dispatcherState);
const packageManagerLink = useRouterCache('plugin/package-manager/package-manager');

const adapters: AdapterRecord[] = currentSettings.runtimeSettings?.adapters ?? [];

Expand Down Expand Up @@ -132,9 +131,9 @@ const ExternalAdapterSettings = (props: Props) => {
<div key={'subtitle'} css={subtitle}>
{formatMessage.rich('<a>Add from package manager</a>.', {
tdurnford marked this conversation as resolved.
Show resolved Hide resolved
a: ({ children }) => (
<Link key="link" href={packageManagerLink}>
<RouterLink key="link" to={`/bot/${projectId}/plugin/package-manager/package-manager`}>
{children}
</Link>
</RouterLink>
),
})}
</div>
Expand Down