implemented the check for full text search if it is enabled in sysConfig

Evolveum · Feb 27, 2017 · 21ce210 · 21ce210
1 parent 00d0e6a
commit 21ce210
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 10 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
@@ -60,9 +60,10 @@ public static enum SearchViewType{
         FULL_TEXT_SEARCH
     };
 
-    private SearchViewType searchType = SearchViewType.FULL_TEXT_SEARCH;
+    private SearchViewType searchType;
 
     private boolean showAdvanced = false;
+    private boolean isFullTextSearchEnabled = false;
 
     private String advancedQuery;
     private String advancedError;
@@ -75,9 +76,19 @@ public static enum SearchViewType{
     private List<SearchItem> items = new ArrayList<>();
 
     public Search(Class<? extends ObjectType> type, Map<ItemPath, ItemDefinition> allDefinitions) {
+        this(type, allDefinitions, false);
+    }
+
+    public Search(Class<? extends ObjectType> type, Map<ItemPath, ItemDefinition> allDefinitions, boolean isFullTextSearchEnabled) {
         this.type = type;
         this.allDefinitions = allDefinitions;
 
+        this.isFullTextSearchEnabled = isFullTextSearchEnabled;
+        if (isFullTextSearchEnabled ){
+            searchType = SearchViewType.FULL_TEXT_SEARCH;
+        } else {
+            searchType = SearchViewType.BASIC_SEARCH;
+        }
         availableDefinitions.addAll(allDefinitions.values());
     }
 
@@ -343,6 +354,14 @@ public void setSearchType(SearchViewType searchType) {
         this.searchType = searchType;
     }
 
+    public boolean isFullTextSearchEnabled() {
+        return isFullTextSearchEnabled;
+    }
+
+    public void setFullTextSearchEnabled(boolean fullTextSearchEnabled) {
+        isFullTextSearchEnabled = fullTextSearchEnabled;
+    }
+
     private String createErrorMessage(Exception ex) {
         StringBuilder sb = new StringBuilder();
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
@@ -22,6 +22,7 @@
 import com.evolveum.midpoint.prism.schema.SchemaRegistry;
 import com.evolveum.midpoint.schema.ResourceShadowDiscriminator;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.schema.util.SystemConfigurationTypeUtil;
 import com.evolveum.midpoint.util.exception.ConfigurationException;
 import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
 import com.evolveum.midpoint.util.exception.SchemaException;
@@ -41,6 +42,7 @@ public class SearchFactory {
 
     private static final String DOT_CLASS = SearchFactory.class.getName() + ".";
     private static final String LOAD_OBJECT_DEFINITION = DOT_CLASS + "loadObjectDefinition";
+    private static final String LOAD_SYSTEM_CONFIGURATION = DOT_CLASS + "loadSystemConfiguration";
 
     private static final Map<Class, List<ItemPath>> SEARCHABLE_OBJECTS = new HashMap<>();
 
@@ -132,8 +134,9 @@ public static <T extends ObjectType> Search createSearch(
         PrismObjectDefinition objectDef = findObjectDefinition(type, discriminator, ctx, modelInteractionService);
 
         Map<ItemPath, ItemDefinition> availableDefs = getAvailableDefinitions(objectDef, useDefsFromSuperclass);
+        boolean isFullTextSearchEnabled = isFullTextSearchEnabled(modelInteractionService);
 
-        Search search = new Search(type, availableDefs);
+        Search search = new Search(type, availableDefs, isFullTextSearchEnabled);
 
         SchemaRegistry registry = ctx.getSchemaRegistry();
         PrismObjectDefinition objDef = registry.findObjectDefinitionByCompileTimeClass(ObjectType.class);
@@ -201,6 +204,16 @@ private static <T extends ObjectType> Map<ItemPath, ItemDefinition> getAvailable
         return map;
     }
 
+    private static boolean isFullTextSearchEnabled(ModelInteractionService modelInteractionService) {
+        OperationResult result = new OperationResult(LOAD_SYSTEM_CONFIGURATION);
+        try {
+            return SystemConfigurationTypeUtil.isFullTextSearchEnabled(modelInteractionService.getSystemConfiguration(result)
+                    .getFullTextSearch());
+        } catch (SchemaException | ObjectNotFoundException ex) {
+                throw new SystemException(ex);
+        }
+    }
+
     private static <T extends ObjectType> Map<ItemPath, ItemDefinition> createExtensionDefinitionList(
             PrismObjectDefinition<T> objectDef) {
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
@@ -190,10 +190,7 @@ public boolean isEnabled() {
                     return true;
                 }
                 return false;
-//                Search search = getModelObject();
-//                PrismContext ctx = getPageBase().getPrismContext();
-//                return search.isAdvancedQueryValid(ctx);
-            }
+           }
 
 			@Override
 			public boolean isVisible() {
@@ -303,7 +300,8 @@ public void onClick(AjaxRequestTarget target) {
         fullTextButton.add(new VisibleEnableBehaviour(){
             @Override
             public boolean isVisible() {
-                return !Search.SearchViewType.FULL_TEXT_SEARCH.equals(getModelObject().getSearchType());
+                return isFullTextSearchEnabled() &&
+                        !Search.SearchViewType.FULL_TEXT_SEARCH.equals(getModelObject().getSearchType());
             }
         });
         linksContainer.add(fullTextButton);
@@ -333,7 +331,14 @@ public String load() {
         initPopover();
 
         WebMarkupContainer fullTextContainer = new WebMarkupContainer(ID_FULL_TEXT_CONTAINER);
-        fullTextContainer.add(createVisibleBehaviour(Search.SearchViewType.FULL_TEXT_SEARCH));
+        fullTextContainer.add(new VisibleEnableBehaviour(){
+            private static final long serialVersionUID = 1L;
+            @Override
+            public boolean isVisible(){
+                return isFullTextSearchEnabled()
+                        && getModelObject().getSearchType().equals(Search.SearchViewType.FULL_TEXT_SEARCH);
+            }
+        });
         fullTextContainer.setOutputMarkupId(true);
         form.add(fullTextContainer);
 
@@ -663,4 +668,8 @@ private void updateAdvancedArea(Component area, AjaxRequestTarget target) {
                 get(createComponentPath(ID_FORM, ID_ADVANCED_GROUP)),
                 get(createComponentPath(ID_FORM, ID_SEARCH_CONTAINER)));
     }
+
+    private boolean isFullTextSearchEnabled(){
+        return getModelObject().isFullTextSearchEnabled();
+    }
 }
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
@@ -36,7 +36,7 @@
         </div>
 
         <form class="form-inline pull-right search-form" wicket:id="searchForm">
-            <div class="form-group" style="margin-top: -15px;">
+            <div class="form-group" wicket:id="choiceContainer">
                 <label class="sr-only"><wicket:message key="pageDebugList.objectType"/></label>
                 <select class="form-control input-sm" wicket:id="choice"/>
             </div>

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
@@ -40,6 +40,7 @@
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
 import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
+import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
@@ -138,6 +139,7 @@ public class PageDebugList extends PageAdminConfiguration {
 	private static final String ID_MAIN_FORM = "mainForm";
 	private static final String ID_ZIP_CHECK = "zipCheck";
 	private static final String ID_TABLE = "table";
+	private static final String ID_CHOICE_CONTAINER = "choiceContainer";
 	private static final String ID_CHOICE = "choice";
 	private static final String ID_EXPORT = "export";
 	private static final String ID_EXPORT_ALL = "exportAll";
@@ -968,9 +970,22 @@ protected String resourceKey(ObjectTypes object) {
 				}
 			};
 
+			WebMarkupContainer choiceContainer = new WebMarkupContainer(ID_CHOICE_CONTAINER);
+			choiceContainer.setOutputMarkupId(true);
+			choiceContainer.add(new AttributeAppender("style", new LoadableModel<String>() {
+				private static final long serialVersionUID = 1L;
+				@Override
+				public String load(){
+					PageDebugList page = (PageDebugList) getPage();
+					return page.searchModel.getObject().getSearch().isFullTextSearchEnabled() ?
+							"margin-top: -15px;" : "";
+				}
+			}));
+			searchForm.add(choiceContainer);
+
 			DropDownChoice choice = new DropDownChoice(ID_CHOICE,
 					new PropertyModel(model, DebugSearchDto.F_TYPE), createChoiceModel(renderer), renderer);
-			searchForm.add(choice);
+			choiceContainer.add(choice);
 			choice.add(new OnChangeAjaxBehavior() {
 
 				@Override

diff --git a/model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java b/model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
@@ -186,6 +186,8 @@ <F extends ObjectType> ModelContext<F> previewChanges(
      */
     AdminGuiConfigurationType getAdminGuiConfiguration(Task task, OperationResult parentResult) throws ObjectNotFoundException, SchemaException;
 
+    SystemConfigurationType getSystemConfiguration(OperationResult parentResult) throws ObjectNotFoundException, SchemaException;
+
 	DeploymentInformationType getDeploymentInformationConfiguration(OperationResult parentResult) throws ObjectNotFoundException, SchemaException;
 
 	AccessCertificationConfigurationType getCertificationConfiguration(OperationResult parentResult)

diff --git a/...rc/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java b/...rc/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
@@ -680,6 +680,15 @@ public AdminGuiConfigurationType getAdminGuiConfiguration(Task task, OperationRe
 		}
 	}
 
+	@Override
+	public SystemConfigurationType getSystemConfiguration(OperationResult parentResult) throws ObjectNotFoundException, SchemaException {
+			PrismObject<SystemConfigurationType> systemConfiguration = systemObjectCache.getSystemConfiguration(parentResult);
+			if (systemConfiguration == null) {
+				return null;
+			}
+			return systemConfiguration.asObjectable();
+	}
+
 	@Override
 	public DeploymentInformationType getDeploymentInformationConfiguration(OperationResult parentResult) throws ObjectNotFoundException, SchemaException {
 		PrismObject<SystemConfigurationType> systemConfiguration = systemObjectCache.getSystemConfiguration(parentResult);