OpenEcoLab-LasAlpujarras/farmOS
3
0
Fork 0
mirror of https://github.com/farmOS/farmOS.git synced 2024-02-23 11:37:38 +01:00
Code Wiki Activity

Added status to the save button

Browse source
This commit is contained in:
Pedro Cambra 2021-06-01 16:51:23 +02:00 committed by Michael Stenta
parent 511bd3771d
commit 7e91f85c81
5 changed files with 110 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
modules/ui/location/css/locations_drag_and_drop.css Normal file
View file

@ -0,0 +1,23 @@
.locations-tree-save {
width: 4rem;
}
a.locations-tree-save.spinner {
background-color: var(--colorGinDisabled);
border: 2px solid var(--colorGinDisabled) !important;
box-shadow: 0 1px 2px var(--colorGinDisabled);
}
.locations-tree-save.spinner:after {
content: "";
display: block;
position: absolute;
top: 0.7rem;
left: 5rem;
width: 1rem;
height: 1rem;
-webkit-animation: gin-throbber 0.75s linear infinite;
animation: gin-throbber 0.75s linear infinite;
border: 2px solid var(--colorGinButtonText);
border-right: 2px dotted transparent;
border-radius: 50%;
}

3
modules/ui/location/farm_ui_location.libraries.yml
View file

@ -1,5 +1,8 @@
locations-drag-and-drop:
version: 1.x
css:
theme:
css/locations_drag_and_drop.css: { }
js:
js/locations_drag_and_drop.js: {}
dependencies:

2
modules/ui/location/farm_ui_location.module
View file

@ -18,7 +18,7 @@ function farm_ui_location_asset_presave(EntityInterface $entity) {
// @see https://github.com/json-api/json-api/pull/824
$bundle = AssetType::load($entity->bundle());
if ($bundle->shouldCreateNewRevision() && $entity->getEntityType()->isRevisionable()) {
/** @var \Drupal\Core\Entity\RevisionLogInterface $entity */
/** @var \Drupal\Core\Entity\RevisionLogInterface $entity */
$entity->setNewRevision(TRUE);
$entity->setRevisionCreationTime(\Drupal::time()->getRequestTime());
}

134
modules/ui/location/js/locations_drag_and_drop.js
View file

@ -5,7 +5,7 @@
(function ($, Drupal, settings) {
"use strict";
"use strict"
// @TODO drag and drop validate if exist.
// @TODO validate circular references.
@ -14,16 +14,21 @@
attach: function (context, settings) {
var tree = new InspireTree({
data: settings.asset_tree,
});
})
new InspireTreeDOM(tree, {
target: '.asset-tree',
target: '.locations-tree',
dragAndDrop: true
});
})
var changes = {};
var changes = {}
console.log(settings.asset_parent)
tree.on('node.drop', function(event, source, target, index) {
var destination = (target === null) ? settings.asset_parent : target.uuid;
console.log(target)
var destination = (target === null) ? settings.asset_parent : target.uuid
console.log(destination)
if (!changes.hasOwnProperty(source.id)) {
if (source.original_parent !== destination) {
changes[source.id] = {
@ -32,44 +37,54 @@
'original_type': source.original_type,
'destination': destination,
'type': (target === null) ? settings.asset_parent_type : target.type,
};
}
}
}
else {
if (changes[source.id].original_parent !== destination) {
changes[source.id].destination = destination;
changes[source.id].destination = destination
}
else {
delete changes[source.id];
delete changes[source.id]
}
}
});
$('.asset-tree-reset').on('click', function(event) {
event.preventDefault();
})
$('.locations-tree-reset').on('click', function(event) {
event.preventDefault()
// Reset the changes so nothing is pushed accidentally.
changes = {};
changes = {}
// Reset the tree to the original status.
tree.reload();
});
tree.reload()
})
$('.asset-tree-save').on('click', function(event) {
event.preventDefault();
var entries = Object.entries(changes);
if (entries.length > 0) {
var token = '';
$.ajax({
async: false,
url: Drupal.url('session/token'),
success(data) {
if (data) {
token = data;
}
},
});
$('.locations-tree-save').on('click', function(event) {
event.preventDefault()
var button = $(this)
var messages = new Drupal.Message()
messages.clear()
var entries = Object.entries(changes)
if (entries.length <= 0) {
messages.add(Drupal.t('No changes to save'), { type: 'status' })
return
}
var messages = new Drupal.Message();
button.addClass('spinner')
button.attr('disabled',true);
var token = ''
$.ajax({
async: false,
url: Drupal.url('session/token'),
success(data) {
if (data) {
token = data
}
},
})
for (var [treeUuid, item] of entries) {
if (item.destination === '' && item.original_parent !== '') {
var deleteItem = {
@ -79,7 +94,7 @@
'id': item.original_parent,
}
]
};
}
$.ajax({
type: 'DELETE',
cache: false,
@ -90,16 +105,20 @@
data: JSON.stringify(deleteItem),
contentType: 'application/vnd.api+json',
success: function success(data) {
messages.clear();
messages.add(Drupal.t('Assets have been saved'), { type: 'status' });
messages.clear()
messages.add(Drupal.t('Locations have been saved'), { type: 'status' })
button.toggleClass('spinner')
button.attr('disabled',false);
delete changes.treeUuid
},
error: function error(xmlhttp) {
var e = new Drupal.AjaxError(xmlhttp);
messages.clear();
messages.add(e.message, { type: 'error' });
var e = new Drupal.AjaxError(xmlhttp)
messages.clear()
messages.add(e.message, { type: 'error' })
button.removeClass('spinner')
button.attr('disabled',false);
}
});
})
}
else {
var patch = {
@ -109,7 +128,7 @@
'id': item.destination,
}
]
};
}
$.ajax({
type: 'POST',
cache: false,
@ -128,7 +147,7 @@
'id': item.original_parent,
}
]
};
}
$.ajax({
type: 'DELETE',
@ -140,34 +159,41 @@
data: JSON.stringify(deleteItem),
contentType: 'application/vnd.api+json',
success: function success(data) {
messages.clear();
messages.add(Drupal.t('Assets have been saved'), { type: 'status' });
messages.clear()
messages.add(Drupal.t('Locations have been saved'), { type: 'status' })
button.removeClass('spinner')
button.attr('disabled',false);
delete changes.treeUuid
},
error: function error(xmlhttp) {
var e = new Drupal.AjaxError(xmlhttp);
messages.clear();
messages.add(e.message, { type: 'error' });
var e = new Drupal.AjaxError(xmlhttp)
messages.clear()
messages.add(e.message, { type: 'error' })
button.removeClass('spinner')
button.attr('disabled',false);
}
});
})
}
else {
messages.clear();
messages.add(Drupal.t('Assets have been saved'), { type: 'status' });
messages.clear()
messages.add(Drupal.t('Locations have been saved'), { type: 'status' })
button.removeClass('spinner')
button.attr('disabled',false);
}
},
error: function error(xmlhttp) {
var e = new Drupal.AjaxError(xmlhttp);
messages.clear();
messages.add(e.message, { type: 'error' });
var e = new Drupal.AjaxError(xmlhttp)
messages.clear()
messages.add(e.message, { type: 'error' })
button.removeClass('spinner')
button.attr('disabled',false);
}
});
})
}
}
});
})
}
}
})(jQuery, Drupal, drupalSettings);
})(jQuery, Drupal, drupalSettings)

6
modules/ui/location/src/Controller/AssetReorderController.php
View file

@ -63,7 +63,7 @@ class AssetReorderController extends ControllerBase implements AssetReorderContr
'#tag' => 'div',
'#attributes' => [
'class' => [
'asset-tree',
'locations-tree',
],
],
];
@ -74,7 +74,7 @@ class AssetReorderController extends ControllerBase implements AssetReorderContr
'#url' => Url::fromRoute('<none>'),
'#attributes' => [
'class' => [
'asset-tree-save',
'locations-tree-save',
'button',
'button--primary',
],
@ -86,7 +86,7 @@ class AssetReorderController extends ControllerBase implements AssetReorderContr
'#url' => Url::fromRoute('<none>'),
'#attributes' => [
'class' => [
'asset-tree-reset',
'locations-tree-reset',
'button',
'button--danger',
],