Skip to content

Commit 74827a0

Browse files
committed
Merge branch 'master' into HEAD
Resolved Conflicts: src/store/workflows.module.js src/views/Workspace.vue
2 parents 1cb0769 + 9679dc6 commit 74827a0

File tree

120 files changed

+8166
-4449
lines changed

Some content is hidden

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

120 files changed

+8166
-4449
lines changed

.eslintrc.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ module.exports = {
2727
'plugin:cypress/recommended'
2828
],
2929
rules: {
30-
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
31-
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
30+
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
31+
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
32+
'no-unreachable': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
33+
'no-unused-vars': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
3234
indent: [
3335
'error',
3436
2,

.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: 7 additions & 2 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

@@ -51,7 +56,7 @@ jobs:
5156
5257
- name: Publish GitHub release
5358
id: create-release
54-
uses: actions/create-release@v1
59+
uses: cylc/release-actions/create-release@v1
5560
env:
5661
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5762
with:
@@ -62,7 +67,7 @@ jobs:
6267
# prerelease: ${{ env.PRERELEASE }}
6368
draft: false
6469
body: |
65-
See [${{ env.CHANGELOG_FILE }}](https://github.com/${{ github.repository }}/blob/master/${{ env.CHANGELOG_FILE }}) for detail.
70+
See [${{ env.CHANGELOG_FILE }}](https://github.com/${{ github.repository }}/blob/master/${{ env.CHANGELOG_FILE }}) for details.
6671
6772
sha256sum: ${{ env.SHA256SUM }}
6873
# TODO: Get topmost changelog section somehow and use that as the body?

.github/workflows/main.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,13 @@ jobs:
5555
runs-on: ${{ matrix.os }}
5656
strategy:
5757
matrix:
58-
include:
59-
- os: ubuntu-20.04
60-
browser: firefox
61-
type: 'e2e'
62-
- os: ubuntu-20.04
63-
browser: firefox
64-
type: 'component'
65-
- os: ubuntu-latest
66-
browser: chrome
67-
type: 'e2e'
68-
- os: ubuntu-latest
69-
browser: chrome
70-
type: 'component'
58+
os: [ubuntu-latest]
59+
browser: [firefox, chrome]
60+
type: [e2e, component]
7161
# TODO: re-enable once macos build is stable #590
72-
# - os: macos-latest
73-
# browser: edge
62+
# include:
63+
# - os: macos-latest
64+
# browser: edge
7465
steps:
7566
- name: Checkout
7667
uses: actions/checkout@v3
@@ -81,7 +72,7 @@ jobs:
8172
node-version: '16'
8273

8374
- name: Test
84-
uses: cypress-io/github-action@v4
75+
uses: cypress-io/github-action@v5
8576
with:
8677
start: yarn run serve --hide=CLIENT # turn off build output because it's absurdly long
8778
wait-on: http://localhost:8080/
@@ -95,7 +86,7 @@ jobs:
9586
env:
9687
CYPRESS_baseUrl: http://localhost:8080/
9788

98-
- uses: actions/upload-artifact@v2
89+
- uses: actions/upload-artifact@v3
9990
if: failure()
10091
with:
10192
name: cypress-screenshots

.yarn/releases/yarn-3.2.3.cjs

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

.yarn/releases/yarn-3.5.0.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.2.3.cjs
13+
yarnPath: .yarn/releases/yarn-3.5.0.cjs

CHANGES.md

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,74 @@ creating a new release entry be sure to copy & paste the span tag with the
1010
`actions:bind` attribute, which is used by a regex to find the text to be
1111
updated. Only the first match gets replaced, so it's fine to leave the old
1212
ones in. -->
13+
-------------------------------------------------------------------------------
14+
## __cylc-ui-1.6.0 (<span actions:bind='release-date'>Upcoming</span>)__
15+
16+
### Enhancements
17+
18+
[#1187](https://github.com/cylc/cylc-ui/pull/1187) - Improved the workflow
19+
filtering menu in the sidebar.
20+
21+
-------------------------------------------------------------------------------
22+
## __cylc-ui-1.5.0 (<span actions:bind='release-date'>Released 2023-02-20</span>)__
23+
24+
### Enhancements
25+
26+
[#1184](https://github.com/cylc/cylc-ui/pull/1184) - Mean times for tasks
27+
in table changed to human readable ISO duration format.
28+
29+
[#1182](https://github.com/cylc/cylc-ui/pull/1182) - Allow filtering by
30+
cycle point and family in tree & table views.
31+
32+
### Fixes
33+
34+
[#1230](https://github.com/cylc/cylc-ui/pull/1230) -
35+
Fixes an issue where tasks were missing from the GUI in workflows which
36+
use multi-level family inheritance.
37+
38+
[#1182](https://github.com/cylc/cylc-ui/pull/1182) - Fixes bug in filtering
39+
by task name.
1340

14-
## __cylc-ui-1.4.0 (<span actions:bind='release-date'>Pending</span>)__
41+
-------------------------------------------------------------------------------
42+
## __cylc-ui-1.4.0 (<span actions:bind='release-date'>Released 2023-01-16</span>)__
1543

1644
### Enhancements
1745

46+
[#1158](https://github.com/cylc/cylc-ui/pull/1158) -
47+
Add log view: A new view which displays workflow and job logs (similar
48+
to log view available in Cylc 7 cylc review).
49+
1850
[#1108](https://github.com/cylc/cylc-ui/pull/1108) -
19-
Graph view: A new view which displays tasks and dependencies as a graph (like
20-
the Cylc 7 graph view).
51+
Add graph view: A new view which displays tasks and dependencies as a graph
52+
(like the Cylc 7 graph view).
53+
54+
[#1144](https://github.com/cylc/cylc-ui/pull/1144) - Add "Edit Runtime"
55+
command, a more convenient way to perform broadcasts by viewing and editing a
56+
task/family's runtime configuration.
2157

2258
[#1108](https://github.com/cylc/cylc-ui/pull/1108) -
2359
Tree view: Task messages are now shown along with outputs.
2460

2561
[#1124](https://github.com/cylc/cylc-ui/pull/1075) - Table view: More options
2662
for number of tasks per page.
2763

64+
[#1177](https://github.com/cylc/cylc-ui/pull/1177) -
65+
New tabs now open on top.
66+
67+
[#1178](https://github.com/cylc/cylc-ui/pull/1178) - Improve appearance of
68+
Table view.
69+
70+
[#1043](https://github.com/cylc/cylc-ui/pull/1043) - The GScan sidebar is
71+
now resizeable.
72+
2873
### Fixes
2974

75+
[#1164](https://github.com/cylc/cylc-ui/pull/1164) -
76+
Fix the mean run time column in the table view.
77+
78+
[#1167](https://github.com/cylc/cylc-ui/pull/1168) - Prevent command menu from
79+
jumping after a delay when clicking "see more".
80+
3081
[#1108](https://github.com/cylc/cylc-ui/pull/1108) -
3182
Tree view: Task outputs are now correctly associated with the jobs that created
3283
them.

0 commit comments

Comments
 (0)