added "app independent" case to data source filter

Author: ayasayadi1

api/utils/requestProcessor.js

@@ -1620,9 +1620,14 @@ const processRequest = (params) => {
                         else {
                             params.qstring.query.$and.push({"$or": [{"global": {"$ne": false}}, {"creator": params.member._id + ""}]});
                         }
-                        if (params.qstring.app_id) {
+                        if (params.qstring.app_id && params.qstring.app_id !== "") {
                             params.qstring.query.$and.push({"app_id": params.qstring.app_id});
                         }
+                        else if (params.qstring.app_independent === true) {
+                            console.log(params.qstring.app_independent);
+                            params.qstring.query.$and.push({"app_id": "undefined"});
+                        }
+
                         if (params.qstring.query.$or) {
                             params.qstring.query.$and.push({"$or": Object.assign([], params.qstring.query.$or) });
                             delete params.qstring.query.$or;

frontend/express/public/core/report-manager/javascripts/countly.views.js

@@ -163,7 +163,8 @@
             },
             availableDataSources: function() {
                 var obj = {
-                    "all": CV.i18n("report-manager.app-independent")
+                    "all": CV.i18n("report-manager.all-sources"),
+                    "independent": CV.i18n("report-manager.app-independent")
                 };
                 if (countlyGlobal.apps && Object.keys(countlyGlobal.apps).length !== 0) {
                     for (var app in countlyGlobal.apps) {
@@ -173,9 +174,12 @@
                 return obj;
             },
             selectedAppId: function() {
-                return (this.currentFilter.selectedDataSource && this.currentFilter.selectedDataSource !== "all")
+                return (this.currentFilter.selectedDataSource && !["all", "independent"].includes(this.currentFilter.selectedDataSource))
                     ? this.currentFilter.selectedDataSource
                     : null;
+            },
+            isAppIndependent: function() {
+                return this.currentFilter.selectedDataSource && this.currentFilter.selectedDataSource === "independent";
             }
         },
         watch: {
@@ -204,6 +208,7 @@
                         url: countlyCommon.API_PARTS.data.r + "/tasks/list",
                         data: {
                             app_id: self.selectedAppId,
+                            app_independent: self.isAppIndependent,
                             query: JSON.stringify(queryObject),
                         }
                     };
@@ -382,7 +387,6 @@
                     }
                     else if (command === "download-task") {
                         self.$emit("download-task", row);
-                        //var link = countlyCommon.API_PARTS.data.r + '/export/download/' + row._id + "?auth_token=" + countlyGlobal.auth_token + "&app_id=" + countlyCommon.ACTIVE_APP_ID;
                         var app_id = row.type === "dbviewer" ? "" : "&app_id=" + row.app_id + "";
                         var link = countlyCommon.API_PARTS.data.r + '/export/download/' + row._id + "?auth_token=" + countlyGlobal.auth_token + app_id;
                         window.location = link;

frontend/express/public/localization/dashboard/dashboard.properties

@@ -955,16 +955,17 @@ report-maanger.automatically-created-title = Automatically created Reports
 report-manager.all-origins = All Origins
 report-manager.all-types = All Types
 report-manager.all-statuses = All Statuses
-report-manager.all-owners = All owners
+report-manager.all-owners = All Owners
 report-manager.my-reports = My reports
+report-manager.all-sources = All Data Sources
 report-manager.data-source = Data source
 report-manager.select-data-source = Select data source
 report-manager.runtime-type = Runtime type
 report-manager.origin = Origin
 report-manager.select-origin = Select origin
 report-manager.owner = Owner
 report-manager.status = Status
-report-manager.app-independent = App independent
+report-manager.app-independent = App Independent
 report-manager.reset-filters = Reset filters
 report-manager.filters = Filters