Skip to content

Commit

Permalink
Merge: development into main (#551)
Browse files Browse the repository at this point in the history
* draft: docs: Caching documentation (#460)

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* terraform-docs: automated action

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: wip templates for adrs

* docs: draft highlevel mapping info

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* fix: handle textBodyDB entity being empty - possible fix

* Linted Code in Dfe.PlanTech.Domain/

* ignore mapping of rich text id

* fix: Check answers page title (#487)

* fix: check answers page title

* fix: remove line

* Linted Code in Dfe.PlanTech.Web/

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* feat: Add caching docs (#486)

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* terraform-docs: automated action

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: wip templates for adrs

* docs: draft highlevel mapping info

* docs: pad out adrs

* docs: add caching adr

* docs: Expand contentful caching process

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* feat: Support preview mode in Content db (#489)

* wip

* feat: process options

* feat: support preview in cmsdbcontext

* tests: tests for save + autosave

* feat: add contentfuloptions to web proj

* fix: add default usepreview

* fix: correctly get ContentfulOptions in dbcontext

* chore: remove unneeded param, add docs

* chore: refactor ignore message condition

* fix: Azure Function Tests (#490)

* fix: Add parameterless constructor again to fix tests

* chore: code cleanup recommendations

* fix: Remove this.getservice as causing errors

* fix: service config issue

* refactor: use guard statement for cleaner code

* refactor: create only adds contentcomponent

* refactor: revert changes and skip create event

* refactor: only save or auto_save when a new entity has all its required fields

* test: update tests

* tests: Initial programatic E2E tests work (#493)

* feat: Hotfixes (#492)

* draft: docs: Caching documentation (#460)

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* terraform-docs: automated action

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: wip templates for adrs

* docs: draft highlevel mapping info

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* fix: handle textBodyDB entity being empty - possible fix

* Linted Code in Dfe.PlanTech.Domain/

* ignore mapping of rich text id

* fix: Check answers page title (#487)

* fix: check answers page title

* fix: remove line

* Linted Code in Dfe.PlanTech.Web/

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* feat: Add caching docs (#486)

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* terraform-docs: automated action

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: wip templates for adrs

* docs: draft highlevel mapping info

* docs: pad out adrs

* docs: add caching adr

* docs: Expand contentful caching process

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* feat: Support preview mode in Content db (#489)

* wip

* feat: process options

* feat: support preview in cmsdbcontext

* tests: tests for save + autosave

* feat: add contentfuloptions to web proj

* fix: add default usepreview

* fix: correctly get ContentfulOptions in dbcontext

* chore: remove unneeded param, add docs

* chore: refactor ignore message condition

* fix: Azure Function Tests (#490)

* fix: Add parameterless constructor again to fix tests

* chore: code cleanup recommendations

* fix: Remove this.getservice as causing errors

* fix: service config issue

* refactor: use guard statement for cleaner code

* refactor: create only adds contentcomponent

* refactor: revert changes and skip create event

* refactor: only save or auto_save when a new entity has all its required fields

* test: update tests

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <“umar.hussain@and.digital”>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <uahussain12@users.noreply.github.com>
Co-authored-by: Zac King <zac.king@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: Zac <119302767+Zac-AND-Digital@users.noreply.github.com>

* wip: validating pages dynamically

* wip: validate textbodies

* wip

* wip: move validations to separate files

* feat: validate paragraphs

* feat: validate table

* feat: use class, add comments

* chore: rearrange files

* chore: add docs

* chore: delete moved files

* fix: add missing comma

* fix: file names, null data

* fix: add relative path

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <“umar.hussain@and.digital”>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <uahussain12@users.noreply.github.com>
Co-authored-by: Zac King <zac.king@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: Zac <119302767+Zac-AND-Digital@users.noreply.github.com>

* tests: Add category and sections to programatic tests (#494)

* feat: Hotfixes (#492)

* draft: docs: Caching documentation (#460)

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* terraform-docs: automated action

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: wip templates for adrs

* docs: draft highlevel mapping info

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* fix: handle textBodyDB entity being empty - possible fix

* Linted Code in Dfe.PlanTech.Domain/

* ignore mapping of rich text id

* fix: Check answers page title (#487)

* fix: check answers page title

* fix: remove line

* Linted Code in Dfe.PlanTech.Web/

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* feat: Add caching docs (#486)

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* terraform-docs: automated action

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: wip templates for adrs

* docs: draft highlevel mapping info

* docs: pad out adrs

* docs: add caching adr

* docs: Expand contentful caching process

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* feat: Support preview mode in Content db (#489)

* wip

* feat: process options

* feat: support preview in cmsdbcontext

* tests: tests for save + autosave

* feat: add contentfuloptions to web proj

* fix: add default usepreview

* fix: correctly get ContentfulOptions in dbcontext

* chore: remove unneeded param, add docs

* chore: refactor ignore message condition

* fix: Azure Function Tests (#490)

* fix: Add parameterless constructor again to fix tests

* chore: code cleanup recommendations

* fix: Remove this.getservice as causing errors

* fix: service config issue

* refactor: use guard statement for cleaner code

* refactor: create only adds contentcomponent

* refactor: revert changes and skip create event

* refactor: only save or auto_save when a new entity has all its required fields

* test: update tests

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <“umar.hussain@and.digital”>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <uahussain12@users.noreply.github.com>
Co-authored-by: Zac King <zac.king@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: Zac <119302767+Zac-AND-Digital@users.noreply.github.com>

* wip: validating pages dynamically

* wip: validate textbodies

* wip

* wip: move validations to separate files

* feat: validate paragraphs

* feat: validate table

* feat: use class, add comments

* chore: rearrange files

* chore: add docs

* chore: delete moved files

* fix: missing comma

* fix: remove file

* feaT: Process sections and categories on /self-assessment page

* fix: skip test due to missing data

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <“umar.hussain@and.digital”>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <uahussain12@users.noreply.github.com>
Co-authored-by: Zac King <zac.king@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: Zac <119302767+Zac-AND-Digital@users.noreply.github.com>

* W.I.P

* tests: Refactor existing work on dynamic E2E tests (#496)

* feat: Hotfixes (#492)

* draft: docs: Caching documentation (#460)

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* terraform-docs: automated action

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: wip templates for adrs

* docs: draft highlevel mapping info

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* fix: handle textBodyDB entity being empty - possible fix

* Linted Code in Dfe.PlanTech.Domain/

* ignore mapping of rich text id

* fix: Check answers page title (#487)

* fix: check answers page title

* fix: remove line

* Linted Code in Dfe.PlanTech.Web/

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* feat: Add caching docs (#486)

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* terraform-docs: automated action

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: initial documentation templates

* docs: add other headers

* docs: overview of readpage

* docs: add db schema

* docs: more caching process documentation

* docs: Update CMS schema diagram

* docs: Add dbdiagram code for schema

* docs: Finish Contentful caching process doc

* docs: wip templates for adrs

* docs: draft highlevel mapping info

* docs: pad out adrs

* docs: add caching adr

* docs: Expand contentful caching process

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* feat: Support preview mode in Content db (#489)

* wip

* feat: process options

* feat: support preview in cmsdbcontext

* tests: tests for save + autosave

* feat: add contentfuloptions to web proj

* fix: add default usepreview

* fix: correctly get ContentfulOptions in dbcontext

* chore: remove unneeded param, add docs

* chore: refactor ignore message condition

* fix: Azure Function Tests (#490)

* fix: Add parameterless constructor again to fix tests

* chore: code cleanup recommendations

* fix: Remove this.getservice as causing errors

* fix: service config issue

* refactor: use guard statement for cleaner code

* refactor: create only adds contentcomponent

* refactor: revert changes and skip create event

* refactor: only save or auto_save when a new entity has all its required fields

* test: update tests

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <“umar.hussain@and.digital”>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <uahussain12@users.noreply.github.com>
Co-authored-by: Zac King <zac.king@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: Zac <119302767+Zac-AND-Digital@users.noreply.github.com>

* wip: validating pages dynamically

* wip: validate textbodies

* wip

* wip: move validations to separate files

* feat: validate paragraphs

* feat: validate table

* feat: use class, add comments

* chore: rearrange files

* chore: add docs

* chore: delete moved files

* fix: missing comma

* refactor: cleanup duplicated code.

* merge development

* chore: delete old dupe files

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <“umar.hussain@and.digital”>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <uahussain12@users.noreply.github.com>
Co-authored-by: Zac King <zac.king@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: Zac <119302767+Zac-AND-Digital@users.noreply.github.com>

* W.I.P

* fix: checkout repo

* refactor: remove superseded workflow

* refactor: add relevant triggers to paths and run some in parallel

* refactor: concurrency groups, pass artifact name as variable

* refactor: concurrency group naming

* chore: remove debug code

* tests: Navigate through every question in a sub-topic using Contentful data (#499)

* feat: add warning validator

* chore: add missing fields

* feat: Test every question page for every sub-topic

- Test question
- Test answers
- Test check answers matches
- Uses path(s) that navigates through each question in a sub-topic

* chore: add skip back

* fix: correct name variable

* tests: E2E tests for every possible recommendation page (#500)

* feat: add warning validator

* chore: add missing fields

* feat: Test every question page for every sub-topic

- Test question
- Test answers
- Test check answers matches
- Uses path(s) that navigates through each question in a sub-topic

* chore: add skip back

* fix: correct name variable

* feat: validate every recommendation for every maturity

* feat: validate recommendation pages

* chore: revert testing things

* refactor: delete unused workflow

* chore: update various versions in workflows

* chore: update various versions in custom actions

* tests: Last E2E component tests (#501)

* fix: Test interstitial page content + replace all whitespaces

* chore: remove empty line

* tests: validate warning component + button with entry reference

* chore: remove log command

* feat: inset text validator + slight refactor

* feat: Test nav link

* docs: update components done

* terraform-docs: automated action

* refactor: see what happens if v2 is changed to v3 for terraform setup

* refactor: see what happens if v2 is changed to v3 for terraform setup

* chore: remove todo

* tests: Split up unit tests by page/section (#502)

* tests: Split up unit tests by page/section

* fix: unauthorised pages

* fix: only test unauthorised pages again

* chore: remove unused var

* chore: remove unused before

* chore: remove log command

* chore: remove log command

* Qa view spike (#504)

* test graphiz dependency install in actions

* test graphiz dependency install in actions

* image output upload

* image upload

* test

* correct location for generated images

* output artifact id

* output artifact id

* test building link to artifact

* retrieve data from sql server

* retrieve data from sql server

* list files

* Add visualisation script to loop through the data files to create viz for each section

* call the teams webhook

* typo

* typo

* test using AD connection string

* retest

* Use access token for DB connection

* use dev environment just for testing

* add required variables

* test building sql connection rather than from secret

* Add new question/answer visaulisation workflow

---------

Co-authored-by: uahussain12 <“umar.hussain@and.digital”>

* wip cleanup (#498)

* wip cleanup

* cleanup

* cleanup

* test for assertion

* chore: upgrade missed version

* refactor: merge ShouldDropMessage and ShouldIgnoreMessage

* Format visualisations (#506)

* Add formatting to visualisations, removes cron schedule from workflow and add as job within matrix deploy

* add -y flag for any prompts

---------

Co-authored-by: uahussain12 <“umar.hussain@and.digital”>

* refactor: Log which required properties are null in such an event

* chore: remove block comment

* fix: RichText retrieval bug (#507)

- Fixes types in `@RichTextIds` and `idColumn`
- Optimised the querying of the fetching of the `ContentComponentIds` and the `RichTextIds`

* refactor: Check validity of component always

* refactor: remove unused parameter

* refactor: remove unused parameter

* refactor: update dotnet-coverage to latest

* refactor: rollback dotnet-coverage to last known good version

* fix: rollback dotnet-coverage for sonarcloud

* test: update tests

* Feat/cleanup (#512)

* wip cleanup

* cleanup

* cleanup

* test for assertion

* Architecture Diagram Update

* update

* added test to update coverage on GetEntitiesException

* refactor: change valid component logic

* chore: move node unit tests package files to actual folder (#515)

* chore: move node unit tests package files to actual folder

- These were originally in root dir incase we had tests spread out across multiple projects. Which we don't so this just cleans it up.

* fix: test path

Swear I already changed this but apparently not.

* chore: Update all nuget packages. (#510)

* chore: Update all nuget packages. Remove moq

* fix: replace automapper package

* feat: Convert RichTextContents function into a view (#509)

* feat: refactor function RichTextContents by page into view

* fix: correct type

* Linted Code in Dfe.PlanTech.Domain/

* chore: linting + remove unnecessary query

* chore: Update all nuget packages. Remove moq

* fix: replace automapper package

* fix: remove broken sql

* chore: small refactor + consistency changes

- Removes unncessary toplevel `SELECT *` statement
- Made every table name + column name in [] to ensure consistency
- Added actual columns to the `SELECT` query for the function

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Feat/cleanup (#517)

* wip cleanup

* cleanup

* cleanup

* test for assertion

* Architecture Diagram Update

* update

* added test to update coverage on GetEntitiesException

* updated tests and protected constructor for serializable class

* Linted Code in Dfe.PlanTech.Infrastructure.Contentful/

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* refactor: W.I.P add semantic versioning

* refactor: global install semantic-release

* refactor: install dependencies

* refactor: install dependencies with versions

* feat: use semantic versioning

* refactor: run it on push test

* refactor: tag change

* refactor: create contentful entity classes

* Feat/cleanup (#518)

* wip cleanup

* cleanup

* cleanup

* test for assertion

* Architecture Diagram Update

* update

* added test to update coverage on GetEntitiesException

* updated tests and protected constructor for serializable class

* more cleanup for v1.05

* refactor: change string to Title component

* fix(sql): 🐛 Fixes a bug where Warning components weren't display text (#521)

* fix(sql): Fixes a bug where Warning components weren't display text

* fix: missing marks and data

* refactor: change Maturity enum to string

* refactor: rename variables to match cms

* refactor: add Title field to RecommendationChunk

* refactor: change title component to header component

* feat: Update Gov UK Packages (#523)

* feat: Update Gov UK Packages

- Updates govuk-frontend
- Updates DFE alpha
- Adds relevant JS to _Layout.cshtml

* fix: unit tests to match govuk changes

* fix: use commands

* fix: button styling, compile scss

* feat: add step-by-step navigation from govuk prototype (#525)

**:sparkles: Features**:

- Add the `step by step navigation` JS and CSS from the `@govuk-prototype-kit/step-by-step` package

**:adhesive_bandage: Fixes**:

- Updates the `Warning component` tag helper, to use the new class to hide the warning text.

* refactor: update interfaces

* test: add temp dummy tests

* refactor: use generic type in interface

* fix: :green_heart: Semver release (#527)

* fix: Remove exec commands

* ⚡: Update Category + Recommendation View Components (#529)

* 💄: Update Tag colour to match changes

- In [version 5](alphagov/govuk-design-system-backlog#62 (comment)) of the GDS front-end packages, they have changed the tag colours. As a result, our "dark blue" tag no longer existed, so all of our tags were using the default colours.
- Changed tag colour match changes.

:zap: Changed GetSectionSubmissionStatuses to return List

- Improves performance by not having to call `.ToList` on an object that is already a List

* :zap:: Make recommendations + category views async

* fix: ignore capitalisation

* fix: Web unit tests

* fix: Application tests

* refactor: debug test comment removal

* refactor: debug test comment removal

* refactor: debug test comment removal

* refactor: change test tag name

* refactor: add debug paths

* refactor: remove debug code

* refactor: change Title to string, link SubtopicRecommendation to subtopic

* Feat/accordion view step by step (#528)

* feat: Update Gov UK Packages

- Updates govuk-frontend
- Updates DFE alpha
- Adds relevant JS to _Layout.cshtml

* WIP - accordion view component

* fix: unit tests to match govuk changes

* fix: use commands

* fix: button styling, compile scss

* feat: add step-by-step navigation from govuk prototype

* feat: Accordion view component added.

* feat: Accordion view component added.

* WIP

* WIP - step by step accordion component

* feat: basic step by step accordion component view

* resolve merge conflict

* Updated JS + CSS files

* feat: Step by step accordion view component added.

* Linted Code in Dfe.PlanTech.Domain/

---------

Co-authored-by: Jim Washbrook <jim.washbrook@and.digital>
Co-authored-by: uahussain12 <“umar.hussain@and.digital”>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* 🔨 Workflow + SQL script to clear user data from DB (#531)

* fix: add file extension

* feat: Initial script to clear DB

* fix: correct ordering, add signin table, remove *

* chore: move sql script

Otherwise it would run on every environment when deployed and clear the data... Whoops.

* cicd: Add workflow

* feat: disallow production

* TESTING: check inputs works.

* UNDO TEST CHANGES

* fix(?): remove init from BeforeContent

- This simply added the class `js-enabled` to the Body element. This seemed to already be covered by the `initAll()` functionality from the govuk-frontend.js file

* fix: remove step by step navigation js from layout (#533)

* chore: Add GovUK body class script in (#534)

Removed this yesterday in an erroneous attempt to fix the E2E tests. It's necessary for the GOV UK front-end initialisation script though so I've added back in.

* Feat/CodeCleanup (#524)

* wip cleanup

* cleanup

* cleanup

* test for assertion

* Architecture Diagram Update

* update

* added test to update coverage on GetEntitiesException

* updated tests and protected constructor for serializable class

* more cleanup for v1.05

* more cleanup for SonarCloud

* fix

* Linted Code in Dfe.PlanTech.Application/

* exception handling

* linting and formatting

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix: Fix SQL script to clear DB (#536)

- For some reason the 'Go' commands weren't working from the workflow (although worked directly on DB). Removed.
- Tweaked CI/CD pipeline a bit to ensure safety

* docs(workflows): 📝 Add workflow changes to docs (#537)

* 📝(workflows) Add new workflows to documentation

- Add information on the `create-tag-release` workflow
- Add information on the `clear-user-data-from-db` workflow
- Moves the information about the `terraform-pr-check` workflow lower down in the document so that it is in alphabetical order

* 📝(workflows) Add TOC

GitHub should automatically have one available but you have to toggle it and this will be immediately visible.

* chore: Packages Update (#540)

* wip cleanup

* cleanup

* cleanup

* test for assertion

* Architecture Diagram Update

* update

* added test to update coverage on GetEntitiesException

* updated tests and protected constructor for serializable class

* more cleanup for v1.05

* more cleanup for SonarCloud

* fix

* Linted Code in Dfe.PlanTech.Application/

* exception handling

* linting and formatting

* Package updates

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* fix: remove text match check (#542)

* fix(197631): 🐛 Fix content ordering on page (#541)

* feat: add error catching

* feat: add join table properties

* chore: remove debug lines

* chore: formatting

* feat: add order pagecontent

* feat: order contents

* refactor: cleanup ordering

* tests: Check for order

* tests: Update unit tests

* tests: Update unit tests

* chore: rename to be more descriptive

* Trigger tf doc update (#544)

* Trigger tf doc update

* terraform-docs: automated action

---------

Co-authored-by: uahussain12 <“umar.hussain@and.digital”>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* fix: 💄 css stylings (#546)

Fixes 197437
197630

Doesn't fix 197620 intentionally as incorrect.

* fix: Remove outdated copying of a specific file (#547)

* fix: 💄 css stylings

Fixes 197437
197630

Doesn't fix 197620 intentionally as incorrect.

* fix: Remove outdated copying of a specific file

* feat: Add order column to PageContents (#549)

* cicd: don't lint if dir not had changes

* feat: add order columnt ot able

* fix: remove incorrect changes

* fix: no longer duplicate content (#550)

* fix: no longer duplicate content

Code was basically doing a full outer join, instead of a left join, resulting in content being duplicated multiple times.

* fix: take latest pagecontent if applicable

* fix: remove old css file

---------

Co-authored-by: jimwashbrook <131891854+jimwashbrook@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <“umar.hussain@and.digital”>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: uahussain12 <uahussain12@users.noreply.github.com>
Co-authored-by: Zac King <zac.king@and.digital>
Co-authored-by: Zac <119302767+Zac-AND-Digital@users.noreply.github.com>
Co-authored-by: Jim Washbrook <jim.washbrook@and.digital>
  • Loading branch information
9 people authored Feb 29, 2024
1 parent 04c1f7b commit fa1d3c8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
8 changes: 4 additions & 4 deletions src/Dfe.PlanTech.Domain/Content/Models/PageDbEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ public void OrderContents()
}

private IEnumerable<ContentComponentDbEntity> OrderContents(List<ContentComponentDbEntity> contents, Func<PageContentDbEntity, string?> idSelector)
=> contents.Join(AllPageContents,
=> contents.GroupJoin(AllPageContents,
content => content.Id,
idSelector,
(content, pageContent) => new
{
content,
order = pageContent.Order
order = pageContent.OrderByDescending(pc => pc.Id).Select(join => join.Order).First()
})
.OrderBy(content => content.order)
.Select(content => content.content);
.OrderBy(joined => joined.order)
.Select(joined => joined.content);
}
13 changes: 6 additions & 7 deletions src/Dfe.PlanTech.Web/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@

@section Head {
<link rel="stylesheet" href="~/css/application.css">
<link rel="stylesheet" href="~/css/govuk-frontend.min.css">

@Html.Raw(GtmConfiguration.Analytics)
@Html.Raw(GtmConfiguration.Head)
@RenderSection("Head", false)
@Html.Raw(GtmConfiguration.Analytics)
@Html.Raw(GtmConfiguration.Head)
@RenderSection("Head", false)
}

@{
Expand Down Expand Up @@ -38,12 +37,12 @@
@{
await Html.RenderPartialAsync("BetaHeader");
}
@RenderSection("BeforeContent", required: false)
@RenderSection("BeforeContent", required: false)

@{
@{
//Add relevant tags for GovUK front-end CSS to body
}
<script>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>
<script>document.body.className += ' js-enabled' + ('noModule' in HTMLScriptElement.prototype ? ' govuk-frontend-supported' : '');</script>
}


Expand Down

0 comments on commit fa1d3c8

Please sign in to comment.