Merge dev for v1.0.0 release #893
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Grouped defences * Better html grouping * Removed strategy box * Visually clearer grouping * Rounded corners on control section * Using some rather than find * Using details html elements For the collapsible sections in the control panel * Better html DRY principles
* add env.example to front end * configures env vars with types * backend service imports URL from env file * update readme to include setup for front end environment file * rearrange the readme slightly * add whitespace at end of .env.example * corrects error message to proper env variable name * adds method which makes and validates the url * returns new url directly rather than setting variable first
* Grouped defences * Better html grouping * Removed strategy box * Visually clearer grouping * Rounded corners on control section * Added the package * Fixed issues in ModelConfigurationSlider * Fixed issues in MainHeader * Fixed issues in DocumentViewBox * Removed autofocus for accessibility considerations * Fixed issues in ApiKeyBox * Using some rather than find * Using details html elements For the collapsible sections in the control panel * Better html DRY principles * Fixed issues in DefenceMechanism * Accessible overlay * No longer disabling eslint rule for file * Using border rather than outline for button hover * Allowing autofocus for chat input * Better overlay close buttons * Aria labels for overlay close buttons * Using class names for styling in handbook overlay * Handbook icon class name * 322 wrap handbook image in a button and give aria label (#341) * aria-labels for handbook and info buttons * Better label for defence toggle checkbox
#359) * hide random sequence seq enclosure defence as it conflicts with xml tagging * remove inactive defence configs from env and readme * add issue number to commented out code
Makes focus indicators consistent, and adds them back in where they were disabled. --------- Co-authored-by: Chris Wilton-Magras <chriswilty@zoho.com>
This work unifies the overlay for the three main popups: welcome message, mission info, handbook.
Plus additional button styling tweaks and fixes --------- Co-authored-by: Chris Wilton-Magras <chriswilty@zoho.com>
--------- Co-authored-by: Chris Wilton-Magras <chriswilty@zoho.com>
* run defence detection and chat completion concurrently * split up chat request * refactor error handling
* Make overlay and handbook accessible * Add click-outside handling to overlay --------- Co-authored-by: Chris Wilton-Magras <chriswilty@zoho.com> Co-authored-by: George Sproston <103250539+gsproston-scottlogic@users.noreply.github.com> Co-authored-by: Heather Logan <118981273+heatherlogan-scottlogic@users.noreply.github.com>
* change default model to GPT-3.5-turbo * eqeqeq eslint
* level 1 story line * update tests * fix typos
* disables send button when message is sending * prevents pressing enter to send msessage while message is sending * puts classname back onto wrapper div * run formatter * stops send button having different styling when loading * runs formatter
* Fix for overlay focus issue Must close the modal properly to give focus back to the last focusable element * Better layout and comment
gave defence toggles unique aria-labels
* Make overlay and handbook accessible * Add click-outside handling to overlay * update welcome screen content * buttons to set start level from overlay * default on beginner button * don't use localStorage for last level for new user * button to switch modes * refactor beginner/expert buttons to set default pressed based on current level * disable level buttons depending on chosen start * refactor levels buttons component * remove onMouse actions from buttons, hide levels in sandbox mode * refactor start new level function * fix linting * code improvements from PR comments * restore font files * other fixes * fix scrollbar --------- Co-authored-by: Chris Wilton-Magras <chriswilty@zoho.com>
* loading dots overlay the send text * makes dots only show when actually loading * matches send button height to text box * makes chat box be one line tall * changes loading dots width to use rem * changes loading dots width to use rem
* Updated level 2 story * New handbook glossary page * ARIA labels and better html elements * Updated level 2 projects * Updated win condition for level 2 * Fixed comments * Frontend tests for new HandbookGlossary * Updated font-sizes on overlay font sizes now match the welcome overlay * Better glossary formatting * Adjust glossary for accessibility * Fix tests, aaarrgh! --------- Co-authored-by: Chris Wilton-Magras <chriswilty@zoho.com>
* defences undefined for levels 1 and 2 * fixes tests * propoerly undefines defences on level 1 and 2 * moves variable declarations to destructureing * missed one * undo error swallow * remove bad type guards * improve validation for configureDefence * last bit of validation * update tests for handleConfigureDefence * new folder for defence controller unit tests and wrote first handleDefencecActivation test * adds test for defence activation * adds tests for defence deactivation * moves tests all back into one file again * adds tests for handleResetSingleDefence * improve validation on handleGetDefenceStatus * removes extraneous stuff from test objects * adds tests to make sure defences aren't chngeable for level 1 * add loop to test levels 1 and 2 with same code * adds remaining tests for defence controller integration * handleResetSingleDefence takes level parameter now * adds level to frontend call to reset defence config item. Types all the prop drillings properly * some renamings and fill in gaps in tests * adds another missing test * tweaks * fix test suite * replace defence search with defences.some and replace cuurrentDefences === undefined check with not currentDefences * change defenceId for generic falsy check * improve guards for level and config * improve guards for level and config * correct test for configuring a config item * updates error message when not allowed to activate or modify defences * rescturecure defence controller integration tests * change other tests to use test.each rather than foreach * uses isValidLevel * improve validateFilterConfig * just pass qa defence rather than all defences * fix tests * uses type intersection to define QaLlmDefence * only gedDefencesFrDTOs if it is defined
…ller (#858) * return chatModel in level and start controllers * removes getModel endpoint * frontend start and leveServices now get the chatModel from the response * save chatModel in MainComponent * chatModel is drilled down to the components that need it * now sets the chatModelId so that the message updates * change a null to an undefined for brevity * remove old comment * remove getModel method from chatService * changes chatModel in LevelGetRequest to be optional * conditionally render the chat model selection * move default configs out of function * wraps comment line * improve config update method
* don't rerender mainCOmponent on reset progress * moves reset progress and overlay code into MainComponent * resetController now returns the relevant stuff for the reset level * removes superfluous mock from levelController * fixes levelController test * fixes startController test * reset progress also resets chatModel * completes resetController tests * frontend process the reset response data * remove unnecessary processing for resetting on level 2 or 3 * move setNewUser tond of method * reorder the method agai * rename to resetAllProgress
* conditionally renders an error message when no docMetas * adds test for error mssage
* change error message * fixes test
--------- Co-authored-by: dhinrichs-scottlogic <125262707+dhinrichs-scottlogic@users.noreply.github.com> Co-authored-by: Peter Marsh <118171430+pmarsh-scottlogic@users.noreply.github.com>
* Docker and backend changes to support prod-lite mode * Bump app version to 1.0.0 across all package files
Closed
pmarsh-scottlogic
approved these changes
Apr 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Merge dev into main, in prep for release 1.0.0 🥳
Part of #890
Notes
We will use GitHub default merge strategy, which adds a merge commit to main branch that is not on dev branch, but this is useful to see exactly what commits were included in the merge and does not affect future merges.
Checklist
Have you done the following?