From a2673aaa87fd4dde1a2291e67ef4f969f9f41b2e Mon Sep 17 00:00:00 2001
From: vicky-primathon <67091118+vicky-primathon@users.noreply.github.com>
Date: Fri, 24 Jul 2020 16:02:31 +0530
Subject: [PATCH 1/2] Fix-Open image in new tab on clicking it in table widget.
 (#119)

* Added Button component in Table widget for actions

* Action button state loading added for Table widget

* Action button font-weight made as normal

* Created header for common functionalities in Table Widget

* Client side searching added in Table Widget. Action created for server side searching also.

* Columns visibility feature initial commit

* Column visibility list added in Table Widget

* Changed pagination designs in accordance with new layout. This enable user to jump page as well.

* Using colors values from constants

* Table widget pagination, numeric input page number clamped between 1 and total pages

* Adding tool tip to truncated values in table widget. Added AutoToolTipComponent that adds tooltip when text is truncated.

* Table data download changes. Added downlaod icon and button to table widget.

* Table data download changes

* Table button loading state fixed. Table code refactored, rendering from props instead of state in ReactTableComponent

* Table widget action button alignment fixed

* Handled actions column changes

* added proper keys to useMemo for react table widget

* Download table data as CSV implemented

* table data download, unused code removed

* Code refactors and added dependency map with meta props and table data for computing columns

* Table UI breakages on scroll and empty cells fixed

* Handled empty rows in table widget

* Fixed last row cut issue

* Code review changes

* Code review changes

* Added table widget component heights as enum

* code review changes

* Search component in Table widget updated with support for clearing data, renamed properties

* Opening image in new tab on clicking in table widget

* Fixed table craching due to empty data filtering

* Empty extra space on loading removed in table widget

* Removed stopping of event propagation on table widget action button click

* Table header UI overflow fixed

* Clearing selected row on searching data in table widget

* fix for cypress test

Co-authored-by: Arpit Mohan <me@arpitmohan.com>
---
 .../appsmith/SearchComponent.tsx              |  1 +
 .../appsmith/TableStyledWrappers.tsx          |  5 +++-
 .../designSystems/appsmith/TableUtilities.tsx | 23 +++++++-------
 .../propertyControls/StyledControls.tsx       |  1 +
 app/client/src/widgets/TableWidget.tsx        | 30 +++++++++++--------
 5 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/app/client/src/components/designSystems/appsmith/SearchComponent.tsx b/app/client/src/components/designSystems/appsmith/SearchComponent.tsx
index 4c201271ed..fc96005365 100644
--- a/app/client/src/components/designSystems/appsmith/SearchComponent.tsx
+++ b/app/client/src/components/designSystems/appsmith/SearchComponent.tsx
@@ -33,6 +33,7 @@ const SearchComponent = (props: SearchProps) => {
   return (
     <SearchInputWrapper
       leftIcon="search"
+      type="search"
       onChange={handleSearch}
       placeholder={props.placeholder}
       value={value}
diff --git a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
index b7a4d0c8be..192f54438d 100644
--- a/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableStyledWrappers.tsx
@@ -11,6 +11,7 @@ export const TableWrapper = styled.div<{ width: number; height: number }>`
   display: flex;
   justify-content: space-between;
   flex-direction: column;
+  overflow: hidden;
   .tableWrap {
     height: 100%;
     display: block;
@@ -22,7 +23,8 @@ export const TableWrapper = styled.div<{ width: number; height: number }>`
     color: ${Colors.BLUE_BAYOUX};
     position: relative;
     overflow-y: auto;
-    height: ${props => props.height - TABLE_SIZES.TABLE_HEADER_HEIGHT}px;
+    /* Subtracting 9px to handling widget padding */
+    height: ${props => props.height - TABLE_SIZES.TABLE_HEADER_HEIGHT - 9}px;
     .thead,
     .tbody {
       overflow: hidden;
@@ -255,6 +257,7 @@ export const TableHeaderWrapper = styled.div`
   align-items: center;
   width: 100%;
   border-bottom: 1px solid ${Colors.GEYSER_LIGHT};
+  min-width: 700px;
 `;
 
 export const CommonFunctionsMenuWrapper = styled.div`
diff --git a/app/client/src/components/designSystems/appsmith/TableUtilities.tsx b/app/client/src/components/designSystems/appsmith/TableUtilities.tsx
index e4e6efc9ea..bb7de29097 100644
--- a/app/client/src/components/designSystems/appsmith/TableUtilities.tsx
+++ b/app/client/src/components/designSystems/appsmith/TableUtilities.tsx
@@ -334,11 +334,18 @@ export const renderCell = (
             .map((item: string, index: number) => {
               if (imageRegex.test(item)) {
                 return (
-                  <div
-                    key={index}
-                    className="image-cell"
-                    style={{ backgroundImage: `url("${item}")` }}
-                  />
+                  <a
+                    onClick={e => e.stopPropagation()}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    href={item}
+                  >
+                    <div
+                      key={index}
+                      className="image-cell"
+                      style={{ backgroundImage: `url("${item}")` }}
+                    />
+                  </a>
                 );
               } else {
                 return <div>Invalid Image</div>;
@@ -401,11 +408,7 @@ const TableAction = (props: {
     setLoading(false);
   };
   return (
-    <ActionWrapper
-      onClick={e => {
-        e.stopPropagation();
-      }}
-    >
+    <ActionWrapper>
       <Button
         loading={loading}
         onClick={() => {
diff --git a/app/client/src/components/propertyControls/StyledControls.tsx b/app/client/src/components/propertyControls/StyledControls.tsx
index b5aa8f7391..c8dc8be4ce 100644
--- a/app/client/src/components/propertyControls/StyledControls.tsx
+++ b/app/client/src/components/propertyControls/StyledControls.tsx
@@ -88,6 +88,7 @@ export const StyledDropDownContainer = styled.div`
         word-break: break-word;
         display: block;
         overflow: auto;
+        overflow-y: hidden;
       }
     }
   }
diff --git a/app/client/src/widgets/TableWidget.tsx b/app/client/src/widgets/TableWidget.tsx
index 7ea372d2dd..546c1c89dd 100644
--- a/app/client/src/widgets/TableWidget.tsx
+++ b/app/client/src/widgets/TableWidget.tsx
@@ -14,7 +14,7 @@ import {
 } from "components/designSystems/appsmith/TableUtilities";
 import { TABLE_SIZES } from "components/designSystems/appsmith/Table";
 import { VALIDATION_TYPES } from "constants/WidgetValidation";
-import { RenderMode, RenderModes } from "constants/WidgetConstants";
+import { RenderModes } from "constants/WidgetConstants";
 import {
   WidgetPropertyValidationType,
   BASE_WIDGET_VALIDATION,
@@ -33,7 +33,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
       prevPageKey: VALIDATION_TYPES.TEXT,
       label: VALIDATION_TYPES.TEXT,
       selectedRowIndex: VALIDATION_TYPES.NUMBER,
-      searchKey: VALIDATION_TYPES.TEXT,
+      searchKeyword: VALIDATION_TYPES.TEXT,
       // columnActions: VALIDATION_TYPES.ARRAY_ACTION_SELECTOR,
       // onRowSelected: VALIDATION_TYPES.ACTION_SELECTOR,
       // onPageChange: VALIDATION_TYPES.ACTION_SELECTOR,
@@ -50,7 +50,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
       pageNo: 1,
       pageSize: undefined,
       selectedRowIndex: -1,
-      searchKey: "",
+      searchKeyword: "",
     };
   }
 
@@ -58,7 +58,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
     return {
       onRowSelected: true,
       onPageChange: true,
-      onSearch: true,
+      onSearchTextChanged: true,
     };
   }
 
@@ -198,9 +198,12 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
   };
 
   searchTableData = (tableData: object[]) => {
+    if (!tableData || !tableData.length) {
+      return [];
+    }
     const searchKey =
-      this.props.searchKey !== undefined
-        ? this.props.searchKey.toString().toUpperCase()
+      this.props.searchKeyword !== undefined
+        ? this.props.searchKeyword.toString().toUpperCase()
         : "";
     return tableData.filter((item: object) => {
       return Object.values(item)
@@ -246,7 +249,7 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
           isLoading={this.props.isLoading}
           widgetId={this.props.widgetId}
           widgetName={this.props.widgetName}
-          searchKey={this.props.searchKey}
+          searchKey={this.props.searchKeyword}
           renderMode={this.props.renderMode}
           hiddenColumns={hiddenColumns}
           columnActions={this.props.columnActions}
@@ -297,11 +300,12 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
   }
 
   handleSearchTable = (searchKey: any) => {
-    const { onSearch } = this.props;
-    super.updateWidgetMetaProperty("searchKey", searchKey);
-    if (onSearch) {
+    const { onSearchTextChanged } = this.props;
+    this.resetSelectedRowIndex();
+    super.updateWidgetMetaProperty("searchKeyword", searchKey);
+    if (onSearchTextChanged) {
       super.executeAction({
-        dynamicString: onSearch,
+        dynamicString: onSearchTextChanged,
         event: {
           type: EventType.ON_SEARCH,
         },
@@ -381,12 +385,12 @@ export interface TableWidgetProps extends WidgetProps {
   nextPageKey?: string;
   prevPageKey?: string;
   label: string;
-  searchKey: string;
+  searchKeyword: string;
   tableData: object[];
   onPageChange?: string;
   pageSize: number;
   onRowSelected?: string;
-  onSearch: string;
+  onSearchTextChanged: string;
   selectedRowIndex?: number;
   columnActions?: ColumnAction[];
   serverSidePaginationEnabled?: boolean;

From 9f8b5ca4d8172eaedabe25590554484b461d899b Mon Sep 17 00:00:00 2001
From: Trisha Anand <trisha@appsmith.com>
Date: Fri, 24 Jul 2020 17:05:49 +0530
Subject: [PATCH 2/2] Adding execute action permissions policy to match read
 actions policy in existing actions. (#156)

* Fixing test cases failing due to non unique names.

* Adding execute action permissions policy to match read actions policy in existing actions.

* Only save the action if there are read actions permission present (and hence could have been updated)
---
 .../server/migrations/DatabaseChangelog.java  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
index 6b07784957..16b58b94f2 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/DatabaseChangelog.java
@@ -1,6 +1,7 @@
 package com.appsmith.server.migrations;
 
 import com.appsmith.external.models.AuthenticationDTO;
+import com.appsmith.external.models.Policy;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Action;
 import com.appsmith.server.domains.Application;
@@ -40,10 +41,13 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static com.appsmith.server.acl.AclPermission.EXECUTE_ACTIONS;
+import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
 import static org.springframework.data.mongodb.core.query.Criteria.where;
 import static org.springframework.data.mongodb.core.query.Query.query;
 import static org.springframework.data.mongodb.core.query.Update.update;
@@ -543,4 +547,34 @@ public class DatabaseChangelog {
             mongoTemplate.save(plugin);
         }
     }
+
+    @ChangeSet(order = "020", id = "execute-action-for-read-action", author = "")
+    public void giveExecutePermissionToReadActionUsers(MongoTemplate mongoTemplate) {
+        final List<Action> actions = mongoTemplate.find(
+                query(where("policies").exists(true)),
+                Action.class
+        );
+
+        for (final Action action : actions) {
+            Set<Policy> policies = action.getPolicies();
+            if (policies.size() > 0) {
+                Optional<Policy> readActionsOptional = policies.stream().filter(policy -> policy.getPermission().equals(READ_ACTIONS.getValue())).findFirst();
+                if (readActionsOptional.isPresent()) {
+                    Policy readActionPolicy = readActionsOptional.get();
+
+                    Optional<Policy> executeActionsOptional = policies.stream().filter(policy -> policy.getPermission().equals(EXECUTE_ACTIONS.getValue())).findFirst();
+                    if (executeActionsOptional.isPresent()) {
+                        Policy executeActionPolicy = executeActionsOptional.get();
+                        executeActionPolicy.getUsers().addAll(readActionPolicy.getUsers());
+                    } else {
+                        // this policy doesnt exist. create and add this to the policy set
+                        Policy newExecuteActionPolicy = Policy.builder().permission(EXECUTE_ACTIONS.getValue())
+                                .users(readActionPolicy.getUsers()).build();
+                        action.getPolicies().add(newExecuteActionPolicy);
+                    }
+                    mongoTemplate.save(action);
+                }
+            }
+        }
+    }
 }