Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .eslintrc.js
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is no longer a valid code, so I applied the allowed value.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
root: true,
extends: ['airbnb-base', 'prettier'],
rules: {
'import/extensions': "always", // Better for native ES Module usage
'import/extensions': 2, // Better for native ES Module usage
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why the symbol is changed to a magic number? What does 2 mean?

'no-console': 0, // We can remove this later
'no-underscore-dangle': 0,
'no-plusplus': ['error', { allowForLoopAfterthoughts: true }],
Expand Down
18 changes: 7 additions & 11 deletions .github/workflows/publish-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,22 @@ on:

jobs:
publish-package:
runs-on: ubuntu-20.04
runs-on: ubuntu:latest
environment: publish

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 16

- name: Install packages
uses: bahmutov/npm-install@v1
- name: Install
uses: oven-sh/setup-bun@v2
run: bun install

- name: Run build
run: npm run build
run: bun run build

- name: Run tests
run: npm run test
run: bun run test

- name: Semantic release
uses: cycjimmy/semantic-release-action@v3
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,18 @@ on:

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 16
uses: actions/checkout@v4

- name: Install packages
uses: bahmutov/npm-install@v1
uses: oven-sh/setup-bun@v2
run: bun install

- name: Run build
run: npm run build
run: bun run build

- name: Run tests
run: npm run test
run: bun run test
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ bower_components

# Build directory
build/
dist/

# Dependency directories
node_modules/
Expand All @@ -56,12 +57,16 @@ typings/

# Yarn lock file
yarn.lock
bun.lock

# dotenv environment variables file
.env

.idea

*.code-workspace
.vscode/

# docker files created by the docker containers for testing
tmp

Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ before_script:

script:
- npm install
- echo travis build definition
- npm run build
16 changes: 16 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[build]
command = "npm install && npm run build"
publish = "build"

[build.environment]
NODE_VERSION = "20"
NPM_FLAGS = "--legacy-peer-deps" # Optional, useful if you run into dependency resolution issues

[build.lifecycle]
# This will run before the build command
onPostBuild = "npm run test"

[[redirects]]
from = "/*"
to = "/index.html"
status = 200
19 changes: 12 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ class DICOMwebClient {
const url = `${this.wadoURL}/studies/${options.studyInstanceUID}/series/${options.seriesInstanceUID}/metadata`;

const request = getRequestOptions(options.request)
return this._httpGetApplicationJson(url, {}, false, withCredentials);
return this._httpGetApplicationJson(url, {}, request);
}

/**
Expand All @@ -1140,7 +1140,6 @@ class DICOMwebClient {
*/
searchForInstances(options = {}) {
let url = this.qidoURL;
let withCredentials = false;
if ('studyInstanceUID' in options) {
url += `/studies/${options.studyInstanceUID}`;
if ('seriesInstanceUID' in options) {
Expand Down