Skip to content

Commit 3023793

Browse files
committed
Merge remote-tracking branch 'upstream/master' into gscan-filter
2 parents 2349a7d + 1bec0e4 commit 3023793

33 files changed

+1203
-1279
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

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

.github/ISSUE_TEMPLATE/feature-request.md

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

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/auto_publish_release.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ jobs:
2626
with:
2727
ref: ${{ env.MERGE_SHA }}
2828

29+
- name: Setup Node
30+
uses: actions/setup-node@v3
31+
with:
32+
node-version: 16
33+
2934
- name: Install
3035
run: yarn install
3136

.yarn/releases/yarn-3.3.1.cjs

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

.yarn/releases/yarn-3.4.1.cjs

Lines changed: 873 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ networkSettings:
1010

1111
nodeLinker: node-modules
1212

13-
yarnPath: .yarn/releases/yarn-3.3.1.cjs
13+
yarnPath: .yarn/releases/yarn-3.4.1.cjs

CHANGES.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ creating a new release entry be sure to copy & paste the span tag with the
1111
updated. Only the first match gets replaced, so it's fine to leave the old
1212
ones in. -->
1313
-------------------------------------------------------------------------------
14-
## __cylc-ui-1.5.0 (<span actions:bind='release-date'>Upcoming</span>)__
14+
## __cylc-ui-1.5.0 (<span actions:bind='release-date'>Released 2023-02-20</span>)__
1515

1616
### Enhancements
1717

@@ -23,6 +23,10 @@ cycle point and family in tree & table views.
2323

2424
### Fixes
2525

26+
[#1230](https://github.com/cylc/cylc-ui/pull/1230) -
27+
Fixes an issue where tasks were missing from the GUI in workflows which
28+
use multi-level family inheritance.
29+
2630
[#1182](https://github.com/cylc/cylc-ui/pull/1182) - Fixes bug in filtering
2731
by task name.
2832

CONTRIBUTING.md

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,37 @@
1-
# Cylc UI: How to Contribute
1+
# Cylc: How to Contribute
22

3-
## Report Bugs
3+
Thanks for you interest in the Cylc project!
44

5-
Report bugs by opening an issue [on
6-
Github](https://github.com/cylc/cylc-ui/issues). Give the version
7-
affected by the bug (you should test the latest release if possible) and a
8-
recipe to reproduce the problem.
5+
Contributions are welcome, please open an issue to discuss changes before
6+
raising a pull request.
97

10-
## Request Enhancements
8+
You can also get in touch via:
9+
10+
* The developers chat: [![chat](https://img.shields.io/matrix/cylc-general:matrix.org)](https://matrix.to/#/#cylc-general:matrix.org)
11+
* The forum: [![forum](https://img.shields.io/discourse/https/cylc.discourse.group/posts.svg)](https://cylc.discourse.group/)
12+
13+
14+
## New Contributors
15+
16+
Please read the [CLA](#contributor-licence-agreement-and-certificate-of-origin).
17+
18+
Please add your name to the
19+
[Code Contributors](#code-contributors) section of this file as part of your
20+
first Pull Request (for each Cylc repository you contribute to).
1121

12-
Request enhancements by opening an issue at [Github
13-
](https://github.com/cylc/cylc-ui/issues). Describe your use case in
14-
detail.
1522

1623
## Contribute Code
1724

18-
All contributions to project are made via Pull Requests against the *master*
19-
branch of [cylc/cylc-ui](https://github.com/cylc/cylc-ui).
20-
Non-trivial developments must be discussed and agreed in advance in a
21-
[Issue](https://github.com/cylc/cylc-ui/issues) as the team may not
22-
be able to consider large changes that appear out of the blue. New
23-
contributors should add their details to the [Code Contributors
24-
](#code-contributors) section of this file as part of their first Pull
25-
Request, and reviewers are responsible for checking this before merging the
26-
new branch into *master*.
25+
**Enhancements** are made on the `master` branch.
26+
27+
**Bugfixes** are made on the branch of the same name as the issue's milestone.
28+
E.G. if the issue is on the `8.0.x` milestone, branch off of `8.0.x` to
29+
develop your bugfix, then raise the pull request against the `8.0.x` branch.
30+
We will later merge the `8.0.x` branch into `master`.
31+
32+
Feel free to ask questions on the issue or developers chat if unsure about
33+
anything.
34+
2735

2836
## Code Contributors
2937

README.md

Lines changed: 76 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,83 @@ PARTICULAR PURPOSE. See the GNU General Public License for more details.
2424
You should have received a copy of the GNU General Public License along with
2525
Cylc. If not, see [GNU licenses](http://www.gnu.org/licenses/).
2626

27-
## Developers
27+
## Development
2828

29-
### Building
29+
### Install & Build
30+
31+
```bash
32+
# Project setup
33+
yarn install
34+
35+
# build & run in offline mode (uses mock data, auto-reloads the browser on change)
36+
yarn run serve
37+
38+
# build for development (rebuilds on change)
39+
# launch using `cylc gui --ui-build-dir=<path>`
40+
# (where path is the path to the `dist/` folder created by build
41+
yarn run build:watch
42+
43+
# build for production
44+
yarn run build
45+
46+
# Produce build report
47+
yarn run build:report
48+
```
49+
50+
### Tests
51+
52+
There are three groups of tests:
53+
54+
* Unit tests
55+
* Simple unit tests for individual functions and classes.
56+
* **Framework:** Mocha
57+
* **Assertions:** Chai
58+
* **Path:** `tests/unit`
59+
* **Command:** `yarn run test:unit`
60+
* (To watch add `--watch`)
61+
* Component tests
62+
* In-browser tests which mount a single Vue component standalone.
63+
* **Framework:** Cypress
64+
* **Assertions:** Chai
65+
* **Path:** `cypress/component`
66+
* **Command:** `yarn run test:e2e` (navigate to component page)
67+
* (For "headless" mode add `-- --headless --config video=false`)
68+
* End to end tests
69+
* In-browser tests which load entire pages of the UI using mocked data.
70+
* **Framework:** Cypress
71+
* **Assertions:** Chai
72+
* **Path:** `tests/e2e`
73+
* **Command:** `yarn run test:e2e` (navigate to e2e page)
74+
* (For "headless" mode add `-- --headless --config video=false`)
75+
76+
For coverage:
77+
```
78+
yarn run coverage:unit
79+
```
80+
81+
Useful test opts:
82+
- `--bail`: exit after first test failure
83+
- `--colors`: enables coloured output in VSCode integrated terminal
84+
85+
### Mocked Data
86+
87+
The "offline" mode (aka `yarn run serve`) which is also used for the end to end
88+
tests is powered by "mock" data.
89+
90+
You can find the index of mocked data here: `src/services/mock/json/index.js`
91+
92+
Mock data is automatically loaded when the subscription/query issued matches
93+
an entry in that file.
94+
95+
### Code Style
96+
97+
See `.eslintrc.js` for style, to test run:
98+
99+
```
100+
yarn run lint
101+
```
102+
103+
### Project Setup
30104

31105
This project was created with the [vue-cli](https://cli.vuejs.org/).
32106

@@ -111,76 +185,6 @@ module.exports = {
111185
(`.browserslistrc`) to determine the polyfills needed. See
112186
https://cli.vuejs.org/guide/browser-compatibility.html.
113187

114-
#### Project setup
115-
116-
```
117-
yarn install
118-
```
119-
120-
#### Compiles and hot-reloads demo mode for development
121-
122-
```
123-
yarn run serve
124-
```
125-
126-
#### Compiles and minifies for production
127-
128-
```
129-
yarn run build
130-
```
131-
132-
#### Compiles and watch for changes for development
133-
134-
```
135-
yarn run build:watch
136-
```
137-
138-
#### Produce build report
139-
140-
```
141-
yarn run build:report
142-
```
143-
144-
#### Run unit tests
145-
146-
```
147-
yarn run test:unit
148-
```
149-
150-
Useful opts:
151-
- `--watch`: watch for changes (allows re-running tests much quicker)
152-
- `--bail`: exit after first test failure
153-
- `--colors`: enables coloured output in VSCode integrated terminal
154-
155-
For coverage:
156-
```
157-
yarn run coverage:unit
158-
```
159-
160-
#### Run functional tests
161-
162-
```
163-
yarn run test:e2e
164-
```
165-
166-
Or for headless mode
167-
168-
```
169-
yarn run test:e2e -- --headless --config video=false
170-
```
171-
172-
For coverage
173-
174-
```
175-
yarn run coverage:e2e
176-
```
177-
178-
#### Lints and fixes files
179-
180-
```
181-
yarn run lint
182-
```
183-
184188
### Integration with the backend Cylc UI server
185189

186190
In the previous section _"Compiles and watch for changes for development"_,

0 commit comments

Comments
 (0)