Merge pull request #260 from ljay79/develop

Merge into Master

src/Code.gs

@@ -10,7 +10,7 @@
  * @OnlyCurrentDoc  Limits the script to only accessing the current spreadsheet.
  */
 
-var BUILD = '1.4.5';
+var BUILD = '1.4.6';
 
 /** 
  * Add a nice menu option for the users.

src/customFunctions.gs

@@ -202,7 +202,7 @@ function customFunctionAllowed_() {
     throw new Error("The document owner (you) must enable custom functions. Open 'Add-ons > Project Aid for Jira > Settings' and toggle 'Custom Functions' to enabled. If you are not the document owner, ask him to enable custom functions.");
   }
 
-  // no return value; throws Error is feature is suspended
+  // no return value; throws Error if feature is suspended
   customFunctionsSuspended_();
 }
 
@@ -241,7 +241,6 @@ CustomFunctionErrorException.prototype._countHandler = function() {
 
 
 /**
- * @TODO: Not activated yet - soft launch with logging before lauching such critical code
  * @desc Check for CustomFunctions Error count and decide to suspend any further calls for a while or not.
  * @throws Error
  * @return void
@@ -255,7 +254,7 @@ function customFunctionsSuspended_() {
   var _timeUntil = docProps.get(key_time);
   var timeUntil = new Date();
 
-  console.info('customFunctionsSuspended_(): Counter is at: %s', count);
+  debug.info('customFunctionsSuspended_(): Counter is at: %s', count);
 
   if (_timeUntil != null) {
     // suspension time is set, convert to Date object
@@ -268,27 +267,27 @@ function customFunctionsSuspended_() {
   if (timeUntilSeconds > (nowSeconds+3)) {
     var _delay_seconds = timeUntilSeconds - nowSeconds;
     var _msg = "Suspension of custom functions for about " + _delay_seconds + " seconds because of to many errors! Please correct all your custom function calls in this document and wait before re-trying.";
-    console.info("customFunctionsSuspended_():" + _msg + " Now: %s < Until: %s", now.toString(), timeUntil.toString());
-    //@TODO: throw new Error(_msg); // NOT YET ACTIVE
+    debug.warn("customFunctionsSuspended_():" + _msg + " Now: %s < Until: %s", now.toString(), timeUntil.toString());
+    throw new Error(_msg);
   }
 
   // else
   if (count >= 100) {
     // set suspension +300s
-    console.info('customFunctionsSuspended_(): ... setting 300s suspension!');
+    debug.info('customFunctionsSuspended_(): ... setting 300s suspension!');
     docProps.put(key_time, now.getTime() + (300*1000));
 
     // reset error counter
     docProps.put(key_count, 0);
 
   } else if (count >= 25 && count < 30) {
     // set suspension +300s
-    console.info('customFunctionsSuspended_(): ... setting 60s suspension!');
+    debug.info('customFunctionsSuspended_(): ... setting 60s suspension!');
     docProps.put(key_time, now.getTime() + (60*1000));
 
   } else if (count >= 10 && count < 15) {
     // set suspension +30s
-    console.info('customFunctionsSuspended_(): ... setting 30s suspension!');
+    debug.info('customFunctionsSuspended_(): ... setting 30s suspension!');
     docProps.put(key_time, now.getTime() + (30*1000));
   }
 

src/debug.gs

@@ -113,7 +113,7 @@ StorageCounter = {
   },
 
   log: function() {
-    console.info("StorageCounter: %o", JSON.parse(this._cache.get(this._id)));
+    debug.info("StorageCounter: %o", JSON.parse(this._cache.get(this._id)));
   }
 
 };

src/jiraApi.gs

@@ -24,7 +24,8 @@ var restMethods = {
     'filter'        : {method: '/filter/{filterId}'},
     //'search': {method: '/search', queryparams: {jql:'', fields: [], properties: [], maxResults: 100, validateQuery: 'strict'}} // GET
     'search'        : {method: '/search'}, // POST
-    'myFilters'     : {method: '/filter/my', queryparams: {includeFavourites: 'true'}},
+    // https://developer.atlassian.com/cloud/jira/platform/rest/v2/#api-rest-api-2-filter-search-get
+    'myFilters'     : {method: '/filter/search', queryparams: {expand: 'favourite,jql,owner', startAt:0, maxResults: 100, orderBy: 'IS_FAVOURITE'}},
 
     // https://SITENAME.atlassian.net/rest/api/2/user/search?startAt=0&maxResults=1000&query=
     'userSearch'    : {method: '/user/search', queryparams: {startAt:0, maxResults: 250, username:''}},

src/jiraCommon.gs

@@ -162,8 +162,13 @@ function getMyFilters() {
     debug.log("getMyFilters()->ok(): %s", responseData);
 
     if (responseData) {
+      /*
+       * responseData = array (server: api v2 /filter/favourite)
+       * responseData.values = array (cloud: api v2 /filter/search)
+       */
+      var values = responseData.values ? responseData.values : responseData;
       // add data to export
-      filters.list.push.apply(filters.list, responseData.map(function (filter) {
+      filters.list.push.apply(filters.list, values.map(function (filter) {
         return {
           id: parseInt(filter.id),
           name: filter.name,

test/customFunctions.test.js

@@ -1,14 +1,13 @@
-CacheService = require('test/mocks/CacheService');
 const getCfg_ = require("../src/settings.gs").getCfg_;
 const setCfg_ = require("../src/settings.gs").setCfg_;
 const customFunctions = require('src/customFunctions.gs');
 
 beforeEach(() =>  {
   jest.resetModules();
   CacheService.resetMocks();
+  CacheService.resetMockUserData();
 });
 
-
 test("customFunctionAllowed_ throws exceptions", () => {
   // custom_fn_enabled not defined
   setCfg_('custom_fn_enabled', null);
@@ -32,6 +31,7 @@ test("customFunctionsSuspended_ for 30 seconds", () => {
   var key_count = 'CUSTOM_FUNCTIONS_ERROR_COUNT';
   var key_time  = 'CUSTOM_FUNCTIONS_ERROR_TIME';
   var now       = new Date(), suspension = null, seconds = 0;
+
   // custom_fn_enabled enabled
   setCfg_('custom_fn_enabled', 1)
 
@@ -47,22 +47,22 @@ test("customFunctionsSuspended_ for 30 seconds", () => {
   expect(seconds).toBeGreaterThanOrEqual(30);
   expect(seconds).toBeLessThan(40);
 
-  // not yet
-  //expect(customFunctions.customFunctionAllowed_).toThrowError();
+  expect(customFunctions.customFunctionAllowed_).toThrowError();
 });
 
 test("customFunctionsSuspended_ for 60 seconds", () => {
   var docProps   = CacheService.getDocumentCache();
   var key_count = 'CUSTOM_FUNCTIONS_ERROR_COUNT';
   var key_time  = 'CUSTOM_FUNCTIONS_ERROR_TIME';
   var now       = new Date(), suspension = null, seconds = 0;
+
   // custom_fn_enabled enabled
   setCfg_('custom_fn_enabled', 1)
 
   /* error count = >= 25 */
   docProps.put(key_count, 25, 60*60);
   now = new Date(); suspension = new Date();
-  
+
   expect(customFunctions.customFunctionAllowed_).not.toThrowError();
   // verify suspension time
   suspension.setTime( docProps.get(key_time) );
@@ -71,8 +71,7 @@ test("customFunctionsSuspended_ for 60 seconds", () => {
   expect(seconds).toBeGreaterThanOrEqual(60);
   expect(seconds).toBeLessThan(70);
 
-  // not yet
-  //expect(customFunctions.customFunctionAllowed_).toThrowError();
+  expect(customFunctions.customFunctionAllowed_).toThrowError();
 });
 
 test("customFunctionsSuspended_ for 300 seconds", () => {