Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] Grid Widget #2389

Merged
merged 556 commits into from
Apr 23, 2021
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
556 commits
Select commit Hold shift + click to select a range
ec0f075
Merge branch 'fix/property-pane-bindings' of github.com:appsmithorg/a…
riodeuno Jan 15, 2021
08fb0b9
Merge branch 'fix/property-pane-bindings' of https://github.com/appsm…
Jan 15, 2021
fd487ff
Updated test
Jan 15, 2021
129254e
Merge branch 'tests/property-pane-bindings' of https://github.com/app…
Jan 15, 2021
e48a2f4
updated assertions
Jan 17, 2021
223ef84
Resizing image to take full width of table cell
vicky-primathon Jan 17, 2021
f0f918e
updated assertion
Jan 18, 2021
a0b5046
Stop updating dynamicBindingPathList directly from widget
riodeuno Jan 19, 2021
1ff7a38
Merge branch 'tests/property-pane-bindings' of github.com:appsmithorg…
riodeuno Jan 19, 2021
715c246
Fix selectedRow and selectedRows computations
riodeuno Jan 19, 2021
a066478
Merge branch 'release' of github.com:appsmithorg/appsmith into tests/…
riodeuno Jan 19, 2021
1b14bbd
Fix primaryColumns computations
riodeuno Jan 19, 2021
117fd11
Updated test for derived column
Jan 19, 2021
e089144
Added tests for computed value
Jan 19, 2021
7ef52e3
Added check clear data
Jan 19, 2021
582ecd5
Reordering of test
Jan 20, 2021
2e7d692
updated common method
Jan 20, 2021
3019c08
Made image size as 100% of table cell size
vicky-primathon Jan 20, 2021
f16f542
add templating logic
Jan 20, 2021
f58a65a
Updated flow and dsl
Jan 20, 2021
340ef79
Merge branch 'tests/property-pane-bindings' of https://github.com/app…
Jan 20, 2021
17cca39
Clear old primary columns
riodeuno Jan 20, 2021
e9f11e1
Merge branch 'tests/property-pane-bindings' of github.com:appsmithorg…
riodeuno Jan 20, 2021
fde66e2
Updated testname
Jan 20, 2021
3eb022a
Merge branch 'release' of github.com:appsmithorg/appsmith into tests/…
riodeuno Jan 20, 2021
88ce4ac
Merge branch 'release' of github.com:appsmithorg/appsmith into tests/…
riodeuno Jan 21, 2021
47c721f
property binding branch
Jan 21, 2021
f5e2a98
updated assertion
Jan 21, 2021
86107e6
use evaluated values for children
Jan 21, 2021
ff92c46
Fix primary columns update on component mount and component update
riodeuno Jan 21, 2021
ae36222
add isArray check
Jan 25, 2021
fe8bc05
remove property pane enhancement reducer
Jan 25, 2021
6ac12d2
add property pane enhancement reducer
Jan 25, 2021
cac75ef
disable items other than template + fix running property enchancment …
Jan 25, 2021
f199bc6
disbled drag, resize, settingsControl, drag for items other than temp…
Jan 25, 2021
1b2239b
Merge branch 'tests/property-pane-bindings' of github.com:appsmithorg…
riodeuno Jan 25, 2021
1e16991
Merge branch 'release' of github.com:appsmithorg/appsmith into tests/…
riodeuno Jan 25, 2021
c4b046e
add grid options
Jan 26, 2021
f6ccb82
uncomment the widget operation for add child for grid children
Jan 26, 2021
076713e
handle delete scenario for child widget in list widget
Jan 26, 2021
da547c3
WIP: Use the new delete and update property features
riodeuno Jan 27, 2021
722b471
add listdsl.json for testcases
Jan 27, 2021
fa54644
add test cases for correct no. of items being rendered
Jan 27, 2021
e1400b6
add test cases currentItem binding in list widget
Jan 27, 2021
20949f6
change dragEnabled to dragDisabled
Jan 28, 2021
236b382
change resizeEnabled to resizeDisabled
Jan 28, 2021
aabea27
change settingsControlEnabled to settingsControlDisabled
Jan 28, 2021
fb06cac
change dropEnabled to dropDisabled
Jan 28, 2021
b081818
update settingsControlDisabled default value
Jan 28, 2021
91e5c58
Use deleteProperties in propertyControls
riodeuno Jan 28, 2021
b418431
Fix unsetting of array indices when deleting widget properties
riodeuno Jan 28, 2021
3b6f651
Merge branch 'release' of github.com:appsmithorg/appsmith into tests/…
riodeuno Jan 28, 2021
bac0761
remove old TableWidget.tsx file
riodeuno Jan 28, 2021
7ec8e70
Fix derived column property update on primary column property update
riodeuno Jan 28, 2021
44d2280
Handle undefined primary columns
riodeuno Jan 28, 2021
444fa8a
Fix filepicker immutable prop issue
riodeuno Jan 28, 2021
83edb29
Fix object.freeze issue when adding ids to the property pane configur…
riodeuno Jan 28, 2021
66b3a00
fix widget issue in grid
Jan 29, 2021
663e49e
fix batch update issue
Jan 30, 2021
ef75ad8
Merge branch 'release' of github.com:appsmithorg/appsmith into tests/…
riodeuno Feb 1, 2021
f79006f
Fix column actions dynamicBindingPathList inclusion issue
riodeuno Feb 1, 2021
fc75f72
Merge branch 'release' of github.com:appsmithorg/appsmith into tests/…
riodeuno Feb 1, 2021
5a91cc6
pull property-binding branch
Feb 1, 2021
a44d653
remove consoles + fix typo around batch update
Feb 1, 2021
96b9ee4
Remove redundant tests
riodeuno Feb 1, 2021
a32db0a
js binding test for date picker
Feb 1, 2021
511a21c
hydate enhancement map on copy list widget
Feb 2, 2021
4777380
check for dynamicleaf
ofpiyush Feb 1, 2021
3876d5e
fixes
ofpiyush Feb 1, 2021
b84799b
improve check
ofpiyush Feb 1, 2021
881d770
Merge branch 'release' into feature/table-new-features
ofpiyush Feb 2, 2021
de392b3
fix getNextWidgetName
ofpiyush Feb 2, 2021
8808d16
update template in list widget when copying
Feb 2, 2021
dca0c64
updating template copy logic when copying widget
Feb 2, 2021
1449397
pull latest release + fix merge conflicts
Feb 2, 2021
550bd10
update dynamicBindingPathList in copied widget
Feb 2, 2021
755794b
Add path parameter to hidden functions in property pane configs
riodeuno Feb 3, 2021
fb41483
fix copy bug when copying list widget
Feb 3, 2021
67b83a3
Merge branch 'release' of github.com:appsmithorg/appsmith into featur…
riodeuno Feb 4, 2021
ff65db0
add computed list property control
Feb 4, 2021
f1cf1dc
Remove time column type
riodeuno Feb 4, 2021
55ae54a
Fix table widget actions and custom column migrations
riodeuno Feb 5, 2021
1f06917
Add logs for cyclical dependency map :recycle:
hetunandu Feb 5, 2021
e7b014d
Process array differences
hetunandu Feb 5, 2021
37c9f79
add property control for list widget
Feb 6, 2021
ebf9bf6
Fix onClick migrations
riodeuno Feb 8, 2021
fe86de7
Merge branch 'feature/table-new-features' of github.com:appsmithorg/a…
riodeuno Feb 8, 2021
5c273e8
Merge branch 'release' of github.com:appsmithorg/appsmith into featur…
riodeuno Feb 8, 2021
a396e95
pull latest table new features branch
Feb 8, 2021
700b319
Property pane config parity
riodeuno Feb 9, 2021
6b84ac8
binding and trigger paths from the property pane config (#2920)
hetunandu Feb 10, 2021
e080c59
try react virtualized library
Feb 10, 2021
ab1db0b
Merge branch 'release' of github.com:appsmithorg/appsmith into featur…
riodeuno Feb 10, 2021
f21816f
Fix unit test
riodeuno Feb 10, 2021
20e592d
Fix unit test :white_check_mark:
hetunandu Feb 10, 2021
2c09c73
Fix minor issues in table widget
riodeuno Feb 10, 2021
117807a
Merge branch 'feature/table-new-features' of github.com:appsmithorg/a…
riodeuno Feb 10, 2021
a5c414f
Add default meta props to binding paths to ensure eval and validation
hetunandu Feb 11, 2021
95d8346
Dummy commit :tada:
hetunandu Feb 11, 2021
eeaec1a
Remove unnecessary datepicker test
riodeuno Feb 11, 2021
4bc8634
Merge branch 'feature/table-new-features' of github.com:appsmithorg/a…
riodeuno Feb 11, 2021
acec663
Merge branch 'release' of github.com:appsmithorg/appsmith into featur…
riodeuno Feb 11, 2021
816f1b7
Achieve table column sorting and resizing parity with release
riodeuno Feb 11, 2021
45c552a
handle scenario where last column isn't available to access
riodeuno Feb 11, 2021
7a2e8f7
Fix for panel config path not existing in the widget
hetunandu Feb 11, 2021
cd73f49
Fix bindings in currentRow (default)
riodeuno Feb 11, 2021
ee76a4e
Merge branch 'feature/table-new-features' of github.com:appsmithorg/a…
riodeuno Feb 11, 2021
9b2c7a7
Update canvas widgets with dynamicPathLists on delete of property paths
riodeuno Feb 11, 2021
6b3e90c
Merge branch 'release' of github.com:appsmithorg/appsmith into featur…
riodeuno Feb 11, 2021
692f8bb
Add all diffs to change paths and trim later
hetunandu Feb 11, 2021
50fcaee
Merge branch 'feature/table-new-features' of github.com:appsmithorg/a…
hetunandu Feb 11, 2021
741a990
Add back default properties 🚶🏻‍♂️
hetunandu Feb 12, 2021
a7621f0
Use object based paths instead of arrays for primaryColumns and deriv…
riodeuno Feb 14, 2021
d0ae685
Fix issue in reordered columns
riodeuno Feb 15, 2021
16724a0
Fix inccorect update order
riodeuno Feb 15, 2021
40cee60
add virtualized list
Feb 15, 2021
d7d98ed
Fix failing property pane tests
riodeuno Feb 15, 2021
003f758
minor change
Feb 15, 2021
2fac3ea
pull table new features + fix merge conflicts
Feb 15, 2021
fcb9f8a
minor list widget change
Feb 16, 2021
403a37f
Merge branch 'release' of github.com:appsmithorg/appsmith into featur…
riodeuno Feb 17, 2021
1eb211f
Remove .vscode from git
riodeuno Feb 17, 2021
fb826df
Rename ads to alloy
riodeuno Feb 17, 2021
30e33fe
move grid component to widget folder
Feb 17, 2021
e560f3e
fix import in widget registry
Feb 17, 2021
77f2815
add sticky row in virtualized list
Feb 18, 2021
f4cb94a
add sticky container
Feb 18, 2021
1966a11
Fix Height of grid widget items container
riodeuno Feb 18, 2021
e88ee9d
fix dragging of items in children other than template children
Feb 18, 2021
f1bccf0
Merge branch 'feature/list-grid-widget' of github.com:appsmithorg/app…
Feb 18, 2021
7b7491f
update list widget
Feb 19, 2021
d6f2401
update list widget
Feb 19, 2021
bb6597d
Merge branch 'release' of github.com:appsmithorg/appsmith into featur…
riodeuno Feb 19, 2021
a427c1e
Fix padding in list widget
riodeuno Feb 19, 2021
efac574
hide scrollbar in list widget list
Feb 19, 2021
9146626
fix copy bug in list widget
Feb 19, 2021
ef90216
regenrate enhancement map on undo delete widget
Feb 19, 2021
5bd6f2d
Merge branch 'release' of github.com:appsmithorg/appsmith into featur…
riodeuno Feb 22, 2021
4d87337
Use enhancementmap for autocomplete in list widget
riodeuno Feb 22, 2021
f0efcc8
add custom control in widget config
Feb 22, 2021
cf56403
minor commit
Feb 23, 2021
9ffade8
update scrollbar styles
Feb 23, 2021
d072d19
fix merge conflicts with release
Feb 23, 2021
03e7f35
remove unused variable
Feb 23, 2021
ddddb29
fix typo in custom control
Feb 23, 2021
1e1b8e4
comment out test cases
Feb 23, 2021
80bfb50
remove unused imports
Feb 23, 2021
bb2b373
remove unused imports
Feb 23, 2021
f76e509
add JSON stringify in interweave
Feb 23, 2021
b247380
add noPad styling in dragLayer for noPad prop
Feb 23, 2021
1549cf7
implement grid gap
Feb 23, 2021
488de13
add list item background color prop
Feb 23, 2021
bb02cab
add white color in color picker control
Feb 24, 2021
d6279a5
fix gap in last list item
Feb 24, 2021
bdf766d
remove onBeforeParse in textcomponent
Feb 24, 2021
7957adc
remove virtualization in grid widget
Feb 24, 2021
7f35704
allow overflow-y
Feb 25, 2021
fc5a6ee
add onListItemClick action
Feb 25, 2021
f87298f
fix merge conflicts
Mar 1, 2021
baf1d3d
add beta label
Mar 1, 2021
ffbb5c4
add pagination
Mar 2, 2021
1f3c4ff
fix actions in pagination in list widget
Mar 2, 2021
f4c88bb
add list widget icon
Mar 3, 2021
307dc9b
add list background color default value
Mar 8, 2021
0bf7ee6
remove extra div
Mar 9, 2021
cc974be
fix pagination issue
Mar 9, 2021
b9f5f37
fix list widget crashing on perpage change
Mar 9, 2021
309f880
extract child operation function to widgetblueprint saga
Mar 11, 2021
5189457
refactor enhancements
Mar 11, 2021
4a9115e
add enhancement hook
Mar 11, 2021
dd2e9f7
refactor propertyUpdate hook enhancment
Mar 12, 2021
d0ed8f2
remove enhacement map
Mar 12, 2021
fbbdb0a
revert renaming ads to alloy
Mar 12, 2021
38b91e6
fix merge conflicts
Mar 12, 2021
8557ad2
add autopagination
Mar 16, 2021
e7f96c6
Cleanup unused vars
riodeuno Mar 17, 2021
a4ef321
update default background color
Mar 17, 2021
7df722b
Merge branch 'feature/list-grid-widget' of github.com:appsmithorg/app…
Mar 17, 2021
8f6395d
remove unnessary scrol + fix pagination per page
Mar 17, 2021
9395773
remove console.log
Mar 17, 2021
1649fb4
use grid gap in pixel instead of snap
Mar 17, 2021
33f6abe
fix list widget tests for binding
Mar 18, 2021
44a1d09
add tests for on click action and pagination
Mar 18, 2021
e65ed26
remove unnecessary imports
Mar 19, 2021
2576c97
Merge branch 'feature/list-grid-widget' of github.com:appsmithorg/app…
Mar 19, 2021
80c8312
remove overflow hidden in list component
Mar 19, 2021
7658862
Add feature to enable template actions
riodeuno Mar 19, 2021
1d2e1ff
Merge branch 'feature/list-grid-widget' of github.com:appsmithorg/app…
riodeuno Mar 19, 2021
5aecea1
update property pane help text for list widget
Mar 19, 2021
04a0bcd
Merge branch 'feature/list-grid-widget' of github.com:appsmithorg/app…
Mar 19, 2021
cc8d608
disable pagination in editor view
Mar 23, 2021
72be3be
update property pane options
Mar 23, 2021
9c2ff13
add test case for action
Mar 23, 2021
e015f21
uncomment tests
Mar 24, 2021
28da2a2
fix grid gap validation
Mar 24, 2021
da2e9e6
Merge branch 'feature/list-grid-widget' of github.com:appsmithorg/app…
Mar 24, 2021
93e80f4
update test cases
Mar 24, 2021
3c08e4b
fix merge conflicts
Mar 24, 2021
7897477
fix property pane opening issue for list tempalte
Mar 24, 2021
3f37d4d
Disable form widgets in list widget
riodeuno Mar 25, 2021
543b125
fix template issue for actions
Mar 25, 2021
ef88185
add validation tests for list data
Mar 26, 2021
e997d0b
pull release + fix actions issue
Mar 26, 2021
26a0b38
update starting template
Mar 31, 2021
88b11ed
fix merge conflicts
Mar 31, 2021
e7430d3
add selectedRow + enable pagination in edit mode
Apr 1, 2021
6446da1
remove extra padding in list widget + popper fix on settingDisabled
Apr 1, 2021
6026ba2
add stop propagation for button click
Apr 1, 2021
3255c10
fix click event in edit mode
Apr 2, 2021
1641e2b
disallow filepicker widget for list widget
Apr 2, 2021
52dcb34
fix merge conflicts
Apr 2, 2021
76d83c2
add test for list widget entity definition for selectItem
Apr 2, 2021
7b44054
remove unused imports
Apr 2, 2021
41c6007
fix test
Apr 2, 2021
7d15a81
remove evaluated value for list child widgets
Apr 12, 2021
ff74d3a
add comment
Apr 13, 2021
c57108c
remove log
Apr 13, 2021
c36de3f
Merge branch 'release' of github.com:appsmithorg/appsmith into featur…
Apr 13, 2021
3b23ddc
fix copying bug in list widget
Apr 13, 2021
2a7229e
add check for not allowing template to copy
Apr 13, 2021
4d6cba1
fix test
Apr 13, 2021
81bcfba
add test for property pane actions
Apr 13, 2021
cc309bb
remove unused import
Apr 14, 2021
54e10c0
Merge branch 'release' of github.com:appsmithorg/appsmith into featur…
Apr 14, 2021
decf84f
add draglayercomponent test
Apr 14, 2021
431f6ce
add test for draggable component
Apr 14, 2021
c5383f4
add test for evaluatedvalue popup
Apr 14, 2021
72f9e6c
add test for messages.ts
Apr 14, 2021
36090cf
add test for widgeticons
Apr 14, 2021
bfa10e4
add test for property pane selector
Apr 15, 2021
8a91939
add test for widget config response
Apr 15, 2021
c279b54
start testing widget configresponse
Apr 15, 2021
0d7b3da
add test for enhancements in widget config
Apr 15, 2021
3039522
add test for codeeditor
Apr 16, 2021
3b55695
add test for base widget + list widget
Apr 16, 2021
cae5f4d
add test for executeWidgetBlueprintChildOperations
Apr 16, 2021
e0f177c
remove unused import
Apr 16, 2021
a442882
add test for widget operation utils
Apr 16, 2021
47f61bc
remove unused import
Apr 16, 2021
35cbf83
add test for handleSpecificCasesWhilePasting
Apr 16, 2021
b00c83a
remove unused function
Apr 16, 2021
918463f
remove unused import
Apr 16, 2021
41ce360
add empty list styling
Apr 21, 2021
a32eafd
resolve all review comments
Apr 21, 2021
9fea0d0
fix message test
Apr 21, 2021
5d1247c
add test for widget operation utils
Apr 21, 2021
faf907f
Merge branch 'release' of github.com:appsmithorg/appsmith into featur…
Apr 21, 2021
e82ba7f
fix merge conflicts
Apr 22, 2021
0d56039
fix merge conflicts
Apr 22, 2021
1ca9b80
move validations in property config
Apr 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.idea
*.iml
.env
.vscode/*

# test coverage
coverage-summary.json
coverage-summary.json
2 changes: 2 additions & 0 deletions app/client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,5 @@ storybook-static/*
build-storybook.log

.eslintcache
.vscode
TODO
3 changes: 3 additions & 0 deletions app/client/cypress/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"env": {
"cypress/globals": true
},
"rules": {
"cypress/no-unnecessary-waiting": 0
},
"extends": [
"plugin:cypress/recommended"
]
Expand Down
161 changes: 161 additions & 0 deletions app/client/cypress/fixtures/listdsl.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
{
"dsl": {
"widgetName": "MainContainer",
"backgroundColor": "none",
"rightColumn": 1224,
"snapColumns": 16,
"detachFromLayout": true,
"widgetId": "0",
"topRow": 0,
"bottomRow": 1280,
"containerStyle": "none",
"snapRows": 33,
"parentRowSpace": 1,
"type": "CANVAS_WIDGET",
"canExtend": true,
"version": 9,
"minHeight": 1292,
"parentColumnSpace": 1,
"dynamicBindingPathList": [],
"leftColumn": 0,
"children": [
{
"isVisible": true,
"enhancements": true,
"backgroundColor": "",
"gridType": "vertical",
"gridGap": 0,
"items": "[\n {\n \"id\": 1,\n \"email\": \"[email protected]\",\n \"first_name\": \"Michael\",\n \"last_name\": \"Lawson\",\n \"avatar\": \"https://reqres.in/img/faces/7-image.jpg\"\n },\n {\n \"id\": 2,\n \"email\": \"[email protected]\",\n \"first_name\": \"Lindsay\",\n \"last_name\": \"Ferguson\",\n \"avatar\": \"https://reqres.in/img/faces/8-image.jpg\"\n },\n {\n \"id\": 3,\n \"email\": \"[email protected]\",\n \"first_name\": \"Brock\",\n \"last_name\": \"Lesnar\",\n \"avatar\": \"https://reqres.in/img/faces/8-image.jpg\"\n }\n]",
"widgetName": "List1",
"children": [
{
"isVisible": true,
"widgetName": "Canvas1",
"containerStyle": "none",
"canExtend": false,
"detachFromLayout": true,
"dropDisabled": true,
"children": [
{
"isVisible": true,
"backgroundColor": "white",
"widgetName": "Container1",
"containerStyle": "card",
"children": [
{
"isVisible": true,
"widgetName": "Canvas2",
"containerStyle": "none",
"canExtend": false,
"detachFromLayout": true,
"children": [
{
"isVisible": true,
"text": "Label",
"textStyle": "LABEL",
"textAlign": "LEFT",
"widgetName": "Text1",
"type": "TEXT_WIDGET",
"isLoading": false,
"parentColumnSpace": 32,
"parentRowSpace": 40,
"leftColumn": 2,
"rightColumn": 6,
"topRow": 0,
"bottomRow": 1,
"parentId": "dinv2tsatk",
"widgetId": "k6ct7dxg4w"
},
{
"isVisible":true,
"text":"Submit",
"buttonStyle":"PRIMARY_BUTTON",
"widgetName":"Button1",
"isDisabled":false,
"isDefaultClickDisabled":true,
"version":1,
"type":"BUTTON_WIDGET",
"isLoading":false,
"parentColumnSpace":29.25,
"parentRowSpace":40,
"leftColumn":6,
"rightColumn":8,
"topRow":1,
"bottomRow":2,
"parentId":"dinv2tsatk",
"widgetId":"fuw9p7cuek"
}
],
"minHeight": null,
"type": "CANVAS_WIDGET",
"isLoading": false,
"parentColumnSpace": 1,
"parentRowSpace": 1,
"leftColumn": 0,
"rightColumn": null,
"topRow": 0,
"bottomRow": null,
"parentId": "4ruj7xl5ri",
"widgetId": "dinv2tsatk"
}
],
"dragDisabled": true,
"isDeletable": false,
"disablePropertyPane": true,
"type": "CONTAINER_WIDGET",
"isLoading": false,
"leftColumn": 0,
"rightColumn": 16,
"topRow": 0,
"bottomRow": 4,
"parentId": "0pvmmqr77m",
"widgetId": "4ruj7xl5ri"
}
],
"minHeight": 400,
"type": "CANVAS_WIDGET",
"isLoading": false,
"parentColumnSpace": 1,
"parentRowSpace": 1,
"leftColumn": 0,
"rightColumn": 592,
"topRow": 0,
"bottomRow": 400,
"parentId": "5bwz8xcvhj",
"widgetId": "0pvmmqr77m"
}
],
"type": "LIST_WIDGET",
"isLoading": false,
"parentColumnSpace": 74,
"parentRowSpace": 40,
"leftColumn": 0,
"rightColumn": 8,
"topRow": 0,
"bottomRow": 10,
"parentId": "0",
"widgetId": "5bwz8xcvhj",
"dynamicBindingPathList": [],
"template": {
"Text1": {
"isVisible": true,
"text": "Label",
"textStyle": "LABEL",
"textAlign": "LEFT",
"widgetName": "Text1",
"type": "TEXT_WIDGET",
"isLoading": false,
"parentColumnSpace": 32,
"parentRowSpace": 40,
"leftColumn": 0,
"rightColumn": 4,
"topRow": 0,
"bottomRow": 1,
"parentId": "dinv2tsatk",
"widgetId": "k6ct7dxg4w"
}
}
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
const commonlocators = require("../../../locators/commonlocators.json");
const widgetsPage = require("../../../locators/Widgets.json");
const dsl = require("../../../fixtures/listdsl.json");
const publishPage = require("../../../locators/publishWidgetspage.json");

describe("Container Widget Functionality", function() {
const items = JSON.parse(dsl.dsl.children[0].items);

before(() => {
cy.addDsl(dsl);
});

it("checks if list shows correct no. of items", function() {
cy.get(commonlocators.containerWidget).then(function($lis) {
expect($lis).to.have.length(2);
});
});

it("checks currentItem binding", function() {
cy.SearchEntityandOpen("Text1");
cy.getCodeMirror().then(($cm) => {
cy.get(".CodeMirror textarea")
.first()
.type(`{{currentItem.first_name}}`, {
force: true,
parseSpecialCharSequences: false,
});
});

cy.wait(1000);

cy.closePropertyPane();

cy.get(commonlocators.TextInside).then(function($lis) {
expect($lis.eq(0)).to.contain(items[0].first_name);
expect($lis.eq(1)).to.contain(items[1].first_name);
});
});

it("checks button action", function() {
cy.SearchEntityandOpen("Button1");
cy.getCodeMirror().then(($cm) => {
cy.get(".CodeMirror textarea")
.first()
.type(`{{currentItem.first_name}}`, {
force: true,
parseSpecialCharSequences: false,
});
});
cy.addAction("{{currentItem.first_name}}");

cy.PublishtheApp();

cy.get(`${widgetsPage.widgetBtn}`)
.first()
.click();

cy.get(commonlocators.toastmsg).contains(items[0].first_name);
});

it("it checks onListItem click action", function() {
cy.get(publishPage.backToEditor).click({ force: true });

cy.SearchEntityandOpen("List1");
cy.addAction("{{currentItem.first_name}}");

cy.PublishtheApp();

cy.get(
"div[type='LIST_WIDGET'] .t--widget-containerwidget:first-child",
).click();

cy.get(commonlocators.toastmsg).contains(items[0].first_name);
});

it("it checks pagination", function() {
// clicking on second pagination button
cy.get(`${commonlocators.paginationButton}-2`).click();

// now we are on the second page which shows first the 3rd item in the list
cy.get(commonlocators.TextInside).then(function($lis) {
expect($lis.eq(0)).to.contain(items[2].first_name);
});
});

afterEach(() => {
// put your clean up code if any
});
});
2 changes: 2 additions & 0 deletions app/client/cypress/locators/commonlocators.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@
"globalSearchInput": ".t--global-search-input",
"globalSearchTrigger": ".t--global-search-modal-trigger",
"globalSearchClearInput": ".t--global-clear-input",
"containerWidget": ".t--widget-containerwidget",
"paginationButton": ".rc-pagination-item",
"switchWidgetActive": ".t--switch-widget-active",
"switchWidgetInActive": ".t--switch-widget-inactive",
"switchWidgetLoading": ".t--switch-widget-loading"
Expand Down
2 changes: 0 additions & 2 deletions app/client/cypress/manual_TestSuite/new_Table_Spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ describe("Table functionality ", function() {
// Navigate to add background colour and Text colour
// Ensure the row colour gets overlapped on table colour
});

it("Collapse the tabs of Property pane", function() {
// Add a table
// Click on the property pane
// Collapse the General ,Action and Tab option
});

it("Bind the column with same name", function() {
// Add a table
// Click on the property pane
Expand Down
13 changes: 8 additions & 5 deletions app/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"lint-staged": "^9.2.5",
"localforage": "^1.7.3",
"lodash": "^4.17.19",
"lodash-es": "4.17.14",
"lodash-move": "^1.1.1",
"loglevel": "^1.6.7",
"lottie-web": "^5.7.4",
Expand All @@ -86,6 +87,7 @@
"popper.js": "^1.15.0",
"prettier": "^1.18.2",
"prismjs": "^1.23.0",
"rc-pagination": "^3.1.3",
"re-reselect": "^3.4.0",
"react": "^16.12.0",
"react-base-table": "^1.9.1",
Expand Down Expand Up @@ -118,7 +120,6 @@
"redux-form": "^8.2.6",
"redux-saga": "^1.1.3",
"reselect": "^4.0.0",
"lodash-es": "4.17.14",
"scroll-into-view-if-needed": "^2.2.26",
"shallowequal": "^1.1.0",
"showdown": "^1.9.1",
Expand All @@ -129,7 +130,8 @@
"tinycolor2": "^1.4.1",
"toposort": "^2.0.2",
"ts-loader": "^6.0.4",
"typescript": "^3.9.2",
"tslib": "^2.1.0",
"typescript": "^4.1.3",
"unescape-js": "^1.1.4",
"url-search-params-polyfill": "^8.0.0",
"worker-loader": "^3.0.2"
Expand Down Expand Up @@ -176,7 +178,7 @@
"@storybook/preset-create-react-app": "^3.1.4",
"@storybook/react": "^5.3.19",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.2.5",
"@testing-library/react": "^11.2.6",
"@testing-library/user-event": "^13.1.1",
"@types/codemirror": "^0.0.96",
"@types/deep-diff": "^1.0.0",
Expand All @@ -186,14 +188,15 @@
"@types/react-beautiful-dnd": "^11.0.4",
"@types/react-select": "^3.0.5",
"@types/react-tabs": "^2.3.1",
"@types/react-test-renderer": "^17.0.1",
"@types/react-window": "^1.8.2",
"@types/redux-form": "^8.1.9",
"@types/redux-mock-store": "^1.0.2",
"@types/styled-system": "^5.1.9",
"@types/tern": "0.22.0",
"@types/toposort": "^2.0.3",
"@typescript-eslint/eslint-plugin": "^4.6.0",
"@typescript-eslint/parser": "^4.6.0",
"@typescript-eslint/eslint-plugin": "^4.15.0",
"@typescript-eslint/parser": "^4.15.0",
"babel-loader": "^8.1.0",
"babel-plugin-styled-components": "^1.10.7",
"craco-babel-loader": "^0.1.4",
Expand Down
1 change: 1 addition & 0 deletions app/client/src/actions/controlActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const updateWidgetPropertyRequest = (
export interface BatchPropertyUpdatePayload {
modify?: Record<string, unknown>; //Key value pairs of paths and values to update
remove?: string[]; //Array of paths to delete
triggerPaths?: string[]; // Array of paths in the modify and remove list which are trigger paths
}

export const batchUpdateWidgetProperty = (
Expand Down
6 changes: 3 additions & 3 deletions app/client/src/actions/pageActions.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { FetchPageRequest, PageLayout, SavePageResponse } from "api/PageApi";
import { WidgetOperation } from "widgets/BaseWidget";
import { WidgetType } from "constants/WidgetConstants";
import {
EvaluationReduxAction,
ReduxAction,
ReduxActionTypes,
UpdateCanvasPayload,
} from "constants/ReduxActionConstants";
import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";
import AnalyticsUtil from "utils/AnalyticsUtil";
import { WidgetOperation } from "widgets/BaseWidget";
import { FetchPageRequest, PageLayout, SavePageResponse } from "api/PageApi";
import { APP_MODE, UrlDataState } from "reducers/entityReducers/appReducer";
import { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer";

export interface FetchPageListPayload {
applicationId: string;
Expand Down
Loading