Editor / Upload file or overview from main form #6371
+237
−173
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,6 +31,136 @@ | |
| goog.require('gn_urlutils_service'); | ||
| goog.require('gn_related_directive'); | ||
|
|
||
|
|
||
| var fileUploader = [ | ||
| 'gnOnlinesrc', 'gnFileStoreService', 'gnCurrentEdit', '$rootScope', '$translate', | ||
| function(gnOnlinesrc, gnFileStoreService, gnCurrentEdit, $rootScope, $translate) { | ||
| return { | ||
| restrict: 'A', | ||
| templateUrl: '../../catalog/components/edit/onlinesrc/' + | ||
| 'partials/file-uploader.html', | ||
| scope: {}, | ||
| link: function (scope, element, attrs) { | ||
| scope.relations = {}; | ||
| scope.uuid = undefined; | ||
| scope.lang = scope.$parent.lang; | ||
| scope.readonly = false; | ||
| scope.numberOfOverviews = parseInt(attrs['numberOfOverviews']) || Infinity; | ||
| scope.onlinesrcService = gnOnlinesrc; | ||
|
|
||
| scope.defaultType = 'thumbnails'; | ||
| scope.type = attrs['type'] || scope.defaultType; | ||
| scope.title = attrs['title'] || (scope.isOverview ? 'overview' : 'download'); | ||
| scope.panelMode = angular.isDefined(attrs['title']) | ||
| && attrs['title'] === '' ? false : true; | ||
| scope.icon = attrs['icon'] || (scope.isOverview ? 'gn-icon-thumbnail' : 'fa-download'); | ||
| scope.btnLabel = attrs['btnLabel'] || (scope.isOverview ? 'chooseImage': 'chooseFileToUpload'); | ||
| scope.protocol = attrs['protocol'] || 'WWW:DOWNLOAD'; | ||
| scope.isOverview = scope.type === scope.defaultType; | ||
| scope.removeBtnConfirm = scope.isOverview ? 'removeThumbnailConfirm' : 'removeOnlinesrcConfirm'; | ||
| scope.removeBtnTitle = scope.isOverview ? 'removeThumbnail' : 'remove'; | ||
|
|
||
| var loadRelations = function() { | ||
| gnOnlinesrc.getAllResources([scope.type]) | ||
| .then(function(data) { | ||
| var res = gnOnlinesrc.formatResources( | ||
| data, | ||
| scope.lang, | ||
| gnCurrentEdit.mdLanguage); | ||
| scope.relations = scope.isOverview | ||
| ? res.relations[scope.type] | ||
| : res.relations[scope.type].filter(function(l) { | ||
| return l.protocol === scope.protocol; | ||
| }); | ||
| }); | ||
| }; | ||
|
|
||
| var uploadFile = function() { | ||
| scope.queue = []; | ||
| scope.filestoreUploadOptions = { | ||
| autoUpload: true, | ||
| url: '../api/records/' + gnCurrentEdit.uuid + | ||
| '/attachments?visibility=public', | ||
| dropZone: $('#gn-overview-dropzone'), | ||
| singleUpload: true, | ||
| // TODO: acceptFileTypes: /(\.|\/)(xml|skos|rdf)$/i, | ||
|
There was a problem hiding this comment. This is something to improve: for thumbnails, only image formats should be allowed. For files, should be limited to certain types, maybe make both configurable in the settings? Not in the scope of this pull request, but to create a ticket to track this. There was a problem hiding this comment. I tried to use https://github.com/blueimp/jQuery-File-Upload/wiki/Options#processqueue without success. |
||
| done: uploadResourceSuccess, | ||
| fail: uploadResourceFailed, | ||
| headers: {'X-XSRF-TOKEN': $rootScope.csrf} | ||
| }; | ||
|
|
||
| }; | ||
|
|
||
| var linkOverviewToRecord = function (link) { | ||
| var params = scope.isOverview ? { | ||
| thumbnail_url: link.url, | ||
| thumbnail_desc: link.name || '', | ||
| process: 'thumbnail-add', | ||
| id: gnCurrentEdit.id | ||
| } : { | ||
| url: link.url, | ||
| name: link.name || '', | ||
| protocol: scope.protocol, | ||
| process: 'onlinesrc-add', | ||
| id: gnCurrentEdit.id | ||
| }; | ||
| gnOnlinesrc.add(params); | ||
| }; | ||
|
|
||
| var uploadResourceSuccess = function(e, data) { | ||
| $rootScope.$broadcast('gnFileStoreUploadDone'); | ||
| scope.clear(scope.queue); | ||
| linkOverviewToRecord(data.response().jqXHR.responseJSON); | ||
| }; | ||
|
|
||
| scope.$on('gnFileStoreUploadDone', scope.loadRelations); | ||
|
|
||
| var uploadResourceFailed = function(e, data) { | ||
| $rootScope.$broadcast('StatusUpdated', { | ||
| title: $translate.instant('resourceUploadError'), | ||
| error: { | ||
| message: data.errorThrown + | ||
| angular.isDefined( | ||
| data.response().jqXHR.responseJSON.message) ? | ||
| data.response().jqXHR.responseJSON.message : '' | ||
| }, | ||
| timeout: 0, | ||
| type: 'danger'}); | ||
| scope.clear(scope.queue); | ||
| }; | ||
|
|
||
| scope.removeFile = function(file) { | ||
| var url = file.url[gnCurrentEdit.mdLanguage]; | ||
| if (url.match(".*/api/records/" + gnCurrentEdit.uuid + "/attachments/.*") == null) { | ||
| // An external URL | ||
| gnOnlinesrc[scope.isOverview ? 'removeThumbnail' : 'removeOnlinesrc'](file).then(function() { | ||
| loadRelations(); | ||
| }); | ||
| } else { | ||
| // A thumbnail from the filestore | ||
| gnFileStoreService.delete({url: url}).then(function () { | ||
| // then remove from record | ||
| gnOnlinesrc[scope.isOverview ? 'removeThumbnail' : 'removeOnlinesrc'](file).then(function() { | ||
| loadRelations(); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| }; | ||
| function init(n, o) { | ||
| if (angular.isUndefined(scope.uuid) || | ||
| n != o) { | ||
| scope.uuid = n; | ||
| loadRelations(); | ||
| uploadFile(); | ||
| } | ||
| } | ||
| scope.$watch('gnCurrentEdit.uuid', init); | ||
| scope.$watch('$parent.gnCurrentEdit.uuid', init); | ||
| } | ||
| } | ||
| }]; | ||
|
|
||
| /** | ||
| * @ngdoc overview | ||
| * @name gn_onlinesrc | ||
|
|
@@ -206,123 +336,18 @@ | |
| } | ||
| }]) | ||
| /** | ||
| * Simple interface to add or remove file/overview. | ||
| * | ||
| * This directive handle in one step the add to filestore | ||
| * action and the update metadata record steps. User | ||
| * can easily drag & drop file/overview in here. | ||
| * | ||
| * It does not provide the possibility to set | ||
| * name and description. See onlineSrcList directive | ||
| * or full editor mode. | ||
| */ | ||
| .directive('gnFileUploader', fileUploader) | ||
| .directive('gnOverviewManager', fileUploader) | ||
|
|
||
| /** | ||
| * @ngdoc directive | ||
|
|
@@ -369,7 +394,7 @@ | |
| scope.lang = scope.$parent.lang; | ||
| scope.readonly = attrs['readonly'] || false; | ||
| scope.gnCurrentEdit.associatedPanelConfigId = attrs['configId'] || 'default'; | ||
| scope.relations = []; | ||
| scope.gnCurrentEdit.codelistFilter = attrs['codelistFilter']; | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <div data-ng-class="{'panel panel-default': panelMode}" | ||
| class="gn-file-uploader"> | ||
| <div data-ng-if="panelMode" class="panel-heading" data-gn-slide-toggle> | ||
| <i class="fa fa-fw {{icon}}"></i> | ||
| <span data-translate="">{{title}}</span> | ||
|
There was a problem hiding this comment. The overview panel with the change displays the header |
||
| </div> | ||
| <div data-ng-class="{'panel-body': panelMode}"> | ||
| <ul class="list-inline"> | ||
| <li class="gn-list-thumb thumbnail" | ||
| data-ng-repeat="f in relations"> | ||
| <img data-ng-if="isOverview" | ||
| class="thumb-small" | ||
| title="{{f.title | gnLocalized: lang}}" | ||
| data-ng-src="{{onlinesrcService.getApprovedUrl(f.lUrl || f.id)}}"/> | ||
|
|
||
| <span data-ng-if="!isOverview"> | ||
| <i class="fa fa-fw fa-2x fa-download"></i> | ||
| <strong>{{f.lUrl.split('/').pop()}}</strong> | ||
| </span> | ||
|
|
||
| <a href="" class="onlinesrc-remove" | ||
| data-ng-if="readonly !== true" | ||
| data-gn-confirm-click="{{removeBtnConfirm | translate:{url: f.lUrl} }}" | ||
| data-gn-click-and-spin="removeFile(f)" | ||
| title="{{removeBtnTitle | translate}}"> | ||
| <i class="btn fa fa-times text-danger"></i> | ||
| </a> | ||
| </li> | ||
|
|
||
| <!-- The one currently uploaded --> | ||
| <li data-ng-repeat="file in queue" | ||
| class="gn-list-thumb thumbnail"> | ||
| <i class="fa gn-icon-thumbnail fa-5x"></i> | ||
| {{file.name}} | ||
| </li> | ||
| </ul> | ||
|
|
||
| <div class="form-horizontal" | ||
| data-file-upload="filestoreUploadOptions"> | ||
|
|
||
| <!-- The upload zone --> | ||
| <span class="btn btn-primary btn-block fileinput-button" | ||
| data-ng-class="{disabled: disabled}" | ||
| data-ng-hide="relations.thumbnails.length >= numberOfOverviews"> | ||
| <i class="fa fa-fw fa-plus-circle" | ||
| data-ng-class="{hidden: active()}"/> | ||
| <i class="fa fa-fw fa-spinner fa-spin" | ||
| data-ng-class="{hidden: !active()}" | ||
| data-file-upload-progress="progress()" | ||
| data-file-upload-done="loadRelations()"/> | ||
| <span>{{btnLabel | translate}}</span> | ||
| <input type="file" | ||
| name="file" | ||
| data-ng-disabled="disabled"/> | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this support translation keys?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You could put text or a key that you can set in database translation.