Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 03-06-2024 #1232

Merged
merged 104 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
359e998
changed casl to allow user to be able to admin and delete instrument
nitrosx Apr 18, 2024
0f7c705
fixed linting issues
nitrosx Apr 18, 2024
57c5b0b
Merge branch 'master' into fix-issue-1172
nitrosx Apr 23, 2024
3864f03
Merge pull request #1181 from SciCatProject/fix-issue-1172
nitrosx Apr 23, 2024
2727ea7
update read-me for auto-release workflow
Junjiequan Apr 23, 2024
c25d23a
minor fix for the text structure
Junjiequan Apr 23, 2024
3b09505
Uploaded release workflow image
Junjiequan Apr 23, 2024
d0e6df4
Merge pull request #1188 from SciCatProject/documentation-update-for-…
nitrosx Apr 23, 2024
d24c3d9
Update PublishedData OpenAPI descriptions
paulmillar Apr 24, 2024
2f564f8
added metadata to proposal
nitrosx Apr 25, 2024
ed71ac8
fixed linting
nitrosx Apr 25, 2024
407f6fc
Merge pull request #1189 from paulmillar/development/update-published…
nitrosx Apr 25, 2024
984dbb5
Merge branch 'master' into feature-issue-1178
nitrosx Apr 25, 2024
795c0b3
build(deps): bump express, @nestjs/core, @nestjs/common, @nestjs/plat…
dependabot[bot] Apr 26, 2024
fce2e92
build(deps-dev): bump @typescript-eslint/parser from 7.7.0 to 7.7.1
dependabot[bot] Apr 29, 2024
197760f
Merge pull request #1194 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] Apr 29, 2024
cd7d935
build(deps): bump mathjs from 12.4.1 to 12.4.2
dependabot[bot] Apr 29, 2024
527986a
build(deps): bump docker/metadata-action from 4 to 5
dependabot[bot] Apr 29, 2024
cf48166
build(deps): bump dependabot/fetch-metadata from 2.0.0 to 2.1.0
dependabot[bot] Apr 29, 2024
5c96796
Merge pull request #1199 from SciCatProject/dependabot/npm_and_yarn/m…
github-actions[bot] Apr 29, 2024
9bdb935
build(deps): bump reflect-metadata from 0.1.14 to 0.2.2
dependabot[bot] Apr 29, 2024
92aa39e
Merge pull request #1198 from SciCatProject/dependabot/npm_and_yarn/r…
github-actions[bot] Apr 29, 2024
e685882
build(deps-dev): bump @typescript-eslint/eslint-plugin
dependabot[bot] Apr 29, 2024
c0ef6e2
Merge pull request #1197 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] Apr 29, 2024
14149eb
build(deps-dev): bump supertest from 6.3.4 to 7.0.0
dependabot[bot] Apr 29, 2024
4b76b5e
Merge branch 'master' into feature-issue-1178
nitrosx Apr 30, 2024
7fad4b5
fix: empty string value in accessGroups field
Junjiequan Apr 30, 2024
857530a
fix: prevent empty string pushed into the accessGroups
Junjiequan May 1, 2024
05965bc
Merge pull request #1203 from SciCatProject/bug-fix-empty-string-valu…
nitrosx May 1, 2024
0ef58bb
Merge branch 'master' into feature-issue-1178
nitrosx May 1, 2024
df54d79
Merge pull request #1190 from SciCatProject/feature-issue-1178
nitrosx May 1, 2024
ebc9ad1
Merge branch 'master' into dependabot/npm_and_yarn/supertest-7.0.0
nitrosx May 1, 2024
b54a82b
Merge pull request #1196 from SciCatProject/dependabot/npm_and_yarn/s…
github-actions[bot] May 1, 2024
ecb9d6e
Merge branch 'master' into dependabot/github_actions/docker/metadata-…
nitrosx May 1, 2024
a650709
build(deps): bump ejs from 3.1.9 to 3.1.10
dependabot[bot] May 1, 2024
6b05c86
build(deps): bump @nestjs-modules/mailer from 1.11.2 to 2.0.2
dependabot[bot] May 1, 2024
a48af90
Merge pull request #1204 from SciCatProject/dependabot/npm_and_yarn/e…
github-actions[bot] May 1, 2024
3ad5254
Merge branch 'master' into dependabot/github_actions/docker/metadata-…
nitrosx May 1, 2024
b0583a5
Merge pull request #1200 from SciCatProject/dependabot/github_actions…
github-actions[bot] May 1, 2024
a5aaad9
Merge branch 'master' into dependabot/github_actions/dependabot/fetch…
nitrosx May 1, 2024
5e8baff
Merge pull request #1201 from SciCatProject/dependabot/github_actions…
github-actions[bot] May 1, 2024
1d26c11
Merge branch 'master' into dependabot/npm_and_yarn/nestjs-modules/mai…
nitrosx May 1, 2024
1a14850
Merge pull request #1205 from SciCatProject/dependabot/npm_and_yarn/n…
github-actions[bot] May 1, 2024
63a4f97
build(deps-dev): bump @types/lodash from 4.17.0 to 4.17.1
dependabot[bot] May 6, 2024
f74c71b
Merge pull request #1206 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 6, 2024
2f477e6
build(deps-dev): bump @typescript-eslint/eslint-plugin
dependabot[bot] May 6, 2024
ac6c45c
Merge pull request #1210 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 6, 2024
7d63c09
build(deps-dev): bump @types/nodemailer from 6.4.14 to 6.4.15
dependabot[bot] May 6, 2024
7a6d5e5
Merge pull request #1207 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 6, 2024
fe7b4ea
build(deps-dev): bump @types/node from 20.12.7 to 20.12.9
dependabot[bot] May 6, 2024
7e32b52
Merge pull request #1208 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 6, 2024
226106f
build(deps-dev): bump @typescript-eslint/parser from 7.7.1 to 7.8.0
dependabot[bot] May 6, 2024
befc6f5
Merge pull request #1209 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 6, 2024
d406670
build(deps-dev): bump @types/chai from 4.3.14 to 4.3.16
dependabot[bot] May 6, 2024
a6d4193
Merge pull request #1211 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 6, 2024
0a54d5f
build(deps-dev): bump chai from 5.1.0 to 5.1.1
dependabot[bot] May 13, 2024
bcae052
Merge pull request #1212 from SciCatProject/dependabot/npm_and_yarn/c…
github-actions[bot] May 13, 2024
af63f11
build(deps-dev): bump @types/node from 20.12.9 to 20.12.11
dependabot[bot] May 13, 2024
3ce9a4c
Merge pull request #1213 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 13, 2024
6733ca5
build(deps): bump rimraf from 5.0.5 to 5.0.7
dependabot[bot] May 13, 2024
0cda53b
Merge pull request #1214 from SciCatProject/dependabot/npm_and_yarn/r…
github-actions[bot] May 13, 2024
8edbb86
only call oaiProvider if the url is defined in config
emigun May 14, 2024
3cc2260
move oai resync to service
emigun May 14, 2024
b425a98
build(deps-dev): bump @typescript-eslint/eslint-plugin
dependabot[bot] May 20, 2024
b21d467
Merge pull request #1217 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 20, 2024
77d7e7f
build(deps-dev): bump @types/lodash from 4.17.1 to 4.17.4
dependabot[bot] May 20, 2024
4d6083b
Merge pull request #1218 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 20, 2024
a37891d
build(deps-dev): bump @typescript-eslint/parser from 7.8.0 to 7.9.0
dependabot[bot] May 20, 2024
c1ee776
Merge pull request #1221 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 20, 2024
1378a16
build(deps-dev): bump @types/node from 20.12.11 to 20.12.12
dependabot[bot] May 20, 2024
db5fcb4
Merge pull request #1220 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 20, 2024
0202783
build(deps-dev): bump sinon from 17.0.1 to 18.0.0
dependabot[bot] May 20, 2024
379368b
Merge pull request #1216 from SciCatProject/dependabot/npm_and_yarn/s…
github-actions[bot] May 21, 2024
4201fff
docs: improve env vars readability on README (#1215)
Junjiequan May 21, 2024
5f237c2
fix: behavior of Elasticsearch query differs from mongoDB query (#1184)
Junjiequan May 21, 2024
8e67903
build(deps): bump mongoose from 8.3.1 to 8.4.0
Junjiequan May 22, 2024
42f4608
Merge pull request #1222 from SciCatProject/build(deps)--bump-mongoos…
nitrosx May 27, 2024
5f1b5e3
build(deps-dev): bump @typescript-eslint/eslint-plugin
dependabot[bot] May 27, 2024
23bd61c
Merge pull request #1226 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 27, 2024
e6dee01
build(deps-dev): bump @typescript-eslint/parser from 7.9.0 to 7.10.0
dependabot[bot] May 27, 2024
b287025
Merge pull request #1227 from SciCatProject/dependabot/npm_and_yarn/t…
github-actions[bot] May 27, 2024
9e2c03c
fix: ES missing number value filter query
Junjiequan May 28, 2024
5dd79a3
improved api test for elasticsearch
Junjiequan May 28, 2024
0c5d587
updated issue and pr templates according to latest requests from deve…
nitrosx May 27, 2024
4b7893b
fix test with refactored published data service
emigun May 28, 2024
78a9119
Merge pull request #1225 from SciCatProject/new-pr-template
nitrosx May 28, 2024
03aa70d
Merge branch 'master' into elastic-search-filter-query-for-numbers
nitrosx May 28, 2024
1bc0cf5
Merge pull request #1228 from SciCatProject/elastic-search-filter-que…
nitrosx May 28, 2024
c0d73a1
throw HttpException if doi config path file does not exist with test
emigun May 28, 2024
b5cea4a
happy flow test case
emigun May 29, 2024
7bff372
test that HttpException is thrown if request to oaiProvider fails
emigun May 29, 2024
bc6d897
remove two empty lines
emigun May 29, 2024
f98c213
remove abundant log
emigun May 29, 2024
b92df78
add swagger doc
emigun May 29, 2024
28baa40
lint:fix
emigun May 30, 2024
7cc64b4
Merge branch 'master' into improve-published-dataset-resync
emigun May 30, 2024
8499bbc
fix problem lint:fix created
emigun May 30, 2024
2646f0d
chore: allow backend image to support multi-platforms
Junjiequan Jun 3, 2024
b3c7096
Merge pull request #1230 from SciCatProject/allow--backend-image-to-s…
nitrosx Jun 3, 2024
9c159c5
build(deps): bump pug from 3.0.2 to 3.0.3
dependabot[bot] Jun 3, 2024
67ab02c
Merge branch 'master' into improve-published-dataset-resync
nitrosx Jun 3, 2024
3fae222
Merge pull request #1231 from SciCatProject/dependabot/npm_and_yarn/p…
github-actions[bot] Jun 3, 2024
cbf6812
Merge branch 'master' into improve-published-dataset-resync
nitrosx Jun 3, 2024
9cc4a9d
Merge pull request #1229 from SciCatProject/improve-published-dataset…
nitrosx Jun 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/ISSUE_TEMPLATE/issue-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,22 @@ about: Describe this issue purpose here.

---

## Issue Name
## Issue Name (title)
Please enter the title for this github issue

### Summary
Description of the issue

### Steps to Reproduce
Describe how to reproduce the issue

### Current Behaviour
Describe the current behavior if it is relevant

### Expected Behaviour
Describe the expected behavior if it is relevant

### Extra Details
### Details
Provide all the details related to this issue. Also include screenshots, wireframes or mockups if they help.

Here you should include details about the system (if it is unique) and possible information about a fix (feel free to link to code where relevant). Screenshots/GIFs are also fine here.
__PS__: make sure to add the proper tags to the issue
16 changes: 12 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,25 @@ Short description of the pull request
Background on use case, changes needed

## Fixes:
Please provide a list of the fixes implemented by this PR

* Items added

## Changes:
Please provide a list of the changes implemented by this PR

* changes made

## Tests included/Docs Updated?
## Tests included

- [ ] Included for each change/fix?
- [ ] Passing? (Merge will not be approved unless this is checked)
- [ ] Docs updated?
- [ ] New packages used/requires npm install?
- [ ] Toggle added for new features?

## Documentation
- [ ] swagger documentation updated \[required\]
- [ ] official documentation updated \[nice-to-have]

### official documentation info
If you have updated the official documentation, please provide PR # and URL of the pages where the updates are included


2 changes: 1 addition & 1 deletion .github/workflows/auto-merge-dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
## Extract information about the dependencies being updated by a Dependabot-generated PR
- name: Dependabot metadata
id: dependabot-metadata
uses: dependabot/fetch-metadata@v2.0.0
uses: dependabot/fetch-metadata@v2.1.0
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Deploy

on:
push:
branches:
- master
branches:
- master

jobs:
deploy:
Expand All @@ -12,7 +12,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

Expand All @@ -22,22 +22,23 @@ jobs:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Create image tags
id: meta
uses: docker/metadata-action@v5
with:
images: ghcr.io/scicatproject/backend-next
flavor: latest=true # adds :latest tag to outputs.tags
tags: type=sha,format=long,prefix= # adds :<sha> tag to outputs.tags

- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64/v8
push: true
tags: ${{ steps.meta.outputs.tags }}

- name: Trigger ESS pipeline
uses: swapActions/trigger-swap-deployment@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-tag-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
## https://github.com/docker/metadata-action
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/scicatproject/backend-next
tags: |
Expand Down
198 changes: 116 additions & 82 deletions README.md

Large diffs are not rendered by default.

Loading