Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* further fixes for UI tests * trialing removal of #dualMapMode * add reconcile tab * trialing ngDefaultControl * trivy fixes * fix up miscopy of fixed version * further version changes required to make trivy happy * making queries work with mysql in dev environment (fingers crossed) * fix typo * blindmapflag logic is in the view * fix up equivalent logic * allow same target code to be used twice in dual mapping * make dual mapping work for same concept in the details view * don't show review tab unless in dual map mode * only add reconcile column if in dual map mode reconcile is only a task type if in dual map mode * colour task in drop down list * prevent multiple reconciler columns * further changes necessary to support reconciler column * make reconcile task table show rows * always display map type (not just hidden behind edit button) * fix tests * implement default sorting for dual map view implement sorting for dbmapview * fix up available status choices in reconcile task * fix up icon for reconcile * sort reconcile task table * remove annoying console log * add reconcile task type * adding in translations for dual / single map mode indicator on table screens * make query do a left outer join so we can see rows even when there is no second author yet * reinstate sibiling row author now that left outer join is working again * Undo reference to snapagogo * fix note delete tooltip * fix typo * fleshing out reconcile task * use nativeQuery to write a query to get around both mysql and hibernate quirks / incompatibilities * sourceIndex was incorrect, is actually source id but that is not available from MapView * missed translation from earlier commit * id needs to come from the api, only have index locally * fix tests * fix issue that prevents user bubble from showing up for both entries * finishing off reconcile task * fix the tab that activates when a reconcile task is created * fix limiting of author task to 2 * further fixes for the reconcile task creation / delete / update * reviewed * fix view so it doesn't join different maps together * prevent "unmapped | draft | mapped | in review .." showing up when the second dual map is put into mapped mode * remove full stops, added automatically * upgrade mockserver * removing entry as upgraded mock-server * work around trivy issue with guava until mock-server updates dependency * - create a note on each row to keep track of the dual mapper - merge notes - merge targets on reconcile * fix issue where selecting no map in a dual map reconcile would not do anything due to a server side error complaining about the map row target not being found * category for system notes some changes to get table editing of reconcile working better * fixing tests * Test commit * make map copy work for dual maps * further changes to handle reconcile in the table * prevent editing of reconcile table * fix typo * don't disable checkbox in details view * bump version in hopes of a trivvy resolution * don't go into mapped state if problem exist in reconcile * fix status message logic .. was returning too early * changing due to drop being prevented in the table * change code to deal with reconcile state * create a lastAuthor for a MapRowTarget so we can keep track of each target .. before the only mechanism was on the maprow which was overwritten as soon a change to any MapRowTarget was made. * remove debug logs * fix tests * add missing migration * initial commit. Discussion to be held with how to handle the workflow of displaying / accepting replacement and if what is proposed is enough. * getting versions up to date on develop branch * updates to fix trivy issues * trivy issues * updating hapi version to get rid of okio and its trivy issue * updating hapi version to get rid of okio and its trivy issue * fix merge problems * fix expected test output and copy-paste error * implement in details view. makes sure concept is active and in scope * sort entries in a rolegroup * remove update inactives button from view screen * remove code that didn't end up getting used * fix tests broken by refactoring * fix issue due to refactoring * remove placeholder * add copyright notice * add in the dual mapping sql migration files (and move the migration file for this change) as the db migration has already happened in develop for dual mapping * fix order * add copyright notices * set a default because it is the easiest way to deal with the confusion of develop having migrations from a branch that is yet to be merged to the develop branch * change file name after adding an extra dual mapping migration * renamed * format and return cards to their original order * remove code tidy as it introduced an error where selection is only possible if the row has a target * change to formControlGroup to keep tests happy * disable the ability to import into a dual map * make export work for dual mapping * make oos count update when table view contents altered. make oos count update when entries removed from detailed view * make sort work again for view / author / reconcile * don't show import warning message in dual mode where you can't import a file * update copyright date displayed in app * fixing up sort and filter so it works for the view and map_row * api support for new version of a dual map * new version dual map ui changes * changes to bulk change UI for dual mapping * missed a required file for bulk change ui * another missed file * tweaks to labels * add reconcile status info message * info to only show for dual mapping * tweak following feedback * after discussion, don't reset reconcile on a new version * ensure blind targets are not exposed in REVIEW task * fix missing targets in certain task views * fix subscription bugs - subscription inside callback; redundant backend requests * remove temporary logging change from April 2022 * remove circle as looks like a radio button and not overly useful in this context anyway * bulk change / maintenance through reconcile / prevent export of deleted comments * fix builder issues with null * make bulk updates work for rows in reconcile state from dual mapping * fix up issues with selecting custom ECL * fix issue where one author selecting no map would remove the mapping the other author had done * add userguide link in footer * add translate capability to test * clear the error message in the details screen on a details screen close or next/previous * add in HttpClientTestingModule import * change over to the translation * fixing issues raised by SI testing * Fix problem with creating new version of the map where if one reconcile row was blank, it would result in the other reconcile row being duplicated * prevent reviewer from getting inactive suggestions and point them in the right direction * fix logic changes to allow for sibling rows to have the no map flag or target * cater for case where two targets get moved into the same relationship * properly fix two issues that were previously "fixed" but has introduced futher errors * code cleanup * stop next skipping a row in reconcile after placing a row into the mapped state * fixing issues: prevent edit and drag in reconcile task after changed into mapping status only check for duplicated target if target is not null * adding info * Bump hashicorp/aws from 4.58.0 to 5.23.1 in /terraform Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 4.58.0 to 5.23.1. - [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases) - [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-provider-aws@v4.58.0...v5.23.1) --- updated-dependencies: - dependency-name: hashicorp/aws dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Bump com.github.eirslett:frontend-maven-plugin in /ui Bumps [com.github.eirslett:frontend-maven-plugin](https://github.com/eirslett/frontend-maven-plugin) from 1.12.1 to 1.14.2. - [Changelog](https://github.com/eirslett/frontend-maven-plugin/blob/master/CHANGELOG.md) - [Commits](eirslett/frontend-maven-plugin@frontend-plugins-1.12.1...frontend-plugins-1.14.2) --- updated-dependencies: - dependency-name: com.github.eirslett:frontend-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump org.yaml:snakeyaml from 2.0 to 2.2 in /ui Bumps [org.yaml:snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 2.0 to 2.2. - [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-2.2..snakeyaml-2.0) --- updated-dependencies: - dependency-name: org.yaml:snakeyaml dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump org.mariadb.jdbc:mariadb-java-client from 3.1.2 to 3.2.0 in /api Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.1.2 to 3.2.0. - [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases) - [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md) - [Commits](mariadb-corporation/mariadb-connector-j@3.1.2...3.2.0) --- updated-dependencies: - dependency-name: org.mariadb.jdbc:mariadb-java-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Merge branch 'develop' into feature/SNOMED-4-dual-authoring-process * Revert "Merge branch 'develop' into feature/SNOMED-4-dual-authoring-process" This reverts commit f1c4aeb. * Bump sentry.version from 6.16.0 to 6.32.0 in /api Bumps `sentry.version` from 6.16.0 to 6.32.0. Updates `io.sentry:sentry-spring-boot-starter` from 6.16.0 to 6.32.0 - [Release notes](https://github.com/getsentry/sentry-java/releases) - [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md) - [Commits](getsentry/sentry-java@6.16.0...6.32.0) Updates `io.sentry:sentry-logback` from 6.16.0 to 6.32.0 - [Release notes](https://github.com/getsentry/sentry-java/releases) - [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md) - [Commits](getsentry/sentry-java@6.16.0...6.32.0) --- updated-dependencies: - dependency-name: io.sentry:sentry-spring-boot-starter dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.sentry:sentry-logback dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump org.springframework.security:spring-security-core in /api Bumps [org.springframework.security:spring-security-core](https://github.com/spring-projects/spring-security) from 6.0.5 to 6.1.5. - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](spring-projects/spring-security@6.0.5...6.1.5) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump com.google.guava:guava from 32.1.1-jre to 32.1.3-jre in /api Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.1-jre to 32.1.3-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump org.apache.maven.plugins:maven-resources-plugin from 3.3.0 to 3.3.1 Bumps [org.apache.maven.plugins:maven-resources-plugin](https://github.com/apache/maven-resources-plugin) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-resources-plugin/releases) - [Commits](apache/maven-resources-plugin@maven-resources-plugin-3.3.0...maven-resources-plugin-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-resources-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump software.aws.rds:aws-mysql-jdbc from 1.1.4 to 1.1.10 Bumps [software.aws.rds:aws-mysql-jdbc](https://github.com/awslabs/aws-mysql-jdbc) from 1.1.4 to 1.1.10. - [Release notes](https://github.com/awslabs/aws-mysql-jdbc/releases) - [Changelog](https://github.com/awslabs/aws-mysql-jdbc/blob/main/CHANGELOG.md) - [Commits](awslabs/aws-mysql-jdbc@1.1.4...1.1.10) --- updated-dependencies: - dependency-name: software.aws.rds:aws-mysql-jdbc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump org.apache.commons:commons-text from 1.10.0 to 1.11.0 in /api Bumps org.apache.commons:commons-text from 1.10.0 to 1.11.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-text dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump com.google.cloud.tools:jib-maven-plugin from 3.3.1 to 3.4.0 in /api Bumps [com.google.cloud.tools:jib-maven-plugin](https://github.com/GoogleContainerTools/jib) from 3.3.1 to 3.4.0. - [Release notes](https://github.com/GoogleContainerTools/jib/releases) - [Commits](https://github.com/GoogleContainerTools/jib/commits) --- updated-dependencies: - dependency-name: com.google.cloud.tools:jib-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump swagger-request-validator.version from 2.34.0 to 2.38.1 Bumps `swagger-request-validator.version` from 2.34.0 to 2.38.1. Updates `com.atlassian.oai:swagger-request-validator-springmvc` from 2.34.0 to 2.38.1 - [Changelog](https://bitbucket.org/atlassian/swagger-request-validator/src/master/RELEASE-NOTES.md) - [Commits](https://bitbucket.org/atlassian/swagger-request-validator/branches/compare/swagger-request-validator-2.38.1..swagger-request-validator-2.34.0) Updates `com.atlassian.oai:swagger-request-validator-mockmvc` from 2.34.0 to 2.38.1 - [Changelog](https://bitbucket.org/atlassian/swagger-request-validator/src/master/RELEASE-NOTES.md) - [Commits](https://bitbucket.org/atlassian/swagger-request-validator/branches/compare/swagger-request-validator-2.38.1..swagger-request-validator-2.34.0) --- updated-dependencies: - dependency-name: com.atlassian.oai:swagger-request-validator-springmvc dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.atlassian.oai:swagger-request-validator-mockmvc dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * terraform commands failing in azure .. rolling back version of hashicorp/aws * fix issue with select all not working for bulk dual mapping resets * fix issues with bulk data dialog .. 1) make the right statues show up for dual maps (view table) 2) don't allow reset in table view, should be the normal dialog * refresh out of scope count on map version change * Bump semver from 5.7.1 to 5.7.2 in /ui/snapclient Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](npm/node-semver@v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Revert "Update README.md" This reverts commit 936242a. * Revert "Update pom.xml" This reverts commit 977802a. * Revert "Update env.prod" This reverts commit 6590aba. * Revert "Update pom.xml" This reverts commit 8056dbc. * Revert "Update azure-pipelines.yml" This reverts commit 34d623f. * Revert "Update pom.xml" This reverts commit 724c43e. * Revert "Update README.md" This reverts commit dc3f876. * Set DB log level to info by default * include mapid in the view * less calls to refresh page * wip .. improving union performance * revert refresh improvements until can investigate why new maps didn't work with these changes * finishing filter and sort for dual map native query * fix spelling mistake * addressing trivy issue CVE-2023-6378 * returning to original version as it did not address the trivy issue .. adding to trivy ignore as no current fix * Bump com.github.eirslett:frontend-maven-plugin in /ui Bumps [com.github.eirslett:frontend-maven-plugin](https://github.com/eirslett/frontend-maven-plugin) from 1.14.2 to 1.15.0. - [Changelog](https://github.com/eirslett/frontend-maven-plugin/blob/master/CHANGELOG.md) - [Commits](eirslett/frontend-maven-plugin@frontend-plugins-1.14.2...frontend-plugins-1.15.0) --- updated-dependencies: - dependency-name: com.github.eirslett:frontend-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * stop maps with additional columns showing up duplicated sort numerical additional columns in a numerical way * Add Lambda promtail zip * updating sentry-logback to address trivy error * updating spring-boot-starter-parent to address trivy issue with dependency tomcat-embed-core * update problem-spring-web version to get rid of an obsolete trivy ignore update spring-core.version as much as I can, we can't go to 6. May need to add a trivy ignore if it still triggers. * Revert "update problem-spring-web version to get rid of an obsolete trivy ignore" This reverts commit 939288f. * further addressing CVE-2023-6481 and removing obsolete fixes * see if this is still an issue after changes for other trivy issues around logback * still an issue, adding back to trivy ignores * Bump software.aws.rds:aws-mysql-jdbc from 1.1.10 to 1.1.13 in /api Bumps [software.aws.rds:aws-mysql-jdbc](https://github.com/awslabs/aws-mysql-jdbc) from 1.1.10 to 1.1.13. - [Release notes](https://github.com/awslabs/aws-mysql-jdbc/releases) - [Changelog](https://github.com/awslabs/aws-mysql-jdbc/blob/1.1.13/CHANGELOG.md) - [Commits](awslabs/aws-mysql-jdbc@1.1.10...1.1.13) --- updated-dependencies: - dependency-name: software.aws.rds:aws-mysql-jdbc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Bump org.apache.poi:poi-ooxml from 5.2.3 to 5.2.5 Bumps org.apache.poi:poi-ooxml from 5.2.3 to 5.2.5. --- updated-dependencies: - dependency-name: org.apache.poi:poi-ooxml dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * fix terraform error in deploy * initial commit * fixing test * including additional column option in tests * missed usage * addressing trivy issues * addressing trivy issues * trivy issue * fix extra identified issues * initial addition of fix --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Deanne Ukovich <[email protected]> Co-authored-by: Michael Lawley <[email protected]> Co-authored-by: Attila Edelenyi <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
- Loading branch information
5 people
authored
Mar 12, 2024
1 parent
e85eb62
commit 2379522