Page Attachments - Improved UI, Now initially complete

[bookstack] / resources / assets / js / controllers.js

diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js
index bc2d43fc8eb0e5e933cd46637b31821480de3b18..99cf6af9d6512f945f30c93ad1381cebec6aea9d 100644 (file)
--- a/resources/assets/js/controllers.js
+++ b/resources/assets/js/controllers.js
@@ -536,6 +536,18 @@ module.exports = function (ngApp, events) {
             const pageId = $scope.uploadedTo = $attrs.pageId;
             let currentOrder = '';
             $scope.files = [];
             const pageId = $scope.uploadedTo = $attrs.pageId;
             let currentOrder = '';
             $scope.files = [];

+            $scope.editFile = false;
+            $scope.file = getCleanFile();
+            $scope.errors = {
+                link: {},
+                edit: {}
+            };
+
+            function getCleanFile() {
+                return {
+                    page_id: pageId
+                };
+            }

 
             // Angular-UI-Sort options
             $scope.sortOptions = {
 
             // Angular-UI-Sort options
             $scope.sortOptions = {


@@ -559,15 +571,16 @@ module.exports = function (ngApp, events) {
                 currentOrder = newOrder;
                 $http.put(`/files/sort/page/${pageId}`, {files: $scope.files}).then(resp => {
                     events.emit('success', resp.data.message);
                 currentOrder = newOrder;
                 $http.put(`/files/sort/page/${pageId}`, {files: $scope.files}).then(resp => {
                     events.emit('success', resp.data.message);

-                });
+                }, checkError('sort'));

             }
 
             /**
              * Used by dropzone to get the endpoint to upload to.
              * @returns {string}
              */
             }
 
             /**
              * Used by dropzone to get the endpoint to upload to.
              * @returns {string}
              */

-            $scope.getUploadUrl = function () {
-                return window.baseUrl('/files/upload');
+            $scope.getUploadUrl = function (file) {
+                let suffix = (typeof file !== 'undefined') ? `/${file.id}` : '';
+                return window.baseUrl(`/files/upload${suffix}`);

             };
 
             /**
             };
 
             /**


@@ -578,7 +591,7 @@ module.exports = function (ngApp, events) {
                 $http.get(url).then(resp => {
                     $scope.files = resp.data;
                     currentOrder = resp.data.map(file => {return file.id}).join(':');
                 $http.get(url).then(resp => {
                     $scope.files = resp.data;
                     currentOrder = resp.data.map(file => {return file.id}).join(':');

-                });
+                }, checkError('get'));

             }
             getFiles();
 
             }
             getFiles();
 


@@ -590,34 +603,129 @@ module.exports = function (ngApp, events) {
              */
             $scope.uploadSuccess = function (file, data) {
                 $scope.$apply(() => {
              */
             $scope.uploadSuccess = function (file, data) {
                 $scope.$apply(() => {

-                    $scope.files.unshift(data);
+                    $scope.files.push(data);

                 });
                 events.emit('success', 'File uploaded');
             };
 
                 });
                 events.emit('success', 'File uploaded');
             };
 

+            /**
+             * Upload and overwrite an existing file.
+             * @param file
+             * @param data
+             */
+            $scope.uploadSuccessUpdate = function (file, data) {
+                $scope.$apply(() => {
+                    let search = filesIndexOf(data);
+                    if (search !== -1) $scope.files[search] = data;
+
+                    if ($scope.editFile) {
+                        $scope.editFile = angular.copy(data);
+                        data.link = '';
+                    }
+                });
+                events.emit('success', 'File updated');
+            };
+

             /**
              * Delete a file from the server and, on success, the local listing.
              * @param file
              */
             $scope.deleteFile = function(file) {
             /**
              * Delete a file from the server and, on success, the local listing.
              * @param file
              */
             $scope.deleteFile = function(file) {

+                if (!file.deleting) {
+                    file.deleting = true;
+                    return;
+                }

                   $http.delete(`/files/${file.id}`).then(resp => {
                       events.emit('success', resp.data.message);
                       $scope.files.splice($scope.files.indexOf(file), 1);
                   $http.delete(`/files/${file.id}`).then(resp => {
                       events.emit('success', resp.data.message);
                       $scope.files.splice($scope.files.indexOf(file), 1);

-                  });
+                  }, checkError('delete'));

             };
 
             };
 

-            $scope.attachLinkSubmit = function(fileName, fileLink) {
-                $http.post('/files/link', {
-                    uploaded_to: pageId,
-                    name: fileName,
-                    link: fileLink
-                }).then(resp => {
-                    $scope.files.unshift(resp.data);
+            /**
+             * Attach a link to a page.
+             * @param fileName
+             * @param fileLink
+             */
+            $scope.attachLinkSubmit = function(file) {
+                file.uploaded_to = pageId;
+                $http.post('/files/link', file).then(resp => {
+                    $scope.files.push(resp.data);

                     events.emit('success', 'Link attached');
                     events.emit('success', 'Link attached');

-                });
-                $scope.fileName = $scope.fileLink = '';
+                    $scope.file = getCleanFile();
+                }, checkError('link'));
+            };
+
+            /**
+             * Start the edit mode for a file.
+             * @param fileId
+             */
+            $scope.startEdit = function(file) {
+                console.log(file);
+                $scope.editFile = angular.copy(file);
+                $scope.editFile.link = (file.external) ? file.path : '';
+            };
+
+            /**
+             * Cancel edit mode
+             */
+            $scope.cancelEdit = function() {
+                $scope.editFile = false;
+            };
+
+            /**
+             * Update the name and link of a file.
+             * @param file
+             */
+            $scope.updateFile = function(file) {
+                $http.put(`/files/${file.id}`, file).then(resp => {
+                    let search = filesIndexOf(resp.data);
+                    if (search !== -1) $scope.files[search] = resp.data;
+
+                    if ($scope.editFile && !file.external) {
+                        $scope.editFile.link = '';
+                    }
+                    $scope.editFile = false;
+                    events.emit('success', 'Attachment details updated');
+                }, checkError('edit'));

             };
 
             };
 

+            /**
+             * Get the url of a file.
+             */
+            $scope.getFileUrl = function(file) {
+                return window.baseUrl('/files/' + file.id);
+            }
+
+            /**
+             * Search the local files via another file object.
+             * Used to search via object copies.
+             * @param file
+             * @returns int
+             */
+            function filesIndexOf(file) {
+                for (let i = 0; i < $scope.files.length; i++) {
+                    if ($scope.files[i].id == file.id) return i;
+                }
+                return -1;
+            }
+
+            /**
+             * Check for an error response in a ajax request.
+             * @param response
+             */
+            function checkError(errorGroupName) {
+                $scope.errors[errorGroupName] = {};
+                return function(response) {
+                    if (typeof response.data !== 'undefined' && typeof response.data.error !== 'undefined') {
+                        events.emit('error', response.data.error);
+                    }
+                    if (typeof response.data !== 'undefined' && typeof response.data.validation !== 'undefined') {
+                        $scope.errors[errorGroupName] = response.data.validation;
+                        console.log($scope.errors[errorGroupName])
+                    }
+                }
+            }
+

         }]);
 
 };
         }]);
 
 };