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

Move the operator component under the components folder. #2415

Merged
merged 22 commits into from
Dec 13, 2023
Merged

Move the operator component under the components folder. #2415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4d39b45
update yarn
YohannParis Dec 11, 2023
35c1cad
update vite
YohannParis Dec 11, 2023
32e318b
update vue
YohannParis Dec 11, 2023
d678552
random updates
YohannParis Dec 11, 2023
0a8f057
update prettier
YohannParis Dec 11, 2023
f89c89e
Update to Node 20.10.0 LTS
YohannParis Dec 11, 2023
06a064c
Fix some linting issue
YohannParis Dec 11, 2023
5cfa0d2
Update tera-modal.vue
YohannParis Dec 11, 2023
d6e8c91
different to adress the vue issue
YohannParis Dec 11, 2023
74f689c
Merge branch 'main' into yohannparis/documents-to-model-operator
YohannParis Dec 11, 2023
8d5dc23
Update prettier
YohannParis Dec 11, 2023
3d58f12
Update package.json
YohannParis Dec 11, 2023
b2a3c42
Update tera-model-configurations.vue
YohannParis Dec 11, 2023
384a22b
Update Types.ts
YohannParis Dec 11, 2023
e1f1d1a
Update Dockerfile
YohannParis Dec 12, 2023
75d9e28
Merge branch 'main' into yohannparis/documents-to-model-operator
YohannParis Dec 12, 2023
46cc8c1
Update Dockerfile
YohannParis Dec 12, 2023
4e9bd28
Update Dockerfile
YohannParis Dec 12, 2023
ad65b2f
Update reset.css
YohannParis Dec 12, 2023
d9b1015
Merge branch 'main' into yohannparis/documents-to-model-operator
YohannParis Dec 13, 2023
25c7548
Move operator under components
YohannParis Dec 13, 2023
5388723
move tera-operator as well
YohannParis Dec 13, 2023
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
0 ...orkflow/operator/tera-operator-header.vue → ...ponents/operator/tera-operator-header.vue
View file
Open in desktop
File renamed without changes.
0 ...orkflow/operator/tera-operator-inputs.vue → ...ponents/operator/tera-operator-inputs.vue
View file
Open in desktop
File renamed without changes.
0 ...rkflow/operator/tera-operator-outputs.vue → ...onents/operator/tera-operator-outputs.vue
View file
Open in desktop
File renamed without changes.
0 ...ow/operator/tera-operator-placeholder.vue → ...ts/operator/tera-operator-placeholder.vue
View file
Open in desktop
File renamed without changes.
0 ...orkflow/operator/tera-operator-status.vue → ...ponents/operator/tera-operator-status.vue
View file
Open in desktop
File renamed without changes.
0 ...workflow/operator/tera-operator-title.vue → ...mponents/operator/tera-operator-title.vue
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...hmi-client/src/workflow/tera-operator.vue → ...src/components/operator/tera-operator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
import floatingWindow from '@/utils/floating-window';
import router from '@/router';
import { RouteName } from '@/router/routes';
import TeraOperatorHeader from './operator/tera-operator-header.vue';
import TeraOperatorInputs from './operator/tera-operator-inputs.vue';
import TeraOperatorOutputs from './operator/tera-operator-outputs.vue';
import TeraOperatorHeader from '@/components/operator/tera-operator-header.vue';
import TeraOperatorInputs from '@/components/operator/tera-operator-inputs.vue';
import TeraOperatorOutputs from '@/components/operator/tera-operator-outputs.vue';

enum PortDirection {
Input,
Expand Down Expand Up @@ -170,8 +170,8 @@ main {
margin: 0.5rem;
}

& > ul,
& > .content,
& > ul,
& > .content,
& > .content:deep(> *) /* Assumes that the child put in the slot will be wrapped in its own parent tag */ {
display: flex;
flex-direction: column;
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<script setup lang="ts">
import { computed } from 'vue';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import { WorkflowNode } from '@/types/workflow';
import Button from 'primevue/button';
import { CalibrationOperationStateCiemss } from './calibrate-operation';
Expand Down
2 changes: 1 addition & 1 deletion ...client/src/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-node-ciemss.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import TeraSimulateChart from '@/workflow/tera-simulate-chart.vue';
import TeraProgressBar from '@/workflow/tera-progress-bar.vue';
import { getTimespan } from '@/workflow/util';
import { logger } from '@/utils/logger';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import {
CalibrateEnsembleCiemssOperationState,
CalibrateEnsembleCiemssOperation,
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/ops/calibrate-julia/tera-calibrate-node-julia.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<script setup lang="ts">
import { computed } from 'vue';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import { WorkflowNode } from '@/types/workflow';
import Button from 'primevue/button';
import { CalibrationOperationStateJulia } from './calibrate-operation';
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/ops/code-asset/tera-code-asset-node.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { onMounted, ref, computed, watch } from 'vue';
import { Code } from '@/types/Types';
import { useProjects } from '@/composables/project';
import Dropdown from 'primevue/dropdown';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import Button from 'primevue/button';
import { CodeAssetState } from './code-asset-operation';

Expand Down
2 changes: 1 addition & 1 deletion .../client/hmi-client/src/workflow/ops/dataset-transformer/tera-dataset-transformer-node.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import { watch } from 'vue';
import { WorkflowNode, WorkflowPortStatus } from '@/types/workflow';
import Button from 'primevue/button';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import { DatasetTransformerState } from './dataset-transformer-operation';

const emit = defineEmits(['append-input-port', 'open-drilldown']);
Expand Down
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/workflow/ops/dataset/tera-dataset-node.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ import Dropdown from 'primevue/dropdown';
import { downloadRawFile, getDataset } from '@/services/dataset';
import { WorkflowNode } from '@/types/workflow';
import MultiSelect from 'primevue/multiselect';
import TeraOperatorTitle from '@/workflow/operator/tera-operator-title.vue';
import TeraOperatorTitle from '@/components/operator/tera-operator-title.vue';
import Button from 'primevue/button';
import { useProjects } from '@/composables/project';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import { DatasetOperationState } from './dataset-operation';

const props = defineProps<{
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/ops/funman/tera-funman-node.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</template>

<script setup lang="ts">
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import { WorkflowNode } from '@/types/workflow';
import { FunmanOperationState } from '@/workflow/ops/funman/funman-operation';
import Button from 'primevue/button';
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/ops/model-config/tera-model-config-node.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { WorkflowNode } from '@/types/workflow';
import { ModelConfiguration } from '@/types/Types';
import { getModelConfigurations } from '@/services/model';
import Button from 'primevue/button';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import { ModelConfigOperationState } from './model-config-operation';

const props = defineProps<{
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/ops/model-from-code/tera-model-from-code.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ import { addAsset } from '@/services/project';
import { useProjects } from '@/composables/project';
import { useToastService } from '@/services/toast';
import TeraModelSemanticTables from '@/components/model/petrinet/tera-model-semantic-tables.vue';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import TeraModal from '@/components/widgets/tera-modal.vue';
import InputText from 'primevue/inputtext';
import { getCodeAsset, getCodeFileAsText } from '@/services/code';
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/ops/model-optimize/tera-model-optimize-node.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</template>

<script setup lang="ts">
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import { WorkflowNode } from '@/types/workflow';
import Button from 'primevue/button';
import { ModelOptimizeOperationState } from './model-optimize-operation';
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/ops/model-optimize/tera-model-optimize.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
import TeraDrilldownSection from '@/components/drilldown/tera-drilldown-section.vue';
import TeraDrilldownPreview from '@/components/drilldown/tera-drilldown-preview.vue';
import TeraInterventionPolicyGroupForm from '@/components/optimize/tera-intervention-policy-group-form.vue';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import {
ModelOptimizeOperationState,
InterventionPolicyGroup,
Expand Down
2 changes: 1 addition & 1 deletion ...ages/client/hmi-client/src/workflow/ops/model-transformer/tera-model-transformer-node.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { Model } from '@/types/Types';
import { WorkflowNode } from '@/types/workflow';
import { onMounted, ref, watch } from 'vue';
import TeraModelDiagram from '@/components/model/petrinet/model-diagrams/tera-model-diagram.vue';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import Button from 'primevue/button';
import { ModelTransformerState } from './model-transformer-operation';

Expand Down
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/workflow/ops/model/tera-model-node.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ import TeraModelDiagram from '@/components/model/petrinet/model-diagrams/tera-mo
import TeraModelEquation from '@/components/model/petrinet/tera-model-equation.vue';
import { WorkflowNode } from '@/types/workflow';
import SelectButton from 'primevue/selectbutton';
import TeraOperatorTitle from '@/workflow/operator/tera-operator-title.vue';
import TeraOperatorTitle from '@/components/operator/tera-operator-title.vue';
import { useProjects } from '@/composables/project';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import Button from 'primevue/button';
import { ModelOperationState } from './model-operation';

Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/ops/simulate-ciemss/tera-simulate-node-ciemss.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ import {
getSimulation
} from '@/services/models/simulation-service';
import InputNumber from 'primevue/inputnumber';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import { ProgressState, WorkflowNode } from '@/types/workflow';
import { ChartConfig, RunResults } from '@/types/SimulateConfig';
import { Poller, PollerState } from '@/api/api';
Expand Down
2 changes: 1 addition & 1 deletion ...i-client/src/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-node-ciemss.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ import { Poller, PollerState } from '@/api/api';
import TeraSimulateChart from '@/workflow/tera-simulate-chart.vue';
import TeraProgressBar from '@/workflow/tera-progress-bar.vue';
import { logger } from '@/utils/logger';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import {
SimulateEnsembleCiemssOperationState,
SimulateEnsembleCiemssOperation
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/ops/simulate-julia/tera-simulate-node-julia.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<script setup lang="ts">
import _ from 'lodash';
import { ref, watch, computed, onMounted, onUnmounted } from 'vue';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import Button from 'primevue/button';
import Dropdown from 'primevue/dropdown';
import { csvParse } from 'd3';
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/ops/stratify-mira/tera-stratify-node-mira.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<script setup lang="ts">
import { WorkflowNode } from '@/types/workflow';
import TeraOperatorPlaceholder from '@/workflow/operator/tera-operator-placeholder.vue';
import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
import Button from 'primevue/button';
import { StratifyOperationStateMira } from './stratify-mira-operation';

Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/workflow/tera-workflow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ import {
WorkflowOutput
} from '@/types/workflow';
// Operation imports
import TeraOperator from '@/workflow/tera-operator.vue';
import TeraOperator from '@/components/operator/tera-operator.vue';
import Button from 'primevue/button';
import InputText from 'primevue/inputtext';
import Menu from 'primevue/menu';
Expand Down