Skip to content

Commit d61143f

Browse files
committed
Merge remote-tracking branch 'origin/main' into 3931-inactive-collaborator-avatar-dissapears-on-the-editor-instead-of-greying-out
2 parents b917230 + 94bbbb7 commit d61143f

File tree

271 files changed

+17577
-12834
lines changed

Some content is hidden

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

271 files changed

+17577
-12834
lines changed

CHANGELOG.md

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,40 @@ and this project adheres to
1919

2020
### Changed
2121

22+
### Fixed
23+
24+
- Fix flickering of active collaborator icons between states(active, inactive,
25+
unavailable) [#3931](https://github.com/OpenFn/lightning/issues/3931)
26+
27+
## [2.15.0-pre] - 2025-11-20
28+
29+
### Added
30+
31+
- Show collaborators mouse pointers on the workflow canvas
32+
[#3810](https://github.com/OpenFn/lightning/issues/3810)
33+
34+
### Changed
35+
36+
- Simplified IDE by only letting users see the "Create a New Manual Run Panel"
37+
when an existing Run isn't already loaded. Cleaned up the Run panel.
38+
[#4006](https://github.com/OpenFn/lightning/issues/4006)
39+
- Consolidated RunStore functionality into HistoryStore in collaborative editor
40+
for improved state management and reduced complexity
2241
- Default failure notifications for project users are now disabled to minimize
2342
email volume [#3517](https://github.com/OpenFn/lightning/issues/3517)
2443
- Simpler "disabled" state for workflows, still show last mod
2544
[#3962](https://github.com/OpenFn/lightning/issues/3962)
45+
- Move user profile to top left corner
46+
[#3997](https://github.com/OpenFn/lightning/issues/3997)
47+
- Collapse breadcrumbs when there are more than 2 of them
48+
[#3997](https://github.com/OpenFn/lightning/issues/3997)
2649

2750
### Fixed
2851

29-
- Fix flickering of active collaborator icons between states(active, inactive,
30-
unavailable) [#3931](https://github.com/OpenFn/lightning/issues/3931)
52+
- Restored footers to inspectors on the canvas while in read only mode
53+
[#4018](https://github.com/OpenFn/lightning/issues/4018)
54+
- Fix vertical scrolling in workflow panels
55+
[#3979](https://github.com/OpenFn/lightning/issues/3979)
3156
- Fix ghost edges blocking saves and breaking autolayout when deleting jobs in
3257
collaborative editor [#3983](https://github.com/OpenFn/lightning/issues/3983)
3358
- Fix tooltip styling inconsistencies in collaborative editor

assets/.postcssrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ module.exports = {
77
},
88
tailwindcss: {},
99
autoprefixer: {},
10-
}
11-
}
10+
},
11+
};

assets/css/app.css

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111
@source '../deps/petal_components/**/*.{ex,exs}';
1212

1313
@theme {
14-
--font-sans: 'Inter var', ui-sans-serif, system-ui, sans-serif,
15-
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
16-
--font-mono: 'Fira Code VF', ui-monospace, SFMono-Regular, Menlo, Monaco,
17-
Consolas, 'Liberation Mono', 'Courier New', monospace;
14+
--font-sans:
15+
'Inter var', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji',
16+
'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
17+
--font-mono:
18+
'Fira Code VF', ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
19+
'Liberation Mono', 'Courier New', monospace;
1820

1921
/* Primary (indigo) colors */
2022
--color-primary-50: var(--color-indigo-50);
@@ -264,6 +266,10 @@
264266
background-color: var(--primary-bg-dark);
265267
}
266268

269+
.primary-light {
270+
color: var(--primary-text-light);
271+
}
272+
267273
input#combobox {
268274
background-color: white;
269275
color: var(--color-gray-900);

assets/dev-server/src/App.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
import {
2-
useState,
3-
useEffect,
4-
useCallback,
5-
useRef,
6-
useMemo,
7-
} from 'react';
1+
import { useState, useEffect, useCallback, useRef, useMemo } from 'react';
82

93
import WorkflowDiagram from '../../js/workflow-diagram/WorkflowDiagram';
104
// import useStore from './store'
@@ -56,7 +50,7 @@ export default () => {
5650
setHistory(h => [evt, ...h]);
5751
};
5852

59-
const [store, setStore] = useState(() => createWorkflowStore({}, () => { }));
53+
const [store, setStore] = useState(() => createWorkflowStore({}, () => {}));
6054

6155
const [selectedId, setSelectedId] = useState<string>();
6256
const ref = useRef(null);

assets/dev-server/src/index.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { StrictMode } from "react";
2-
import { createRoot } from "react-dom/client";
1+
import { StrictMode } from 'react';
2+
import { createRoot } from 'react-dom/client';
33

4-
import App from "./App";
4+
import App from './App';
55

6-
new EventSource('/esbuild').addEventListener('change', () => location.reload())
6+
new EventSource('/esbuild').addEventListener('change', () => location.reload());
77

8-
const root = createRoot(document.getElementById("root"));
8+
const root = createRoot(document.getElementById('root'));
99
root.render(
1010
<StrictMode>
1111
<App />

assets/dev-server/src/main.css

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

55
#root {
66
height: 100vh;
7-
}
7+
}

assets/fonts/fira-code.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@
4040
font-weight: 300 700;
4141
font-style: normal;
4242
}
43-

assets/fonts/inter.css

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,136 @@
11
@font-face {
22
font-family: 'Inter';
3-
font-style: normal;
3+
font-style: normal;
44
font-weight: 100;
55
font-display: swap;
6-
src: url("Inter-Thin.woff2") format("woff2");
6+
src: url('Inter-Thin.woff2') format('woff2');
77
}
88
@font-face {
99
font-family: 'Inter';
10-
font-style: italic;
10+
font-style: italic;
1111
font-weight: 100;
1212
font-display: swap;
13-
src: url("Inter-ThinItalic.woff2") format("woff2");
13+
src: url('Inter-ThinItalic.woff2') format('woff2');
1414
}
1515

1616
@font-face {
1717
font-family: 'Inter';
18-
font-style: normal;
18+
font-style: normal;
1919
font-weight: 200;
2020
font-display: swap;
21-
src: url("Inter-ExtraLight.woff2") format("woff2");
21+
src: url('Inter-ExtraLight.woff2') format('woff2');
2222
}
2323
@font-face {
2424
font-family: 'Inter';
25-
font-style: italic;
25+
font-style: italic;
2626
font-weight: 200;
2727
font-display: swap;
28-
src: url("Inter-ExtraLightItalic.woff2") format("woff2");
28+
src: url('Inter-ExtraLightItalic.woff2') format('woff2');
2929
}
3030

3131
@font-face {
3232
font-family: 'Inter';
33-
font-style: normal;
33+
font-style: normal;
3434
font-weight: 300;
3535
font-display: swap;
36-
src: url("Inter-Light.woff2") format("woff2");
36+
src: url('Inter-Light.woff2') format('woff2');
3737
}
3838
@font-face {
3939
font-family: 'Inter';
40-
font-style: italic;
40+
font-style: italic;
4141
font-weight: 300;
4242
font-display: swap;
43-
src: url("Inter-LightItalic.woff2") format("woff2");
43+
src: url('Inter-LightItalic.woff2') format('woff2');
4444
}
4545

4646
@font-face {
4747
font-family: 'Inter';
48-
font-style: normal;
48+
font-style: normal;
4949
font-weight: 400;
5050
font-display: swap;
51-
src: url("Inter-Regular.woff2") format("woff2");
51+
src: url('Inter-Regular.woff2') format('woff2');
5252
}
5353
@font-face {
5454
font-family: 'Inter';
55-
font-style: italic;
55+
font-style: italic;
5656
font-weight: 400;
5757
font-display: swap;
58-
src: url("Inter-Italic.woff2") format("woff2");
58+
src: url('Inter-Italic.woff2') format('woff2');
5959
}
6060

6161
@font-face {
6262
font-family: 'Inter';
63-
font-style: normal;
63+
font-style: normal;
6464
font-weight: 500;
6565
font-display: swap;
66-
src: url("Inter-Medium.woff2") format("woff2");
66+
src: url('Inter-Medium.woff2') format('woff2');
6767
}
6868
@font-face {
6969
font-family: 'Inter';
70-
font-style: italic;
70+
font-style: italic;
7171
font-weight: 500;
7272
font-display: swap;
73-
src: url("Inter-MediumItalic.woff2") format("woff2");
73+
src: url('Inter-MediumItalic.woff2') format('woff2');
7474
}
7575

7676
@font-face {
7777
font-family: 'Inter';
78-
font-style: normal;
78+
font-style: normal;
7979
font-weight: 600;
8080
font-display: swap;
81-
src: url("Inter-SemiBold.woff2") format("woff2");
81+
src: url('Inter-SemiBold.woff2') format('woff2');
8282
}
8383
@font-face {
8484
font-family: 'Inter';
85-
font-style: italic;
85+
font-style: italic;
8686
font-weight: 600;
8787
font-display: swap;
88-
src: url("Inter-SemiBoldItalic.woff2") format("woff2");
88+
src: url('Inter-SemiBoldItalic.woff2') format('woff2');
8989
}
9090

9191
@font-face {
9292
font-family: 'Inter';
93-
font-style: normal;
93+
font-style: normal;
9494
font-weight: 700;
9595
font-display: swap;
96-
src: url("Inter-Bold.woff2") format("woff2");
96+
src: url('Inter-Bold.woff2') format('woff2');
9797
}
9898
@font-face {
9999
font-family: 'Inter';
100-
font-style: italic;
100+
font-style: italic;
101101
font-weight: 700;
102102
font-display: swap;
103-
src: url("Inter-BoldItalic.woff2") format("woff2");
103+
src: url('Inter-BoldItalic.woff2') format('woff2');
104104
}
105105

106106
@font-face {
107107
font-family: 'Inter';
108-
font-style: normal;
108+
font-style: normal;
109109
font-weight: 800;
110110
font-display: swap;
111-
src: url("Inter-ExtraBold.woff2") format("woff2");
111+
src: url('Inter-ExtraBold.woff2') format('woff2');
112112
}
113113
@font-face {
114114
font-family: 'Inter';
115-
font-style: italic;
115+
font-style: italic;
116116
font-weight: 800;
117117
font-display: swap;
118-
src: url("Inter-ExtraBoldItalic.woff2") format("woff2");
118+
src: url('Inter-ExtraBoldItalic.woff2') format('woff2');
119119
}
120120

121121
@font-face {
122122
font-family: 'Inter';
123-
font-style: normal;
123+
font-style: normal;
124124
font-weight: 900;
125125
font-display: swap;
126-
src: url("Inter-Black.woff2") format("woff2");
126+
src: url('Inter-Black.woff2') format('woff2');
127127
}
128128
@font-face {
129129
font-family: 'Inter';
130-
font-style: italic;
130+
font-style: italic;
131131
font-weight: 900;
132132
font-display: swap;
133-
src: url("Inter-BlackItalic.woff2") format("woff2");
133+
src: url('Inter-BlackItalic.woff2') format('woff2');
134134
}
135135

136136
/* -------------------------------------------------------
@@ -148,18 +148,17 @@ Usage:
148148
font-display: swap;
149149
font-style: normal;
150150
font-named-instance: 'Regular';
151-
src: url("Inter-roman.var.woff2") format("woff2");
151+
src: url('Inter-roman.var.woff2') format('woff2');
152152
}
153153
@font-face {
154154
font-family: 'Inter var';
155155
font-weight: 100 900;
156156
font-display: swap;
157157
font-style: italic;
158158
font-named-instance: 'Italic';
159-
src: url("Inter-italic.var.woff2") format("woff2");
159+
src: url('Inter-italic.var.woff2') format('woff2');
160160
}
161161

162-
163162
/* --------------------------------------------------------------------------
164163
[EXPERIMENTAL] Multi-axis, single variable font.
165164
@@ -178,5 +177,5 @@ explicitly, e.g.
178177
font-weight: 100 900;
179178
font-display: swap;
180179
font-style: oblique 0deg 10deg;
181-
src: url("Inter.var.woff2") format("woff2");
180+
src: url('Inter.var.woff2') format('woff2');
182181
}

0 commit comments

Comments
 (0)