[rbrowser] remove last cycle from request

Now it is global settings, which changed only when really clicked on the gui side. Or when WebGui.Browser.LastCycle
rootrc parameter configured - which is analyzed only once when browser started

Author: linev

gui/browserv7/inc/ROOT/RBrowserRequest.hxx

@@ -31,7 +31,6 @@ public:
    bool reverse{false};   ///< reverse item order
    bool hidden{false};    ///< show hidden files
    bool reload{false};    ///< force items reload
-   int lastcycle{0};      ///< show only last cycle, -1 - off, 0 - not change, +1 on,
    std::string regex;     ///< applied regex
 };
 

gui/browserv7/src/RBrowser.cxx

@@ -269,12 +269,13 @@ Chrome or Firefox browsers are though required when running ROOT in batch mode.
 Most configuration options for RBrowser, such as default web browser, server mode are not specific to this class,
 but are rather applied for all web widgets: canvases, geometry viewer, eve7, browser, fit panel, etc.
 
-Following .rootrc parameters can be configured for the browser:
+Following `.rootrc` parameters can be configured for the browser:
 
    * WebGui.Browser.SortBy:  sort by "name", "size", "none" (default "name")
    * WebGui.Browser.Reverse: reverse item order (default off)
    * WebGui.Browser.ShowHidden: show hidden files (default off)
    * WebGui.Browser.LastCycle: show only last key cycle (default off)
+   * WebGui.Browser.Expand: expand browsable area (default off)
 
 \note See major settings in RWebWindowWindowsManager::CreateServer and RWebWindowsManager::ShowWindow
 */
@@ -312,16 +313,12 @@ RBrowser::RBrowser(bool use_rcanvas)
 
    reverse = (reverse == "on" || reverse == "yes" || reverse == "1") ? "true" : "false";
    hidden = (hidden == "on" || hidden == "yes" || hidden == "1") ? "true" : "false";
-   if (lastcycle == "on" || lastcycle == "yes" || lastcycle == "1") {
-      lastcycle = "1";
+   if (lastcycle == "on" || lastcycle == "yes" || lastcycle == "1")
       Browsable::RElement::SetLastKeyCycle(true);
-   } else if (lastcycle == "off" || lastcycle == "no" || lastcycle == "0") {
-      lastcycle = "-1";
+   else if (lastcycle == "off" || lastcycle == "no" || lastcycle == "0")
       Browsable::RElement::SetLastKeyCycle(false);
-   } else
-      lastcycle = Browsable::RElement::IsLastKeyCycle() ? "1" : "0";
 
-   fWebWindow->SetUserArgs(TString::Format("{ sort: \"%s\", reverse: %s, hidden: %s, lastcycle: %s }", sortby.c_str(), reverse.c_str(), hidden.c_str(), lastcycle.c_str()).Data());
+   fWebWindow->SetUserArgs(TString::Format("{ sort: \"%s\", reverse: %s, hidden: %s }", sortby.c_str(), reverse.c_str(), hidden.c_str()).Data());
 
    // this is call-back, invoked when message received via websocket
    fWebWindow->SetCallBacks([this](unsigned connid) { fConnId = connid; SendInitMsg(connid); },
@@ -774,7 +771,8 @@ void RBrowser::SendInitMsg(unsigned connid)
 
    reply.emplace_back(std::vector<std::string>({
       "settings"s,
-      gEnv->GetValue("WebGui.Browser.Expand", "no")
+      gEnv->GetValue("WebGui.Browser.Expand", "no"),
+      Browsable::RElement::IsLastKeyCycle() ? "1" : "0"
    }));
 
    std::string msg = "INMSG:";
@@ -898,6 +896,10 @@ void RBrowser::ProcessMsg(unsigned connid, const std::string &arg0)
       auto json = ProcessBrowserRequest(msg);
       if (!json.empty()) fWebWindow->Send(connid, json);
 
+   } else if (kind == "LASTCYCLE") {
+      // when changed on clients side
+      Browsable::RElement::SetLastKeyCycle(msg == "1");
+
    } else if (kind == "DBLCLK") {
 
       auto arr = TBufferJSON::FromJSON<std::vector<std::string>>(msg);

gui/browserv7/src/RBrowserData.cxx

@@ -268,11 +268,6 @@ bool RBrowserData::ProcessBrowserRequest(const RBrowserRequest &request, RBrowse
 
 std::string RBrowserData::ProcessRequest(const RBrowserRequest &request)
 {
-   if (request.lastcycle < 0)
-      Browsable::RElement::SetLastKeyCycle(false);
-   else if (request.lastcycle > 0)
-      Browsable::RElement::SetLastKeyCycle(true);
-
    RBrowserReply reply;
 
    reply.path = request.path;

ui5/browser/controller/Browser.controller.js

@@ -83,8 +83,7 @@ sap.ui.define(['sap/ui/core/mvc/Controller',
 
         const SortMethod =  this.websocket.getUserArgs('sort') ?? 'name',
               ReverseOrder = this.websocket.getUserArgs('reverse') ?? false,
-              ShowHiddenFiles = this.websocket.getUserArgs('hidden') ?? false,
-              LastCycle = this.websocket.getUserArgs('lastcycle') ?? 0;
+              ShowHiddenFiles = this.websocket.getUserArgs('hidden') ?? false;
 
         this._oSettingsModel = new JSONModel({
             SortMethods: [
@@ -95,7 +94,7 @@ sap.ui.define(['sap/ui/core/mvc/Controller',
             SortMethod,
             ReverseOrder,
             ShowHiddenFiles,
-            OnlyLastCycle: (LastCycle > 0),
+            OnlyLastCycle: false,
             AppendToCanvas: false,
             HandleDoubleClick: true,
             DBLCLKRun: false,
@@ -194,7 +193,6 @@ sap.ui.define(['sap/ui/core/mvc/Controller',
          this.model.setSortMethod(SortMethod);
          this.model.setReverseOrder(ReverseOrder);
          this.model.setShowHidden(ShowHiddenFiles);
-         this.model.setOnlyLastCycle(LastCycle);
 
          // copy extra attributes from element to node in the browser
          // later can be done automatically
@@ -785,7 +783,7 @@ sap.ui.define(['sap/ui/core/mvc/Controller',
       onSettingsPress() {
          this._oSettingsModel.setProperty("/AppendToCanvas", this.model.isAppendToCanvas());
          this._oSettingsModel.setProperty("/HandleDoubleClick", this.model.isHandleDoubleClick());
-         this._oSettingsModel.setProperty("/OnlyLastCycle", (this.model.getOnlyLastCycle() > 0));
+         this._oSettingsModel.setProperty("/OnlyLastCycle", this.model.getOnlyLastCycle());
          this._oSettingsModel.setProperty("/ShowHiddenFiles", this.model.isShowHidden());
          this._oSettingsModel.setProperty("/SortMethod", this.model.getSortMethod());
          this._oSettingsModel.setProperty("/ReverseOrder", this.model.isReverseOrder());
@@ -826,9 +824,10 @@ sap.ui.define(['sap/ui/core/mvc/Controller',
             changed_dblclick = true;
          }
 
-         if (lastcycle != (this.model.getOnlyLastCycle() > 0)) {
+         if (lastcycle != this.model.getOnlyLastCycle()) {
             changed = true;
-            this.model.setOnlyLastCycle(lastcycle ? 1 : -1);
+            this.model.setOnlyLastCycle(lastcycle);
+            this.websocket.send('LASTCYCLE:' + (lastcycle ? '1' : '0'));
          }
 
          if (hidden != this.model.isShowHidden()) {
@@ -1420,8 +1419,9 @@ sap.ui.define(['sap/ui/core/mvc/Controller',
                this._oSettingsModel.setProperty('/optTProfile', arr[k][3]|| '<dflt>');
             } else if (kind == "settings") {
                const expand = (arr[k][1] == 'on' || arr[k][1] == 'yes' || arr[k][1] == '1');
-               if (expand) 
+               if (expand)
                   this.onExpandMaster();
+               this.model.setOnlyLastCycle(arr[k][2] == '1');
             } else {
                const pr = this.createElement(kind, arr[k][1], arr[k][2], arr[k][3], arr[k][4]);
                Promise.resolve(pr).then(tab => {

ui5/browser/model/BrowserModel.js

@@ -29,7 +29,7 @@ sap.ui.define([
          this.showHidden = false;
          this.appendToCanvas = false;
          this.handleDoubleClick = true;
-         this.onlyLastCycle = 0; // 0 - not changed, -1 off , +1 on
+         this.onlyLastCycle = false;
 
          this.threshold = 100; // default threshold to prefetch items
       },
@@ -280,7 +280,6 @@ sap.ui.define([
             sort: this.sortMethod || '',
             reverse: this.reverseOrder || false,
             hidden: this.showHidden ? true : false,
-            lastcycle: this.onlyLastCycle ?? 0,
             reload: force_reload ? true : false,  // re-scan items by server even when path was not changed
             regex
          };