Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mrc-5490 Add graph #207

Merged
merged 97 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
b3e1726
migrate changes from POC
EmmaLRussell Jun 26, 2024
7f846b0
merge with mrc-5440
EmmaLRussell Jun 27, 2024
a576227
working version as per POC
EmmaLRussell Jun 27, 2024
b34ed78
UI tweaks from review
EmmaLRussell Jun 27, 2024
78623f6
refactor selectedVariabled component into graphConfigs
EmmaLRussell Jun 27, 2024
4fdf8cb
add graphs UI to options tab
EmmaLRussell Jun 27, 2024
723dcd9
use mixin for drag variables
EmmaLRussell Jun 27, 2024
1d7ea2d
use mixin for drop
EmmaLRussell Jun 27, 2024
644b537
variable order should match that in mode
EmmaLRussell Jun 27, 2024
1db8c55
unit tests for GraphConfig component
EmmaLRussell Jun 27, 2024
b9df2c3
add GraphConfigs tests
EmmaLRussell Jun 28, 2024
2f0ec80
unit tests
EmmaLRussell Jul 1, 2024
1fdd74e
playwright tests
EmmaLRussell Jul 1, 2024
1872477
lint and format
EmmaLRussell Jul 1, 2024
6d58e14
fix test
EmmaLRussell Jul 1, 2024
665b90b
add util to browser test and add delete button test
EmmaLRussell Jul 1, 2024
632fe5e
format
EmmaLRussell Jul 1, 2024
3ce85fa
remove unused change
EmmaLRussell Jul 1, 2024
f49637b
delete graph
EmmaLRussell Jul 1, 2024
ecd56a7
unit tests
EmmaLRussell Jul 1, 2024
d005e6f
add browser test
EmmaLRussell Jul 1, 2024
97f0fdf
fix typo
EmmaLRussell Jul 1, 2024
217b3fb
lint
EmmaLRussell Jul 1, 2024
cd1acd7
updates for PR comments
EmmaLRussell Jul 2, 2024
8c572de
generate width of legend from maximum length of selected variable
EmmaLRussell Jul 2, 2024
2723970
merge with mrc-5490
EmmaLRussell Jul 3, 2024
803f8da
works for x,y zoom
EmmaLRussell Jul 4, 2024
10cd428
working for single axis zoom
EmmaLRussell Jul 4, 2024
2de136f
use plotly axis type for last Y axis from Zoom
EmmaLRussell Jul 4, 2024
69a5a4c
use layout axis type for linked x axis
EmmaLRussell Jul 4, 2024
cbe818a
shared layout code
EmmaLRussell Jul 4, 2024
0adb378
Merge pull request #208 from mrc-ide/mrc-5441
EmmaLRussell Jul 4, 2024
885c282
comments
EmmaLRussell Jul 5, 2024
7a682f2
Merge branch 'mrc-5490' into mrc-5484
EmmaLRussell Jul 5, 2024
05b0a9d
use uid to retain graph component state
EmmaLRussell Jul 5, 2024
6de251c
implement in Stochastic
EmmaLRussell Jul 6, 2024
aae0884
wodin plot tests
EmmaLRussell Jul 7, 2024
0d8e237
fix unit tests and add e2e test
EmmaLRussell Jul 8, 2024
9812503
lint
EmmaLRussell Jul 8, 2024
018a165
lint and format
EmmaLRussell Jul 8, 2024
a770eaf
do not include graph config id when serialise
EmmaLRussell Jul 8, 2024
58bb66e
do not serialise graph config ids
EmmaLRussell Jul 8, 2024
3400f90
fix type error;
EmmaLRussell Jul 8, 2024
ed0caa0
another type fix
EmmaLRussell Jul 8, 2024
4200367
per graph settings, with separate fit plot settings
EmmaLRussell Jul 9, 2024
2b4b367
styling
EmmaLRussell Jul 9, 2024
8f49dcf
PR comments
EmmaLRussell Jul 16, 2024
4d1581f
fix test
EmmaLRussell Jul 16, 2024
ff143a4
lint
EmmaLRussell Jul 16, 2024
3e13370
Merge pull request #209 from mrc-ide/mrc-5484
EmmaLRussell Jul 16, 2024
0e3f903
fix delete bug, provide graph config to plots as props
EmmaLRussell Jul 17, 2024
bf59118
do not show graph configs on Options Tab if Fit tab is open
EmmaLRussell Jul 23, 2024
0ae34f5
unit tests
EmmaLRussell Jul 24, 2024
e8f63d6
fix e2e tests
EmmaLRussell Jul 25, 2024
6e3c103
add e2e tests
EmmaLRussell Jul 25, 2024
d8de6d8
lint etc
EmmaLRussell Jul 25, 2024
8ad1cf7
Merge branch 'main' into mrc-5442
EmmaLRussell Jul 25, 2024
4327ff1
merge with epic branch
EmmaLRussell Jul 25, 2024
3aa1ae2
formatting
EmmaLRussell Jul 25, 2024
79a700a
changes following review
EmmaLRussell Jul 25, 2024
80d7375
fix unit tests
EmmaLRussell Jul 25, 2024
c598d71
Show Time label on final graph only
EmmaLRussell Jul 25, 2024
263f598
add tests
EmmaLRussell Jul 25, 2024
68ba6b1
e2e tests
EmmaLRussell Jul 26, 2024
a9f3e0b
add graphConfig prop to sensitivity components
EmmaLRussell Jul 26, 2024
4662e4f
Merge pull request #210 from mrc-ide/mrc-5442
EmmaLRussell Jul 26, 2024
7ab8779
summary plot
EmmaLRussell Jul 26, 2024
035d60d
Merge branch 'mrc-5490' into mrc-5551
EmmaLRussell Jul 26, 2024
ed31fe9
Merge branch 'mrc-5490' into mrc-5485
EmmaLRussell Jul 26, 2024
362814a
Merge pull request #211 from mrc-ide/mrc-5551
EmmaLRussell Jul 30, 2024
2bf7a7c
Merge branch 'mrc-5490' into mrc-5485
EmmaLRussell Jul 30, 2024
747b48c
update redraw watches to ensure stochastic and sensitivity plots upda…
EmmaLRussell Jul 30, 2024
8aab7e2
e2e tests
EmmaLRussell Jul 30, 2024
30a2b1e
unit tests
EmmaLRussell Jul 30, 2024
342c661
restore playwright config
EmmaLRussell Jul 31, 2024
2859341
do not show linked fit data on graphs without linked variables
EmmaLRussell Jul 31, 2024
2c5d328
show sos after all graphs
EmmaLRussell Jul 31, 2024
5209f68
show scatter series as transparent if linked variable is not seleted
EmmaLRussell Aug 1, 2024
d9e3b99
unit tests
EmmaLRussell Aug 1, 2024
403e510
e2e test
EmmaLRussell Aug 2, 2024
9a7eb0f
lint
EmmaLRussell Aug 2, 2024
8c67091
Merge pull request #212 from mrc-ide/mrc-5485
EmmaLRussell Aug 2, 2024
dd701f1
Merge branch 'mrc-5490' into mrc-5545
EmmaLRussell Aug 2, 2024
5c423eb
add graphCount to redraw watches in RunPlot
EmmaLRussell Aug 2, 2024
267bb0f
lint
EmmaLRussell Aug 2, 2024
3825997
Copy on drag it Ctrl key is pressed
EmmaLRussell Aug 2, 2024
9bfb077
test
EmmaLRussell Aug 3, 2024
692bc48
specify drag positions
EmmaLRussell Aug 4, 2024
d3c09a3
format
EmmaLRussell Aug 4, 2024
47f6280
Commit suggested comment change
EmmaLRussell Aug 5, 2024
43689a8
lint
EmmaLRussell Aug 5, 2024
ce43d29
Merge pull request #213 from mrc-ide/mrc-5545
EmmaLRussell Aug 6, 2024
ab858d0
Merge branch 'mrc-5490' into mrc-5443
EmmaLRussell Aug 6, 2024
acb89fe
support Mac Command key
EmmaLRussell Aug 6, 2024
fcbdd63
updates for PR
EmmaLRussell Aug 8, 2024
e9bb88c
Merge pull request #214 from mrc-ide/mrc-5443
EmmaLRussell Aug 16, 2024
0f19023
readme tweak
EmmaLRussell Oct 7, 2024
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
175 changes: 117 additions & 58 deletions app/static/package-lock.json

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

2 changes: 2 additions & 0 deletions app/static/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"@types/d3-format": "^3.0.1",
"axios": "^0.26.0",
"bootstrap": "^5.1.3",
"color": "^4.2.3",
"csv-parse": "^5.2.1",
"d3-format": "^3.1.0",
"i18next": "^22.4.11",
Expand All @@ -50,6 +51,7 @@
"devDependencies": {
"@playwright/test": "1.37.0",
"@types/bootstrap": "^5.2.6",
"@types/color": "^3.0.6",
"@types/jest": "^27.4.0",
"@types/markdown-it": "^12.2.3",
"@types/plotly.js-basic-dist-min": "^2.12.1",
Expand Down
16 changes: 5 additions & 11 deletions app/static/src/app/components/code/CodeTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
</div>
<error-info :error="error"></error-info>
<div class="mt-3">
<vertical-collapse v-if="showSelectedVariables" title="Select variables" collapse-id="select-variables">
<selected-variables></selected-variables>
</vertical-collapse>
<graph-configs-collapsible></graph-configs-collapsible>
</div>
</div>
</template>
Expand All @@ -32,19 +30,18 @@ import CodeEditor from "./CodeEditor.vue";
import { ModelAction } from "../../store/model/actions";
import userMessages from "../../userMessages";
import ErrorInfo from "../ErrorInfo.vue";
import SelectedVariables from "./SelectedVariables.vue";
import VerticalCollapse from "../VerticalCollapse.vue";
import GenericHelp from "../help/GenericHelp.vue";
import GraphConfigsCollapsible from "../graphConfig/GraphConfigsCollapsible.vue";

export default defineComponent({
name: "CodeTab",
components: {
GraphConfigsCollapsible,
GenericHelp,
SelectedVariables,

ErrorInfo,
CodeEditor,
VueFeather,
VerticalCollapse
VueFeather
},
setup() {
const store = useStore();
Expand All @@ -55,8 +52,6 @@ export default defineComponent({
const validIcon = computed(() => (codeIsValid.value ? "check" : "x"));
const iconValidatedClass = computed(() => (codeIsValid.value ? "text-success" : "text-danger"));
const iconClass = computed(() => (codeValidating.value ? "code-validating-icon" : iconValidatedClass.value));
const allVariables = computed<string[]>(() => store.state.model.odinModelResponse?.metadata?.variables || []);
const showSelectedVariables = computed(() => allVariables.value.length && !store.state.model.compileRequired);
const appIsConfigured = computed(() => store.state.configured);
const compile = () => store.dispatch(`model/${ModelAction.CompileModel}`);
const loadingMessage = userMessages.code.isValidating;
Expand All @@ -69,7 +64,6 @@ export default defineComponent({
iconClass,
compile,
error,
showSelectedVariables,
codeHelp,
codeValidating,
loadingMessage
Expand Down
Loading
Loading