[#73] Fixes #73, bug with using the active sheet instead of the table's sheet

Author: Alex-At-Home

src/server/services/ElasticsearchService.gs

@@ -341,7 +341,7 @@ var ElasticsearchService_ = (function() {
 
         // Also handle any global triggers (including queries):
         var globalTriggerRanges =
-          TableRangeUtils_.getExternalTableRanges(ss, tableConfig, /*controlOnly*/true)
+          TableRangeUtils_.getExternalTableRanges(activeRange.getSheet(), tableConfig, /*controlOnly*/true)
         modifiedOffsets = modifiedOffsets.concat(
           globalTriggerRanges.filter(function(triggerRange) {
             return TableRangeUtils_.doRangesIntersect(event.range, triggerRange)

src/server/services/TableService.gs

@@ -168,15 +168,15 @@ var TableService_ = (function(){
   */
   function findTablesIntersectingRange(range, addRange) {
     var ss = SpreadsheetApp.getActive()
-    var currRange = ss.getActiveRange()
     var tableMap = ManagementService_.listSavedObjects()
     var namedRangeMap = TableRangeUtils_.listTableRanges(ss, Object.keys(tableMap))
     var retVal = {}
     Object.keys(namedRangeMap).forEach(function(tableName) {
       var tableConfig = tableMap[tableName]
-      var globalTriggerRanges =
-        TableRangeUtils_.getExternalTableRanges(ss, tableConfig, /*controlOnly*/false)
       var namedRange = namedRangeMap[tableName]
+      var globalTriggerRanges = TableRangeUtils_.getExternalTableRanges(
+        namedRange.getRange().getSheet(), tableConfig, /*controlOnly*/false
+      )
       var allRangesToTest = globalTriggerRanges.concat([ namedRange.getRange() ])
       for (rangeToTestIndex in allRangesToTest) {
         var rangeToTest = allRangesToTest[rangeToTestIndex]

src/server/utils/ElasticsearchRequestUtils.gs

@@ -125,12 +125,11 @@ var ElasticsearchRequestUtils_ = (function() {
      } else if ( //Global query, get from its external location:
        "global" == TableRangeUtils_.getJson(tableConfig, [ "common", "query", "source" ])
      ) {
-       var ss = SpreadsheetApp.getActive()
        var globalQueryRef = TableRangeUtils_.getJson(
          tableConfig, [ "common", "query", "global", "range_name" ]
        )
        var globalQueryRange = globalQueryRef ?
-         TableRangeUtils_.getRangeFromName(ss, globalQueryRef) : null
+         TableRangeUtils_.getRangeFromName(activeRange.getSheet(), globalQueryRef) : null
        if (globalQueryRange) {
          retVal.query = globalQueryRange.getCell(1, 1).getValue()
        }
@@ -170,8 +169,7 @@ var ElasticsearchRequestUtils_ = (function() {
               break
         }
       } else if (!testMode) { // Check for global status
-        var ss = SpreadsheetApp.getActive()
-        TableRangeUtils_.handleGlobalStatusInfo(ss, statusInfo, tableConfig)
+        TableRangeUtils_.handleGlobalStatusInfo(activeRange.getSheet(), statusInfo, tableConfig)
       }
 
      // Headers

src/server/utils/ElasticsearchResponseUtils.gs

@@ -705,8 +705,7 @@ var ElasticsearchResponseUtils_ = (function() {
 
   /** Adds the error info the status, if necessary */
   function setQueryResponseInStatus_(range, statusLocation, errorString, tableConfig) {
-    var ss = SpreadsheetApp.getActive()
-     if (!TableRangeUtils_.handleGlobalStatusInfo(ss, errorString, tableConfig)) {
+     if (!TableRangeUtils_.handleGlobalStatusInfo(range.getSheet(), errorString, tableConfig)) {
        range.getCell(statusLocation.row, statusLocation.col).setValue(errorString)
      }
   }

src/server/utils/TableRangeUtils.gs

@@ -357,7 +357,7 @@
    /** For a given table, returns a list of ranges that the table monitors
     *  and treats like control changes
     */
-   function getExternalTableRanges(ss, tableConfig, controlOnly) {
+   function getExternalTableRanges(sheet, tableConfig, controlOnly) {
      var globalControlTriggers =
       (TableRangeUtils_.getJson(tableConfig, [ "common", "global_control_triggers" ]) || [])
      var globalContentTriggers = !controlOnly ?
@@ -369,7 +369,7 @@
        globalTriggers = globalTriggers.concat([ globalQuery ])
      }
      return globalTriggers.map(function(rangeOrNotation) {
-       return getRangeFromName(ss, rangeOrNotation)
+       return getRangeFromName(sheet, rangeOrNotation)
      }).filter(function(range) {
        return range != null
      })
@@ -378,30 +378,30 @@
    /** Returns the range from a range notation
     * TODO: needs to be able to handle named ranges (see getJsonLookup)
    */
-   function getRangeFromName(ss, rangeOrNotation) {
-     var isNotation =
-      rangeOrNotation.indexOf(":") >= 0 || /^[A-Z]+[0-9]+$/.exec(rangeOrNotation)
+   function getRangeFromName(sheet, rangeOrNotation) {
      var isFullNotation = rangeOrNotation.indexOf("!") >= 0
+     var isNotation = isFullNotation ||
+      (rangeOrNotation.indexOf(":") >= 0 || /^[A-Z]+[0-9]+$/.exec(rangeOrNotation))
 
      return isNotation ?
        (isFullNotation ?
-         ss.getRange(rangeOrNotation)
+         sheet.getParent().getRange(rangeOrNotation)
          :
-         ss.getActiveSheet().getRange(rangeOrNotation)
+         sheet.getRange(rangeOrNotation)
        )
        : null //(see above: also support named ranges, cf getJsonLookup)
    }
 
    /** Utility function to write global status info out - returns true iff status _is_ global */
-   function handleGlobalStatusInfo(ss, statusInfo, tableConfig) {
+   function handleGlobalStatusInfo(sheet, statusInfo, tableConfig) {
      if ( //Global query, get from its external location:
        "global" == TableRangeUtils_.getJson(tableConfig, [ "common", "status", "position" ])
      ) {
        var globalSourceRef = TableRangeUtils_.getJson(
          tableConfig, [ "common", "status", "global", "range_name" ]
        )
        var globalSourceRange = globalSourceRef ?
-         TableRangeUtils_.getRangeFromName(ss, globalSourceRef) : null
+         TableRangeUtils_.getRangeFromName(sheet, globalSourceRef) : null
        if (globalSourceRange) {
          globalSourceRange.getCell(1, 1).setValue(statusInfo)
          return true