diff options
5 files changed, 40 insertions, 18 deletions
diff --git a/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java b/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java index 30559f55076..4362e04a207 100644 --- a/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java +++ b/plugins/org.eclipse.osee.ats.presenter.mock/src/org/eclipse/osee/ats/presenter/mock/internal/MockAtsWebSearchPresenter.java @@ -237,25 +237,56 @@ public class MockAtsWebSearchPresenter implements AtsSearchPresenter<AtsSearchHe @Override public void initSearchResults(String url, AtsSearchHeaderComponent searchHeaderComponent, SearchResultsListComponent resultsComponent) { + if ((url == null || url.isEmpty()) && searchHeaderComponent != null) { + searchHeaderComponent.clearAll(); + Set<Entry<WebId, Collection<WebId>>> entrySet = programsAndBuilds.entrySet(); + if (entrySet != null) { + for (Entry<WebId, Collection<WebId>> entry : entrySet) { + searchHeaderComponent.addProgram(entry.getKey()); + } + } + } + if (resultsComponent != null) { boolean showVerboseSearchResults = true; + String searchPhrase = ""; + boolean nameOnly = false; Map<String, String> params = requestStringToParameterMap(url); if (params != null && params.size() > 0) { String showVerbose_str = params.get(UrlParamNameConstants.PARAMNAME_SHOWVERBOSE); if (showVerbose_str != null && !showVerbose_str.isEmpty()) { showVerboseSearchResults = showVerbose_str.equalsIgnoreCase("true"); } + + searchPhrase = params.get(UrlParamNameConstants.PARAMNAME_SEARCHPHRASE); + if (searchPhrase == null) { + searchPhrase = ""; + } + + String nameOnly_str = params.get(UrlParamNameConstants.PARAMNAME_NAMEONLY); + if (nameOnly_str != null && !nameOnly_str.isEmpty()) { + nameOnly = nameOnly_str.equalsIgnoreCase("true"); + } } resultsComponent.clearAll(); - Set<Entry<String, WebArtifact>> entrySet = artifacts.entrySet(); - for (Entry<String, WebArtifact> artifactEntry : entrySet) { - SearchResultComponent searchResultComp = resultsComponent.createSearchResult(); - if (searchResultComp != null) { + if (!searchPhrase.isEmpty()) { + Set<Entry<String, WebArtifact>> entrySet = artifacts.entrySet(); + for (Entry<String, WebArtifact> artifactEntry : entrySet) { WebArtifact artifact = artifactEntry.getValue(); - searchResultComp.setShowVerboseSearchResults(showVerboseSearchResults); - searchResultComp.setArtifact(artifact); - searchResultComp.addSearchResultMatch(new SearchResultMatch("Word Template Content", "...{COM_PAGE}...", - 10)); + if (artifact.getArtifactName().toLowerCase().contains(searchPhrase.toLowerCase())) { + SearchResultComponent searchResultComp = resultsComponent.createSearchResult(); + if (searchResultComp != null) { + if (showVerboseSearchResults) { + artifact = + new WebArtifact(artifact.getGuid(), artifact.getArtifactName(), artifact.getArtifactType()); + } + searchResultComp.setArtifact(artifact); + if (!nameOnly && !showVerboseSearchResults) { + searchResultComp.addSearchResultMatch(new SearchResultMatch("Word Template Content", + "...{COM_PAGE}...", 10)); + } + } + } } } } diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiViews.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiViews.java index 2d7d74e5cb4..ed02a3cd18a 100644 --- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiViews.java +++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsUiViews.java @@ -13,7 +13,6 @@ package org.eclipse.osee.ats.view.web; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.ats.view.web.search.AtsArtifactView; -import org.eclipse.osee.ats.view.web.search.AtsSearchHomeView; import org.eclipse.osee.ats.view.web.search.AtsSearchResultsView; import org.eclipse.osee.vaadin.widgets.HasViews; import org.eclipse.osee.vaadin.widgets.Navigator; @@ -25,9 +24,8 @@ public class AtsUiViews implements HasViews { @Override public List<Class<? extends Navigator.View>> getViews() { - // Dynamic View Registration? List<Class<? extends Navigator.View>> views = new ArrayList<Class<? extends Navigator.View>>(); - views.add(AtsSearchHomeView.class); + // views.add(AtsSearchHomeView.class); views.add(AtsSearchResultsView.class); views.add(AtsArtifactView.class); return views; diff --git a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultComponent.java b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultComponent.java index bfe04542217..40c63bba0ce 100644 --- a/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultComponent.java +++ b/plugins/org.eclipse.osee.display.api/src/org/eclipse/osee/display/api/components/SearchResultComponent.java @@ -18,8 +18,6 @@ import org.eclipse.osee.display.api.data.WebArtifact; */ public interface SearchResultComponent extends DisplaysErrorComponent { - void setShowVerboseSearchResults(boolean showVerboseSearchResults); - void setArtifact(WebArtifact artifact); void addSearchResultMatch(SearchResultMatch match); diff --git a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java index 433f988a626..d194c1a845d 100644 --- a/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java +++ b/plugins/org.eclipse.osee.display.presenter.mocks/src/org/eclipse/osee/display/presenter/mocks/MockSearchResultComponent.java @@ -45,8 +45,4 @@ public class MockSearchResultComponent implements SearchResultComponent { @Override public void setErrorMessage(String message) { } - - @Override - public void setShowVerboseSearchResults(boolean showVerboseSearchResults) { - } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java index dbd814e840a..c8d1f205ae1 100644 --- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java +++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java @@ -118,7 +118,6 @@ public class OseeSearchResultComponent extends VerticalLayout implements SearchR public void setErrorMessage(String message) { } - @Override public void setShowVerboseSearchResults(boolean showVerboseSearchResults) { this.showVerboseSearchResults = showVerboseSearchResults; removeAllComponents(); |