Skip to content

[Fix] revert new nav#5533

Merged
pranavkanade merged 2 commits into
releasefrom
fix/revert-new-nav
Jul 1, 2021
Merged

[Fix] revert new nav#5533
pranavkanade merged 2 commits into
releasefrom
fix/revert-new-nav

Conversation

@pranavkanade

@pranavkanade pranavkanade commented Jul 1, 2021

Copy link
Copy Markdown
Contributor

Reverting new nav changes from release

Test coverage results 🧪

🟢 Total coverage has increased
// Code coverage diff between base branch:release and head branch: fix/revert-new-nav 
Status File % Stmts % Branch % Funcs % Lines
🟢 total 54.13 (0.06) 36.12 (0.03) 32.79 (0.22) 54.63 (0.01)
✨ 🆕 app/client/src/actions/collectionAction.ts 75 100 0 66.67
🟢 app/client/src/actions/datasourceActions.ts 66.67 (0) 0 (0) 0 (0) 52.78 (0.28)
🟢 app/client/src/api/DatasourcesApi.ts 65 (2.5) 0 (0) 14.29 (3.18) 63.16 (2.29)
🟢 app/client/src/components/ads/Dropdown.tsx 62.5 (-0.51) 67.11 (3.58) 36.84 (0) 59.09 (-0.61)
🟢 app/client/src/components/ads/Tabs.tsx 27.5 (4.58) 40 (21.82) 0 (0) 27.5 (4.58)
✨ 🆕 app/client/src/components/editorComponents/ActionCreator.tsx 34.67 23.22 22.22 33.68
🔴 app/client/src/components/editorComponents/ApiResponseView.tsx 52.86 (-1.31) 35.48 (-2.02) 0 (0) 54.41 (-1.3)
🔴 app/client/src/components/editorComponents/CloseEditor.tsx 56.52 (-2.57) 100 (0) 0 (0) 56.52 (-2.57)
🔴 app/client/src/components/editorComponents/GlobalSearch/SearchResults.tsx 27.36 (0) 24 (-1.35) 0 (0) 28.16 (0)
🔴 app/client/src/components/editorComponents/form/fields/DropdownFieldWrapper.tsx 16.67 (-4.38) 0 (0) 0 (0) 18.75 (-4.78)
🔴 app/client/src/constants/DefaultTheme.tsx 92.38 (-0.07) 88.89 (-0.58) 71.43 (0) 91.01 (-0.1)
🟢 app/client/src/constants/messages.ts 71.94 (0.05) 100 (0) 15.17 (0.15) 76.11 (-0.16)
🟢 app/client/src/constants/routes.ts 82.93 (1.05) 42.68 (1.86) 64.71 (1.55) 81.13 (1.3)
🟢 app/client/src/icons/MenuIcons.tsx 64.86 (2.7) 100 (0) 23.53 (5.88) 64.86 (2.7)
🔴 app/client/src/pages/Editor/routes.tsx 38.81 (-0.9) 22.22 (0) 6.67 (0) 43.1 (-0.97)
✨ 🆕 app/client/src/pages/Editor/APIEditor/ApiHomeScreen.tsx 37.04 24.32 3.57 37.4
🟢 app/client/src/pages/Editor/APIEditor/Form.tsx 37.8 (0.22) 47.92 (0) 0 (0) 40 (0.26)
🔴 app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx 35.29 (0) 37.74 (-3.08) 4.76 (0) 37.63 (0)
🟢 app/client/src/pages/Editor/APIEditor/index.tsx 31.13 (0.36) 3.51 (-0.13) 5 (0) 33.68 (0.35)
🟢 app/client/src/pages/Editor/DataSourceEditor/BackButton.tsx 85.71 (10.71) 100 (0) 0 (0) 85.71 (10.71)
🔴 app/client/src/pages/Editor/DataSourceEditor/DBForm.tsx 46.05 (0.37) 24 (-3.59) 7.14 (0) 45.95 (-1.42)
✨ 🆕 app/client/src/pages/Editor/DataSourceEditor/DatasourceHome.tsx 56.52 52.63 10 58.14
🔴 app/client/src/pages/Editor/DataSourceEditor/JSONtoForm.tsx 15.71 (-0.6) 20.29 (0) 4.55 (0) 16.8 (-0.66)
🔴 app/client/src/pages/Editor/DataSourceEditor/RestAPIDatasourceForm.tsx 26.88 (-0.54) 22 (0) 3.03 (-0.1) 30.06 (-0.61)
🟢 app/client/src/pages/Editor/DataSourceEditor/index.tsx 28.42 (0.58) 0 (0) 11.76 (0) 29.07 (0)
🔴 app/client/src/pages/Editor/Explorer/Actions/ActionEntityContextMenu.tsx 35.48 (-3.41) 0 (0) 0 (0) 36.67 (-3.33)
🟢 app/client/src/pages/Editor/Explorer/Actions/helpers.tsx 55.38 (8.61) 38.78 (2.93) 31.82 (11.82) 56.14 (7.08)
🔴 app/client/src/pages/Editor/Explorer/PluginGroup/PluginGroup.tsx 88 (-0.46) 61.4 (0) 60 (0) 87.5 (-0.5)
✨ 🆕 app/client/src/pages/Editor/QueryEditor/AddDatasourceSecurely.tsx 91.67 100 0 91.67
✨ 🆕 app/client/src/pages/Editor/QueryEditor/DatasourceCard.tsx 58.97 52.94 0 58.97
🟢 app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx 48.51 (2.93) 48.48 (2.77) 0 (0) 50.78 (2.92)
✨ 🆕 app/client/src/pages/Editor/QueryEditor/QueryHomeScreen.tsx 41.07 42.11 8.33 44.9
🟢 app/client/src/pages/Editor/QueryEditor/index.tsx 32.95 (0.77) 11.43 (-0.69) 7.69 (0) 35 (0.82)
🟢 app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx 35.42 (1.42) 19.05 (0) 6.25 (0) 37.5 (0.83)
🟢 app/client/src/reducers/entityReducers/datasourceReducer.ts 10.64 (1.55) 0 (0) 0 (0) 11.11 (1.49)
🔴 app/client/src/sagas/ActionSagas.ts 12.01 (-0.05) 1.06 (-0.04) 4.55 (0) 14.59 (-0.07)
🔴 app/client/src/sagas/ApiPaneSagas.ts 15.28 (-0.29) 1.87 (0) 7.41 (0) 17.2 (-0.29)
🟢 app/client/src/sagas/DatasourcesSagas.ts 13.96 (0.63) 2.11 (0.13) 9.52 (0.82) 16.44 (0.63)
🟢 app/client/src/sagas/OnboardingSagas.ts 18.06 (1.35) 3.65 (2.19) 12.24 (2.04) 18.41 (1.58)
🔴 app/client/src/selectors/entitiesSelector.ts 45.25 (-2.52) 5.56 (0) 15.85 (-3.43) 42.33 (-3.12)
app/client/src/components/editorComponents/ActionCreator/Fields.tsx 29 26.09 7.69 28.14
app/client/src/components/editorComponents/ActionCreator/index.tsx 48.78 11.43 56.52 47.93
app/client/src/components/utils/CollapseComponent.tsx 40 20 0 46.15
app/client/src/pages/Editor/IntegrationEditor/ActiveDataSources.tsx 46.81 47.06 9.09 55.26
app/client/src/pages/Editor/IntegrationEditor/AddDatasourceSecurely.tsx 90.91 100 0 90.91
app/client/src/pages/Editor/IntegrationEditor/DatasourceCard.tsx 60.98 55.56 0 60.98
app/client/src/pages/Editor/IntegrationEditor/DatasourceHome.tsx 55.26 53.33 11.11 60.61
app/client/src/pages/Editor/IntegrationEditor/IntegrationsHomeScreen.tsx 30.89 15.15 5.56 32.17
app/client/src/pages/Editor/IntegrationEditor/MockDataSources.tsx 60 90 0 60
app/client/src/pages/Editor/IntegrationEditor/NewApi.tsx 62.5 66.67 0 64.52
app/client/src/pages/Editor/IntegrationEditor/NewQuery.tsx 54.55 100 16.67 68.75
app/client/src/pages/Editor/IntegrationEditor/index.tsx 71.43 100 0 71.43

@pranavkanade
pranavkanade requested a review from sharat87 July 1, 2021 11:58
@pranavkanade pranavkanade reopened this Jul 1, 2021
@pranavkanade
pranavkanade merged commit 1647815 into release Jul 1, 2021
@pranavkanade
pranavkanade deleted the fix/revert-new-nav branch July 1, 2021 12:44
rishabhsaxena pushed a commit that referenced this pull request Jul 2, 2021
* Revert "[Bug] Mock data section is missing (#5517)"

This reverts commit be48f2f

* Revert "[Feature #4542] : simple nav unify api/datasource (#4987)"

This reverts commit 8d8b9ed
pranavkanade added a commit that referenced this pull request Jul 2, 2021
pranavkanade added a commit that referenced this pull request Jul 7, 2021
* temp commit

* using onsubmit to continue using action on form

* added recaptcha site key to env example file

* moved the recaptcha lib loading logic to signup page

* removed unnecessary edit

* handle the case where the recaptcha token is not provided as env var

* added proper env var config for client

* recaptcha config for ansible

* recaptcha config for heroku

* recaptcha config for k8s

* updated app.json

* fixed the typos

* added more description for env vars

* removed api key

* minor typo fix

* added new integration button

* updated the add int default link

* added active and create new tabs

* added the empty components to tabs. will control the section manually.

* added proper grid for integrations page

* added vertical tabs

* Added secondary tabs to integrations page

* added separate page for new apis

* classname changes

* added new components for active queries, new queries etc.

* added a separate component for data source list

* adding screen component conditionally, to be showing upon user's choice

* 1. Added grid styling to datasource home
2. Added connect buttons to em

* fixed data source security banner

* updated the styling for new api page

* added tertiary menu for active integrations

* updated styling for active connections

* updated collapse component to work properly

* added show more option to active data sources

* Slash commands feature init commit

* Added more commands

* Introduced JSX to render custom commands

* Merge conflict fix

* Spacing changes

* removed apis/db tabs and replaced em with integrations tab

* removed the unnecessary + integrations btn

* Added slash commands button

* Adjust styles for better ui

* Ordered the action entries under integrations

* Added new datasource command

* updated the getURL with proper params

* updated the link of create datasource btn

* updated the back btn link from data source editor

* Show connect data cta in property pane

* Styling fixes

* Fix margin

* added scrollable content to create new

* added on click scroll to create new page

* fixed a bug, creating new datasource twice

* added new action creator for integrations.

* Minor changes to add new bindings command.
Changed ui behaviour of / button

* UI style change

* updated the query editor to match the over all theme

* updated the query editor tabs

* Added the run btn to empty response screens

* minor fix

* updated the bg color of api type drop down

* updated the url being visited after delete api/query

* removed log

* Insert binding command UI change

* More UI changes

* removed unnecessary junk from integrations editor index

* clean up, removed unnecessary files

* removed useless routes

* for debugger only checking if integrations editor

* Removed all the links for api/query home pages

* Move command actions to a saga
Added support to binding the data back to the widget when are new API is created from widget

* Added reverse binding for DB queries

* Show / button only on hover

* not routing to integrations on create query/api

* Hide actions from suggestions in action pages

* removed the query/datasource/api home pages

* Changes widget.data to widget in slash commands

* Show dependencies in property pane

* Fix warning

* fixed scrolling issue

* will show a list of queries and apis for action picker

* showing icons for each action under integrations

* Fix dropdown not showing up

* Minor refactoring.
Changed commands

* added a way to list data sources in action creators

* Update query page url

* cam show icons for datasources

* Removed unused code

* Feature/slash commands (#5002)

* Slash commands feature init commit

* Added more commands

* Introduced JSX to render custom commands

* Merge conflict fix

* Spacing changes

* Added slash commands button

* Adjust styles for better ui

* Added new datasource command

* Minor changes to add new bindings command.
Changed ui behaviour of / button

* UI style change

* Insert binding command UI change

* More UI changes

* Move command actions to a saga
Added support to binding the data back to the widget when are new API is created from widget

* Added reverse binding for DB queries

* Show / button only on hover

* Hide actions from suggestions in action pages

* Changes widget.data to widget in slash commands

* Minor refactoring.
Changed commands

* Removed unused code

* remove more unusued code

* Added support to generate new api from a datasource in quick commands

* Code correction to use types

* Refactored commands code

* Minor bug fixes

* Remove new integrations command for actions.
Fixed autocomplete not showing up

* Changes to prevent autocomplete trigger for navigation commands

* Prevent hinter execution when show hint is open already.

* Show hinter on focus

* Update text to be called in the omnibar

* updated the copy for empty active datasources

* Update url

* Fix text decoration

* updated the redirection for back btns

* Use themes

* Add cypress test

* fixed back btn nav

* fetching form configs for datasources

* a callback fixed

* Fix slash command not executed on click (#5540)

* Replace the value if not a string else append

* Log commands menu events

* updated mock data base navigation

* updated mock data base navigation

* updated the close editors and back buttons

* All back btns from editors will go back to data sources and back from data source will go back to canvas

* fixed bg colors

* minor styled updates

* removed margin from header of generic datasource

* warnings fixes

* If user is already on the location not redirecting em

* when editing, will check if the coming from data source and redirect accordingly

* updated redirection for newly created api/queries

* updated back btn for newly created datasources

* back for new curl goes to data sources

* Revert "[Fix] revert new nav (#5533)"

This reverts commit 1647815

* remaining original reverted chagnes

* fixed the width of incoming/outgoing entity bar in property pane

* removing residue from resolved merge conflicts

* Fix widget icons not visible in dropdown menu

* minor fix to use proper integration URL

* updated the URLs for unified datasources

* converted back and close to btns from banners

* on accessing data source from sidebar, it'll always go to view mode

* updated the edit path for saas editors

* Added saved state for google sheet

* on google sheet delete redirecting to create new

* minor fix

* fixed the redirection call on saving a datasource

* removed save and test cmd as it wasn't needed

* Removing test cases to be fixed by Arun

* commenting more tests to be fixed by Arun

* updated call api cy command

* Fix extra margin issue

* fixed the update datasource saga

* fixed video spec

* Revert "commenting more tests to be fixed by Arun"

This reverts commit 42087a9.

* Revert "Removing test cases to be fixed by Arun"

This reverts commit f6fad67.

* fixed the entity explorer query datasource spec

* cautious fix

* update widget locators

* fixed leave org test

* fixes for FormWidgets

* updated the image spec

* Use memo

* Fix debugger url checks

* for copy and delete widget pointing directly to svgs

* Fix entity text

* Fix styling and show tooltip for property pane dependencies

* removed the unnecessary callback

* added a separate saga to to redirect to new integrations using onSuccess

* Bug Fixes - New nav (#5629)

* will show scrollbar only on hover

* made mock data cards clickable

* fixed the grid view

* fixed the cursor position when clicking on / btn

* updated the hint for `/` command

* binding prompt will close on focus change

* hiding / command for api body

* hiding / command for query pane

* Added 2 new icons

* Fix cursor position on selecting a binding and clicking on the slash menu button

* trying out fix to copyWidget cy command

* removing zero width space characters from the property pane text

Co-authored-by: arunvjn <arun@appsmith.com>
Co-authored-by: Akash N <akash@codemonk.in>
Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com>
Co-authored-by: Rishabh Saxena <rishabh.robben@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants