Skip to content

Commit

Permalink
Merge pull request #3788 from bcgov/NDT-694-Update-Applicant-Portal-L…
Browse files Browse the repository at this point in the history
…anding-page-and-dashboard-for-Intake-6

feat: intake 6 UI preparation
  • Loading branch information
ccbc-service-account authored Jan 16, 2025
2 parents e752c96 + 8dfb5c0 commit abfbd94
Show file tree
Hide file tree
Showing 17 changed files with 840 additions and 752 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# [1.224.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.223.0...v1.224.0) (2025-01-16)

### Bug Fixes

- authorized path for gis ([c2b4551](https://github.com/bcgov/CONN-CCBC-portal/commit/c2b45514f3c11c17cf536cd697fe006217563d4a))
- remove unwanted unsaved change modal ([8fae8dd](https://github.com/bcgov/CONN-CCBC-portal/commit/8fae8dd1f0352c3539bf0281935321d9affe4e46))

### Features

- intake 6 UI preparation ([083cc8e](https://github.com/bcgov/CONN-CCBC-portal/commit/083cc8eea4fe036148713c1d910a89aaadd3754f))

## [1.223.1](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.223.0...v1.223.1) (2025-01-14)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion app/components/Dashboard/Row.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const Row = ({ application, onWithdraw, onDelete, schema }) => {
status === 'submitted' ||
status === 'applicant_conditionally_approved';
const isDraft = application.status === 'draft';
const isEditable = formData.isEditable && status !== 'withdrawn';
const isEditable = false && formData.isEditable && status !== 'withdrawn';

const getApplicationUrl = () => {
if (isWithdrawn) {
Expand Down
2 changes: 1 addition & 1 deletion app/components/Dashboard/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import ArchiveModal from './ArchiveModal';
import WithdrawModal from './WithdrawModal';

const StyledFontAwesome = styled(FontAwesomeIcon)`
margin-left: 4px; ;
margin-left: 4px;
`;

const StyledTable = styled('table')`
Expand Down
3 changes: 2 additions & 1 deletion app/components/Form/ApplicationForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,12 @@ const ApplicationForm: React.FC<Props> = ({
jsonData,
rowId: formDataRowId,
id: formDataId,
isEditable,
// isEditable,
updatedAt,
},
status,
} = application;
const isEditable = false;
const ccbcIntakeNumber =
application.intakeByIntakeId?.ccbcIntakeNumber || null;
const latestIntakeNumber =
Expand Down
Loading

0 comments on commit abfbd94

Please sign in to comment.