WorkBC24-R3 (#659)

* Update SSOT for NOC 2021

* [NOC-251] Remove regional_top_industries

* [NOC-250] Remove population dataset

* Remove unused code

* [NOC-258] Update ssot

* [NOC-258] Adjust data display

* Squashed commit of the following:

commit ea9b93b351d5308ee274b05af076d65d9907a3d5
Merge: 4714f2a dbaef25
Author: rjkuyvenhoven <[email protected]>
Date:   Thu Feb 8 10:11:29 2024 -0800

    Merge branch 'develop-noc' into NOC-226-227-data-migration

commit 4714f2a
Author: rjkuyvenhoven <[email protected]>
Date:   Wed Feb 7 13:27:02 2024 -0800

    updates to ensure exsiting career profiles are updated with NOC 2021

commit 9e1af9e
Author: rjkuyvenhoven <[email protected]>
Date:   Wed Feb 7 11:28:26 2024 -0800

    re-work NOC to make things a little cleaner and to avoid unnecessarily archiving/unpublishing NOCs and creating new NOCs

commit bd0a37c
Author: rjkuyvenhoven <[email protected]>
Date:   Wed Feb 7 11:26:04 2024 -0800

    fix redirect issue with Merged NOCs

commit 554f4af
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 6 17:19:39 2024 -0800

    re-structure NOC 3142,3237,3424 to avoid URL & Redirect issues

commit 4cd8712
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 6 17:08:52 2024 -0800

    move rows for easier migration

commit 9d69002
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 6 16:22:55 2024 -0800

    prefix Career Profile titles with [ARCHIVED] for archived & unpublished Career Profiles

commit de24411
Author: infojunkie <[email protected]>
Date:   Mon Feb 5 19:43:36 2024 -0800

    Less migration messages

commit a82465b
Author: infojunkie <[email protected]>
Date:   Mon Feb 5 17:54:48 2024 -0800

    [NOC-227] Fix occupational interest display

commit 7cb0a6a
Author: infojunkie <[email protected]>
Date:   Mon Feb 5 17:28:06 2024 -0800

    Code cleanup

commit bb54c99
Author: infojunkie <[email protected]>
Date:   Mon Feb 5 17:26:13 2024 -0800

    Normalize concordance file

commit a298be2
Author: infojunkie <[email protected]>
Date:   Mon Feb 5 17:25:15 2024 -0800

    Merge NOCs 0012-0016 into 00018

commit f13d3c8
Author: infojunkie <[email protected]>
Date:   Mon Feb 5 17:22:42 2024 -0800

    Move row for easier migration

commit 005f649
Author: infojunkie <[email protected]>
Date:   Mon Feb 5 17:22:02 2024 -0800

    Initial concordance data

commit 9914d2d
Author: rjkuyvenhoven <[email protected]>
Date:   Mon Feb 5 14:15:50 2024 -0800

    update concordance file names

commit 88d4013
Author: rjkuyvenhoven <[email protected]>
Date:   Mon Feb 5 14:12:08 2024 -0800

    code cleanup

commit aa7f58c
Author: rjkuyvenhoven <[email protected]>
Date:   Mon Feb 5 13:43:14 2024 -0800

    wip

commit f64fa95
Merge: f090906 3d5c193
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 2 17:11:48 2024 -0800

    Merge branch 'develop-noc' into NOC-226-227-data-migration

commit f090906
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 2 17:10:58 2024 -0800

    wip

commit ede7d3d
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 2 12:21:42 2024 -0800

    add TEER # field to Education taxonomy vocabulary

commit 15f568f
Author: rjkuyvenhoven <[email protected]>
Date:   Thu Feb 1 14:48:57 2024 -0800

    wip

commit 2f0ed08
Author: rjkuyvenhoven <[email protected]>
Date:   Thu Feb 1 14:15:12 2024 -0800

    wip

* [NOC-229] Use NOC 2016 for EPBC search link

* [NOC-229] Update SSOT

* Fix concordance filename

* [NOC-230] Update Job Board sidebar block and save button for career profiles

* [NOC-288] Update ssot

* [NOC-281] validate noc migration

commit b623017
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 13 10:21:33 2024 -0800

    Clean up Validation report, add to admin menu

commit b17a70c
Author: rjkuyvenhoven <[email protected]>
Date:   Mon Feb 12 16:05:30 2024 -0800

    re-work unpublished redirection validation to use saved NOC 2016 paths, code cleanup

commit bec04fe
Author: rjkuyvenhoven <[email protected]>
Date:   Mon Feb 12 14:29:11 2024 -0800

    update test csv job title to match migration concordance and SSOT

commit 81b7e66
Author: rjkuyvenhoven <[email protected]>
Date:   Mon Feb 12 14:15:54 2024 -0800

    additional error checking to confirm redirection is to published career profile node.

commit 5d9e5e2
Merge: c29c38f b6649be
Author: rjkuyvenhoven <[email protected]>
Date:   Mon Feb 12 14:00:00 2024 -0800

    Merge branch 'develop-noc' into NOC-281-validate-noc-migration

commit c29c38f
Author: rjkuyvenhoven <[email protected]>
Date:   Mon Feb 12 13:59:28 2024 -0800

    save NOC 2016 Career Profile paths pre-migration, update redirection validation

commit d66b3ea
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 9 14:42:06 2024 -0800

    NOC 2021 Validation

commit 26ba543
Author: rjkuyvenhoven <[email protected]>
Date:   Thu Feb 8 14:25:58 2024 -0800

    wip

* [NOC-290] Ingest updated Occupational_Interests_2023

* [WBCAMS-378] Add find_session script

* [WBCAMS-378] Add find_session script

* Adjust script doc

* [NOC-229] Education Background

commit c3c017ff838a2c22719b65650f7d92d2a4075503
Merge: 2b1da2b0 6af8abc
Author: rjkuyvenhoven <[email protected]>
Date:   Wed Feb 14 08:57:24 2024 -0800

    Merge branch 'develop-noc' into NOC-228-education-background

commit 2b1da2b02361a6f71f946f0d9a6ff9aacbee8899
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 13 12:01:21 2024 -0800

    update education background field to use new TEER values

* [NOC-231] High Opportunity Occupations filter

commit d8208c0b33857a5316ebd7885665e8820f1d54c9
Merge: 7a799080 6af8abc
Author: rjkuyvenhoven <[email protected]>
Date:   Wed Feb 14 08:57:32 2024 -0800

    Merge branch 'develop-noc' into NOC-231-high-opportunity-occupations-filter

commit 7a799080028f38d906d801858627d01f74921b73
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 13 15:31:28 2024 -0800

    Updates for new education TEERs

commit 0b788efabf90f967a4dbc24281fbec52dd5b2627
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 13 13:16:37 2024 -0800

    wip

* [NOC-228] Update field label

* [NOC-231] Update TEER field label

* [NOC-231] Update TEER field label

* [NOC-111] career prifle data display

commit 3472704
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 20 10:44:19 2024 -0800

    re-compile style.css

commit b02c375
Merge: 3adc8a7 d271672
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 20 10:42:11 2024 -0800

    Merge branch 'develop-noc' into NOC-111-career-profile-data-display

commit 3adc8a7
Merge: 7614d2f b4de9ee
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 20 10:41:42 2024 -0800

    Merge branch 'develop-noc' into NOC-111-career-profile-data-display

    # Conflicts:
    #	src/web/themes/custom/workbc/css/style.css
    #	src/web/themes/custom/workbc/css/style.css.map

commit 7614d2f
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 20 10:40:30 2024 -0800

    code cleanup

commit 8ec7f57
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 16 09:44:37 2024 -0800

    update donut charts

commit 8a3df0a
Author: rjkuyvenhoven <[email protected]>
Date:   Thu Feb 15 13:54:40 2024 -0800

    wip

commit efc0af2
Merge: b968da7 a532ae3
Author: rjkuyvenhoven <[email protected]>
Date:   Thu Feb 15 11:53:30 2024 -0800

    Merge branch 'develop-noc' into NOC-111-career-profile-data-display

commit b968da7
Author: rjkuyvenhoven <[email protected]>
Date:   Thu Feb 15 11:53:04 2024 -0800

    update "N/A" to "Not available", add "Data not available" to charts, update Donut chart tooltip

* [NOC-253] [NOC-254] [NOC-256] career-profile-skills

commit 4dd69b252bff88865d77f846a523dbe19bfdeb68
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 20 10:47:33 2024 -0800

    re-compile style.css

commit cadb658532211d2b66d9d459aaea9e54c9339a13
Merge: 6753054a 0a4e24a4
Author: rjkuyvenhoven <[email protected]>
Date:   Tue Feb 20 10:46:28 2024 -0800

    Merge branch 'develop-noc' into NOC-253-254-256-career-profile-skills

    # Conflicts:
    #	src/web/modules/custom/workbc_extra_fields/workbc_extra_fields.module
    #	src/web/themes/custom/workbc/css/style.css
    #	src/web/themes/custom/workbc/css/style.css.map

commit 6753054aa7012446ba2aae64bac7a777feb3fbee
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 16 15:06:14 2024 -0800

    Occupational Interests data not available

commit 483ae059e4144f0370e7edd5007394582e7b3783
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 16 13:34:00 2024 -0800

    NOC-256 - skills data not available

commit 587358142e7c0dd83059fd037c0d37c393926d57
Merge: 39f3dc58 bb859077
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 16 13:02:11 2024 -0800

    Merge branch 'NOC-253-region-data-display' into NOC-256-career-profile-skills

commit 39f3dc589b3ed1f301fca25db4ba1bb81440d89c
Merge: 8ec7f57 4263db47
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 16 13:01:46 2024 -0800

    Merge branch 'NOC-254-forecasted-job-openings-by-industry' into NOC-256-career-profile-skills

commit 4263db4707238cdc2c6dc7acd76b823f14a15fdf
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 16 12:02:54 2024 -0800

    update Career Profile Industry Highlights table

commit 8ec7f57
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 16 09:44:37 2024 -0800

    update donut charts

commit bb85907759e98b14a13b2fb8a0d3123027b70294
Author: rjkuyvenhoven <[email protected]>
Date:   Fri Feb 16 09:35:12 2024 -0800

    Label updates

commit 8a3df0a
Author: rjkuyvenhoven <[email protected]>
Date:   Thu Feb 15 13:54:40 2024 -0800

    wip

commit efc0af2
Merge: b968da7 a532ae3
Author: rjkuyvenhoven <[email protected]>
Date:   Thu Feb 15 11:53:30 2024 -0800

    Merge branch 'develop-noc' into NOC-111-career-profile-data-display

commit b968da7
Author: rjkuyvenhoven <[email protected]>
Date:   Thu Feb 15 11:53:04 2024 -0800

    update "N/A" to "Not available", add "Data not available" to charts, update Donut chart tooltip

* add null value checking

* [NOC-264,228,231,227] Update TEER labels

* add career profile content validation

* use short term label when creating new Education taxonomy term

* update merge message to include NOC 2021 number

* [NOC-130] Ingest new Job Title dataset

* [NOC-264] Adjust TEER labels

* [WBCAMS-349] interactivd maps

commit 9f056da
Author: rjkuyvenhoven <[email protected]>
Date:   Thu Feb 22 11:22:16 2024 -0800

    updated interactive map hot spots

* Enable slow log

* [NOC-312] Update Occupational_Interests_2023

* [WBCAMS-348] remove authored by & on fields from News & Blog page display (#607)

* Add POSTGRES_SSOT env var

* Disable EPBC SOAP call

* [WBCAMS-381] add Tags field to Page content type, add Page Tags to metatag keywords (#608)

* Add aws-dev-noc to environment-specific configurations

* Add SSOT reset to site reset script

* Update ecs3.tf

* Update ecs.tf (#609)

* Update ecs.tf

* Update ecs.tf

* Update ecs.tf

* Update ecs.tf

* Update ecs.tf

* Update ecs.tf

* Add SSOT reset to site reset script

* Remove unneeded test pages

* [WBCAMS-379] [WBCAMS-380] google translate bc logo (#610)

* wip

* wip

* google translate disclaimer

* re-compile style.css

* wip

* update BC Logo

* [WBCAMS-349] interactive maps (#611)

* updated interactive map hot spots

* remove alt text from map line images

* [NOC-232] add noc_2016 field to search index configuration (#612)

* [WBCAMS-366] Optimize autocomplete search query

* fix rules of default lb

* [NOC-268] update text in Explore Careers block (#613)

* [NOC-269] added new Career Profile extra field for Job Titles (#614)

* [NOC-113, 298] Fix order of entries in the LFS ingestion pipeline

* [NOC-300] update BC Types of Employment display (#615)

* [NOC-298] Sort industry data by name rather than key to ensure correct display order. (#616)

* [NOC-331] Update TEER labels

* [NOC-114] Update table header, data, data source (#617)

* [NOC-331] Update TEER infotip

* [WBCAMS-392] Update SSOT with January Monthly Labour Force Survey data

* [WBCAMS-392] Update SSOT with January Monthly Labour Force Survey data

* Add Lambda Canary

* Update lambda.tf

* [NOC-302] Finalize nocs dataset and derived views

* Add files via upload

* update jb commit hash 0e5186c (#621)

* [NOC-111] update Job Composition chart to use percentages provided by SSoT to avoid data issues for negative growth scenarios (#622)

* [WBCAMS-309] upcoming events overlapping buttons (#623)

* update Prev/Next positioning

* update Prev/Next positions, add "No upcoming events" message

* Add cache policy to dev noc cf

* [WBCAMS-372] industry profile high opportunity occupations button (#624)

* Industry profile HOO button resizing for mobile

* re-compile css

* [NOC-265] add "Not available" if Occupational Interests field has no values (#625)

* [WBCAMS-343] update BC Region interactive map formatting (#626)

* [NOC-340] use NOC 2016 code to pass to epbc API (#627)

* Update dev noc cache policy in cf

* fix dev noc cf cache policy

* [NOC-350] provide Career Profile /career/{noc} route (#629)

* [WBCAMS-404] Update SSOT with February Monthly Labour Force Survey data

* [WBCAMS-404] Update SSOT with February Monthly Labour Force Survey data

* [WBCAMS-34] Remove "&" when transforming Job Board ID when generating "View more jobs" link for Region profiles. (#631)

* Release workbc noc jb

* [NOC-363] Only show industry if Job Openings have a value greater than Zero (#632)

* Update cloudfront3.tf (#634)

* Update cloudfront3.tf

* Update cloudfront.tf

* Update cloudfront3.tf (#635)

* Update cloudfront3.tf

* Update cloudfront.tf

* [NOC-245] Adjust Career Trek dataset

* [NOC-375] Update Occupational_Interests_2023

* Update ecs.tf

* Update ecs.tf

* [NOC-348] Remove comma

* [NOC-347] Ensure industry names use canonical naming

* [mobile styling updates (#639)

* [NOC-245] Update Career Trek and Career Profile datasets

* [WBCAMS-14] link to Career Trek site on associated right-side video (#638)

* add Link to Media - Remote Video type

* add Career Trek list csv

* update Settings configuration

* update Career Trek link field settings

* Post update to populate Media Remove Video Career Trek link

* update Career Trek link processing, add Career Trek link validation, add link and styling for Career Profile videos

* accessibility update

* remove test code

* update styling

* Default to CT PROD locally

* update url generation

* fix validation bug

---------

Co-authored-by: infojunkie <[email protected]>

* [WBCAMS-14] base url fix (#640)

* add error checking and fix url if base url is missing.

* code cleanup

* [WBCAMS-428] Update SSOT with March Monthly Labour Force Survey data

* [WBCAMS-428] Update SSOT with March Monthly Labour Force Survey data

* [WBCAMS-426] change $50 filter operator to Greater than or Equal to (#641)

* [WBCAMS-375] Update CareerTrek dataset for video migration

* [WBCAMS-375] Update CareerTrek dataset for video migration

* [WBCAMS-428] Normalize industry names into keys

* [WBCAMS-428] Normalize industry names into keys

* [NOC-342] Adjust card height

* [WBCAMS-375] Update CT dataset, v2

* [WBCAMS-375] Update CT dataset, v2

* [NOC-237,238] Ingest CST datasets

* [NOC-404] Updates nocs_categories endpoint

* [NOC-375] Update CT dataset

* [NOC-86] Update CT dataset

* [WBCAMS-375] Update CT dataset

* [WBCAMS-449] Update SSOT with revised March Monthly Labour Force Survey data (#643)

* [NOC-411] Display "Data not available" if there are no industries with job openings. (#644)

* [NOC-237, NOC-238, WBCAMS-449] Update SSOT

* [WBCAMS-394] Recent Job card style changes to resolve overlapping issue. (#645)

* [NOC-356]  Read industries metadata from SSOT (#648)

* Initial commit

* wip

* Remove unnecessary comments

* Update SSOT to normalize LMS data

---------

Co-authored-by: rjkuyvenhoven <[email protected]>

* [NOC-356] Update casing for LMM industries

* [NOC-356]  Read industries metadata from SSOT (#648)

* Initial commit

* wip

* Remove unnecessary comments

* Update SSOT to normalize LMS data

---------

Co-authored-by: rjkuyvenhoven <[email protected]>

* Update cloudfront.tf

* Update cloudfront.tf

* [NOC-427] Save career profiles based on NOC 2021

* Optimize search index settings

* [NOC-386] Send NOC 2021 to Job Board recent jobs

* [NOC-386] Update Job Board commit hash

* [NOC-386] Update Job Board commit hash

* [NOC-384] Update Job Board commit hash

* [NOC-387] Update Job Board commit hash

* Update cloudfront.tf

* SSOT updates

* SSOT updates

* SSOT updates, 2

* SSOT updates, 2

* [WBCAMS-394] increase Recent Jobs card height to resolve overlapping issue. (#651)

* Update build.yml

* Patch search_api_autocomplete to avoid DeprecationHelper error

* Also explicitly update module version to ensure the patch applies

* [WBCAMS-480] Update May LMU

* [WBCAMS-480] Update May LMU

* [WBCAMS-510] Adjust video library path

* [WBCAMS-510] Remove CT link

* Indicate the CT link is deprecated

* Make deprecated field labels consistent

* Remove SSOT dumps to avoid data duplication and loss of sync

* [WBCAMS-500] Add metatag description field to Blog, News, Page and Success Story content types… (#657)

* Add metatag description field to Blog, News, Page and Success Story content types, configure Metatag module to use metatag description field to provide content for description metatag

* update Metatag Description field

* implement metatag_attachments_alter hook to provide description if new metatag_description field is empty.

* remove test field from success story

* use summary field for description if one is available.

* remove unnecessary code

* Initial commit

* Adjust dialog styles and positioning

* Add showing triggers

* More style adjustments

* Adjust triggers

* [WBCAMS-467] Demo of feedback component

* Update to feedback v2

* Update ecs.tf

* Update ecs.tf

* [WBCAMS-467] Adjust styles

* [WBCAMS-500] fix user login issue. (#660)

* Webform >= 6.24 is no longer compatible with Drupal 9

---------

Co-authored-by: rjkuyvenhoven <[email protected]>
Co-authored-by: jinchuantang <[email protected]>
Co-authored-by: Guo <[email protected]>
Co-authored-by: jinchuantang <[email protected]>
Co-authored-by: Jonathan Longe <[email protected]>
Co-authored-by: guopeiyaopearl <[email protected]>
Co-authored-by: vmuchalla <[email protected]>

README.md

@@ -13,7 +13,7 @@ This is the [WorkBC.ca](https://workbc.ca) site on Drupal.
   - `docker-compose exec php sudo chown www-data /var/www/html/config/sync`
 - Import the init data dumps:
   - `gunzip -k -c src/scripts/workbc-init.sql.gz | docker-compose exec -T postgres psql -U workbc workbc`
-  - `docker-compose exec -T postgres psql -U workbc ssot < src/scripts/ssot-full.sql && docker-compose kill -s SIGUSR1 ssot`
+  - Restore the SSOT data dump as per the [`workbc-ssot` README](https://github.com/bcgov/workbc-ssot?tab=readme-ov-file#development)
 - Create the Solr index:
   - `docker-compose exec -u 0 solr sh -c "chown -R solr:solr /opt/solr/server/solr/workbc_dev"`
   - `docker-compose exec solr sh -c "curl -sIN 'http://localhost:8983/solr/admin/cores?action=CREATE&name=workbc_dev&configSet=workbc&instanceDir=workbc_dev'"`
@@ -60,7 +60,7 @@ See https://developer.gov.bc.ca/Typography for more details.
 
 ## Development
 The `php` Docker container has `yarn`, `grunt`, and `grunt-dart-sass` set up for compilation.
-You will need to either `make install` or `yarn install` from `src/` to install all of the dependencies first.
+You will need to `yarn install` from `src/` to install all of the dependencies first.
 
 Once dependencies are in place:
 `yarn run grunt dart-sass` will compile everything starting with the style.scss, and

src/composer.json

@@ -156,7 +156,7 @@
         "drupal/views_database_connector": "^2.0",
         "drupal/views_infinite_scroll": "^2.0",
         "drupal/viewsreference": "^1.8",
-        "drupal/webform": "^6.2",
+        "drupal/webform": "^6.2 <6.2.4",
         "drush/drush": "^11.0",
         "frdh/mmenu-js": "^9.2.0",
         "google/charts": "45",