Skip to content

Commit 5f9e17c

Browse files
Merge branch 'develop' into TASK-7600-dev
2 parents 9980e0e + c70f22f commit 5f9e17c

File tree

260 files changed

+22972
-14844
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+22972
-14844
lines changed

.babelrc

Lines changed: 0 additions & 13 deletions
This file was deleted.

.eslintrc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
"plugin:wc/recommended",
88
"plugin:lit/recommended"
99
],
10-
"parser": "babel-eslint",
1110
"parserOptions": {
12-
"ecmaVersion": 6,
11+
"ecmaVersion": 2020,
1312
"sourceType": "module"
1413
},
1514
"env": {

.github/workflows/develop.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ jobs:
1313
test:
1414
uses: ./.github/workflows/test.yml
1515
needs: build
16-
with:
17-
test_profile: runShortTests
18-
secrets: inherit
1916

2017
deploy-docker:
2118
uses: ./.github/workflows/deploy-docker-jsorolla.yml

.github/workflows/long-test-execution.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,3 @@ on:
88
jobs:
99
test:
1010
uses: ./.github/workflows/test.yml
11-
with:
12-
test_profile: runShortTests,runMediumTests,runLongTests
13-
secrets: inherit

.github/workflows/task.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ jobs:
1212
test:
1313
uses: ./.github/workflows/test.yml
1414
needs: build
15-
with:
16-
test_profile: runShortTests
17-
secrets: inherit
15+
1816

1917
deploy-docker:
2018
uses: ./.github/workflows/deploy-docker-jsorolla.yml

.github/workflows/test.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@ name: "Build and Run tests"
22

33
on:
44
workflow_call:
5-
inputs:
6-
test_profile:
7-
type: string
8-
required: true
9-
secrets:
10-
SONAR_TOKEN:
11-
required: true
5+
126

137
jobs:
148
test:

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,5 @@ cypress/videos
6767
.nyc_output
6868
coverage
6969

70-
71-
70+
# macOS
71+
.DS_Store

README.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
# Overview
22
JSorolla is a JavaScript library for biological and genomic data visualization.
33

4-
### Documentation
5-
You can find JSorolla documentation and tutorials at: http://docs.opencb.org/display/jsorolla/JSorolla+Home.
6-
74
### Issue Tracking
8-
You can report bugs or request new features at [GitHub issue tracking](https://github.com/opencb/jsorolla/issues).
5+
Found a bug or have an idea for a new feature? Let us know at https://zettagenomics.com/academic/
96

107
### Release Notes and Roadmap
11-
Releases notes are available at [GitHub releases](https://github.com/opencb/jsorolla/releases).
12-
13-
Roadmap is available at [GitHub milestones](https://github.com/opencb/jsorolla/milestones). You can report bugs or request new features at [GitHub issue tracking](https://github.com/opencb/jsorolla/issues).
14-
15-
### Versioning
16-
JSorolla is versioned following the rules from [Semantic versioning](http://semver.org/).
8+
Releases notes are available at [[GitHub releases](https://github.com/opencb/jsorolla/releases).](https://zettagenomics.com/release-notes/)
179

1810
### Maintainers
1911
The main developers and maintainers are:

cypress/e2e/iva/cohort-browser-grid.cy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ context("Cohort Browser Grid", () => {
7474
it("should render create title", () => {
7575
cy.get("@modal-create")
7676
.find("h4.modal-title")
77-
.should("contain.text", "Cohort Create");
77+
.should("contain.text", "Create Cohort");
7878
});
7979
// 3. Render button clear
8080
it("should render button clear", () => {

cypress/e2e/iva/disease-panel-browser-grid.cy.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ context("Disease Panel Browser Grid", () => {
7575
it("should render create title", () => {
7676
cy.get("@modal-create")
7777
.find("h4.modal-title")
78-
.should("contain.text", "Disease Panel Create");
78+
.should("contain.text", "Create Disease Panel");
7979
});
8080
// 3. Render button clear
8181
it("should render button clear", () => {
@@ -127,7 +127,7 @@ context("Disease Panel Browser Grid", () => {
127127
it("should render update title", () => {
128128
cy.get("@modal-update")
129129
.find("h4.modal-title")
130-
.should("contain.text", "Disease Panel Update");
130+
.should("contain.text", "Update Disease Panel");
131131
});
132132
// 3. Render button clear
133133
it("should render button clear", () => {

0 commit comments

Comments
 (0)