Merge pull request #5496 from jay-hodgson/SWC-7033

SWC-7033
Sage-Bionetworks · Aug 22, 2024 · 7fac99f · 7fac99f
2 parents cbec9a2 + b1316ca
commit 7fac99f
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 5 deletions.
diff --git a/...a/org/sagebionetworks/web/client/widget/entity/controller/EntityActionControllerImpl.java b/...a/org/sagebionetworks/web/client/widget/entity/controller/EntityActionControllerImpl.java
@@ -74,8 +74,19 @@
 import org.sagebionetworks.repo.model.table.VirtualTable;
 import org.sagebionetworks.repo.model.v2.wiki.V2WikiHeader;
 import org.sagebionetworks.repo.model.wiki.WikiPage;
-import org.sagebionetworks.web.client.*;
+import org.sagebionetworks.web.client.ChallengeClientAsync;
+import org.sagebionetworks.web.client.DisplayConstants;
+import org.sagebionetworks.web.client.DisplayUtils;
 import org.sagebionetworks.web.client.DisplayUtils.NotificationVariant;
+import org.sagebionetworks.web.client.EntityTypeUtils;
+import org.sagebionetworks.web.client.FeatureFlagConfig;
+import org.sagebionetworks.web.client.FeatureFlagKey;
+import org.sagebionetworks.web.client.GWTWrapper;
+import org.sagebionetworks.web.client.GlobalApplicationState;
+import org.sagebionetworks.web.client.PopupUtilsView;
+import org.sagebionetworks.web.client.PortalGinInjector;
+import org.sagebionetworks.web.client.SynapseClientAsync;
+import org.sagebionetworks.web.client.SynapseJavascriptClient;
 import org.sagebionetworks.web.client.context.KeyFactoryProvider;
 import org.sagebionetworks.web.client.context.QueryClientProvider;
 import org.sagebionetworks.web.client.cookie.CookieProvider;
@@ -99,7 +110,6 @@
 import org.sagebionetworks.web.client.utils.Callback;
 import org.sagebionetworks.web.client.utils.CallbackP;
 import org.sagebionetworks.web.client.widget.EntityTypeIcon;
-import org.sagebionetworks.web.client.widget.EntityTypeIconImpl;
 import org.sagebionetworks.web.client.widget.asynch.AsynchronousProgressHandler;
 import org.sagebionetworks.web.client.widget.asynch.IsACTMemberAsyncHandler;
 import org.sagebionetworks.web.client.widget.asynch.JobTrackingWidget;
@@ -127,7 +137,6 @@
 import org.sagebionetworks.web.client.widget.entity.tabs.ChallengeTab;
 import org.sagebionetworks.web.client.widget.evaluation.EvaluationSubmitter;
 import org.sagebionetworks.web.client.widget.sharing.AccessControlListModalWidget;
-import org.sagebionetworks.web.client.widget.sharing.AccessControlListModalWidgetImpl;
 import org.sagebionetworks.web.client.widget.sharing.EntityAccessControlListModalWidget;
 import org.sagebionetworks.web.client.widget.statistics.StatisticsPlotWidget;
 import org.sagebionetworks.web.client.widget.table.modal.fileview.CreateTableViewWizard;
@@ -730,7 +739,9 @@ private void configureReportViolation() {
   private void configureFullTextSearch() {
     if (
       entityBundle.getEntity() instanceof Table &&
-      entityBundle.getPermissions().getCanCertifiedUserEdit()
+      entityBundle.getPermissions().getCanCertifiedUserEdit() &&
+      // SWC-7033: available if table is not a VirtualTable
+      !(entityBundle.getEntity() instanceof VirtualTable)
     ) {
       Table tableEntity = (Table) entityBundle.getEntity();
       actionMenu.setActionVisible(Action.TOGGLE_FULL_TEXT_SEARCH, true);

diff --git a/...gebionetworks/web/unitclient/widget/entity/controller/EntityActionControllerImplTest.java b/...gebionetworks/web/unitclient/widget/entity/controller/EntityActionControllerImplTest.java
@@ -27,7 +27,21 @@
 import static org.sagebionetworks.web.client.DisplayConstants.VIRTUAL_TABLE;
 import static org.sagebionetworks.web.client.utils.FutureUtils.getDoneFuture;
 import static org.sagebionetworks.web.client.utils.FutureUtils.getFailedFuture;
-import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.*;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.ACCESS_REQUIREMENT_GUIDANCE;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.ARE_YOU_SURE_YOU_WANT_TO_DELETE;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.DELETE_CONTAINER_EXPLANATION_END;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.DELETE_CONTAINER_EXPLANATION_START;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.DELETE_PREFIX;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.EDIT_NAME_AND_DESCRIPTION;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.EDIT_WIKI_PREFIX;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.ENABLE_2FA_GUIDANCE;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.MOVE_PREFIX;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.NO_PERMISSION_TO_DOWNLOAD;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.REQUEST_DOWNLOAD_GUIDANCE;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.THE;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.UPDATE_DOI_FOR;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.WAS_SUCCESSFULLY_DELETED;
+import static org.sagebionetworks.web.client.widget.entity.controller.EntityActionControllerImpl.WIKI;
 import static org.sagebionetworks.web.shared.WebConstants.FLAG_ISSUE_COLLECTOR_URL;
 import static org.sagebionetworks.web.shared.WebConstants.FLAG_ISSUE_DESCRIPTION_PART_1;
 import static org.sagebionetworks.web.shared.WebConstants.FLAG_ISSUE_PRIORITY;
@@ -658,6 +672,22 @@ public void testConfigureWithTableEntity() {
     verify(mockActionMenu).setActionVisible(Action.VIEW_DEFINING_SQL, false);
   }
 
+  @Test
+  public void testFullTableSearchUnavailableForVirtualTableEntity() {
+    entityBundle.setEntity(new VirtualTable());
+
+    controller.configure(
+      mockActionMenu,
+      entityBundle,
+      true,
+      wikiPageId,
+      currentEntityArea,
+      mockAddToDownloadListWidget
+    );
+    verify(mockActionMenu)
+      .setActionVisible(Action.TOGGLE_FULL_TEXT_SEARCH, false);
+  }
+
   @Test
   public void testConfigureWithTableEntityNoPermission() {
     boolean canEdit = false;