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

Jump to bottom

dataset op save semantic - need backend support #5013

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

dataset op save semantic - need backend support #5013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f41929
dataset save-as plumbing
mwdchang Oct 1, 2024
8199653
Merge remote-tracking branch 'origin/main' into dataset-op-save-semantic
mwdchang Oct 2, 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
30 changes: 21 additions & 9 deletions packages/client/hmi-client/src/components/dataset/tera-dataset.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="btn-group">
<tera-asset-enrichment :asset-type="AssetType.Dataset" :assetId="assetId" @finished-job="fetchDataset" />
<Button label="Reset" severity="secondary" outlined @click="reset" />
<Button label="Save as..." severity="secondary" outlined @click="showSaveModal = true" disabled />
<Button label="Save as..." severity="secondary" outlined @click="showSaveModal = true" />
<Button label="Save" :disabled="isSaved" @click="updateDatasetContent" />
</div>
</template>
Expand Down Expand Up @@ -121,15 +121,15 @@
</section>
</tera-asset>
<!-- TODO: Add create dataset support to save modal -->
<!---<tera-save-asset-modal
v-if="transientDataset"
:initial-name="transientDataset.name"
:is-visible="showSaveModal"
<tera-save-asset-modal
:asset="transientDataset"
:asset-type="AssetType.Dataset"
:initial-name="transientDataset?.name"
:is-visible="showSaveModal"
:open-on-save="isWorkflow ? false : true"
@close-modal="showSaveModal = false"
@on-save="showSaveModal = false"
/> -->
@on-save="onModalSave"
/>
</template>

<script setup lang="ts">
Expand Down Expand Up @@ -161,7 +161,7 @@ import TeraAssetEnrichment from '@/components/widgets/tera-asset-enrichment.vue'
import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue';
import TeraDatasetDatatable from '@/components/dataset/tera-dataset-datatable.vue';
import TeraColumnInfo from '@/components/dataset/tera-column-info.vue';
// import TeraSaveAssetModal from '@/components/project/tera-save-asset-modal.vue';
import TeraSaveAssetModal from '@/components/project/tera-save-asset-modal.vue';

const props = defineProps({
assetId: {
Expand All @@ -175,10 +175,14 @@ const props = defineProps({
source: {
type: String as PropType<DatasetSource>,
default: DatasetSource.TERARIUM
},
isWorkflow: {
type: Boolean,
default: false
}
});

const emit = defineEmits(['close-preview']);
const emit = defineEmits(['close-preview', 'on-save']);

const dataset = ref<Dataset | null>(null);
const transientDataset = ref<Dataset | null>(null);
Expand Down Expand Up @@ -231,6 +235,14 @@ const optionsMenuItems = ref([
}
]);

// Save modal
function onModalSave(event: any) {
showSaveModal.value = false;
if (props.isWorkflow) {
emit('on-save', event);
}
}

const isSaved = computed(() => isEqual(dataset.value, transientDataset.value));
const columnInformation = computed(
() =>
Expand Down
7 changes: 5 additions & 2 deletions packages/client/hmi-client/src/components/project/tera-save-asset-modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import Button from 'primevue/button';
import TeraInputText from '@/components/widgets/tera-input-text.vue';
import TeraModal from '@/components/widgets/tera-modal.vue';
import { AssetType, ProgrammingLanguage } from '@/types/Types';
import type { InterventionPolicy, Model, ModelConfiguration } from '@/types/Types';
import type { InterventionPolicy, Model, Dataset, ModelConfiguration } from '@/types/Types';
import type { Workflow } from '@/types/workflow';
import { emptyWorkflow } from '@/services/workflow';
import { setFileExtension } from '@/services/code';
Expand Down Expand Up @@ -115,6 +115,9 @@ function save() {
case AssetType.Model:
(newAsset as Model).header.name = newName.value;
break;
case AssetType.Dataset:
(newAsset as Dataset).name = newName.value;
break;
case AssetType.Workflow:
(newAsset as Workflow).name = newName.value;
break;
Expand All @@ -132,7 +135,7 @@ function save() {
(newAsset as ModelConfiguration).temporary = false;
break;
default:
break;
throw new Error(`Unsupported asset type ${props.assetType}`);
}

// Save method
Expand Down
21 changes: 17 additions & 4 deletions packages/client/hmi-client/src/components/workflow/ops/dataset/tera-dataset-drilldown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
@update-state="(state: any) => emit('update-state', state)"
>
<tera-drilldown-section>
<tera-dataset v-if="node.state.datasetId" :asset-id="node.state.datasetId" />
<tera-dataset v-if="node.state.datasetId" :asset-id="node.state.datasetId" @on-save="onSaveEvent" />
</tera-drilldown-section>
</tera-drilldown>
</template>

<script setup lang="ts">
// Proxy to use tera-dataset via a workflow context

import { cloneDeep } from 'lodash';
import { WorkflowNode } from '@/types/workflow';
import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
import type { CsvAsset, Dataset } from '@/types/Types';
Expand All @@ -21,7 +21,7 @@ import { downloadRawFile, getClimateDatasetPreview, getDataset } from '@/service
import { enrichDataset } from '@/components/dataset/utils';
import TeraDrilldownSection from '@/components/drilldown/tera-drilldown-section.vue';
import TeraDataset from '@/components/dataset/tera-dataset.vue';
import { DatasetOperationState } from './dataset-operation';
import { DatasetOperation, DatasetOperationState } from './dataset-operation';

const dataset = ref<Dataset | null>(null);
const rawContent = ref<CsvAsset | null>(null);
Expand All @@ -30,7 +30,20 @@ const image: Ref<string | undefined> = ref(undefined);
const props = defineProps<{
node: WorkflowNode<DatasetOperationState>;
}>();
const emit = defineEmits(['close', 'update-state']);
const emit = defineEmits(['close', 'update-state', 'append-output']);

const onSaveEvent = (event: any) => {
const state = cloneDeep(props.node.state);
state.datasetId = event.id;
emit('update-state', state);
emit('append-output', {
type: DatasetOperation.outputs[0].type,
label: event.header.name,
value: [event.id],
state,
isSelected: false
});
};

onMounted(async () => {
fetchingDataset.value = true;
Expand Down
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/services/save-asset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import { AssetType } from '@/types/Types';
import { logger } from '@/utils/logger';
import router from '@/router';
import { RouteName } from '@/router/routes';
import type { Model, Code, InterventionPolicy, ModelConfiguration } from '@/types/Types';
import type { Model, Dataset, Code, InterventionPolicy, ModelConfiguration } from '@/types/Types';
import type { Workflow } from '@/types/workflow';
import { createInterventionPolicy, updateInterventionPolicy } from './intervention-policy';
import { createModelConfiguration, updateModelConfiguration } from './model-configurations';

export type AssetToSave = Model | Workflow | ModelConfiguration | InterventionPolicy | File;
export type AssetToSave = Model | Dataset | Workflow | ModelConfiguration | InterventionPolicy | File;

// TODO: Once assets have a type property, we can remove the assetType parameter

Expand Down