diff --git a/.envrc b/.envrc index 2b7f6cc4a5ca..0fda20c6f684 100644 --- a/.envrc +++ b/.envrc @@ -1,31 +1,24 @@ #!/bin/bash -declare -A TIME_KEEP -# t - get elapsed time in milliseconds since first invocation (with nanosecond precision) -t() { - if [[ -v TIME_KEEP[$1] ]]; then - D="$(date +%N)" - echo "$(((${D##0} - ${TIME_KEEP[$1]##0}) / 1000000))" - else - TIME_KEEP[$1]=$(date +%N) - fi -} -set -euo pipefail -t root + +source_env .env.secret # global + export NODE_OPTIONS="--max-old-space-size=8192" # MacOS specific + export REDIS_CLUSTER_IP=0.0.0.0 -# Developer custom direnv config -for envrc in .envrc.* $(if [[ "${IS_DEVCONTAINER:-}" == true ]]; then echo .devcontainer/.envrc.private; fi); do - t "${envrc}" - source_env_if_exists "$envrc" - T_TOTAL=$(t "${envrc}") - if ((T_TOTAL > 100)); then - echo -e "\033[93mSetting '$envrc' took ${T_TOTAL}ms\033[0m" - fi -done - -echo "Loading .envrc took $(t root)ms" +# developer custom direnv config + +source_env_if_exists .envrc.private +if [[ "${IS_DEVCONTAINER:-}" == true ]]; then + source_env_if_exists .devcontainer/.envrc.private +fi + +# Podman compatibility +# NOTE: Exits direnv if user is using docker. +source_env_if_exists .envrc.podman + +source_env_if_exists .envrc.kube diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 24278126b802..c7834ff45dc9 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -371,9 +371,6 @@ codemagic.yaml /libs/application/templates/university/ @island-is/origo /libs/application/template-api-modules/src/lib/modules/templates/university/ @island-is/origo -# Temporary assignment while the QA bootstrap project is in progress -/apps/system-e2e/ @island-is/qa - # DevOps /.github/ @island-is/devops /.githooks/ @island-is/devops @@ -386,3 +383,17 @@ codemagic.yaml /scripts/postinstall.js @island-is/devops @island-is/core /scripts/codegen.js @island-is/devops @island-is/core /charts/ @island-is/devops + + +# System tests +# Catch-all +/apps/system-e2e/ @island-is/qa +# Islandis +/apps/system-e2e/src/tests/islandis/admin-portal/ @island-is/aranja +/apps/system-e2e/src/tests/islandis/application-system/ @island-is/norda-applications +/apps/system-e2e/src/tests/islandis/application-system/acceptance/parental-leave.spec.ts @island-is/deloitte +/apps/system-e2e/src/tests/islandis/consultation-portal/ @island-is/advania +/apps/system-e2e/src/tests/islandis/service-portal/ @island-is/hugsmidjan @island-is/juni @island-is/norda-applications +/apps/system-e2e/src/tests/islandis/web/ @island-is/hugsmidjan @island-is/juni @island-is/stefna +# Judicial system +/apps/system-e2e/src/tests/judicial-system/ @island-is/kolibri-justice-league diff --git a/apps/application-system/api/infra/application-system-api.ts b/apps/application-system/api/infra/application-system-api.ts index 98e258a3d972..ef44dd546487 100644 --- a/apps/application-system/api/infra/application-system-api.ts +++ b/apps/application-system/api/infra/application-system-api.ts @@ -122,6 +122,7 @@ export const serviceSetup = (services: { skilavottordWs: ServiceBuilder<'skilavottord-ws'> // The user profile service is named service-portal-api in infra setup servicePortalApi: ServiceBuilder<'service-portal-api'> + userNotificationService: ServiceBuilder<'services-user-notification'> }): ServiceBuilder<'application-system-api'> => service('application-system-api') .namespace(namespace) @@ -256,6 +257,9 @@ export const serviceSetup = (services: { SERVICE_USER_PROFILE_URL: ref( (h) => `http://${h.svc(services.servicePortalApi)}`, ), + USER_NOTIFICATION_API_URL: ref( + (h) => `http://${h.svc(services.userNotificationService)}`, + ), }) .xroad( Base, diff --git a/apps/web/components/Stepper/Stepper/Stepper.tsx b/apps/web/components/Stepper/Stepper/Stepper.tsx index 0337d441c212..df936727b35c 100644 --- a/apps/web/components/Stepper/Stepper/Stepper.tsx +++ b/apps/web/components/Stepper/Stepper/Stepper.tsx @@ -106,7 +106,7 @@ const getInitialStateAndAnswersByQueryParams = ( ) const stepQuestion = getStepQuestion(step) - if (stepQuestion) { + if (stepQuestion && stepType !== STEP_TYPES.INFORMATION) { questionsAndAnswers.push({ question: stepQuestion, answer: selectedOption.label, @@ -305,7 +305,10 @@ const Stepper = ({ diff --git a/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx b/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx index be4d29bd92af..7da91a5a0a37 100644 --- a/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx +++ b/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx @@ -51,7 +51,10 @@ const ActionReviewComplete = ({ variant="ghost" icon={listReviewed ? 'reload' : 'checkmark'} onClick={() => setModalSubmitReviewIsOpen(true)} - disabled={listStatus === ListStatus.Active} + disabled={ + listStatus === ListStatus.Active || + listStatus === ListStatus.Extendable + } > {modalText} diff --git a/libs/service-portal/information/src/screens/UserInfo/UserInfo.graphql b/libs/service-portal/information/src/screens/UserInfo/UserInfo.graphql index 7df730d19577..94bc8a3da14a 100644 --- a/libs/service-portal/information/src/screens/UserInfo/UserInfo.graphql +++ b/libs/service-portal/information/src/screens/UserInfo/UserInfo.graphql @@ -1,7 +1,6 @@ query NationalRegistryPerson($useFakeData: Boolean) { nationalRegistryPerson(useFakeData: $useFakeData) { nationalId - fullName gender exceptionFromDirectMarketing religion @@ -9,6 +8,7 @@ query NationalRegistryPerson($useFakeData: Boolean) { firstName middleName lastName + fullName } maritalStatus citizenship { diff --git a/libs/service-portal/information/src/screens/UserInfo/UserInfo.tsx b/libs/service-portal/information/src/screens/UserInfo/UserInfo.tsx index 467fcb1bdf32..25876221db72 100644 --- a/libs/service-portal/information/src/screens/UserInfo/UserInfo.tsx +++ b/libs/service-portal/information/src/screens/UserInfo/UserInfo.tsx @@ -3,7 +3,6 @@ import { defineMessage } from 'react-intl' import { checkDelegation } from '@island.is/shared/utils' import { info } from 'kennitala' import { Problem } from '@island.is/react-spa/shared' -import { Box, Divider, Stack } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' import { FootNote, @@ -39,7 +38,7 @@ const SubjectInfo = () => { return ( <> { { {!error && !loading && data?.nationalRegistryPerson && ( diff --git a/libs/shared/form-fields/src/lib/SelectController/SelectController.tsx b/libs/shared/form-fields/src/lib/SelectController/SelectController.tsx index 213eddc0ffeb..d5ec6a74d63d 100644 --- a/libs/shared/form-fields/src/lib/SelectController/SelectController.tsx +++ b/libs/shared/form-fields/src/lib/SelectController/SelectController.tsx @@ -57,7 +57,7 @@ export const SelectController = ({ } const getValue = (value: Value | Value[]) => { - if (!value) { + if (value === null) { return null } diff --git a/scripts/run-proxies.sh b/scripts/run-proxies.sh index 8266adc8a255..26684294736c 100755 --- a/scripts/run-proxies.sh +++ b/scripts/run-proxies.sh @@ -16,11 +16,12 @@ if [[ -n "${DEBUG:-}" || -n "${CI:-}" ]]; then set -x; fi CONTEXT="$(kubectl config get-contexts -o name | grep -o ".*:cluster/${AWS_PROFILE##islandis-}-cluster.*")" kubectl config use-context "${CONTEXT}" >&2 kubectl config current-context | sed 's/.*\///' >/dev/null - echo "${CONTEXT}" + # Strip loading ARN role, region, etc. + echo "${CONTEXT##*/}" )"}" echo "AWS_PROFILE=${AWS_PROFILE}" >&2 -echo "CLUSTER=$CLUSTER" >&2 +echo "CLUSTER=${CLUSTER}" >&2 ARGS=() PROXIES=()