Skip to content

[GSK-1400] Add spinner to the run button in the catalog #1252

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

Merged
merged 3 commits into from
Jul 24, 2023
Merged

[GSK-1400] Add spinner to the run button in the catalog #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a50833
Add loading to run slicing function button
henchaves Jul 21, 2023
a3c24b1
Add loading to run transformation function button
henchaves Jul 21, 2023
d39f279
Merge branch 'main' into feature/gsk-1400-add-spinner-to-the-run-butt…
kevinmessiaen Jul 24, 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
48 changes: 27 additions & 21 deletions frontend/src/views/main/project/FiltersCatalog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<SuiteInputListSelector :editing="true" :modelValue="slicingArguments" :inputs="inputType" :project-id="props.projectId" class="pt-0 mt-0" :doc="doc"></SuiteInputListSelector>
<div class="d-flex">
<v-spacer></v-spacer>
<v-btn width="100" small class="primaryLightBtn" color="primaryLight" @click="runSlicingFunction">
<v-btn width="100" small class="primaryLightBtn" color="primaryLight" @click="runSlicingFunction" :loading="isSlicingFunctionRunning">
Run
</v-btn>
</div>
Expand Down Expand Up @@ -182,6 +182,7 @@ const sliceResult = ref<SlicingResultDTO | null>(null);
const selectedDataset = ref<string | null>(null);
const selectedColumn = ref<string | null>(null);
let slicingArguments = ref<{ [name: string]: FunctionInputDTO }>({})
const isSlicingFunctionRunning = ref<boolean>(false);

const panel = ref<number[]>([0]);

Expand Down Expand Up @@ -222,27 +223,32 @@ onActivated(async () => {
});

async function runSlicingFunction() {
const params = Object.values(slicingArguments.value);
if (selected.value!.cellLevel) {
params.push({
isAlias: false,
name: 'column_name',
params: [],
type: 'str',
value: selectedColumn.value
})
isSlicingFunctionRunning.value = true;
try {
const params = Object.values(slicingArguments.value);
if (selected.value!.cellLevel) {
params.push({
isAlias: false,
name: 'column_name',
params: [],
type: 'str',
value: selectedColumn.value
})
}

mixpanel.track("Run slicing function from Catalog", {
slicingFunctionName: selected.value!.name,
inputs: anonymize(params),
});

sliceResult.value = await api.datasetProcessing(props.projectId, selectedDataset.value!, [{
uuid: selected.value!.uuid,
params,
type: 'SLICING',
}]);
} finally {
isSlicingFunctionRunning.value = false;
}

mixpanel.track("Run slicing function from Catalog", {
slicingFunctionName: selected.value!.name,
inputs: anonymize(params),
});

sliceResult.value = await api.datasetProcessing(props.projectId, selectedDataset.value!, [{
uuid: selected.value!.uuid,
params,
type: 'SLICING',
}]);
}

watch(() => selected.value, () => {
Expand Down
49 changes: 28 additions & 21 deletions frontend/src/views/main/project/TransformationsCatalog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

<div class="d-flex">
<v-spacer></v-spacer>
<v-btn width="100" small class="primaryLightBtn" color="primaryLight" @click="runTransformationFunction">
<v-btn width="100" small class="primaryLightBtn" color="primaryLight" @click="runTransformationFunction" :loading="isTransformationFunctionRunning">
Run
</v-btn>
</div>
Expand Down Expand Up @@ -182,6 +182,7 @@ const transformationResult = ref<FunctionInputDTO | null>(null);
const selectedDataset = ref<string | null>(null);
const selectedColumn = ref<string | null>(null);
let transformationArguments = ref<{ [name: string]: FunctionInputDTO }>({})
const isTransformationFunctionRunning = ref<boolean>(false);

const monacoOptions: IEditorOptions = inject('monacoOptions');
const panel = ref<number[]>([0]);
Expand Down Expand Up @@ -222,27 +223,33 @@ onActivated(async () => {
});

async function runTransformationFunction() {
const params = Object.values(transformationArguments.value);
if (selected.value!.cellLevel) {
params.push({
isAlias: false,
name: 'column_name',
params: [],
type: 'str',
value: selectedColumn.value
})
isTransformationFunctionRunning.value = true;
try {
const params = Object.values(transformationArguments.value);
if (selected.value!.cellLevel) {
params.push({
isAlias: false,
name: 'column_name',
params: [],
type: 'str',
value: selectedColumn.value
})
}

mixpanel.track("Run transformation function from Catalog", {
transformationFunctionName: selected.value!.name,
inputs: anonymize(params),
});

transformationResult.value = await api.datasetProcessing(props.projectId, selectedDataset.value!, [{
uuid: selected.value!.uuid,
params,
type: 'TRANSFORMATION'
}]);
}
finally {
isTransformationFunctionRunning.value = false;
}

mixpanel.track("Run transformation function from Catalog", {
transformationFunctionName: selected.value!.name,
inputs: anonymize(params),
});

transformationResult.value = await api.datasetProcessing(props.projectId, selectedDataset.value!, [{
uuid: selected.value!.uuid,
params,
type: 'TRANSFORMATION'
}]);
}

watch(() => selected.value, () => {
Expand Down