DM-9565 merge Support Hidden Filters pr #316

DM-9565 - support for hidden filters

Author: tgoldina

src/firefly/java/edu/caltech/ipac/firefly/server/query/SearchRequestUtils.java

@@ -29,7 +29,31 @@ public class SearchRequestUtils {
      * @throws IOException
      * @throws DataAccessException
      */
-    static DataGroup dataGroupFromSearchRequest(String searchRequestJson) throws IOException, DataAccessException {
+    public static DataGroup dataGroupFromSearchRequest(String searchRequestJson) throws IOException, DataAccessException {
+        FileInfo fi = fileInfoFromSearchRequest(searchRequestJson);
+        return DataGroupReader.readAnyFormat(new File(fi.getInternalFilename()));
+    }
+
+    /**
+     * Get file created by the search request
+     * @param searchRequestJson search request in JSON format
+     * @return File file with the result table
+     * @throws IOException
+     * @throws DataAccessException
+     **/
+    public static File fileFromSearchRequest(String searchRequestJson) throws IOException, DataAccessException {
+        FileInfo fi = fileInfoFromSearchRequest(searchRequestJson);
+        return new File(fi.getInternalFilename());
+    }
+
+    /**
+     * Get file info for the results created by the search request
+     * @param searchRequestJson search request in JSON format
+     * @return File file with the result table
+     * @throws IOException
+     * @throws DataAccessException
+     **/
+    static FileInfo fileInfoFromSearchRequest(String searchRequestJson)  throws IOException, DataAccessException {
         if (searchRequestJson == null) {
             throw new DataAccessException("Missing search request");
         }
@@ -51,6 +75,6 @@ static DataGroup dataGroupFromSearchRequest(String searchRequestJson) throws IOE
             throw new SecurityException("Access is not permitted.");
         }
 
-       return DataGroupReader.readAnyFormat(new File(fi.getInternalFilename()));
+       return fi;
     }
 }

src/firefly/java/edu/caltech/ipac/firefly/server/query/tables/IpacTableFromSource.java

@@ -28,16 +28,22 @@
 public class IpacTableFromSource extends IpacTablePartProcessor {
     public static final String TBL_TYPE = "tblType";
     public static final String TYPE_CATALOG = "catalog";
-    public static final String TBL_INDEX = TableServerRequest.TBL_INDEX;     // the table to show if it's a multi-table file.
+    //public static final String TBL_INDEX = TableServerRequest.TBL_INDEX;     // the table to show if it's a multi-table file.
+    private static final String SEARCH_REQUEST = "searchRequest";
+
 
     protected File loadDataFile(TableServerRequest request) throws IOException, DataAccessException {
 
         String source = request.getParam(ServerParams.SOURCE);
         String altSource = request.getParam(ServerParams.ALT_SOURCE);
         String processor = request.getParam("processor");
+        String searchRequestJson = request.getParam(SEARCH_REQUEST);
 
         if (StringUtils.isEmpty(source) && processor != null) {
             return getByProcessor(processor, request);
+        } else if (searchRequestJson != null) {
+            // wrapping search request is useful to hide filters of the wrapped search request
+            return SearchRequestUtils.fileFromSearchRequest(searchRequestJson);
         } else {
             // get source by source key
             File inf = getSourceFile(source, request);
@@ -58,7 +64,7 @@ protected File loadDataFile(TableServerRequest request) throws IOException, Data
 
     private File getByProcessor(String processor, TableServerRequest request) throws DataAccessException {
         if (StringUtils.isEmpty(processor)) {
-            throw new DataAccessException("Required parameter 'source' is not given.");
+            throw new DataAccessException("Required parameter 'processor' is not given.");
         }
         TableServerRequest sReq = new TableServerRequest(processor, request);
         FileInfo fi = new SearchManager().getFileInfo(sReq);
@@ -82,9 +88,9 @@ public boolean doCache() {
     /**
      * resolve the file given a 'source' string.  it could be a local path, or a url.
      * if it's a url, download it into the application's workarea
-     * @param source
-     * @param request
-     * @return
+     * @param source source file
+     * @param request table request
+     * @return file
      */
     private File getSourceFile(String source, TableServerRequest request) {
         if (source == null) return null;

src/firefly/js/templates/lightcurve/lsst_sdss/LsstSdssMissionOptions.js

@@ -8,7 +8,7 @@ import {ValidationField} from '../../../ui/ValidationField.jsx';
 import {SuggestBoxInputField} from '../../../ui/SuggestBoxInputField.jsx';
 import {RadioGroupInputField} from '../../../ui/RadioGroupInputField.jsx';
 import {FieldGroup} from '../../../ui/FieldGroup.jsx';
-import {makeFileRequest} from '../../../tables/TableUtil.js';
+import {makeFileRequest, makeTblRequest} from '../../../tables/TableUtil.js';
 import {dispatchTableSearch} from '../../../tables/TablesCntlr.js';
 import {sortInfoString} from '../../../tables/SortInfo.js';
 import {FilterInfo} from '../../../tables/FilterInfo.js';
@@ -202,16 +202,16 @@ export function lsstSdssRawTableRequest(converter, source) {
 }
 
 function makeRawTableRequest(missionEntries) {
+    const band = missionEntries['band'];
     const filterInfo = new FilterInfo;
-    filterInfo.addFilter('filterName', `LIKE ${missionEntries['band']}`);
+    filterInfo.addFilter('filterName', `LIKE ${band}`);
+    const searchRequest = JSON.stringify(makeFileRequest('Raw Table', missionEntries['rawTableSource'], null, {filters: filterInfo.serialize()}));
     const options = {
         tbl_id: LC.RAW_TABLE,
         tblType: 'notACatalog',
         sortInfo: sortInfoString(missionEntries[LC.META_TIME_CNAME]),
-        filters: filterInfo.serialize(),
         META_INFO: missionEntries,
         pageSize: LC.TABLE_PAGESIZE
     };
-    return makeFileRequest('Raw Table', missionEntries['rawTableSource'], null, options);
-
+    return makeTblRequest('IpacTableFromSource', `Raw Table ${band}`, {searchRequest}, options);
 }