barsa-novin-ray-core 2.3.112 → 2.3.113

package/fesm2022/barsa-novin-ray-core.mjs

@@ -5326,7 +5326,7 @@ function searchNavigatorInApp(app, keyword) {
         if (node.Caption && node.Caption.toLowerCase().includes(keyword.toLowerCase())) {
             let url = '';
             if (!node.IsRoot && node.ReportId && node.ReportId !== '0') {
-                url = `#/application/${app.Id}/report/${node.FolderId}__${node.Caption}__${node.ReportId}`;
+                url = `#/application/report/${node.FolderId}__${node.Caption}__${node.ReportId}`;
             }
             else if (node.IsRoot) {
                 url = `#/application/${app.Id}`;
@@ -5515,7 +5515,7 @@ class ApplicationCtrlrService {
     selectSystemCommand(command) {
         this.selectSystemCommandId(command.Key);
         new Promise((resolve, _reject) => {
-            this._routeToSelectedSystem();
+            // this._routeToSystem(this._selectedSystemId$.getValue());
             if (command.DynamicCommand) {
                 BarsaApi.Common.CustomCodeManager.RunDynamicCommand(command.Key, {}, resolve);
             }
@@ -5603,6 +5603,7 @@ class ApplicationCtrlrService {
     searchItemClick(data) {
         if (data.original.IsRoot) {
             this._routeToSystem(data.appId);
+            this.sidebarToggled(true);
         }
         else if (data.source === 'Command') {
             this.selectSystemCommand(data.original);
@@ -5610,6 +5611,7 @@ class ApplicationCtrlrService {
         else if (data.source === 'Navigator') {
             if (data.original.ReportId === '0') {
                 this._routeToSystem(data.appId);
+                this.sidebarToggled(true);
                 this.selectNavGroup(data.id, false);
             }
             else {
@@ -5618,8 +5620,7 @@ class ApplicationCtrlrService {
         }
     }
     _routeToSystem(systemId) {
-        this.selectedSystem(systemId);
-        this._routeToSelectedSystem();
+        this.systemChange(systemId);
     }
     getLastActivatedRoute() {
         let route = this._router.routerState.root;
@@ -5629,15 +5630,7 @@ class ApplicationCtrlrService {
         return route;
     }
     _routeToReport(navGroupId, caption, reportId) {
-        this._router.navigate([
-            'application',
-            this._selectedSystemId$.getValue(),
-            'report',
-            navGroupId + '__' + caption + '__' + reportId
-        ]);
-    }
-    _routeToSelectedSystem() {
-        this._router.navigate(['application', this._selectedSystemId$.getValue()]);
+        this._router.navigate(['application', 'report', navGroupId + '__' + caption + '__' + reportId]);
     }
     flattenLeafCommands(commands) {
         const result = [];