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

feat: funman output settings #5226

Merged
merged 19 commits into from
Oct 25, 2024
+516 −409
Merged

feat: funman output settings #5226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
55d4036
move output component into main component as it'll be easier to acces…
shawnyama Oct 21, 2024
afc50c8
Merge branch 'main' into funman-output-settings
shawnyama Oct 21, 2024
6e6fbe7
raw output view
shawnyama Oct 21, 2024
6584bdc
save output settings in state
shawnyama Oct 22, 2024
a5f34ea
setup settings
shawnyama Oct 22, 2024
157fde2
better filter for state charts
shawnyama Oct 22, 2024
df71ab7
Merge branch 'main' into funman-output-settings
shawnyama Oct 22, 2024
7b8f9d8
init all charts to be shown
shawnyama Oct 22, 2024
c59eaa3
Merge branch 'main' into funman-output-settings
shawnyama Oct 22, 2024
d0a1bcd
Merge branch 'main' into funman-output-settings
shawnyama Oct 23, 2024
32bb4aa
resolve conflicts
shawnyama Oct 23, 2024
4d4bce3
class bind
shawnyama Oct 23, 2024
75c77e1
Merge branch 'main' into funman-output-settings
shawnyama Oct 23, 2024
94be5b6
Merge branch 'main' into funman-output-settings
shawnyama Oct 24, 2024
9a5128b
chart setting type
shawnyama Oct 24, 2024
0e36ddf
Merge branch 'main' into funman-output-settings
shawnyama Oct 24, 2024
10ee61b
Merge branch 'main' into funman-output-settings
shawnyama Oct 24, 2024
04bf4db
Merge branch 'main' into funman-output-settings
shawnyama Oct 25, 2024
8101315
change settings to variable
shawnyama Oct 25, 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
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/assets/css/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@

.ace-editor {
border: 1px solid var(--surface-border);
border-radius: var(--border-radius-medium);
border-radius: var(--border-radius-medium);
}

/* Markdown style overrides */
.markdown-text {
& h1 {
Expand Down
4 changes: 0 additions & 4 deletions packages/client/hmi-client/src/components/code/tera-code.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,10 +510,6 @@ header > section {
gap: 0.5rem;
}

.ace-editor {
border-top: 1px solid var(--surface-border-light);
}

.dynamic {
position: absolute;
background-color: var(--surface-highlight);
Expand Down
8 changes: 5 additions & 3 deletions packages/client/hmi-client/src/components/widgets/tera-chart-settings-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<div class="chart-settings-item">
<h6>{{ settings.name }}</h6>
<div class="btn-group">
<Button label="Open chart settings" outlined severity="secondary" size="small" @click="$emit('open')" />
<Button icon="pi pi-trash" rounded text @click="$emit('remove', settings.id)" />
<Button icon="pi pi-cog" rounded text @click="$emit('open')" />
<Button icon="pi pi-times" rounded text @click="$emit('remove', settings.id)" />
</div>
</div>
</template>
Expand All @@ -26,9 +26,11 @@ defineEmits(['open', 'remove']);
padding: var(--gap-3);
padding-left: var(--gap-4);
background: var(--surface-50);
display: flex;
align-items: center;
justify-content: space-between;
}
.btn-group {
display: flex;
justify-content: space-between;
}
</style>
1 change: 1 addition & 0 deletions packages/client/hmi-client/src/components/widgets/tera-input-number.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<main :class="{ error: getErrorMessage }" @click.self.stop="focusInput">
<i v-if="icon" :class="icon" />
<input
:class="$attrs.class"
@click.stop
ref="inputField"
:disabled="getDisabled"
Expand Down
2 changes: 1 addition & 1 deletion ...i-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@
v-model:is-open="isOutputSettingsPanelOpen"
direction="right"
class="input-config"
header="Output Settings"
header="Output settings"
content-width="360px"
>
<template #overlay>
Expand Down
5 changes: 3 additions & 2 deletions packages/client/hmi-client/src/components/workflow/ops/funman/funman-operation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Operation, WorkflowOperationTypes, BaseState } from '@/types/workflow';
import type { FunmanInterval, TimeSpan } from '@/types/Types';
import { ChartSetting } from '@/types/common';

const DOCUMENTATION_URL = 'https://github.com/siftech/funman';

Expand Down Expand Up @@ -51,9 +52,8 @@ export interface FunmanOperationState extends BaseState {
compartmentalConstraint: CompartmentalConstraint;
constraintGroups: ConstraintGroup[];
requestParameters: RequestParameter[];
chartSettings: ChartSetting[] | null;
mwdchang marked this conversation as resolved.
Show resolved Hide resolved
currentProgress: number;
// selected state in ouptut
trajectoryState?: string;
}

export const FunmanOperation: Operation = {
Expand All @@ -78,6 +78,7 @@ export const FunmanOperation: Operation = {
requestParameters: [],
inProgressId: '',
runId: '',
chartSettings: null,
currentProgress: 0
};
return init;
Expand Down
Loading