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.

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

Jamie move suggested config section above context, add counts to accordions, don't show empty tables #2857

Merged
merged 6 commits into from
Feb 28, 2024
Merged

Jamie move suggested config section above context, add counts to accordions, don't show empty tables #2857

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c23c2f
moved suggested configs to top, added count to accordion, added logic…
jamiewaese-uncharted Feb 28, 2024
53b93a1
don't show the datatable if there are no suggested configurations
jamiewaese-uncharted Feb 28, 2024
b7b5106
made buttons Large
jamiewaese-uncharted Feb 28, 2024
ffa19e8
Added (counts) to the Parameters and Initial conditions sections
jamiewaese-uncharted Feb 28, 2024
b681313
Don't show initials and parameters tables if they are empty
jamiewaese-uncharted Feb 28, 2024
accdd9d
Merge branch 'main' into jamie-move-context-input-fields-below-sugges…
YohannParis Feb 28, 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
79 changes: 56 additions & 23 deletions packages/client/hmi-client/src/workflow/ops/model-config/tera-model-config.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,14 @@
<section :tabName="ConfigTabs.Wizard">
<tera-drilldown-section>
<Accordion multiple :active-index="[0, 1, 2, 3, 4]" class="pb-6">
<AccordionTab header="Context">
<p class="text-sm mb-1">Name</p>
<InputText
class="context-item"
placeholder="Enter a name for this configuration"
v-model="knobs.name"
/>
<p class="text-sm mb-1 mt-3">Description</p>
<Textarea
class="context-item"
placeholder="Enter a description"
v-model="knobs.description"
/>
</AccordionTab>
<AccordionTab v-if="model" header="Suggested Configurations">
<AccordionTab v-if="model">
<template #header>
Suggested configurations<span class="artifact-amount"
>({{ suggestedConfirgurationContext.tableData.length }})</span
>
<Button
outlined
label="Extract configurations from document"
label="Extract configurations from a document"
size="small"
icon="pi pi-cog"
@click.stop="extractConfigurations"
Expand All @@ -41,10 +30,11 @@
</template>

<DataTable
v-if="suggestedConfirgurationContext.tableData.length > 0"
:value="suggestedConfirgurationContext.tableData"
size="small"
data-key="id"
paginator
:paginator="suggestedConfirgurationContext.tableData.length > 5"
:rows="5"
sort-field="createdOn"
:sort-order="-1"
Expand Down Expand Up @@ -90,13 +80,35 @@
<Vue3Lottie :animationData="EmptySeed" :height="200" :width="200"></Vue3Lottie>
</template>
</DataTable>
<section v-else>
<p class="empty-section">No configurations found.</p>
</section>
</AccordionTab>
<AccordionTab header="Context">
<p class="text-sm mb-1">Name</p>
<InputText
class="context-item"
placeholder="Enter a name for this configuration"
v-model="knobs.name"
/>
<p class="text-sm mb-1 mt-3">Description</p>
<Textarea
class="context-item"
placeholder="Enter a description"
v-model="knobs.description"
/>
</AccordionTab>
<AccordionTab header="Diagram">
<tera-model-diagram v-if="model" :model="model" :is-editable="false" />
</AccordionTab>
<AccordionTab header="Initials">
<AccordionTab>
<template #header>
Initial variable values<span class="artifact-amount"
>({{ tableFormattedInitials.length }})</span
>
</template>
<tera-model-config-table
v-if="modelConfiguration"
v-if="modelConfiguration && tableFormattedInitials.length > 0"
:model-configuration="modelConfiguration"
:data="tableFormattedInitials"
@update-value="updateConfigInitial"
Expand All @@ -106,10 +118,16 @@
}
"
/>
<section v-else>
<p class="empty-section">No initial values found.</p>
</section>
</AccordionTab>
<AccordionTab header="Parameters">
<AccordionTab>
<template #header>
Parameters<span class="artifact-amount">({{ tableFormattedParams.length }})</span>
</template>
<tera-model-config-table
v-if="modelConfiguration"
v-if="modelConfiguration && tableFormattedParams.length > 0"
:model-configuration="modelConfiguration"
:data="tableFormattedParams"
@update-value="updateConfigParam"
Expand All @@ -119,17 +137,21 @@
}
"
/>
<section v-else>
<p class="empty-section">No parameters found.</p>
</section>
</AccordionTab>
</Accordion>
<template #footer>
<Button
outlined
size="large"
:disabled="isSaveDisabled"
label="Run"
icon="pi pi-play"
@click="createConfiguration"
/>
<Button style="margin-left: auto" label="Close" @click="emit('close')" />
<Button style="margin-left: auto" size="large" label="Close" @click="emit('close')" />
</template>
</tera-drilldown-section>
</section>
Expand All @@ -141,7 +163,7 @@
label="Run"
outlined
severity="secondary"
size="small"
size="large"
@click="runFromCode"
/>
</div>
Expand Down Expand Up @@ -759,6 +781,17 @@ onUnmounted(() => {
gap: var(--gap);
}

.artifact-amount {
font-size: var(--font-caption);
color: var(--text-color-subdued);
margin-left: 0.25rem;
}
.empty-section {
color: var(--text-color-subdued);
}
.p-datatable.p-datatable-sm :deep(.p-datatable-tbody > tr > td) {
padding: 0;
}
.context-item {
width: 100%;
}
Expand Down
Loading