diff --git a/packages/client/hmi-client/src/components/drilldown/tera-drilldown-header.vue b/packages/client/hmi-client/src/components/drilldown/tera-drilldown-header.vue index 7b40c1b2ee..7f48f52fd7 100644 --- a/packages/client/hmi-client/src/components/drilldown/tera-drilldown-header.vue +++ b/packages/client/hmi-client/src/components/drilldown/tera-drilldown-header.vue @@ -74,7 +74,7 @@ header .title { header .tabs-row { justify-content: space-between; align-items: end; - gap: var(--gap); + gap: var(--gap-1); } header .tabs-row:deep(.p-tabview .p-tabview-panels) { diff --git a/packages/client/hmi-client/src/components/model/model-parts/tera-model-part-entry.vue b/packages/client/hmi-client/src/components/model/model-parts/tera-model-part-entry.vue index 90cdd689db..3f0f373a36 100644 --- a/packages/client/hmi-client/src/components/model/model-parts/tera-model-part-entry.vue +++ b/packages/client/hmi-client/src/components/model/model-parts/tera-model-part-entry.vue @@ -137,6 +137,7 @@ h6 { .description { grid-area: description; + color: var(--text-color-subdued); } .unit { diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue index 1d18e3a803..6a42aca96b 100644 --- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue +++ b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue @@ -1,16 +1,20 @@ - - - - {{ initialId }} - {{ '| ' + name }} - - Unit - {{ unit }} - - - {{ description }} - + + + {{ initialId }} + {{ '| ' + name }} + + Unit + {{ unit }} + + + Concept + {{ concept }} + + + {{ description }} + + - + + diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue index 8e6996b5dd..10baeaef92 100644 --- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue +++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue @@ -41,7 +41,7 @@ - + @@ -80,7 +80,7 @@ - + emit('update-state', state)" @update:selection="onSelection" > - - emit('update-state', state)" /> - @@ -65,7 +63,7 @@ - + - - Some metadata is missing from these values. This information can be added manually to the attached model. - - - - + + + Some metadata is missing from these values. This information can be added manually to the attached model. + + + + + + + + + + + @@ -221,6 +233,7 @@ import TeraNotebookError from '@/components/drilldown/tera-notebook-error.vue'; import TeraNotebookJupyterInput from '@/components/llm/tera-notebook-jupyter-input.vue'; import TeraModelDiagram from '@/components/model/petrinet/model-diagrams/tera-model-diagram.vue'; import TeraModelParts from '@/components/model/tera-model-parts.vue'; +import TeraObservables from '@/components/model/model-parts/tera-observables.vue'; import TeraModal from '@/components/widgets/tera-modal.vue'; import teraNotebookJupyterThoughtOutput from '@/components/llm/tera-notebook-jupyter-thought-output.vue'; import TeraInitialTable from '@/components/model/petrinet/tera-initial-table.vue'; @@ -240,7 +253,7 @@ import { } from '@/services/model-configurations'; import { useToastService } from '@/services/toast'; import type { Model, ModelConfiguration, TaskResponse, ClientEvent } from '@/types/Types'; -import { ClientEventType, TaskStatus } from '@/types/Types'; +import { ClientEventType, Observable, TaskStatus } from '@/types/Types'; import type { WorkflowNode } from '@/types/workflow'; import { OperatorStatus } from '@/types/workflow'; import { logger } from '@/utils/logger'; @@ -288,6 +301,15 @@ const knobs = ref({ transientModelConfig: blankModelConfig }); +const calibratedConfigObservables = computed(() => + knobs.value.transientModelConfig.observableSemanticList.map(({ referenceId, states, expression }) => ({ + id: referenceId, + name: referenceId, + states, + expression + })) +); + const sanityCheckErrors = ref([]); const isSaveDisabled = computed(() => knobs.value.transientModelConfig.name === ''); @@ -675,6 +697,10 @@ onUnmounted(() => { background-color: var(--surface-0) !important; } +:deep(.p-accordion-content) { + padding-bottom: var(--gap-2); +} + #notebook-section:deep(main) { gap: var(--gap-small); position: relative; diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-petrinet-tables.vue b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-petrinet-tables.vue deleted file mode 100644 index e69de29bb2..0000000000