scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7309 from aignatov-bio/ai-sci-10452-fix-duplicate-task-spinner

Browse source 
Fix tasks table copy callback [SCI-10402][SCI-10346]
This commit is contained in:
ajugo 2024-03-18 12:12:53 +01:00 committed by GitHub
parent 0419609a1a 09e981a746
commit 469c23b02b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/vue/components/action_toolbar.vue
View file

@ -15,7 +15,7 @@
<div v-if="action.type === 'group' && Array.isArray(action.actions) && action.actions.length > 1" class="export-actions-dropdown sci-dropdown dropup">
<button class="btn btn-primary dropdown-toggle single-object-action rounded" type="button" id="exportDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-e2e="e2e-DD-actionToolbar-export">
<i class="sn-icon sn-icon-export"></i>
<span>{{ action.group_label }}</span>
<span class="sn-action-toolbar__button-text">{{ action.group_label }}</span>
<span class="sn-icon sn-icon-down"></span>
</button>
<ul class="sci-dropdown dropup dropdown-menu dropdown-menu-right px-2" aria-labelledby="<%= id %>">
@ -31,7 +31,7 @@
:data-object-id="groupAction.item_id"
:data-action="groupAction.type"
@click="closeExportDropdown($event); doAction(groupAction, $event);">
<span class="sn-action-toolbar__button-text">{{ groupAction.label }}</span>
<span>{{ groupAction.label }}</span>
</a>
</li>
</ul>

17
app/javascript/vue/my_modules/list.vue
View file

@ -313,11 +313,28 @@ export default {
roles_path: this.userRolesUrl
};
},
checkProvisioning(params) {
if (params.data.provisioning_status === 'done') return;
axios.get(params.data.urls.provisioning_status).then((response) => {
const provisioningStatus = response.data.provisioning_status;
if (provisioningStatus === 'done') {
this.reloadingTable = true;
} else {
setTimeout(() => {
this.checkProvisioning(params);
}, 5000);
}
});
},
// Renderers
nameRenderer(params) {
const { name, urls } = params.data;
const provisioningStatus = params.data.provisioning_status;
if (provisioningStatus === 'in_progress') {
setTimeout(() => {
this.checkProvisioning(params);
}, 5000);
return `
<span class="flex gap-2 items-center">
<div title="${this.i18n.t('experiments.duplicate_tasks.duplicating')}"

3
app/serializers/lists/my_module_serializer.rb
View file

@ -63,7 +63,8 @@ module Lists
experiments_to_move: experiments_to_move_experiment_path(object.experiment),
move: move_modules_experiment_path(object.experiment),
update: my_module_path(object),
show_access: access_permissions_my_module_path(object)
show_access: access_permissions_my_module_path(object),
provisioning_status: provisioning_status_my_module_url(object)
}
if can_manage_project_users?(object.experiment.project)