Fix main merge #109
Merged
Fix main merge #109
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
* local development environment * relocate local development init files * create ci action * update ci action * update ci action * clean unit-tests and fix lint errors * create codeQL action * update codeQL action * create pre-release action * update pre-release action * update pre-release action * update pre-release action * update pre-release action * assets #12 setup local environment and create a clean DB * create release action * update release action * update release action * clean-up * rename development-names * update release action * update release action * update release action * update docker file * update docker file * Bump @babel/traverse from 7.20.12 to 7.24.0 Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.20.12 to 7.24.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.24.0/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump webpack and @angular-devkit/build-angular Bumps [webpack](https://github.com/webpack/webpack) to 5.76.1 and updates ancestor dependency [@angular-devkit/build-angular](https://github.com/angular/angular-cli). These dependencies need to be updated together. Updates `webpack` from 5.75.0 to 5.76.1 - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.75.0...v5.76.1) Updates `@angular-devkit/build-angular` from 15.1.1 to 15.2.10 - [Release notes](https://github.com/angular/angular-cli/releases) - [Changelog](https://github.com/angular/angular-cli/blob/main/CHANGELOG.md) - [Commits](angular/angular-cli@15.1.1...15.2.10) --- updated-dependencies: - dependency-name: webpack dependency-type: indirect - dependency-name: "@angular-devkit/build-angular" dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * Bump vite from 4.0.4 to 4.5.2 Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.0.4 to 4.5.2. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v4.5.2/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v4.5.2/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * Bump word-wrap from 1.2.3 to 1.2.5 Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.5) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump axios from 1.4.0 to 1.6.7 Bumps [axios](https://github.com/axios/axios) from 1.4.0 to 1.6.7. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.4.0...v1.6.7) --- updated-dependencies: - dependency-name: axios dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump follow-redirects from 1.15.2 to 1.15.5 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.5. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.2...v1.15.5) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump undici from 5.22.1 to 5.28.3 Bumps [undici](https://github.com/nodejs/undici) from 5.22.1 to 5.28.3. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v5.22.1...v5.28.3) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump semver from 5.7.1 to 5.7.2 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]> * Bump ip from 2.0.0 to 2.0.1 Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1. - [Commits](indutny/node-ip@v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * assets-39: remove console log of password from test * Feature/assets 16 replace logos (#43) * assets-16: replace the old logo and favicon with new ones * assets-32: replace the logo with the actual one for assets * Feature/assets 8: add missing scrollbars (#40) * assets-8: add scrollbars to all tabs in assets editor and user management * assets-8: remove some duplicate attributes * assets-8: fix unchanged files with annotations * assets-8: fix unchanged files with annotations * assets-8: fix unchanged files with annotations --------- Co-authored-by: Alex Graf <[email protected]> * assets-32: break long titles so the edit button is not hidden. same for the search result in order to display the entire title (#44) * update pre-release action * update pre-release action * update pre-release action * update pre-release action * update release action * update release action * update dockerfiles and actions * Bump follow-redirects from 1.15.5 to 1.15.6 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.5 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.5...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump fast-xml-parser and @aws-sdk/client-s3 Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) to 4.2.5 and updates ancestor dependency [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-s3). These dependencies need to be updated together. Updates `fast-xml-parser` from 4.0.11 to 4.2.5 - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](NaturalIntelligence/fast-xml-parser@v4.0.11...v4.2.5) Updates `@aws-sdk/client-s3` from 3.252.0 to 3.537.0 - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.537.0/clients/client-s3) --- updated-dependencies: - dependency-name: fast-xml-parser dependency-type: indirect - dependency-name: "@aws-sdk/client-s3" dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Bump tough-cookie and @cypress/request Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) and [@cypress/request](https://github.com/cypress-io/request). These dependencies needed to be updated together. Updates `tough-cookie` from 4.1.2 to 4.1.3 - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](salesforce/tough-cookie@v4.1.2...v4.1.3) Updates `@cypress/request` from 2.88.11 to 2.88.12 - [Release notes](https://github.com/cypress-io/request/releases) - [Changelog](https://github.com/cypress-io/request/blob/master/CHANGELOG.md) - [Commits](cypress-io/request@v2.88.11...v2.88.12) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect - dependency-name: "@cypress/request" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * update release action * update release action * update release action * update release action * Bump the npm_and_yarn group across 1 directory with 6 updates Bumps the npm_and_yarn group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) | `4.0.11` | `4.2.5` | | [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-s3) | `3.252.0` | `3.537.0` | | [follow-redirects](https://github.com/follow-redirects/follow-redirects) | `1.15.5` | `1.15.6` | | [ip](https://github.com/indutny/node-ip) | `2.0.0` | `2.0.1` | | [tough-cookie](https://github.com/salesforce/tough-cookie) | `4.1.2` | `4.1.3` | | [@cypress/request](https://github.com/cypress-io/request) | `2.88.11` | `2.88.12` | Updates `fast-xml-parser` from 4.0.11 to 4.2.5 - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](NaturalIntelligence/fast-xml-parser@v4.0.11...v4.2.5) Updates `@aws-sdk/client-s3` from 3.252.0 to 3.537.0 - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.537.0/clients/client-s3) Updates `follow-redirects` from 1.15.5 to 1.15.6 - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.5...v1.15.6) Updates `ip` from 2.0.0 to 2.0.1 - [Commits](indutny/node-ip@v2.0.0...v2.0.1) Updates `tough-cookie` from 4.1.2 to 4.1.3 - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](salesforce/tough-cookie@v4.1.2...v4.1.3) Updates `@cypress/request` from 2.88.11 to 2.88.12 - [Release notes](https://github.com/cypress-io/request/releases) - [Changelog](https://github.com/cypress-io/request/blob/master/CHANGELOG.md) - [Commits](cypress-io/request@v2.88.11...v2.88.12) --- updated-dependencies: - dependency-name: fast-xml-parser dependency-type: indirect dependency-group: npm_and_yarn-security-group - dependency-name: "@aws-sdk/client-s3" dependency-type: direct:production dependency-group: npm_and_yarn-security-group - dependency-name: follow-redirects dependency-type: indirect dependency-group: npm_and_yarn-security-group - dependency-name: ip dependency-type: indirect dependency-group: npm_and_yarn-security-group - dependency-name: tough-cookie dependency-type: indirect dependency-group: npm_and_yarn-security-group - dependency-name: "@cypress/request" dependency-type: indirect dependency-group: npm_and_yarn-security-group ... Signed-off-by: dependabot[bot] <[email protected]> * update release action * update release action * update pre-release action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update dev-deploy action * update release action * update release action * update release action * #67: update elasticsearch-index local * fix lint * #11 fix sonar-issues, unit-tests * Feature/assets 7 eIAM (#75) #7: integrate eIAM * Add elasticsearch init script * Remove initial `rdsadmin` user * Extend setup instructions in README * update create-docker-image action * update create-docker-image action * update create-docker-image action * Replace build workflows with new unified `build` workflow * Rewrite `release` workflow to just add `latest` flag The workflow will no longer add a new image tagged as `release`. Also, the ChangeLog has been removed completely as it is not used by the current project team. * Re-add codeql workflow * Remove pull request triggers from workflows * Remove duplicates from displayed sibling assets * Remove all existing siblings when patching an asset * Revert bad commits * Remove all existing siblings when patching an asset * Add tagging/release notes to actions * Add name to `release` pipeline * Remove self-dependency of `build.build` step * Remove docker image version tag * Use `install` instead of `ci` to install node modules * Run nx with `npx` * Add node modules cache to build pipeline * Add debug steps to build pipeline * Move debug steps to test job * Add `npm ci` to check jobs * Cache build node_modules from within build dir * Reset nx in build pipeline * Add explicit typing to `contact-edit.service` * Add dev setup steps to build pipeline * Remove postinstall from build pipeline * Run `ng` via npx in build pipeline * Replace `actions/cache@v2` with `v4` * Make `tag_edge_commit` build step depend on `build_and_push_app` * Fix pipeline job branch check * Add checkouts before building images * Make GITHUB_TOKEN an input for `create-image` action * Add startup prisma migration to server Dockerfile * #81: Added checking for user groups in middleware and returns the error message to the frontend. Added env variable fields to template for o_Auth * #81: Show error message when error returned from the backend * Remove unused code for auth (password reset etc) as part of #11 * #81: pr comments and remove serach field on error page * Create Bug template * Add Issue template * Refine templates * #81: fix lint issues * Extract CRUD of `asset` table into `AssetRepo` * Install `@faker-js/faker` Library for generating fake data for testing. * Test `AssetRepo` * Apply `build` workflow to all branches * Update `fp-ts` package `tap` function is only available from 2.15+ * Extract elasticsearch usages into `AssetSearchService` * Add `AllStudy` view definition to schema * Test `AssetSearchService` * Replace elasticsearch usages by `AssetSearchService` * Merge pull request #96 from swisstopo/feature/asset-71-update-elasticsearch-index * Merge pull request #98 from swisstopo/feature/asset-33-bug-alternative-ids --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Alex Graf <[email protected]> Co-authored-by: till_schuetze <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Till Schütze <[email protected]> Co-authored-by: Jannic Veith <[email protected]> Co-authored-by: Jannic Veith <[email protected]>
vej-ananas
approved these changes
May 15, 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.
No description provided.