Commit Graph

488 Commits

Author SHA1 Message Date
Vicky Bansal
791e8195b1
Align column headers when aligning columns (#3885)
* Align table column header title with table columns

* Added cypress test to validate column header text alignment
2021-04-09 16:04:01 +05:30
Trisha Anand
df993efcde
Updated the DSL to change primary columns for an array to a map structure in the DSL (#3905) 2021-04-07 18:22:52 +05:30
NandanAnantharamu
547a9a7ee0
Added tests for Oauth and Stubbed tests (#3463)
* Added tests for Oauth and Stubbed tests

* updated tests

* test updated

* updated DS tests

* review comments incorporated

* flag removed

* postinvite stubbed

* intercept req added and chromewebsecurity flag added

* Update app/client/cypress/support/commands.js

* updated header request

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
2021-04-06 18:59:27 +05:30
NandanAnantharamu
8cd6c95e70
updated table property pane test (#3837)
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
2021-04-05 17:25:27 +05:30
Kaushik Varanasi
8f8b7b281f
Fixes error on failed github docs fetch (#3665)
fixes #3551
2021-04-05 14:07:04 +05:30
Vicky Bansal
bdf31dbf37
Text Widget new styling properties (#3167) 2021-04-01 14:00:33 +05:30
Rishabh Saxena
7ffc0d3786
Ignore cypress/no-unnecessary-waiting (#3794) 2021-03-31 14:05:19 +05:30
Abhinav Jha
10159fc442
Fix #3752 DatePicker tries to auto parse the defaultDate (#3753) 2021-03-30 14:32:25 +05:30
Ashok Kumar M
bf21c15ba9
Feature: Property pane enhancements(Bug fixes + Draggable popper) (#3748)
* Fix: On renaming a widget via entity explorer the canvas gets resized

* Fix: Close prop pane on resize start of unselected widget.

* Fix: Match all - corejs polyfill

* Fix: Proppane not updated properly when same type widgets are selected.

* Feature: Draggable Proppane.

* Bug fixes for draggable popup.

* Fix: Property pane editor when selecting another widget.

* resolve rebase bad merges.

* cytest fix

* cytest fix

* cytest fix

* cytest fix

* cytest fix

* cytest fix

* cytest fixes

* cytest fix

* fixing draggable components inside porp pane.

* Adding cypress test.

* refactored Draggable list POC version

* reverting unwanted changes.

* prop pane bug fix

* unwanted dependencies.

* double click to open prop pane.

* Fixing bugs in draggable prop pane.

* one click prop pane open.

* ignore drag/resize click captures

* make prop pane draggable only via drag handler.

* Fixed property pane title.

* converting layer to hook and adding it to top most layer.

* removing irrelevant comments.

* close panel when widget changes.

* fixing cytests.

* bug fix

* fixing cytest

* Addressing code review comments.

* bug fix
2021-03-29 21:17:22 +05:30
Rishabh Saxena
3f55e16b35
Fix onboarding test spec: check res instead of req to verify if the datasource was created successfully (#3747) 2021-03-29 19:51:50 +05:30
hetunandu
b0580e9ee0 Revert "Feature: Property Pane improvements (#3561)"
This reverts commit 3437c16ef0.
2021-03-29 16:58:22 +05:30
Ashok Kumar M
3437c16ef0
Feature: Property Pane improvements (#3561)
* Fix: On renaming a widget via entity explorer the canvas gets resized

* Fix: Close prop pane on resize start of unselected widget.

* Fix: Match all - corejs polyfill

* Fix: Proppane not updated properly when same type widgets are selected.

* Feature: Draggable Proppane.

* Bug fixes for draggable popup.

* Fix: Property pane editor when selecting another widget.

* resolve rebase bad merges.

* cytest fix

* cytest fix

* cytest fix

* cytest fix

* cytest fix

* cytest fix

* cytest fixes

* cytest fix

* fixing draggable components inside porp pane.

* Adding cypress test.

* refactored Draggable list POC version

* reverting unwanted changes.

* prop pane bug fix

* unwanted dependencies.

* double click to open prop pane.

* Fixing bugs in draggable prop pane.

* one click prop pane open.

* ignore drag/resize click captures

* make prop pane draggable only via drag handler.

* Fixed property pane title.

* converting layer to hook and adding it to top most layer.

* removing irrelevant comments.

* close panel when widget changes.

* fixing cytests.

* bug fix

* fixing cytest

* Addressing code review comments.

* bug fix
2021-03-29 15:28:52 +05:30
Apeksha Bhosale
8983940a30
Merge pull request #3659 from appsmithorg/fix/new-field-POST-change
Added index check to add content type in existing field
2021-03-29 15:26:03 +05:30
prapullac
d9417dc043
Adding test ideas for Switch widget (#3490)
* adding test ideas for Switch widget

* reset  widget for date change
2021-03-26 14:08:10 +05:30
prapullac
cee1b86f32
Adding test ideas for Edit profile (#3700) 2021-03-26 12:51:46 +05:30
Apeksha Bhosale
eab1f8372a Merge branch 'release' into fix/new-field-POST-change 2021-03-26 09:33:52 +05:30
NandanAnantharamu
424a1cbf69
SwitchWidget within FormWidget tests (#3501)
* added test with switch widget within farm widget

* Added another usecase with Switch

* added wait

* updated locators

* minor update

* add locators for switch widget spec

* removed waits and replaced with suitable assertions

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
2021-03-25 21:38:16 +05:30
NandanAnantharamu
378330815b
Added test for tableWidget bug (#3528)
* Added test for tableWidget bug

* updated test

* review comment incorporated

* updated collapse pane test

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2021-03-25 16:31:51 +05:30
Rishabh Saxena
f2160d61e1
Fix onboarding Cypress test (#3678) 2021-03-25 13:23:56 +05:30
Abhinav Jha
1ccece69e1
Custom FusionCharts Config (#2670)
* Property pane enhancements

- Property pane sections are collapsible
- Property pane controls can be hidden conditionally
- Property pane configurations now come from the widget instead of a global config file
- Property pane property updates can be hooked with other related updates
- Property pane control and section ids are generated dynamically now.

* Add chart type: "Custom FusionChart" (#2996)

Co-authored-by: Zeger Hoogeboom <zegerhoogeboom@users.noreply.github.com>
Co-authored-by: zeger <zeger@equinoxai.com>
2021-03-25 03:35:04 +05:30
Abhinav Jha
4a05b5d320
Fix #3335 - New method of computing table data to display (#3607) 2021-03-25 00:55:38 +05:30
Vicky Bansal
f2e0ed29c5
Update: DatePicker validates data as ISO 8601 string (#3397) 2021-03-24 17:42:24 +05:30
Vicky Bansal
97b9a32b32
Feature: Table Widget: URL column type (#3569) 2021-03-24 16:54:10 +05:30
Vicky Bansal
5ba4cc4400
Table Widget: Show null values as empty cells (#3522)
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-03-24 14:33:48 +05:30
Vicky Bansal
eb2c551def
DatePicker Widget: Additional date formats (#3162)
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
2021-03-24 14:23:39 +05:30
prapullac
9da0d7abf6
Added test ideas for Table and Hide feature of the page (#3594) 2021-03-23 17:56:31 +05:30
Apeksha Bhosale
28a4b4a6d6 test case fixed
it was checking 3rd key:value pair for content type but with changes it will added to first empty field (0th)
2021-03-23 16:55:21 +05:30
NandanAnantharamu
a82c789c1a
udpated tests (#3617)
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-03-19 11:19:54 +05:30
Kaushik Varanasi
55c17a66aa
Fix success message for single user invite and multiple user invite (#3591)
* Fixed error message for single user invite

* updated success message for single user invite and created tests

* use state to detect and update the number of users invited

* removing unnecessary lines

* typo
2021-03-18 19:20:33 +05:30
Kaushik Varanasi
5f80e2561e
Merge pull request #3572 from appsmithorg/bugfix/trunncate-org-name-settings
add ellipsis to org name in settings
2021-03-18 12:39:52 +05:30
Hetu Nandu
441bb368d2
Reduce flakiness by adding waits (#3605) 2021-03-18 02:02:16 +05:30
Hetu Nandu
0debe37637
Add arbitary wait on onboarding test (#3604)
We recently changed the test to make sure we wait for the client to create an onboarding data source if it did not exist. This kind of check was also happening on the source code, and the complexity was not getting translated properly in the tests.

To improve the reliability of the test, I added an arbitrary wait time before we start the building
2021-03-17 23:59:40 +05:30
Vicky Bansal
1195a0b694
Reset selected row(s) when table data is changed (#3576)
* Fixed selected row resets when table data is changed

Added cypress test case to test selected row resets when table data changes

* Fixed cypress test case
2021-03-17 17:27:38 +05:30
Rishabh Saxena
0e3901953b
Fix specs (#3577) 2021-03-17 15:06:08 +05:30
Kaushik Varanasi
8fd0509bcb Merge branch 'release' into bugfix/trunncate-org-name-settings 2021-03-17 12:45:13 +05:30
NandanAnantharamu
8aca378028
updated flaky test (#3584)
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-03-17 10:38:00 +05:30
Kaushik Varanasi
f9d2318e5a reconciling with current release 2021-03-17 00:22:01 +05:30
Kaushik Varanasi
dfa23a6944 added tests, documentation and better naming convention 2021-03-17 00:18:36 +05:30
ram-primathon
3b0fb539d5
Property Pane re design (#3057)
Co-authored-by: devrk96 <rohit.kumawat@primathon.in>
Co-authored-by: hetunandu <hetu@appsmith.com>
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
Co-authored-by: Vicky Bansal <67091118+vicky-primathon@users.noreply.github.com>
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-03-15 17:47:56 +05:30
Arpit Mohan
660c194009
Moving all toast messages to messages.ts file (#2798)
Co-authored-by: hetunandu <hetu@appsmith.com>
2021-03-13 19:54:45 +05:30
Nikhil Nandagopal
3b2072eeb9
Merge pull request #3055 from appsmithorg/fix/rte-newline
Added defaultText and defaultHTML properties in RTE
2021-03-12 17:38:58 +05:30
vicky-primathon.in
3da86b33fe Merge branch 'release' of https://github.com/appsmithorg/appsmith into fix/rte-newline 2021-03-12 15:24:51 +05:30
Nikhil Nandagopal
82b65e12d1 Removed the property pane 2021-03-12 14:37:24 +05:30
Arpit Mohan
f11cd45886
Correcting the github condition to start the API server (#3506) 2021-03-12 11:06:54 +05:30
Abhinav Jha
0172430489
Fix unreachable code reported by deepsourcelabs (#3483) 2021-03-11 08:46:50 +05:30
Shrikant Sharat Kandula
65568a4e13
Add more devices in AppLayout options (#3451)
* Remove width and introduce more AppLayout type enums

* Fix: Adding min width to layout options.

Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com>
2021-03-11 07:51:48 +05:30
Sumit Kumar
b6961ce7a4
Add timeout failure for mongo plugin test datasource (#3431)
- Mongo plugin client driver does not return with exception upon first failure - instead it keeps retrying. Hence, adding timeout error to report failure before the client thread cancels due to delay in response.
- It seems that the mongdb connection string cannot be directly used for ping test, hence skipping it.
2021-03-10 11:11:14 +05:30
Rishabh Saxena
99b3fa6bb8
Omnibar global search (#2903) 2021-03-08 13:54:12 +05:30
Dwayne Forde
2dfc8ebf8a
Adds support for base64 image strings to image cells (#2769) 2021-03-06 01:07:49 +05:30
prapullac
d452c78453
Adding manual test cases for Table (#3325) 2021-03-05 14:02:54 +05:30
hetunandu
8574b86926 Merge branch 'master' into release 2021-03-05 12:06:14 +05:30
NandanAnantharamu
71f4a4b0a9
grouping another set of tests (#3404)
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
Co-authored-by: hetunandu <hetu@appsmith.com>
2021-03-05 00:35:41 +05:30
akash-codemonk
1e4878f983
Support editing user's name field (#3306) 2021-03-04 15:07:02 +05:30
Rishabh Saxena
013c4230e2
Wrap ads button text within span for resilience for DOM mutations (#3292) 2021-03-04 11:34:36 +05:30
Ashok Kumar M
a7e0990cf8
Feature: Canvas Layout Options(max width config) (#3141)
* Feature: Canvas Layout Options(max width config)

* Fixing css issues.

* Changing Default Device option to Desktop.

* Changed Implementation to maintain resize updates within the client.

* Addressing code review changes.

* Updating device resolutions.

* updating cytests

* Fixing resize bug.
2021-03-03 10:56:47 +05:30
Dwayne Forde
b074a035b5
Updates json input from typing to value setting (#2805) 2021-03-03 10:34:52 +05:30
Arpit Mohan
bf16b45f2b
Merge pull request #3309 from appsmithorg/release
Release v1.4.1
2021-03-02 13:41:51 +05:30
Pawan Kumar
d2a0980ec7
Fix: Table Actions button border radius and green shade color (#3222)
* update green shade and set border-radius 0 for table buttons

* updated color code for assertion

Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-03-02 08:43:43 +05:30
Sumit Kumar
7d2effae18
Modify hint statement for 'import from curl' form (#3285)
- Move to hint statement out of query box and put if above it - between the label and the query box - so that user's don't confuse it as a typed in statement.

Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
2021-03-01 23:28:07 +05:30
Hetu Nandu
df2d353fbe
Add sync meta property update function (#3293) 2021-03-01 20:26:47 +05:30
vicky-primathon.in
950c7b93bb Merge branch 'release' of https://github.com/appsmithorg/appsmith into fix/rte-newline 2021-02-26 16:35:12 +05:30
Vicky Bansal
118467c5bb
Feature: Show/Hide Tabs in Tabs Widget (#3192)
* Added functionality to show/hide a tab from tab property pane controls

* Added isVisible property in tabs widget default value

* Passing visible tabs to component from widget. Added missing widgetId
2021-02-26 11:47:21 +05:30
NandanAnantharamu
4bed88d7e1
Added test for table data sorting (#2257)
* Added test for table data sorting

* commented tests

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-02-26 10:18:27 +05:30
Arpit Mohan
d420518cad Fixing merge conflicts 2021-02-25 17:29:49 +05:30
NandanAnantharamu
21eecb1fe6
WIP : Added test for chart datapoint validation (#3176)
* Added test for chart datapoint validation

* updated test

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-02-25 12:49:23 +05:30
akash-codemonk
7fa5e3b1af
Hide pages in publish mode (#3106) 2021-02-24 19:17:37 +05:30
akash-codemonk
791d92af94
Add validation to check if widget exists (#3140)
* Check if widget is present incase it got deleted etc.

* Update test
2021-02-24 11:30:22 +05:30
vicky-primathon.in
b474442ec7 Merge branch 'release' of https://github.com/appsmithorg/appsmith into fix/rte-newline 2021-02-23 18:11:14 +05:30
NandanAnantharamu
6c80f23201
Feature: DatePicker V2 (#2889)
Co-authored-by: vicky-primathon.in <vicky.bansal@primathon.in>
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
2021-02-23 18:05:09 +05:30
NandanAnantharamu
d20d013d69
Cypress test for Tab rename from entity explorer (#2780)
* Bug automation

* Test flow completed

* Another bug automation

* Updated tests

* uncommented delete tab test

* Uncommented a test

* updated tests

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-02-23 15:08:31 +05:30
NandanAnantharamu
725043fde3
Replace test api with mockApi in Cypress tests (#2975)
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-02-23 09:56:02 +05:30
Ashok Kumar M
d1822a9dee
Feature: Modal Widget (#3092)
* Feature: Modal Widget(DIP)

* Adding cypress tests.
2021-02-23 09:48:23 +05:30
vicky-primathon.in
3d5d51fbde Merge branch 'release' of https://github.com/appsmithorg/appsmith into fix/rte-newline 2021-02-22 22:20:36 +05:30
Vicky Bansal
0eab1993f8
Feature: onDataPointClick trigger in Chart Widget (#2953) 2021-02-22 22:01:13 +05:30
akash-codemonk
92d1c381f1
Allow searching for page names in explorer and other improvements (#3038) 2021-02-22 19:31:46 +05:30
NandanAnantharamu
03eba7ed27
Categorise tests between client and server (#2856)
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
Co-authored-by: hetunandu <hetu@appsmith.com>
2021-02-22 10:18:30 +05:30
vicky-primathon.in
517fe592f1 Merge branch 'release' of https://github.com/appsmithorg/appsmith into fix/rte-newline 2021-02-18 15:42:45 +05:30
prapullac
743791a95d
Manual negative test ideas for user invite flow (#2481)
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
2021-02-17 20:27:18 +05:30
prapullac
8cd3a981b9
Manual test ideas for datasource query (#2763)
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
2021-02-17 20:22:16 +05:30
akash-codemonk
e604357643 Go back to application list instead of deleting app (#2981) 2021-02-16 17:52:04 +05:30
akash-codemonk
9c20ac5306 New onboarding flow (#2686)
Co-authored-by: a <rishabh.robben@gmail.com>
2021-02-16 17:51:46 +05:30
Ashok Kumar M
a55c10a8ed
Feature Switch Widget (#2999)
* Feature Switch Widget

* Center switch widget

* Adding Cypress tests and changing some nomenclature.

* Adding doc reference

* Swap label for checkbox widget.

* Addressing code review comments.

* remove swap label as exposed property

* Align widget even when label isn't present.

* Changing swapLabel property to Alignment property.

* Fixing test cases.

* Adding default alignment for checkbox.

* Switch documentation link correction

* Removing Ids and adding bind and trigger properties as per new config.

* Changing  default state to bindable property.

Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
2021-02-16 17:45:17 +05:30
Piyush Mishra
a4fe0a461e
Table Widget New Features (#2816)
- Each column has more options and can be configured in the property pane instead of the table
- Table level styles can now be set in the property pane
- Property sections are collapsible

Co-authored-by: vicky-primathon.in <vicky.bansal@primathon.in>
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
Co-authored-by: Abhinav Jha <abhinav@appsmith.com>
Co-authored-by: hetunandu <hetu@appsmith.com>
2021-02-16 15:59:08 +05:30
Arpit Mohan
01ca53899e
Fixing the organization share Cypress test cases (#2993) 2021-02-11 23:50:49 +05:30
devrk96
ac23629647
Feature: API Pane Redesign (#2218)
Co-authored-by: Hetu Nandu <hetunandu@gmail.com>
Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
2021-02-11 18:24:00 +05:30
Nidhi
8823f9d407
Added client credentials grant type for OAuth2 (#2649)
* Added client credentials grant type for OAuth2

Co-authored-by: Piyush <piyush@codeitout.com>
2021-02-11 17:58:06 +05:30
akash-codemonk
8aa39eae7b
Go back to application list instead of deleting app (#2981) 2021-02-11 16:55:47 +05:30
akash-codemonk
c1b3f311e3
New onboarding flow (#2686)
Co-authored-by: a <rishabh.robben@gmail.com>
2021-02-11 12:06:07 +05:30
NandanAnantharamu
3d43d04658
Remove unwanted step in Cypress Map widget test (#2902)
* updated test

* removed the commented line

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-02-08 16:20:28 +05:30
NandanAnantharamu
1aa879d8c2
updated flaky test (#2899)
* updated flaky test

* review comments incorporated

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-02-08 15:50:03 +05:30
Pawan Kumar
3e53df8b64
Update Default styles of Widgets (#2823)
* update default styling of widgets

* [CodeFactor] Apply fixes

* update widgets styles

* fix eslint bug

* update button colors

* update primary button color

* update primary button color

* remove px in 0px in css

* incorporate abhinav review feedbacks

* fixed global styling of popover

Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local>
Co-authored-by: codefactor-io <support@codefactor.io>
2021-02-08 13:00:01 +05:30
Hetu Nandu
5d514849b4
Fix org creation and app creation tests (#2878) 2021-02-04 17:01:32 +05:30
Sumit Kumar
e6b77a1299
Stop logging some AppsmithPluginException to Sentry (#2351)
1. Move package  appsmith-interfaces/src/main/java/com/appsmith/external/pluginExceptions-> appsmith-interfaces/src/main/java/com/appsmith/external/exceptions/pluginExceptions
2. Move enum AppsmithErrorAction from appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java -> appsmith-interfaces/src/main/java/com/appsmith/external/exceptions/AppsmithErrorAction.java, so that both plugin exceptions and server exceptions could use the same enum.
3. Log exception based on the error action defined for each exception.
2021-02-04 15:24:30 +05:30
Rishabh Saxena
32b641c118
Implement new designs for the editor and viewer's navbar (#2750) 2021-02-04 12:32:36 +05:30
NandanAnantharamu
b3a75de6d3
split the test (#2799)
Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-02-03 18:08:27 +05:30
Rishabh Saxena
5da3b0165e
Prevent input component cursor getting reset using asyncControlledInput (#2802) 2021-02-03 14:52:19 +05:30
Rishabh Saxena
8ae86c34e0
Fix: redirect to applications page from auth pages when the user is logged in (#2771) 2021-02-03 13:29:00 +05:30
NandanAnantharamu
7a9ec45901
Added test for invalid binding (#2777)
* Added test for invalid binding

* Updated review comments

Co-authored-by: nandan.anantharamu <nandan.anantharamu@thoughtspot.com>
2021-02-03 11:56:46 +05:30
Vicky Bansal
11f5687b38
Date picker validation fixed (#2789)
* Date picker validation fixed

* Added date value check to remove unncessary validations

Commented defaultDate validation test as invalid date cannot be saved in date control

* Fixed date selection on user change

Fixed min and max date parsing for date picker control default date

* Added validation for min and max date in validations to handle validations when field is converted to JS
2021-02-02 20:12:49 +05:30
prapullac
66eb08413c
Test Ideas for "Copy to Clipboard" (#2585)
* Test Ideas for copy to Clipboard

* Adding test ideas for App viewer and admin flow

Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
2021-02-02 14:11:34 +05:30