Skip to content

Cleaning up #519

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.

Sign up for GitHub

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

Merged
agarny merged 4 commits into from
Jun 11, 2026
Merged

Cleaning up #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ec612b
New version.
agarny Jun 11, 2026
fa17e6b
Updated our dependencies.
agarny Jun 11, 2026
0011637
Renamed a few files.
agarny Jun 11, 2026
b0a6e28
Context menu: fixed an issue with the colour of the text.
agarny Jun 11, 2026
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
6 changes: 3 additions & 3 deletions bun.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"url": "git+https://github.com/opencor/webapp.git"
},
"type": "module",
"version": "0.20260611.1",
"version": "0.20260611.2",
"engines": {
"bun": ">=1.2.0"
},
Expand Down
6 changes: 3 additions & 3 deletions src/renderer/bun.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/renderer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"./style.css": "./dist/opencor.css"
},
"version": "0.20260611.1",
"version": "0.20260611.2",
"libopencorVersion": "0.20260604.0",
"scripts": {
"build": "vite build && bun scripts/generate.version.js",
Expand Down
5 changes: 5 additions & 0 deletions src/renderer/src/assets/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ body {
transition: none !important;
}

.p-contextmenu-item-content,
.p-contextmenu-item-link {
color: var(--p-contextmenu-item-color, var(--p-text-color));
}

a {
color: var(--p-button-link-color);
}
Expand Down
12 changes: 6 additions & 6 deletions src/renderer/src/components/OpenCOR.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<SafeBlockUI ref="safeBlockUiRef" class="opencor" :class="isFullWebApp ? 'with-main-menu' : ''"
<SafeBlockUIWidget ref="safeBlockUiRef" class="opencor" :class="isFullWebApp ? 'with-main-menu' : ''"
:blocked="compBlockUiEnabled"
@click="activateInstance"
@focus="activateInstance"
Expand Down Expand Up @@ -110,7 +110,7 @@
@close="webUpdateAvailableVisible = false"
/>
</div>
</SafeBlockUI>
</SafeBlockUIWidget>
</template>

<script setup lang="ts">
Expand Down Expand Up @@ -146,7 +146,7 @@ import ContentsComponent from '../components/ContentsComponent.vue';
import * as locApi from '../libopencor/locApi';

import { provideDialogState } from './dialogs/BaseDialog.vue';
import SafeBlockUI from './widgets/SafeBlockUI.vue';
import SafeBlockUIWidget from './widgets/SafeBlockUIWidget.vue';
import MainMenu from './MainMenu.vue';

const props = defineProps<IOpenCORProps>();
Expand Down Expand Up @@ -273,7 +273,7 @@ defineExpose({

const { isDialogActive } = provideDialogState();

const safeBlockUiRef = vue.ref<InstanceType<typeof SafeBlockUI> | null>(null);
const safeBlockUiRef = vue.ref<InstanceType<typeof SafeBlockUIWidget> | null>(null);
const mainMenuRef = vue.ref<InstanceType<typeof MainMenu> | null>(null);
const filesRef = vue.ref<HTMLElement | null>(null);
const issues = vue.ref<locApi.IIssue[]>([]);
Expand Down Expand Up @@ -332,15 +332,15 @@ const compUiEnabled = vue.computed<boolean>(() => {
return !compBlockUiEnabled.value && !isDialogActive.value;
});

// Remove any leftover SafeBlockUI masks when unblocking.
// Remove any leftover SafeBlockUIWidget masks when unblocking.
// Note: this is to ensure that we don't end up with leftover masks if the block event is emitted multiple times before
// the unblock event is emitted, which can lead to multiple masks being created and not properly removed.

vue.watch(
compBlockUiEnabled,
(newCompBlockUiEnabled: boolean) => {
if (!newCompBlockUiEnabled) {
const safeBlockUi = safeBlockUiRef.value as unknown as InstanceType<typeof SafeBlockUI> | null;
const safeBlockUi = safeBlockUiRef.value as unknown as InstanceType<typeof SafeBlockUIWidget> | null;

if (!safeBlockUi) {
return;
Expand Down
56 changes: 28 additions & 28 deletions src/renderer/src/components/dialogs/SimulationExperimentViewSettingsDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<div class="settings-form">
<div class="form-row">
<InputScientificNumber v-model="localSettings.simulation.initialPoint" class="form-field"
<InputScientificNumberWidget v-model="localSettings.simulation.initialPoint" class="form-field"
:label="`Initial point (${voiUnit})`"
size="small"
/>
Expand All @@ -50,17 +50,17 @@
</div>
</div>
<div class="form-row">
<InputScientificNumber v-model="localSettings.simulation.startingPoint" class="form-field"
<InputScientificNumberWidget v-model="localSettings.simulation.startingPoint" class="form-field"
:label="`Starting point (${voiUnit})`"
size="small"
/>
<InputScientificNumber v-model="localSettings.simulation.endingPoint" class="form-field"
<InputScientificNumberWidget v-model="localSettings.simulation.endingPoint" class="form-field"
:label="`Ending point (${voiUnit})`"
size="small"
/>
</div>
<div class="form-row">
<InputScientificNumber v-model="localSettings.simulation.pointInterval" class="form-field"
<InputScientificNumberWidget v-model="localSettings.simulation.pointInterval" class="form-field"
:label="`Point interval (${voiUnit})`"
size="small"
/>
Expand Down Expand Up @@ -93,7 +93,7 @@

<div class="settings-form">
<div class="form-row">
<InputScientificNumber v-model="localSettings.solvers.cvodeMaximumStep" class="form-field"
<InputScientificNumberWidget v-model="localSettings.solvers.cvodeMaximumStep" class="form-field"
:label="`CVODE's maximum step (${voiUnit})`"
size="small"
/>
Expand Down Expand Up @@ -200,7 +200,7 @@
</FloatLabel>
</div>
<div class="form-row">
<InputScientificNumber v-model="input.defaultValue" class="form-field"
<InputScientificNumberWidget v-model="input.defaultValue" class="form-field"
label="Default value"
size="small"
/>
Expand Down Expand Up @@ -231,15 +231,15 @@
<!-- Scalar model input fields -->

<div v-if="locApi.isScalarInput(input)" class="form-row">
<InputScientificNumber v-model="input.minimumValue" class="form-field"
<InputScientificNumberWidget v-model="input.minimumValue" class="form-field"
label="Minimum value"
size="small"
/>
<InputScientificNumber v-model="input.maximumValue" class="form-field"
<InputScientificNumberWidget v-model="input.maximumValue" class="form-field"
label="Maximum value"
size="small"
/>
<InputScientificNumber v-model="input.stepValue" class="form-field"
<InputScientificNumberWidget v-model="input.stepValue" class="form-field"
label="Step value (optional)"
:allowEmpty="true"
size="small"
Expand Down Expand Up @@ -271,7 +271,7 @@
<InputText v-model="possibleValue.name" class="w-full" size="small" />
<label>Name</label>
</FloatLabel>
<InputScientificNumber v-model="possibleValue.value" class="form-field"
<InputScientificNumberWidget v-model="possibleValue.value" class="form-field"
label="Value"
size="small"
/>
Expand Down Expand Up @@ -348,12 +348,12 @@
/>
<label>Model parameter</label>
</FloatLabel>
<Tooltip :content="parameterValueTooltip()" class="flex-1">
<TooltipWidget :content="parameterValueTooltip()" class="flex-1">
<FloatLabel variant="on" class="w-full">
<InputText v-model="parameter.value" class="w-full" size="small" />
<label>Value</label>
</FloatLabel>
</Tooltip>
</TooltipWidget>
<Button
icon="pi pi-times"
text rounded
Expand Down Expand Up @@ -520,18 +520,18 @@
<!-- Description and VOI expression -->

<div class="form-row">
<Tooltip :content="externalDataDescriptionTooltip()" class="flex-1">
<TooltipWidget :content="externalDataDescriptionTooltip()" class="flex-1">
<FloatLabel variant="on" class="w-full">
<InputText v-model="externalDataFile.description" class="w-full" size="small" />
<label>Description (optional)</label>
</FloatLabel>
</Tooltip>
<Tooltip :content="externalDataVoiExpressionTooltip()" class="flex-1">
</TooltipWidget>
<TooltipWidget :content="externalDataVoiExpressionTooltip()" class="flex-1">
<FloatLabel variant="on" class="w-full">
<InputText v-model="externalDataFile.voiExpression" class="w-full" size="small" />
<label>VOI expression (optional)</label>
</FloatLabel>
</Tooltip>
</TooltipWidget>
</div>

<!-- External data entries -->
Expand Down Expand Up @@ -663,26 +663,26 @@
</div>
<div class="w-full">
<div class="mb-3">
<Tooltip :content="traceNameTooltip()" class="flex-1">
<TooltipWidget :content="traceNameTooltip()" class="flex-1">
<FloatLabel variant="on" class="w-full">
<InputText v-model="plot.name" class="w-full" size="small" />
<label>Name (optional)</label>
</FloatLabel>
</Tooltip>
</TooltipWidget>
</div>
<div class="entry-row">
<Tooltip :content="xyValueTooltip(true)" class="flex-1">
<TooltipWidget :content="xyValueTooltip(true)" class="flex-1">
<FloatLabel variant="on" class="w-full">
<InputText v-model="plot.xValue" class="w-full" size="small" />
<label>X value</label>
</FloatLabel>
</Tooltip>
<Tooltip :content="xyValueTooltip(false)" class="flex-1">
</TooltipWidget>
<TooltipWidget :content="xyValueTooltip(false)" class="flex-1">
<FloatLabel variant="on" class="w-full">
<InputText v-model="plot.yValue" class="w-full" size="small" />
<label>Y value</label>
</FloatLabel>
</Tooltip>
</TooltipWidget>
</div>
</div>
<Button
Expand All @@ -708,26 +708,26 @@
</div>
<div class="w-full">
<div class="mb-3">
<Tooltip :content="traceNameTooltip()" class="flex-1">
<TooltipWidget :content="traceNameTooltip()" class="flex-1">
<FloatLabel variant="on" class="w-full">
<InputText v-model="trace.name" class="w-full" size="small" />
<label>Name (optional)</label>
</FloatLabel>
</Tooltip>
</TooltipWidget>
</div>
<div class="entry-row">
<Tooltip :content="xyValueTooltip(true)" class="flex-1">
<TooltipWidget :content="xyValueTooltip(true)" class="flex-1">
<FloatLabel variant="on" class="w-full">
<InputText v-model="trace.xValue" class="w-full" size="small" />
<label>X value</label>
</FloatLabel>
</Tooltip>
<Tooltip :content="xyValueTooltip(false)" class="flex-1">
</TooltipWidget>
<TooltipWidget :content="xyValueTooltip(false)" class="flex-1">
<FloatLabel variant="on" class="w-full">
<InputText v-model="trace.yValue" class="w-full" size="small" />
<label>Y value</label>
</FloatLabel>
</Tooltip>
</TooltipWidget>
</div>
</div>
<Button
Expand Down
Loading
Loading