diff --git a/frontend/src/api-service/ApiConfig.ts b/frontend/src/api-service/ApiConfig.ts
index 02eefdac2..df8da4096 100644
--- a/frontend/src/api-service/ApiConfig.ts
+++ b/frontend/src/api-service/ApiConfig.ts
@@ -12,6 +12,8 @@ const ApiConfig = {
geneticClasses: `${serverHost}/api/genetic-classes`,
+ geneticWothList: `${serverHost}/api/genetic-worth`,
+
methodsOfPayment: `${serverHost}/api/methods-of-payment`,
orchards: `${serverHost}/api/orchards`,
@@ -32,6 +34,8 @@ const ApiConfig = {
seedlots: `${serverHost}/api/seedlots`,
+ orchardsVegCode: `${serverHost}/api/orchards/vegetation-codes`,
+
tscAdmin: `${serverHost}/api/tsc-admin`,
tscSeedlotEdit: `${serverHost}/api/tsc-admin/seedlots/{seedlotNumber}/edit`,
@@ -49,9 +53,9 @@ const ApiConfig = {
oracleOrchards: `${oracleServerHost}/api/orchards`,
- orchardsVegCode: `${oracleServerHost}/api/orchards/vegetation-code`,
+ areaOfUseSpzList: `${oracleServerHost}/api/area-of-use/spz-list/vegetation-code`,
- areaOfUseSpzList: `${oracleServerHost}/api/area-of-use/spz-list/vegetation-code`
+ parentTreeByVegCode: `${oracleServerHost}/api/parent-trees/vegetation-codes/{vegCode}`
};
export default ApiConfig;
diff --git a/frontend/src/api-service/GeneticWorthAPI.ts b/frontend/src/api-service/GeneticWorthAPI.ts
new file mode 100644
index 000000000..f0704c50f
--- /dev/null
+++ b/frontend/src/api-service/GeneticWorthAPI.ts
@@ -0,0 +1,10 @@
+import { GeneticWorthDto } from '../types/GeneticWorthType';
+import ApiConfig from './ApiConfig';
+import api from './api';
+
+const getGeneticWorthList = () => {
+ const url = ApiConfig.geneticWothList;
+ return api.get(url).then((res): GeneticWorthDto[] => res.data);
+};
+
+export default getGeneticWorthList;
diff --git a/frontend/src/api-service/forestClientsAPI.ts b/frontend/src/api-service/forestClientsAPI.ts
index b76fe9b80..577995d5b 100644
--- a/frontend/src/api-service/forestClientsAPI.ts
+++ b/frontend/src/api-service/forestClientsAPI.ts
@@ -2,11 +2,12 @@ import ApiConfig from './ApiConfig';
import api from './api';
import { ForestClientType } from '../types/ForestClientTypes/ForestClientType';
import { ForestClientSearchType } from '../types/ForestClientTypes/ForestClientSearchType';
-import { ClientSearchOptions } from '../components/ApplicantAgencyFields/ClientSearchModal/definitions';
+import { ClientSearchOptions } from '../components/ClientAndCodeInput/ClientSearchModal/definitions';
+import { ForestClientLocationType } from '../types/ForestClientTypes/ForestClientLocationType';
export const getForestClientLocation = (clientNumber: string, locationCode: string) => {
const url = `${ApiConfig.forestClient}/${clientNumber}/location/${locationCode}`;
- return api.get(url).then((res) => res.data);
+ return api.get(url).then((res): ForestClientLocationType => res.data);
};
export const getForestClientByNumberOrAcronym = (numberOrAcronym: string) => {
diff --git a/frontend/src/api-service/orchardAPI.ts b/frontend/src/api-service/orchardAPI.ts
index db56ec143..3615ba923 100644
--- a/frontend/src/api-service/orchardAPI.ts
+++ b/frontend/src/api-service/orchardAPI.ts
@@ -12,11 +12,6 @@ export const getSeedPlanUnits = (orchardId: string) => {
return api.get(url).then((res) => res.data);
};
-export const getAllParentTrees = (vegCode: string) => {
- const url = `${ApiConfig.orchards}/parent-trees/vegetation-codes/${vegCode}`;
- return api.get(url).then((res) => res.data);
-};
-
export const getOrchardByVegCode = (vegCode: string) => {
const url = `${ApiConfig.orchardsVegCode}/${vegCode}`;
return api.get(url).then((res): OrchardDataType[] => res.data);
diff --git a/frontend/src/api-service/parentTreeAPI.ts b/frontend/src/api-service/parentTreeAPI.ts
index eba47e86c..61d502b3f 100644
--- a/frontend/src/api-service/parentTreeAPI.ts
+++ b/frontend/src/api-service/parentTreeAPI.ts
@@ -1,3 +1,4 @@
+import { ParentTreeByVegCodeResType } from '../types/ParentTreeTypes';
import { PtValsCalcReqPayload } from '../types/PtCalcTypes';
import ApiConfig from './ApiConfig';
import api from './api';
@@ -7,4 +8,9 @@ export const postForCalculation = (data: PtValsCalcReqPayload) => {
return api.post(url, data);
};
+export const getAllParentTrees = (vegCode: string) => {
+ const url = ApiConfig.parentTreeByVegCode.replace('{vegCode}', vegCode);
+ return api.get(url).then((res): ParentTreeByVegCodeResType => res.data);
+};
+
export default postForCalculation;
diff --git a/frontend/src/assets/img/cone.jpeg b/frontend/src/assets/img/cone.jpeg
new file mode 100644
index 000000000..6c5917f11
Binary files /dev/null and b/frontend/src/assets/img/cone.jpeg differ
diff --git a/frontend/src/assets/img/seeding.png b/frontend/src/assets/img/seeding.png
deleted file mode 100644
index 28f33fb63..000000000
Binary files a/frontend/src/assets/img/seeding.png and /dev/null differ
diff --git a/frontend/src/aws-exports.ts b/frontend/src/aws-exports.ts
index 45d595af5..147c21814 100644
--- a/frontend/src/aws-exports.ts
+++ b/frontend/src/aws-exports.ts
@@ -4,13 +4,17 @@ import { env } from './env';
const ZONE = env.VITE_ZONE ? env.VITE_ZONE.toLocaleLowerCase() : 'dev';
const retUrlEnv = ZONE !== 'prod' && ZONE !== 'test' ? 'dev' : ZONE;
+const retUrlString = ZONE === 'prod'
+ ? 'https://loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/logout'
+ : `https://${retUrlEnv}.loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/logout`;
+
// [https://logon7.gov.bc.ca] for PROD and [https://logontest7.gov.bc.ca] for everyting else
const logoutDomain = ZONE === 'prod' ? 'https://logon7.gov.bc.ca' : 'https://logontest7.gov.bc.ca';
const signOutUrl = [
`${logoutDomain}/clp-cgi/logoff.cgi`,
'?retnow=1',
- `&returl=https://${retUrlEnv}.loginproxy.gov.bc.ca/auth/realms/standard/protocol/openid-connect/logout`,
+ `&returl=${retUrlString}`,
`?redirect_uri=${window.location.origin}/`
].join('');
@@ -23,7 +27,7 @@ const awsconfig = {
domain: env.VITE_AWS_DOMAIN || 'prod-fam-user-pool-domain.auth.ca-central-1.amazoncognito.com',
scope: ['openid'],
redirectSignIn: `${window.location.origin}/`,
- redirectSignOut: env.VITE_REDIRECT_SIGN_OUT || signOutUrl,
+ redirectSignOut: signOutUrl,
responseType: 'code'
},
federationTarget: 'COGNITO_USER_POOLS'
diff --git a/frontend/src/components/ApplicantAgencyFields/ClientSearchModal/ClientSearchFields.tsx b/frontend/src/components/ApplicantAgencyFields/ClientSearchModal/ClientSearchFields.tsx
deleted file mode 100644
index d518ba764..000000000
--- a/frontend/src/components/ApplicantAgencyFields/ClientSearchModal/ClientSearchFields.tsx
+++ /dev/null
@@ -1,83 +0,0 @@
-/* eslint-disable jsx-a11y/anchor-is-valid */
-import React from 'react';
-import {
- FlexGrid, Row, Column,
- TextInput, Dropdown, Button
-} from '@carbon/react';
-import { Search } from '@carbon/icons-react';
-import { Link } from 'react-router-dom';
-
-import ComboBoxEvent from '../../../types/ComboBoxEvent';
-
-import { clientSearchOptions } from './constants';
-import { ClientSearchFieldsProps } from './definitions';
-
-const ClientSearchFields = ({
- searchWord,
- setSearchWord,
- searchOption,
- setSearchOption,
- mutationFn
-}: ClientSearchFieldsProps) => (
- - Search for a specific client or agency, you can search by name, acronym or number. - To view more information about the client, you can - {' '} - - go to client search screen. - -
-
- ) => handleAgencyInput(e.target.value)
- }
- onWheel={(e: React.ChangeEvent) => e.target.blur()}
- onBlur={(e: React.ChangeEvent) => {
- if (!e.target.readOnly) {
- handleAgencyBlur(e.target.value);
- }
- }}
- size="md"
- />
- {
- renderLoading(
- validateAgencyAcronymMutation.isLoading,
- validateAgencyAcronymMutation.isSuccess,
- showSuccessIconAgency
- )
- }
-
-
- ) => {
- handleLocationCodeChange(e.target.value);
- }}
- onWheel={(e: React.ChangeEvent) => e.target.blur()}
- onBlur={(e: React.ChangeEvent) => {
- if (!e.target.readOnly) {
- handleLocationCodeBlur(e.target.value);
- }
- }}
- />
- {
- renderLoading(
- validateLocationCodeMutation.isLoading,
- validateLocationCodeMutation.isSuccess,
- showSuccessIconLocCode
- )
- }
-
-
- If you don't remember the agency information you can
- {' '}
-
{favObject.header}
-{favObject.description}
+ Search for a specific client or agency, you can search by name, acronym or number. + {/* Commenting this until search screen is created */} + {/* To view more information about the client, you can + {' '} + + go to client search screen. + */} +
+
+ ) => e.target.blur()}
+ onBlur={(e: React.ChangeEvent) => {
+ if (!e.target.readOnly) {
+ handleAgencyBlur(e.target.value);
+ }
+ }}
+ size="md"
+ />
+ {
+ renderLoading(
+ validateClientAcronymMutation.isLoading,
+ validateClientAcronymMutation.isSuccess,
+ showClientValidationStatus,
+ clientInput.id,
+ openAgnTooltip,
+ setOpenAgnTooltip
+ )
+ }
+
+
+ ) => e.target.blur()}
+ onBlur={(e: React.ChangeEvent) => {
+ if (!e.target.readOnly) {
+ handleLocationCodeBlur(e.target.value);
+ }
+ }}
+ />
+ {
+ renderLoading(
+ validateLocationCodeMutation.isLoading,
+ validateLocationCodeMutation.isSuccess,
+ showLocCodeValidationStatus,
+ locationCodeInput.id,
+ openLocTooltip,
+ setOpenLocTooltip
+ )
+ }
+
+
+ If you don't remember the clientInput information you can
+ {' '}
+
{inputText.extractionTitle.titleText}
+{inputTextObj.extractionTitle.titleText}
{ !isReview ? ( -{inputText.storageTitle.titleText}
+{inputTextObj.storageTitle.titleText}
{ !isReview ? ( -
+
+
+
+
{
- state.orchards.map((orchard: OrchardObj, index: number) => (
-
-
-
-
-
-
- ))
+ state.orchards.secondaryOrchard.value.label
+ ? (
+
+
+
+
+ )
+ : null
}
);
}
- return (state.orchards.map((orchard: OrchardObj) => (
- +
+ {/* eslint-disable-next-line jsx-a11y/anchor-is-valid */} + { + setStepFn(0); + }} + > + {inputText.modal.notification.link} + + + )} /> )} diff --git a/frontend/src/components/SeedlotRegistrationSteps/SubmitModal/styles.scss b/frontend/src/components/SeedlotRegistrationSteps/SubmitModal/styles.scss index 62c40861f..3ac94553b 100644 --- a/frontend/src/components/SeedlotRegistrationSteps/SubmitModal/styles.scss +++ b/frontend/src/components/SeedlotRegistrationSteps/SubmitModal/styles.scss @@ -36,4 +36,8 @@ .#{vars.$bcgov-prefix}--modal-footer .#{vars.$bcgov-prefix}--btn { height: 0; } + + .submit-notification { + max-inline-size: none; + } } diff --git a/frontend/src/components/SeedlotReviewSteps/ApplicantAndSeedlot/Read/index.tsx b/frontend/src/components/SeedlotReviewSteps/ApplicantAndSeedlot/Read/index.tsx index c59ce97ce..dc611f5a0 100644 --- a/frontend/src/components/SeedlotReviewSteps/ApplicantAndSeedlot/Read/index.tsx +++ b/frontend/src/components/SeedlotReviewSteps/ApplicantAndSeedlot/Read/index.tsx @@ -1,16 +1,29 @@ import React, { useContext } from 'react'; import { Column, Row, FlexGrid } from '@carbon/react'; +import { useQuery } from '@tanstack/react-query'; import Divider from '../../../Divider'; import ReadOnlyInput from '../../../ReadOnlyInput'; import ClassAContext from '../../../../views/Seedlot/ContextContainerClassA/context'; import EmailDisplay from '../../../EmailDisplay'; +import { THREE_HALF_HOURS, THREE_HOURS } from '../../../../config/TimeUnits'; +import { getForestClientByNumberOrAcronym } from '../../../../api-service/forestClientsAPI'; +import { getForestClientLabel } from '../../../../utils/ForestClientUtils'; const ApplicantAndSeedlotRead = () => { const { - defaultAgencyObj, defaultCode, seedlotData, seedlotSpecies, isFetchingData + defaultClientNumber, defaultCode, seedlotData, seedlotSpecies, isFetchingData } = useContext(ClassAContext); + const forestClientQuery = useQuery({ + queryKey: ['forest-clients', defaultClientNumber], + queryFn: () => getForestClientByNumberOrAcronym(defaultClientNumber), + enabled: !!defaultClientNumber, + staleTime: THREE_HOURS, + cacheTime: THREE_HALF_HOURS, + select: (fc) => getForestClientLabel(fc) + }); + return (
+
+ + Any changes you made will be discarded unless saved. +
+
+
+
+
+
+ {
+ statusToUpdateTo === 'PND'
+ ? (
+
+
+ {SaveStatusModalText.pendingHeader}
+ {SaveStatusModalText.pendingBody}
+
+ )
+ : (
+ {SaveStatusModalText.approveHeader}
+ )
+ }
+
+
+ {
+ statusToUpdateTo === 'PND'
+ ? (
+
+ )
+ : (
+
+ )
+ }
+
+ + Send seedlot back to pending +
+ ), + pendingBody: ( ++ Confirm this action if there is something wrong with this seedlot, + this will change the seedlot status from submitted back to pending, + allowing the applicant agency to edit the form again. +
+ ), + approveHeader: ( +