upstream: b=main,r=0e873e183a93c40c0d15dc2ac60a07068baa6b16,t=2024-03…

…-01-1342-46311
sonatype · Mar 1, 2024 · 999fced · 999fced
1 parent fcc1120
commit 999fced
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 54 deletions.
diff --git a/...in/java/org/sonatype/nexus/rapture/internal/settings/SettingsCapabilityConfiguration.java b/...in/java/org/sonatype/nexus/rapture/internal/settings/SettingsCapabilityConfiguration.java
@@ -42,8 +42,6 @@ public class SettingsCapabilityConfiguration
 
   public static final String LONG_REQUEST_TIMEOUT = "longRequestTimeout";
 
-  public static final String SEARCH_REQUEST_TIMEOUT = "searchRequestTimeout";
-
   public static final String TITLE = "title";
 
   public SettingsCapabilityConfiguration() {
@@ -62,7 +60,6 @@ public SettingsCapabilityConfiguration(final Map<String, String> properties) {
     setSessionTimeout(parseInteger(properties.get(SESSION_TIMEOUT), DEFAULT_SESSION_TIMEOUT));
     setRequestTimeout(parseInteger(properties.get(REQUEST_TIMEOUT), DEFAULT_REQUEST_TIMEOUT));
     setLongRequestTimeout(parseInteger(properties.get(LONG_REQUEST_TIMEOUT), DEFAULT_LONG_REQUEST_TIMEOUT));
-    setSearchRequestTimeout(parseInteger(properties.get(SEARCH_REQUEST_TIMEOUT), DEFAULT_SEARCH_REQUEST_TIMEOUT));
     setTitle(parseString(properties.get(TITLE), DEFAULT_TITLE));
   }
 
@@ -74,7 +71,6 @@ public Map<String, String> asMap() {
     props.put(SESSION_TIMEOUT, Integer.toString(getSessionTimeout()));
     props.put(REQUEST_TIMEOUT, Integer.toString(getRequestTimeout()));
     props.put(LONG_REQUEST_TIMEOUT, Integer.toString(getLongRequestTimeout()));
-    props.put(SEARCH_REQUEST_TIMEOUT, Integer.toString(getSearchRequestTimeout()));
     props.put(TITLE, getTitle());
     return props;
   }
@@ -115,7 +111,6 @@ public String toString() {
         + ", sessionTimeout=" + getSessionTimeout()
         + ", requestTimeout=" + getRequestTimeout()
         + ", longRequestTimeout=" + getLongRequestTimeout()
-        + ", searchRequestTimeout=" + getSearchRequestTimeout()
         + "}";
   }
 }
diff --git a/.../main/java/org/sonatype/nexus/rapture/internal/settings/SettingsCapabilityDescriptor.java b/.../main/java/org/sonatype/nexus/rapture/internal/settings/SettingsCapabilityDescriptor.java
@@ -96,14 +96,6 @@ private interface Messages
         "Period of time to keep the connection alive for requests expected to take an extended period of time (seconds)")
     String longRequestTimeoutHelp();
 
-    @DefaultMessage("Search request timeout")
-    String searchRequestTimeoutLabel();
-
-    @DefaultMessage("Period of time to keep the connection alive for search requests (seconds); " +
-        "this value should be less than the request time in order for the correct error messages to be displayed. " +
-        "If this value is not set, the standard request timeout will be used instead.")
-    String searchRequestTimeoutHelp();
-
     @DefaultMessage("Title")
     String titleLabel();
 
@@ -160,13 +152,7 @@ public SettingsCapabilityDescriptor() {
             messages.longRequestTimeoutHelp(),
             FormField.MANDATORY
         ).withInitialValue(RaptureSettings.DEFAULT_LONG_REQUEST_TIMEOUT)
-            .withMinimumValue(RaptureSettings.DEFAULT_LONG_REQUEST_TIMEOUT),
-        new NumberTextFormField(
-            SettingsCapabilityConfiguration.SEARCH_REQUEST_TIMEOUT,
-            messages.searchRequestTimeoutLabel(),
-            messages.searchRequestTimeoutHelp(),
-            FormField.OPTIONAL
-        ).withMinimumValue(RaptureSettings.MIN_SEARCH_REQUEST_TIMEOUT)
+            .withMinimumValue(RaptureSettings.DEFAULT_LONG_REQUEST_TIMEOUT)
     );
   }
 

diff --git a/...ents/nexus-rapture/src/main/java/org/sonatype/nexus/rapture/settings/RaptureSettings.java b/...ents/nexus-rapture/src/main/java/org/sonatype/nexus/rapture/settings/RaptureSettings.java
@@ -38,8 +38,6 @@ public class RaptureSettings
 
   public static final int DEFAULT_LONG_REQUEST_TIMEOUT = 3 * 60; // seconds
 
-  public static final int DEFAULT_SEARCH_REQUEST_TIMEOUT = 0; // seconds
-
   public static final int MIN_SEARCH_REQUEST_TIMEOUT = 0; // seconds
 
   private boolean debugAllowed = DEFAULT_DEBUG_ALLOWED;
@@ -59,9 +57,6 @@ public class RaptureSettings
   @Min(DEFAULT_LONG_REQUEST_TIMEOUT)
   private int longRequestTimeout = DEFAULT_LONG_REQUEST_TIMEOUT;
 
-  @Min(MIN_SEARCH_REQUEST_TIMEOUT)
-  private int searchRequestTimeout = DEFAULT_SEARCH_REQUEST_TIMEOUT;
-
   @NotBlank
   private String title;
 
@@ -113,14 +108,6 @@ public void setLongRequestTimeout(final int longRequestTimeout) {
     this.longRequestTimeout = longRequestTimeout;
   }
 
-  public int getSearchRequestTimeout() {
-    return searchRequestTimeout;
-  }
-
-  public void setSearchRequestTimeout(final int searchRequestTimeout) {
-    this.searchRequestTimeout = searchRequestTimeout;
-  }
-
   public String getTitle() {
     return title;
   }

diff --git a/plugins/nexus-coreui-plugin/src/main/java/org/sonatype/nexus/coreui/SearchComponent.java b/plugins/nexus-coreui-plugin/src/main/java/org/sonatype/nexus/coreui/SearchComponent.java
@@ -30,7 +30,6 @@
 import org.sonatype.nexus.extdirect.model.StoreLoadParameters;
 import org.sonatype.nexus.extdirect.model.StoreLoadParameters.Filter;
 import org.sonatype.nexus.extdirect.model.StoreLoadParameters.Sort;
-import org.sonatype.nexus.rapture.UiSettingsManager;
 import org.sonatype.nexus.repository.search.ComponentSearchResult;
 import org.sonatype.nexus.repository.search.SearchRequest;
 import org.sonatype.nexus.repository.search.SearchResponse;
@@ -67,8 +66,6 @@ public class SearchComponent
 {
   private final SearchService searchService;
 
-  private final UiSettingsManager uiSettingsManager;
-
   private final EventManager eventManager;
 
   private final SearchResultsGenerator searchResultsGenerator;
@@ -79,13 +76,11 @@ public class SearchComponent
   public SearchComponent(
       final SearchService searchService,
       @Named("${nexus.searchResultsLimit:-1000}") final int searchResultsLimit,
-      final UiSettingsManager uiSettingsManager,
       final SearchResultsGenerator searchResultsGenerator,
       final EventManager eventManager)
   {
     this.searchService = checkNotNull(searchService);
     this.searchResultsLimit = searchResultsLimit;
-    this.uiSettingsManager = checkNotNull(uiSettingsManager);
     this.searchResultsGenerator = checkNotNull(searchResultsGenerator);
     this.eventManager = checkNotNull(eventManager);
   }
@@ -117,8 +112,7 @@ else if (formatCriteriaOnly) {
     fireSearchEvent(searchFilters);
 
     try {
-      int timeout = uiSettingsManager.getSettings().getSearchRequestTimeout();
-      return componentSearch(parameters.getLimit(), parameters.getPage(), orEmpty(parameters.getSort()), timeout,
+      return componentSearch(parameters.getLimit(), parameters.getPage(), orEmpty(parameters.getSort()),
           searchFilters);
     }
     catch (IllegalArgumentException e) {
@@ -138,7 +132,6 @@ private LimitedPagedResponse<ComponentXO> componentSearch(
       final Integer limit,
       final Integer page,
       final List<Sort> sort,
-      final Integer seconds,
       final List<SearchFilter> filters)
   {
     String sortField = sort.stream().findFirst().map(Sort::getProperty).orElse(null);

diff --git a/plugins/nexus-coreui-plugin/src/main/resources/static/rapture/NX/coreui/controller/Search.js b/plugins/nexus-coreui-plugin/src/main/resources/static/rapture/NX/coreui/controller/Search.js
@@ -315,20 +315,10 @@ Ext.define('NX.coreui.controller.Search', {
    */
   setResponseMessage: function() {
     var rawData = this.getSearchResultStore().proxy.reader.rawData,
-        searchRequestTimeoutInSeconds = NX.State.getValue('uiSettings', {})['searchRequestTimeout'] ||
-            NX.State.getValue('uiSettings', {})['requestTimeout'] - 5,
-        timedOut = rawData && rawData.timedOut,
         limited = rawData && rawData.limited,
-        format = Ext.util.Format.numberRenderer('0,000'),
-        learnMore = '<a target="_blank" rel="noopener" href="' + NX.controller.Help.getDocsUrl() + '/Searching+for+Components">' +
-            NX.I18n.get('Search_Results_TimedOut_LearnMore') + ' <i class="fa fa-external-link" /></a>';
+        format = Ext.util.Format.numberRenderer('0,000');
 
-    if (timedOut) {
-      this.timedOutMessage = NX.I18n.format('Search_Results_TimedOut_Message', searchRequestTimeoutInSeconds, learnMore);
-    }
-    else {
-      this.timedOutMessage = null;
-    }
+    this.timedOutMessage = null;
 
     if (limited) {
       this.limitMessage = NX.I18n.format('Search_Results_Limit_Message', format(rawData.total), format(rawData.unlimitedTotal));

diff --git a/revision.txt b/revision.txt
@@ -1 +1 @@
-b=main,r=31733f390bb48a9ef51f7ca50bef0f391944d353,t=2024-02-29-1534-50564
+b=main,r=0e873e183a93c40c0d15dc2ac60a07068baa6b16,t=2024-03-01-1342-46311