Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
914 commits
Select commit Hold shift + click to select a range
c67c5e7
enabling dynamic height under the hood for autolayout.
marks0351 Feb 21, 2023
60d4b33
add Canvas Resizer.
marks0351 Feb 21, 2023
e350a2e
Adding alignment based resizing behaviour for autolayout.
marks0351 Feb 21, 2023
4e98bd0
feat: Responsive Checkbox & Switch Widgets (#19999)
aswathkk Feb 21, 2023
816e6f3
Feat: Responsive select widgets (#19985)
aswathkk Feb 21, 2023
91c0276
fix: Jest tests
Feb 21, 2023
0d1c31a
Updates widget config according to spec
Feb 21, 2023
6456a04
minor fix
prsidhu Feb 22, 2023
a38a194
Merge remote-tracking branch 'origin/release' into mobile/v1/main
prsidhu Feb 22, 2023
b10ca47
fix: infinite loop in jest test
Feb 22, 2023
a94c0e8
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Feb 22, 2023
dfca434
Fix Auto layout bugs #20694, #20704, #20696
Feb 22, 2023
1a704cb
fix global hot keys test
prsidhu Feb 22, 2023
6f56418
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Feb 22, 2023
bc71f0a
remove unused import
prsidhu Feb 22, 2023
055e0e8
pull from main barnch and resolve conflicts
Feb 22, 2023
e757c42
removing console logs.
marks0351 Feb 22, 2023
3f1be90
Revert "enabling dynamic height under the hood for autolayout."
marks0351 Feb 22, 2023
784ef4e
pull from mobile QA branch and resolve conflicts
Feb 22, 2023
0c35b4d
fix canvasResizer width related bugs
Feb 22, 2023
867e710
pull from mobile QA branch and resolve conflicts
Feb 22, 2023
c1499c4
Adjust widget name component border.
marks0351 Feb 22, 2023
d1c9fb5
adjust resize handles position.
marks0351 Feb 22, 2023
e1ac2e0
select new widget on drop in auto layout mode.
marks0351 Feb 22, 2023
aecd8a6
cleanup resizable component and remove additionalAction
prsidhu Feb 23, 2023
250619c
move widgetTypeClassname to widgetUtils
prsidhu Feb 23, 2023
1479e2d
memoize flexbox style
prsidhu Feb 23, 2023
33cae06
Merge branch 'mobile/v1/refactor' into mobile/v1/main
prsidhu Feb 23, 2023
d69dc3e
wip: tried to use updateMultipleWidgetPropertiesAction
Feb 23, 2023
105c76b
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Feb 23, 2023
dd4ac50
fix: warning
Feb 23, 2023
28d621c
feat: added dynamic height to group widgets, remove label position le…
yaldram Feb 23, 2023
008ea8a
remove default layout as it is already handled in the selector.
marks0351 Feb 23, 2023
1fec0b1
fix build issue
prsidhu Feb 23, 2023
1bbab80
avoid triggering drag to select while resizing canvas
Feb 23, 2023
9bd17f4
refactoring auto layout copy paste utils into autolayoututils
Feb 23, 2023
15579c2
fix minor gap at the bottom of the canvas #20693
Feb 23, 2023
e051900
remove unused code
prsidhu Feb 23, 2023
a91dcb1
use flattenedWidgetProps type
prsidhu Feb 24, 2023
f35ba2e
clean up
prsidhu Feb 24, 2023
70a58a3
Merge branch 'release' into mobile/v1/main
prsidhu Feb 24, 2023
2606bb2
removing widget name popper based changes.
marks0351 Feb 24, 2023
7232468
fixing resize based css.
marks0351 Feb 24, 2023
6b138a6
min width for Divider widget
Feb 27, 2023
0a79faa
feat: 2d widget min dimensions (#20909)
yaldram Feb 27, 2023
54a129c
Merge branch 'feat/widget_responsiveness' of https://github.com/appsm…
Feb 27, 2023
aeb2833
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Feb 27, 2023
faca83a
transparent resize borders.
marks0351 Feb 27, 2023
9a94f2d
use flattenedWidgetProps type
Feb 28, 2023
aa19bff
Cleanup
Feb 28, 2023
36d66c5
poc: widget min-width & min-height constraints (#20489)
yaldram Feb 28, 2023
4c2ed8a
Merge remote-tracking branch 'origin/release' into mobile/v1/main
prsidhu Feb 28, 2023
caaec16
remove unused code
prsidhu Feb 28, 2023
26962c3
Merge branch 'mobile/v1/main' into mobile/v1/widget_res
prsidhu Feb 28, 2023
7d8cdbb
add layer children check and enable scroll in container
prsidhu Feb 28, 2023
ac8d6e3
update positions of parent and siblings
prsidhu Feb 28, 2023
0679443
add new update position method for resize and paste
prsidhu Feb 28, 2023
2e63103
Merge branch 'mobile/v1/widget_res' into feat/widget_responsiveness
prsidhu Feb 28, 2023
96e9279
fix: failed jest test
Feb 28, 2023
eb54138
fix: jest test
Feb 28, 2023
d0a726b
Adds min dimension for ContainerWidget
Feb 28, 2023
3d411db
address code review comments 1
prsidhu Mar 1, 2023
6620e47
updates widget position without causing an eval
Mar 1, 2023
a7db07a
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Mar 1, 2023
88ad524
address code review comments 2
prsidhu Mar 1, 2023
96d023a
Merge remote-tracking branch 'origin/release' into mobile/v1/main
prsidhu Mar 1, 2023
6435c5d
undo resize handles ui
prsidhu Mar 1, 2023
2c38633
fix list widget v2
prsidhu Mar 1, 2023
3dff787
Adds default columns/rows config specific for AutoLayout
Mar 1, 2023
2016292
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Mar 1, 2023
044bff7
fix: Type issue
Mar 1, 2023
4753244
fix listwidgetv2
prsidhu Mar 1, 2023
381a7ba
cleanup
Mar 1, 2023
0b16dc4
fix list widget
prsidhu Mar 2, 2023
047fce3
Merge remote-tracking branch 'origin/release' into mobile/v1/main
prsidhu Mar 2, 2023
85da46f
remove unused imports
prsidhu Mar 2, 2023
cb7e5f3
temp: revert resizable to release version
prsidhu Mar 2, 2023
69a29e5
remove unnecessary code.
marks0351 Mar 2, 2023
79af3e8
temp: remove appPositioningType control
prsidhu Mar 2, 2023
69c3e26
Merge branch 'mobile/v1/perf' into mobile/v1/main
prsidhu Mar 2, 2023
66e9ee8
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Mar 2, 2023
2d287d4
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Mar 2, 2023
3580586
build fix
prsidhu Mar 2, 2023
23b95ca
Merge branch 'release' into mobile/v1/main
prsidhu Mar 2, 2023
8b10734
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Mar 2, 2023
e95620c
temp: remove canvas resize handle
prsidhu Mar 2, 2023
68e8a56
update useAutoLayout condition
prsidhu Mar 2, 2023
f740cc0
revert widgetname component color
prsidhu Mar 2, 2023
24015fc
Merge remote-tracking branch 'origin/release' into mobile/v1/main
prsidhu Mar 2, 2023
58c0db0
fix hover color
prsidhu Mar 2, 2023
7c31f61
temp: cypress fixes
prsidhu Mar 3, 2023
82a3d4b
temp: remove canvas positioning selector
prsidhu Mar 3, 2023
b3da788
fix import order
prsidhu Mar 3, 2023
02725e9
cypress fixes
prsidhu Mar 3, 2023
233f6dc
Merge remote-tracking branch 'refs/remotes/origin/release'
prsidhu Mar 3, 2023
d551a2a
rever first merge changes
prsidhu Mar 4, 2023
0c82193
merge release
prsidhu Mar 4, 2023
8793a9d
merge fix
prsidhu Mar 5, 2023
c214b56
address code review comments 3
prsidhu Mar 5, 2023
40952f9
remove LayoutDirection usage
prsidhu Mar 5, 2023
3a1d327
Merge remote-tracking branch 'origin/release' into mobile/v1/main
prsidhu Mar 5, 2023
f9df3c7
Revert "remove LayoutDirection usage"
prsidhu Mar 5, 2023
005a6af
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Mar 6, 2023
d09b8cc
merging mobile/v1/main
marks0351 Mar 6, 2023
5dd0b9d
fix: group widgets expanding on adding new options.
yaldram Mar 6, 2023
2063405
Merge branch 'release' into mobile/v1/main
prsidhu Mar 7, 2023
470592b
Merge branch 'mobile/v1/main' into mobile/v1/qa
prsidhu Mar 7, 2023
81deb30
fix: widget width calculation
Mar 8, 2023
c9d8b1e
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Mar 8, 2023
a813dd9
review comments(Define widgetnamecomponent's height)
marks0351 Mar 8, 2023
92c5f6f
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
marks0351 Mar 8, 2023
ee9f6e2
address code review comments 4
prsidhu Mar 8, 2023
250167a
Merge remote-tracking branch 'origin/mobile/v1/main' into mobile/v1/main
prsidhu Mar 8, 2023
e64f58a
Merge branch 'mobile/v1/qa' into mobile/v1/main
prsidhu Mar 8, 2023
461df08
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Mar 8, 2023
0fdfc3a
feat: widget min-width & min-height constraints
Mar 8, 2023
487ca35
updates minHeight for Image widget
Mar 8, 2023
5461c78
fix undefined issue
prsidhu Mar 8, 2023
aed2c3f
minor update
prsidhu Mar 8, 2023
9677a1b
feat: add responsive min-height to all widgets (#21241)
yaldram Mar 8, 2023
41cfc5c
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Mar 8, 2023
d9a1821
feat: minWidth for Button Group (#20930)
aswathkk Mar 8, 2023
60c8dfe
Merge branch 'feat/widget_responsiveness' of https://github.com/appsm…
Mar 8, 2023
2c05589
change height config for Textwidget
Mar 8, 2023
b7e128f
change default value for RateWidget
Mar 8, 2023
9c362c6
Disabling drag to select in autolayout mode.
marks0351 Mar 8, 2023
6f01487
layout conversion UI first flow
Mar 8, 2023
4c16759
pull from mobile main branch and resolve conflicts
Mar 8, 2023
1da08ab
modify auto to fixed algorithm to use existing position calculations
Mar 8, 2023
0bfdf31
fix restoring snapshot spinner message
Mar 8, 2023
8449289
fix margin at the top of Use snapshot banner
Mar 8, 2023
c120a50
add Beta card to conversion dialog title
Mar 8, 2023
f04ae0c
perf fix for widget name component
marks0351 Mar 9, 2023
a3def51
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
marks0351 Mar 9, 2023
ef3dfce
useRef for highlights
prsidhu Mar 9, 2023
64bb880
Merge remote-tracking branch 'origin/mobile/v1/main' into mobile/v1/main
prsidhu Mar 9, 2023
4b84e3b
Revert "perf fix for widget name component"
marks0351 Mar 9, 2023
0a792bf
fix: comment
Mar 9, 2023
33e7f4a
refactor: moves responsive behaviour config into widgets (#21141)
yaldram Mar 9, 2023
a1e4a5f
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Mar 9, 2023
6ab68b0
fix lint error
Mar 9, 2023
efa79ee
removes unused function
Mar 9, 2023
1c70e29
update auto layout positions after conversion
Mar 9, 2023
3b18d8e
fix unexpected closing of modal while using snapshot
Mar 9, 2023
77e105f
refactor: snapSpace computation (#21278)
aswathkk Mar 10, 2023
5dcb9d5
feat: disable widget resize handlers (#21041)
yaldram Mar 10, 2023
7daded5
fix: width diff
Mar 10, 2023
6d6d8cf
refactor: auto dimension constants
Mar 10, 2023
1b0db58
enable auto Height and fix canvas height for main container
Mar 10, 2023
1a3c80e
set layout type based on selected layout post conversion from auto to…
Mar 10, 2023
dd77917
enable auto Height only for canvas type widgets
Mar 10, 2023
8e52477
fix bugs and address review commnets
Mar 13, 2023
4eb69ac
convert onOpenOrClose event handler with useCallback
Mar 13, 2023
a92740f
Merge branch 'mobile/v1/main' of github.com:appsmithorg/appsmith into…
Mar 13, 2023
d1dfea2
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
marks0351 Mar 14, 2023
44353b6
Merge branch 'mobile/v1/main' of github.com:appsmithorg/appsmith into…
Mar 14, 2023
42ac540
fix: type errors for autoDimension.
yaldram Mar 14, 2023
3a76e38
hide empty alignments in a full layer
prsidhu Mar 14, 2023
52e7f5d
Merge remote-tracking branch 'origin/release' into mobile/v1/main
prsidhu Mar 14, 2023
2645caf
Merge remote-tracking branch 'origin/mobile/v1/main' into mobile/v1/main
prsidhu Mar 14, 2023
d0fe4b2
remove log
prsidhu Mar 14, 2023
2617610
Added disabledPropsDefaults property to aid in conversion algo
Mar 14, 2023
8f6de5e
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
marks0351 Mar 14, 2023
97b67de
Merge branch 'mobile/v1/main' into feat/widget_responsiveness
Mar 14, 2023
c6a33ea
fix: type issue
Mar 14, 2023
ef44fc5
minor name correction
Mar 14, 2023
f939f64
widget responsive changes
Mar 14, 2023
ea085df
pull from qa branch and resolve conflicts
Mar 14, 2023
e2d9d5f
Auto Layout Editor Perf Fixes Draft (#21121)
marks0351 Mar 14, 2023
dccf359
Merge branch 'mobile/v1/main' of https://github.com/appsmithorg/appsm…
marks0351 Mar 14, 2023
a8ddd78
merge fix.
marks0351 Mar 14, 2023
78b1ab5
Revert "merge fix."
marks0351 Mar 14, 2023
f3e4a0d
Revert "Merge branch 'mobile/v1/main' of https://github.com/appsmitho…
marks0351 Mar 14, 2023
89cff29
use leftColumn for minWidth comparison
prsidhu Mar 15, 2023
244ce27
fixing canvas resizer
marks0351 Mar 15, 2023
88a365a
reverting position based changes.
marks0351 Mar 15, 2023
03f12b9
updating the main container on updating app position.
marks0351 Mar 15, 2023
df0e5a8
enable auto layout for statbox and list widget
Mar 15, 2023
a58b973
fix: disable diagonal resize for widgets in auto layout (#21419)
yaldram Mar 15, 2023
d2e505e
incorporate min size in fillLength calculation
prsidhu Mar 15, 2023
cd396d2
Merge branch 'mobile/v1/qa' into mobile/v1/fixes
prsidhu Mar 15, 2023
e625f8b
clean up
prsidhu Mar 16, 2023
ed2de5d
make sure alignment is updated in the widget as well.
marks0351 Mar 16, 2023
ec45015
use mainCanvasWidth instead of canvasWidth
prsidhu Mar 16, 2023
bfa1ec5
updating FE as per appPositionType api changes
marks0351 Mar 16, 2023
038fe96
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
marks0351 Mar 16, 2023
0595e92
pull from main branch and resolve conflicts
Mar 16, 2023
d97ba1e
fix: resolve merge conflicts.
yaldram Mar 16, 2023
44e52d4
pull from main and conversion flow and resolve conflicts
Mar 16, 2023
574ea39
fix fillWidgetLength update
prsidhu Mar 16, 2023
046a89a
Merge branch 'mobile/v1/qa' into mobile/v1/fixes
prsidhu Mar 16, 2023
accc511
debounce recalculate on canvas resize
prsidhu Mar 16, 2023
076f7ec
remove unused import
prsidhu Mar 16, 2023
4419a5f
Merge branch 'mobile/v1/fixes' into mobile/v1/qa
prsidhu Mar 16, 2023
2765839
re applying perf changes.
marks0351 Mar 16, 2023
5c2e97f
fixing canvas resizer
marks0351 Mar 15, 2023
4185461
reverting position based changes.
marks0351 Mar 15, 2023
2f5de12
updating the main container on updating app position.
marks0351 Mar 15, 2023
a93527a
make sure alignment is updated in the widget as well.
marks0351 Mar 16, 2023
fdf920f
updating FE as per appPositionType api changes
marks0351 Mar 16, 2023
547907a
fix app positioning type changes
Mar 16, 2023
e3d641d
fix drag handles inside statbox
Mar 16, 2023
adbfecd
pull from conversion flow and resolve conflicts
Mar 16, 2023
20df29a
Merge remote-tracking branch 'origin/release' into mobile/v1/qa
prsidhu Mar 17, 2023
db0dcb1
Merge remote-tracking branch 'origin/release' into mobile/v1/qa
prsidhu Mar 17, 2023
830b2b6
fix import type issues
prsidhu Mar 17, 2023
fbbaed3
more import fixes
prsidhu Mar 17, 2023
780ce7e
import fixes encore
prsidhu Mar 17, 2023
a8e7d85
add mobile position props when adding widget on mobile viewport
prsidhu Mar 17, 2023
29b8eab
update positions in auto to fixed layout coneversion test
Mar 17, 2023
cc8026d
stop layout recalcs while converting
Mar 17, 2023
5aebee5
Merge branch 'feat/auto-layout-conversion-flow' of github.com:appsmit…
Mar 17, 2023
0fc61ea
Merge branch 'mobile/v1/qa' of github.com:appsmithorg/appsmith into m…
Mar 17, 2023
d33ea11
hide widgetname component and resize handlers while canvas resizing.
marks0351 Mar 17, 2023
7812380
disabling drag to select from canvas boundaries in autolayout mode.
marks0351 Mar 17, 2023
6c50672
feat: Keeps track of user defined width for widgets (#21497)
aswathkk Mar 20, 2023
ca66a77
Merge branch 'feat/widget_responsiveness' into mobile/v1/qa
Mar 20, 2023
c9f2f20
Auto Layout Mobile breakpoint resizing. (#21538)
marks0351 Mar 20, 2023
9b43f19
add discard snapshot modal and adress design feedback for conversion …
Mar 20, 2023
eba756b
Merge branch 'mobile/v1/qa' of github.com:appsmithorg/appsmith into m…
Mar 20, 2023
9a4c254
get is auto layout in conversion form flow only when it is first rend…
Mar 20, 2023
f2568be
remove template and crud entry points within the app
Mar 20, 2023
836d4ca
fix removal of crud and template entry points from within the app
Mar 20, 2023
af851b9
Fixing bugs wrt to mobile.
marks0351 Mar 20, 2023
915e114
Adding back missed dependencies
marks0351 Mar 20, 2023
8a5d3e8
redeirect ti default page if current page does not exist while refres…
Mar 20, 2023
3709e88
fix unit test
prsidhu Mar 20, 2023
50ba183
re enable templates inside app for autolayout apps and convert while …
Mar 20, 2023
db5757a
Merge branch 'mobile/v1/qa' of github.com:appsmithorg/appsmith into m…
Mar 20, 2023
cac26b8
fixing list widget crash.
marks0351 Mar 20, 2023
c1e3ff7
fixing resizing css based glitch.
marks0351 Mar 21, 2023
165c946
disable resize handle dots while canvas is resizing.
marks0351 Mar 21, 2023
26a6156
Remove App positioning control.
marks0351 Mar 21, 2023
7638727
display canvas size only fixed layout.
marks0351 Mar 21, 2023
f3ff076
Re enable canvas scroll.
marks0351 Mar 21, 2023
d31a9ac
fix scroll not showing up in deploy mode.
marks0351 Mar 21, 2023
9abbd57
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
marks0351 Mar 21, 2023
7adacc1
Release merge fixes.
marks0351 Mar 21, 2023
c142683
Merge branch 'mobile/v1/main' of https://github.com/appsmithorg/appsm…
marks0351 Mar 21, 2023
00dc05b
fix restore snapshot flow, by updating appPositioning type
Mar 21, 2023
69ef081
implement widthInPercentage while converting by using positionUtils
Mar 21, 2023
9b05b1b
Merge branch 'mobile/v1/qa' of github.com:appsmithorg/appsmith into m…
Mar 21, 2023
4f660ef
prevent saving snapshot for single empty page
Mar 21, 2023
cc6ff11
prevent recalculating columns while converting or using snapshot
Mar 21, 2023
99c3e1c
updates widget configs
Mar 22, 2023
c6fdcaa
fix: resized widgets gets back to original size & widget config updates
Mar 22, 2023
f865200
fix: infinite update on auto dimension
Mar 22, 2023
df26d0c
udpates widget config from Widgets in Stacks doc
Mar 23, 2023
7d65f6e
feat: added vertical alignment bottom to widgets.
yaldram Mar 23, 2023
af9805e
feat: add margin bottom 6px to select widgets.
yaldram Mar 23, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe("JSONForm Footer spec", () => {
cy.get(".t--jsonform-footer").then(($footer) => {
const gap = $footer.prop("offsetTop") - $body.prop("scrollHeight");

expect(gap).equals(0);
expect(gap).equals(1);
});
});
});
Expand All @@ -72,7 +72,7 @@ describe("JSONForm Footer spec", () => {
$footer.prop("offsetHeight") -
$form.prop("offsetHeight");

expect(gap).equals(0);
expect(gap).equals(1);
});
});
});
Expand All @@ -91,7 +91,7 @@ describe("JSONForm Footer spec", () => {
$footer.prop("offsetHeight") -
$form.prop("scrollHeight");

expect(gap).equals(0);
expect(gap).equals(1);
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe("Dropdown Widget Functionality", function () {
.find(widgetLocators.menuButton)
.invoke("outerWidth")
.then((width) => {
expect(parseInt(width)).to.equal(147);
expect(parseInt(width)).to.equal(146);
});
cy.get(formWidgetsPage.menuButtonWidget)
.find(widgetLocators.menuButton)
Expand All @@ -40,7 +40,7 @@ describe("Dropdown Widget Functionality", function () {
cy.get(".menu-button-popover")
.invoke("outerWidth")
.then((width) => {
expect(parseInt(width)).to.equal(147);
expect(parseInt(width)).to.equal(146);
});

// MultiSelect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ describe("Label feature", () => {
it("CheckboxGroupWidget label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "checkboxgroupwidget",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='checkboxgroup-container']",
isCompact: true,
labelText: "Name",
Expand All @@ -22,8 +21,7 @@ describe("Label feature", () => {
it("CurrencyInputWidget label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "currencyinputwidget",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='input-container']",
isCompact: true,
labelText: "Name",
Expand All @@ -36,8 +34,7 @@ describe("Label feature", () => {
it("DatePickerWidget2 label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "datepickerwidget2",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='datepicker-container']",
isCompact: true,
labelText: "Name",
Expand All @@ -50,8 +47,7 @@ describe("Label feature", () => {
it("InputWidgetV2 label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "inputwidgetv2",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='input-container']",
isCompact: true,
labelText: "Name",
Expand All @@ -64,8 +60,7 @@ describe("Label feature", () => {
it("MultiSelectTreeWidget label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "multiselecttreewidget",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='multitreeselect-container']",
isCompact: true,
labelText: "Name",
Expand All @@ -78,8 +73,7 @@ describe("Label feature", () => {
it("MultiSelectWidgetV2 label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "multiselectwidgetv2",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='multiselect-container']",
isCompact: true,
labelText: "Name",
Expand All @@ -92,8 +86,7 @@ describe("Label feature", () => {
it("PhoneInputWidget label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "phoneinputwidget",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='input-container']",
isCompact: true,
labelText: "Name",
Expand All @@ -106,8 +99,7 @@ describe("Label feature", () => {
it("RadioGroupWidget label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "radiogroupwidget",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='radiogroup-container']",
isCompact: true,
labelText: "Name",
Expand All @@ -120,8 +112,7 @@ describe("Label feature", () => {
it("RichTextEditorWidget label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "richtexteditorwidget",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='rte-container']",
isCompact: false,
labelText: "Name",
Expand All @@ -134,8 +125,7 @@ describe("Label feature", () => {
it("SelectWidget label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "selectwidget",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='select-container']",
isCompact: true,
labelText: "Name",
Expand All @@ -148,8 +138,7 @@ describe("Label feature", () => {
it("SingleSelectTreeWidget label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "singleselecttreewidget",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='treeselect-container']",
isCompact: true,
labelText: "Name",
Expand All @@ -162,8 +151,7 @@ describe("Label feature", () => {
it("SwitchGroupWidget label properties: Text, Position, Alignment, Width", () => {
const options = {
widgetName: "switchgroupwidget",
// parentColumnSpace: 11.90625,
parentColumnSpace: 11.9375,
parentColumnSpace: 11.90625,
containerSelector: "[data-testid='switchgroup-container']",
isCompact: true,
labelText: "Name",
Expand Down
4 changes: 2 additions & 2 deletions app/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"cypress-log-to-output": "^1.1.2",
"dayjs": "^1.10.6",
"deep-diff": "^1.0.2",
"design-system-old": "npm:@appsmithorg/[email protected].52",
"design-system-old": "npm:@appsmithorg/[email protected].53-alpha.1",
"downloadjs": "^1.4.7",
"exceljs": "^4.3.0",
"fast-deep-equal": "^3.1.3",
Expand Down Expand Up @@ -329,4 +329,4 @@
"trim": "0.0.3",
"webpack": "5.76.0"
}
}
}
90 changes: 82 additions & 8 deletions app/client/src/actions/autoLayoutActions.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,88 @@
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
import type { AppPositioningTypes } from "reducers/entityReducers/pageListReducer";
import type {
CONVERSION_STATES,
SnapShotDetails,
} from "reducers/uiReducers/layoutConversionReducer";

/**
* Calculate size and position changes owing to minSizes and flex wrap.
* This function is triggered the first time mobile viewport (480px) is encountered.
* It is also called when increasing viewport size from mobile to desktop.
*/
export const updateLayoutForMobileBreakpointAction = (
parentId: string,
isMobile: boolean,
canvasWidth: number,
) => ({
type: ReduxActionTypes.RECALCULATE_COLUMNS,
payload: {
parentId,
isMobile,
canvasWidth,
},
});
) => {
return {
type: ReduxActionTypes.RECALCULATE_COLUMNS,
payload: {
parentId,
isMobile,
canvasWidth,
},
};
};

export const updateLayoutPositioning = (
positioningType: AppPositioningTypes,
) => {
return {
type: ReduxActionTypes.UPDATE_LAYOUT_POSITIONING,
payload: positioningType,
};
};

export const setLayoutConversionStateAction = (
conversionState: CONVERSION_STATES,
error?: Error,
) => {
return {
type: ReduxActionTypes.SET_LAYOUT_CONVERSION_STATE,
payload: { conversionState, error },
};
};

export const updateSnapshotDetails = (
snapShotDetails: SnapShotDetails | undefined,
) => {
return {
type: ReduxActionTypes.UPDATE_SNAPSHOT_DETAILS,
payload: snapShotDetails,
};
};
export function updateWidgetDimensionAction(
widgetId: string,
width: number,
height: number,
) {
return {
type: ReduxActionTypes.UPDATE_WIDGET_DIMENSIONS,
payload: {
widgetId,
width,
height,
},
};
}

export const setConversionStart = (conversionState: CONVERSION_STATES) => {
return {
type: ReduxActionTypes.START_CONVERSION_FLOW,
payload: conversionState,
};
};

export const setConversionStop = () => {
return {
type: ReduxActionTypes.STOP_CONVERSION_FLOW,
};
};

export const setAutoCanvasResizing = (isAutoCanvasResizing: boolean) => {
return {
type: ReduxActionTypes.SET_AUTO_CANVAS_RESIZING,
payload: isAutoCanvasResizing,
};
};
30 changes: 26 additions & 4 deletions app/client/src/actions/pageActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,24 @@ export const createPage = (
};
};

export const createNewPageFromEntities = (
applicationId: string,
pageName: string,
blockNavigation?: boolean,
) => {
AnalyticsUtil.logEvent("CREATE_PAGE", {
pageName,
});
return {
type: ReduxActionTypes.CREATE_NEW_PAGE_FROM_ENTITIES,
payload: {
applicationId,
name: pageName,
blockNavigation,
},
};
};

/**
* action to clone page
*
Expand Down Expand Up @@ -282,10 +300,14 @@ export type MultipleWidgetDeletePayload = {
export type WidgetResize = {
widgetId: string;
parentId: string;
leftColumn: number;
rightColumn: number;
topRow: number;
bottomRow: number;
leftColumn?: number;
rightColumn?: number;
topRow?: number;
bottomRow?: number;
mobileLeftColumn?: number;
mobileRightColumn?: number;
mobileTopRow?: number;
mobileBottomRow?: number;
snapColumnSpace: number;
snapRowSpace: number;
};
Expand Down
29 changes: 28 additions & 1 deletion app/client/src/api/ApplicationApi.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@ import type { ApiResponse } from "./ApiResponses";
import type { AxiosPromise } from "axios";
import type { AppColorCode } from "constants/DefaultTheme";
import type { AppIconName } from "design-system-old";
import type { AppLayoutConfig } from "reducers/entityReducers/pageListReducer";
import type {
AppLayoutConfig,
AppPositioningTypeConfig,
} from "reducers/entityReducers/pageListReducer";
import type { APP_MODE } from "entities/App";
import type { ApplicationVersion } from "actions/applicationActions";
import type { Datasource } from "entities/Datasource";
import { getSnapShotAPIRoute } from "ce/constants/ApiConstants";

export type EvaluationVersion = number;

Expand Down Expand Up @@ -110,6 +114,9 @@ export type UpdateApplicationPayload = {
currentApp?: boolean;
appLayout?: AppLayoutConfig;
applicationVersion?: number;
applicationDetail?: {
appPositioning?: AppPositioningTypeConfig;
};
embedSetting?: AppEmbedSetting;
};

Expand Down Expand Up @@ -208,6 +215,10 @@ export interface PageDefaultMeta {
default: boolean;
}

export interface snapShotApplicationRequest {
applicationId: string;
}

class ApplicationApi extends Api {
static baseURL = "v1/applications";
static publishURLPath = (applicationId: string) =>
Expand Down Expand Up @@ -337,6 +348,22 @@ class ApplicationApi extends Api {
},
);
}

static createApplicationSnapShot(request: snapShotApplicationRequest) {
return Api.post(getSnapShotAPIRoute(request.applicationId));
}

static getSnapShotDetails(request: snapShotApplicationRequest) {
return Api.get(getSnapShotAPIRoute(request.applicationId));
}

static restoreApplicationFromSnapshot(request: snapShotApplicationRequest) {
return Api.post(getSnapShotAPIRoute(request.applicationId) + "/restore");
}

static deleteApplicationSnapShot(request: snapShotApplicationRequest) {
return Api.delete(getSnapShotAPIRoute(request.applicationId));
}
}

export default ApplicationApi;
Loading