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.

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

Feature/help-links APS-2364, APS-2299, APS-2300 #995

Merged
merged 3 commits into from
Feb 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci-build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@ jobs:
NEXT_PUBLIC_HELP_API_DOCS_URL:
value: '/ds/api/v2/console/'
NEXT_PUBLIC_HELP_SUPPORT_URL:
value: 'https://bcgov.github.io/aps-infra-platform/'
value: 'https://mvp.developer.gov.bc.ca/docs/default/component/aps-infra-platform-docs/'
NEXT_PUBLIC_HELP_RELEASE_URL:
value: 'https://bcgov.github.io/aps-infra-platform/releases/'
value: 'https://mvp.developer.gov.bc.ca/docs/default/component/aps-infra-platform-docs/reference/releases/'
NEXT_PUBLIC_HELP_STATUS_URL:
value: 'https://uptime.com/s/bcgov-dss'
NEXT_PUBLIC_DEVELOPER_IDS:
Expand Down
4 changes: 2 additions & 2 deletions src/nextapp/.env.local
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ NEXT_PUBLIC_HELP_DESK_URL=https://dpdd.atlassian.net/servicedesk/customer/portal
NEXT_PUBLIC_HELP_CHAT_URL=https://chat.developer.gov.bc.ca/channel/aps-ops
NEXT_PUBLIC_HELP_ISSUE_URL=https://github.com/bcgov/api-services-portal/issues
NEXT_PUBLIC_HELP_API_DOCS_URL=/ds/api/v2/console/
NEXT_PUBLIC_HELP_SUPPORT_URL=https://bcgov.github.io/aps-infra-platform/
NEXT_PUBLIC_HELP_RELEASE_URL=https://bcgov.github.io/aps-infra-platform/releases/
NEXT_PUBLIC_HELP_SUPPORT_URL=https://mvp.developer.gov.bc.ca/docs/default/component/aps-infra-platform-docs/
NEXT_PUBLIC_HELP_RELEASE_URL=https://mvp.developer.gov.bc.ca/docs/default/component/aps-infra-platform-docs/reference/releases/
NEXT_PUBLIC_HELP_STATUS_URL=https://uptime.com/s/bcgov-dss

20 changes: 10 additions & 10 deletions src/nextapp/components/auth-action/help-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,27 +56,27 @@ const HelpMenu: React.FC = () => {
},
}}
>
<MenuGroup title="Documentation">
<MenuGroup>
<MenuItem
as="a"
color="bc-blue"
href={data?.helpLinks.helpApiDocsUrl}
href={data?.helpLinks.helpSupportUrl}
data-testid="help-menu-aps-support"
target="_blank"
rel="noopener noreferrer"
data-testid="help-menu-api-docs"
>
API Docs
Support Docs
<Icon as={BiLinkExternal} boxSize="4" ml={2} />
</MenuItem>
<MenuItem
as="a"
color="bc-blue"
href={data?.helpLinks.helpSupportUrl}
data-testid="help-menu-aps-support"
href={data?.helpLinks.helpApiDocsUrl}
target="_blank"
rel="noopener noreferrer"
data-testid="help-menu-api-docs"
>
APS Support
API Console
<Icon as={BiLinkExternal} boxSize="4" ml={2} />
</MenuItem>
<MenuItem
Expand All @@ -92,17 +92,17 @@ const HelpMenu: React.FC = () => {
</MenuItem>
</MenuGroup>
<MenuDivider />
<MenuGroup title="Contact Us">
<MenuGroup>
<MenuItem
color="bc-blue"
data-testid="help-menu-support"
onClick={onOpen}
>
Support Links
Contact Us
</MenuItem>
</MenuGroup>
<MenuDivider />
<MenuGroup title="About">
<MenuGroup>
<MenuItem
as="a"
color="bc-blue"
Expand Down
15 changes: 2 additions & 13 deletions src/nextapp/components/support-links/support-links.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const SupportLinks: React.FC<SupportLinksProps> = ({ isOpen, onClose }) => {
<Modal isOpen={isOpen} onClose={onClose}>
<ModalOverlay />
<ModalContent>
<ModalHeader>Support Links</ModalHeader>
<ModalHeader>Contact Us</ModalHeader>
<ModalCloseButton />
<ModalBody>
<UnorderedList
Expand All @@ -49,8 +49,7 @@ const SupportLinks: React.FC<SupportLinksProps> = ({ isOpen, onClose }) => {
target="_blank"
rel="noopener noreferrer"
>
Submit product and service requests using the Data Systems and
Services request system
Submit a support ticket
<Icon as={BiLinkExternal} boxSize="4" ml={2} />
</Link>
</ListItem>
Expand All @@ -64,16 +63,6 @@ const SupportLinks: React.FC<SupportLinksProps> = ({ isOpen, onClose }) => {
<Icon as={BiLinkExternal} boxSize="4" ml={2} />
</Link>
</ListItem>
<ListItem>
<Link
href={data?.helpLinks.helpIssueUrl}
target="_blank"
rel="noopener noreferrer"
>
Create an issue in GitHub
<Icon as={BiLinkExternal} boxSize="4" ml={2} />
</Link>
</ListItem>
</UnorderedList>
</ModalBody>

Expand Down
Loading