nextcloud · juliusknorr · Jun 10, 2018
diff --git a/js/app/Config.js b/js/app/Config.js
@@ -27,11 +27,9 @@ import md from 'angular-markdown-it';
 import markdownitLinkTarget from 'markdown-it-link-target';
 import markdownitCheckbox from 'legacy/markdown-it-checkbox.js';
 
-app.config(function ($provide, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownItConverterProvider) {
+app.config(function ($provide, $interpolateProvider, $httpProvider, $urlRouterProvider, $stateProvider, $compileProvider, markdownItConverterProvider, $logProvider) {
 	'use strict';
 	$httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
-
-
 	$compileProvider.debugInfoEnabled(true);
 
 	markdownItConverterProvider.use(markdownitLinkTarget, {

diff --git a/js/controller/BoardController.js b/js/controller/BoardController.js
@@ -126,13 +126,18 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 		if ($scope.stacks === undefined) {
 			return;
 		}
-		angular.copy(StackService.getData(), $scope.stacks);
-		$scope.stacks = $filter('orderBy')($scope.stacks, 'order');
-		angular.forEach($scope.stacks, function (value, key) {
-			var cards = $filter('cardSearchFilter')(value.cards, text);
-			cards = $filter('orderBy')(cards, order);
-			$scope.stacks[key].cards = cards;
-		});
+		$scope.stacks = StackService.getData();
+		$scope.stacks = $filter('orderBy')($scope.stacks, order);
+		/* only copy the whole stacks to local scope for filtering them while searching */
+		console.log(text);
+		if (text !== '') {
+			angular.copy(StackService.getData(), $scope.stacks);
+			angular.forEach($scope.stacks, function (value, key) {
+				var cards = $filter('cardSearchFilter')(value.cards, text);
+				cards = $filter('orderBy')(cards, order);
+				$scope.stacks[key].cards = cards;
+			});
+		}
 	};
 
 	$scope.loadDefault = function () {
@@ -266,12 +271,20 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
 			card.stackId = newStack;
 			CardService.update(card);
 			CardService.reorder(card, order).then(function (data) {
-				StackService.addCard(card);
-				StackService.reorderCard(card, order);
+				// not working ? https://www.aaron-gray.com/delaying-the-digest-cycle-in-angularjs/
+				// we want the digest to happen after all sorting operations are complete
+				var watchers = $scope.$$watchers;
+				StackService.$$watchers = [];
 				StackService.removeCard({
 					id: card.id,
 					stackId: oldStack
 				});
+				StackService.addCard(card);
+				StackService.reorderCard(card, order);
+				// restore watchers and run digest now
+				if (watchers)
+					StackService.$$watchers = watchers;
+				$scope.$digest();
 			});
 		},
 		orderChanged: function (event) {

diff --git a/js/controller/CardController.js b/js/controller/CardController.js
@@ -119,15 +119,15 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
 		var currentTime = Date.now();
 		var timeSinceEdit = currentTime-$scope.status.lastEdit;
 		if (timeSinceEdit > 1000 && $scope.status.lastEdit > $scope.status.lastSave && !$scope.status.saving) {
-			$scope.status.lastSave = currentTime;
+			$scope.status.lastSave = $scope.status.lastEdit = currentTime;
 			$scope.status.saving = true;
 			var header = $('.section-header.card-description');
 			header.find('.save-indicator.unsaved').fadeIn(500);
 			CardService.update($scope.status.edit).then(function (data) {
 				var header = $('.section-header.card-description');
 				header.find('.save-indicator.unsaved').hide();
 				header.find('.save-indicator.saved').fadeIn(250).fadeOut(1000);
-				StackService.updateCard($scope.status.edit);
+				//StackService.updateCard($scope.status.edit);
 				$scope.status.saving = false;
 			});
 		}
@@ -216,14 +216,14 @@ app.controller('CardController', function ($scope, $rootScope, $sce, $location,
 
 	$scope.addAssignedUser = function(item) {
 		CardService.assignUser(CardService.getCurrent(), item.uid).then(function (data) {
-			StackService.updateCard(CardService.getCurrent());
+			//StackService.updateCard(CardService.getCurrent());
 		});
 		$scope.status.showAssignUser = false;
 	};
 
 	$scope.removeAssignedUser = function(uid) {
 		CardService.unassignUser(CardService.getCurrent(), uid).then(function (data) {
-			StackService.updateCard(CardService.getCurrent());
+			//StackService.updateCard(CardService.getCurrent());
 		});
 	};
 

diff --git a/js/service/ApiService.js b/js/service/ApiService.js
@@ -142,12 +142,17 @@ app.factory('ApiService', function ($http, $q) {
 		angular.forEach(entities, function (entity) {
 			self.add(entity);
 		});
+		console.log(self);
 	};
 
 	ApiService.prototype.getCurrent = function () {
 		return this.data[this.id];
 	};
 
+	ApiService.prototype.get = function (id) {
+		return this.data[id];
+	};
+
 	ApiService.prototype.unsetCurrrent = function () {
 		this.id = null;
 	};

diff --git a/js/service/StackService.js b/js/service/StackService.js
@@ -21,7 +21,7 @@
  */
 import app from '../app/App.js';
 
-app.factory('StackService', function (ApiService, $http, $q) {
+app.factory('StackService', function (ApiService, $http, $q, CardService) {
 	var StackService = function ($http, ep, $q) {
 		ApiService.call(this, $http, ep, $q);
 	};
@@ -32,6 +32,12 @@ app.factory('StackService', function (ApiService, $http, $q) {
 		$http.get(this.baseUrl + '/' + boardId).then(function (response) {
 			self.clear();
 			self.addAll(response.data);
+			// When loading a stack add cards to the CardService so we can fetch
+			// information from there. That way we don't need to refresh the whole
+			// stack data during digest if some value changes
+			angular.forEach(response.data, function (entity) {
+				CardService.addAll(entity.cards);
+			});
 			deferred.resolve(self.data);
 		}, function (error) {
 			deferred.reject('Error while loading stacks');
@@ -45,6 +51,9 @@ app.factory('StackService', function (ApiService, $http, $q) {
 		$http.get(this.baseUrl + '/' + boardId + '/archived').then(function (response) {
 			self.clear();
 			self.addAll(response.data);
+			angular.forEach(response.data, function (entity) {
+				CardService.addAll(entity.cards);
+			});
 			deferred.resolve(self.data);
 		}, function (error) {
 			deferred.reject('Error while loading stacks');

diff --git a/js/webpack.config.js b/js/webpack.config.js
@@ -58,6 +58,11 @@ module.exports = {
     new webpack.ProvidePlugin({
       $: 'jquery',
       jQuery: 'jquery'
-    })
+    }),
+    new webpack.DefinePlugin({
+      'process.env': {
+        DEBUG: true,
+      }
+    }),
   ]
 };
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
@@ -57,7 +57,7 @@
 			</h3>
 			<ul data-as-sortable="sortOptions" is-disabled="!boardservice.canEdit() || filter==='archive'" data-ng-model="s.cards" class="card-list" ng-class="{emptyStack: !s.cards.length}">
 				<li class="card as-sortable-item"
-					ng-repeat="c in s.cards"
+					ng-repeat="c in s.cards track by c.id"
 					data-as-sortable-item
 					ng-click="$event.stopPropagation()"
 					ui-sref="board.card({boardId: id, cardId: c.id})"
@@ -75,7 +75,7 @@
 						</div>
 
 						<div class="card-controls">
-							<i class="icon icon-filetype-text" ng-if="c.description" title="{{ c.description }}"></i>
+							<i class="icon icon-filetype-text" ng-if="cardservice.get(c.id).description" title="{{ cardservice.get(c.id).description }}"></i>
 							<span class="due" ng-if="c.duedate" ng-class="{'overdue': c.overdue == 3, 'now': c.overdue == 2, 'next': c.overdue == 1  }" title="{{ c.duedate }}">
 								<i class="icon icon-badge"></i>
 								<span data-timestamp="{{ c.duedate | dateToTimestamp }}" class="live-relative-timestamp">{{ c.duedate | relativeDateFilterString }}</span>
@@ -85,7 +85,7 @@
 								<span>{{ getCheckboxes(c.description)[0] }}/{{ getCheckboxes(c.description)[1] }}</span>
 							</div>
 							<div class="card-assigned-users">
-								<div class="assigned-user" ng-repeat="user in c.assignedUsers | limitTo: 3">
+								<div class="assigned-user" ng-repeat="user in cardservice.get(c.id).assignedUsers | limitTo: 3">
 									<avatar data-user="{{ user.participant.uid }}" data-displayname="{{ user.participant.displayname }}" data-tooltip></avatar>
 								</div>
 							</div>

diff --git a/templates/part.card.php b/templates/part.card.php
@@ -96,7 +96,7 @@
 	<div class="section-content card-description">
 		<textarea elastic ng-if="status.cardEditDescription"
 				  placeholder="<?php p($l->t('Add a card description…')); ?>"
-				  ng-blur="cardUpdate(status.edit)"
+				  ng-blur="cardUpdate(status.edit); updateMarkdown(status.edit.description)"
 				  ng-model="status.edit.description"
 				  ng-change="cardEditDescriptionChanged(); updateMarkdown(status.edit.description)"
 				  autofocus-on-insert> </textarea>