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

Jump to bottom

Feature approve own request #1107

Merged
merged 2 commits into from
Jul 30, 2024
Merged

Feature approve own request #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7faefa
fix for manager approving self access
ikethecoder Jul 17, 2024
b2e4031
Merge branch 'feature/ns-to-gw' into feature/approve-own-request
rustyjux Jul 30, 2024
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
13 changes: 12 additions & 1 deletion .env.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,22 @@ LOCAL_ENV=true
WORKING_PATH=/tmp
DESTINATION_URL=
SSR_API_ROOT=http://apsportal.localtest.me:3000
NEXT_PUBLIC_APP_VERSION=0.0.0
NEXT_PUBLIC_APP_REVISION=000000000000000000000000
NEXT_PUBLIC_KUBE_CLUSTER=local
NEXT_PUBLIC_HELP_DESK_URL=https://dpdd.atlassian.net/servicedesk/customer/portal/1/group/2
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/v3/console/
NEXT_PUBLIC_HELP_SUPPORT_URL=https://dev.developer.gov.bc.ca/docs/default/component/aps-infra-platform-docs/
NEXT_PUBLIC_HELP_RELEASE_URL=https://dev.developer.gov.bc.ca/docs/default/component/aps-infra-platform-docs/reference/releases/
NEXT_PUBLIC_HELP_STATUS_URL=https://uptime.com/s/bcgov-dss
NEXT_PUBLIC_DEVELOPER_IDS=idir,bceid,bcsc,github
NEXT_PUBLIC_PROVIDER_IDS=idir
NEXT_PUBLIC_ACCOUNT_BCEID_URL=https://www.test.bceid.ca/logon.aspx?returnUrl=/profile_management
NEXT_PUBLIC_ACCOUNT_BCSC_URL=https://idtest.gov.bc.ca/account/
NEXT_PUBLIC_GRAFANA_URL=https://grafana-apps-gov-bc-ca.dev.api.gov.bc.ca
NEXT_PUBLIC_GRAFANA_URL=https://grafana.local


# For automated integrated testing
TEST_PORTAL_CLIENT_ID=aps-portal
Expand Down
5 changes: 5 additions & 0 deletions local/feeder-init/shared-idp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ record:
owner: janis@testmail.com
isShared: true
environmentDetails:
- environment: dev
issuerUrl: http://keycloak.localtest.me:9081/auth/realms/master
clientId: gwa-api
clientRegistration: managed
clientSecret: '18900468-3db1-43f7-a8af-e75f079eb742'
- environment: test
issuerUrl: http://keycloak.localtest.me:9081/auth/realms/master
clientId: gwa-api
Expand Down
1 change: 1 addition & 0 deletions src/authz/matrix.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ NS MANAGER,,getConsumerProdEnvAccess,,,,,,,api-owner,,,allow,
NS MANAGER,,allProductsByNamespace,,,,,,,api-owner,,,allow,filterByUserNS
NS MANAGER,,allGatewayServicesByNamespace,,,,,,,api-owner,,,allow,filterByUserNS
NS MANAGER,,getFilteredNamespaceConsumers,,,,,,,api-owner,,,allow,filterByUserNS
Any User,,,AccessRequest,update,,"isApproved,isIssued",,,,,,deny,
API Owner Role Rules,,,AccessRequest,read,,,,,,,"api-owner,provider-user",allow,
API Owner Role Rules,,,Activity,read,,,,,,,"api-owner,provider-user",allow,filterByUserNS
API Owner Role Rules,,,Alert,,read,,,,,,"api-owner,provider-user",allow,
Expand Down
10 changes: 0 additions & 10 deletions src/nextapp/.env.local
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +0,0 @@
NEXT_PUBLIC_APP_VERSION=0.0.0
NEXT_PUBLIC_APP_REVISION=000000000000000000000000
NEXT_PUBLIC_KUBE_CLUSTER=local
NEXT_PUBLIC_HELP_DESK_URL=https://dpdd.atlassian.net/servicedesk/customer/portal/1/group/2
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/v3/console/
NEXT_PUBLIC_HELP_SUPPORT_URL=https://dev.developer.gov.bc.ca/docs/default/component/aps-infra-platform-docs/
NEXT_PUBLIC_HELP_RELEASE_URL=https://dev.developer.gov.bc.ca/docs/default/component/aps-infra-platform-docs/reference/releases/
NEXT_PUBLIC_HELP_STATUS_URL=https://uptime.com/s/bcgov-dss
3 changes: 2 additions & 1 deletion src/nextapp/components/new-product/new-product-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,11 @@ const NewProductDialog: React.FC<NewProductDialogProps> = ({
isClosable: true,
});
onClose();
} catch {
} catch (err: any) {
toast({
title: 'Create failed',
status: 'error',
description: err,
isClosable: true,
});
}
Expand Down
Loading