c76c052d36
8 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Ankita Kinger
|
9b7944e7ee
|
feat: migrate organisation to workspace (#13863)
* migration from organization to workspace on code level * updated a few more files * fixed runtime errors * update org settings URL * Renamed organizationId in domain objects * changed field named from organization to workspace * Reverted AppsmithRole changes * fixed migrations * recreating indexes * migration update * seed data runs before migration, undo changes * mock commit * seedmongo to populate upgraded data, datasource upgrade * fixed two test cases * updated migrations * updated prop name * Upgraded AclPermission * comment * migrated AppsmithRole * more changes * final set of changes * variable name changes * update cypress variable name * Update app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java * Update app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java Co-authored-by: Trisha Anand <trisha@appsmith.com> * reverting encryption handler change * migrated a few missed out org to workspace * migrated a few missed out org to workspace * migration changes * Removed Permission import * fixed AppsmithRole * mongodb version update * fixed compile error * fixed compile issue * fixed some tests * simplified embedded mongodb config * updated a cypress test Co-authored-by: Sidhant Goel <sidhant@appsmith.com> Co-authored-by: Trisha Anand <trisha@appsmith.com> Co-authored-by: Sidhant Goel <sidhant@hexcod.in> |
||
|
haojin111
|
27ebbfabe3 | update full changes | ||
|
haojin111
|
89990c2114 | unstaging coverage-summary.json | ||
|
haojin111
|
a3be2498e3 | added import application progress bar when importing from json | ||
|
haojin111
|
9cfca0518f
|
feat: 9754 import work flow (#10453)
* updated import application modal design as v2 * updated import flow * added title, description, uploadIcon on filepicker ads component for custom file picker * adding modal of add credential for git import * added "Git Import" modal * added generating ssh key for importing flow * fixed issue of merging * chore: fix import * chore: show old import modal based on feature flag * seperated import api from connect * added datasource list on reconnect credential modal * chore: minor changes * chore: move ssh keys to git sync reducer from applications reducer * chore: minor fixes * chore: fetch datasource config for import * for pulling * for review of displaying of datasource * added reconnect datasources after git import * fix: initialize datasource with default values * fix: initialise redux for after updating datasource with default values * fixed issue of git connection init when importing * if there is a datasource config missing in import, reconnect modal should be opened * updated logic for unconfigured datasources * commented unnecessary code * fixed issue of successful import * updated import app error logic * Add un-configured datasources to Import via file response * Add test * fix * chore: refactors * change per review * fix: reset ssh keys / url * Fix issue with newly created datasources not sent * fix * chore: minor updates * chore: minor fix * WIP * added saas and rest api datasource form * feat: fixes and updates for file import flow * chore: close on upload * Refactor logic ofr finding unconfigured datasources * fix: minor fixes * Fix issue with IsPartialImport * fix * Add PartialImport flag for ImportExport service * refactoring of datasource editor form for both of importing app and editing app * fixed collapse config * Fix tests * Handle redirection back to the /applications for oAuth type * Show reconnect button on the datasources pages if the datasource configuration is skipped * added analytic events for reconnecting datasource modal * Fix the repo limit check for git import * updated test of importing app from json as new work flow * updated exported app json while testing automatically * Add isImport flag for handling OAuth redirection in import flow * WIP * updated card UI for import from git title and message in import app modal * chore: cleanup * chore: lint * fix: add is import query param to get token for oauth * fix * When the user imports the application there should not be any uncommitted changes displayed on the commit icon * Add flag to identify OAuth redirection for git import * Update the variable name * refactoring reconnect datasource modal * close git import modal when repo limit error responded * fixed issue of restoring draft data of datasource form without save on reconnect datasource modal * chore: update query * updated query name of oauth redirection url * Fix duplicate name issue in git import * fixed rest api reconnect issue on reconnect modal * init datasources and plugins after imported app, updated reconnect modal as new design * added unconfigured datasource list logic when importing and updated rest api form delete button visible * removed put default config of datasource and fixed issue on it * Add logic to check isCOnfugred in datasource API * Expose API to get un configured datasources for git import * added fetch unconfigured datasource list api when redirecting form OAuth * Remove sensitive fields from application json during export * update put call response to check for datasourceConfig * chore: use @appsmith for constants/messages * chore: use download icon and Import for Importing application label * chore: move import application text up a bit * Fix bad merge * chore: update skip to application tooltip text * fixed tooltip content of skip to application CTA * init values of datasource when importing * updated ui of git import modal as figma design * fixing padding issue of reconnect datasource modal * fixed cursor issue on import app modal * Fix issue with datasource config * chore: make code compile * chore: sort lines * fixed save button issue of dbform on reconnecting modal * fixed style of import application modal * Fix iisue with wrong value updated to flag * reverted from reconnection form style * fix: update design as per slack discussions on 2022.02.23 * fix: move modal close button to the left * Remove check for the flag and use the one from db * Set siCOnfigured as true for mockdata sets * updated creating datasource with isConfigured as false * Fix NPE while importing * fixed scrollbar issue and text alignment on reconnect datasource modal * fixed style of form container in reconnect datasource and redirecting to app if all are configured * remove unwanted fields from application json * FIx NPE for file import * fix: move close button up in import modal * remove delete button on reconnect datasource modal * Add isConfigured false while creating datasources * fix: add a gap and update color gap between git import dialog title and subtitle update color of subtext to GREY_800 * fix: use git import feature flag * fix: do not use older modal * updated selecting logic of unconfigured datasource in reconnect modal * cleanup: auto format * cleanup: refactor react component * cleanup: refactor some more * cleanup: autoformat * Fix reconnect flag for mockdatasource * During git import set the isConfigured to false for datasources * Remove decrypted field from the applicationJson file * Remove decrypted field from the applicationJson file * Add app slug to remote repo * fixed cypress test related with git * updated json while testing * Changes per review * Update the method name * fixed cypress test related with git * fixed migration cypress test * set is configured field as true on tour app * Fix issue with datasource creation for welcome tour * fixed issue of replay_editor cypress test Co-authored-by: Rishabh Saxena <rishabh@appsmith.com> Co-authored-by: Anagh Hegde <anagh@appsmith.com> Co-authored-by: Anubhav <anubhav@appsmith.com> Co-authored-by: f0c1s <iamanubhavsaini+git@gmail.com> |
||
|
akash-codemonk
|
b3de51272c
|
fix: Templates UI polishing (#11567) | ||
|
akash-codemonk
|
a6946fbcf0
|
fix: end guided tour on exiting editor (#11084) | ||
|
Rishabh Saxena
|
acf01995bd
|
chore: git sync cypress tests (#10006)
* Fix connect test * check api response * [wip] test comments across branches (#8704) * Intercept only connect api * chore: update switch branches tests (#9005) * test switch branches from the query params * test flow wip * . * fix merge status update * change mergeAble to isMergeAble * wip * fix: show error popup if pulled from bottom bar * fix: append branch query to notification links * fix: disable git connection during onboarding * fix: typo * fix: typo * fix: typo * fix: z-index bottom bar cout * fix: pull button minor fix * fix: reset conflicts when the git sync modal is opened * fix * feat: enable search for branch dropdown * fix * fix: typo * added merge conflicting on merge tab * updated gitsyncsaga for git sync error action * added generate ssh key on init and updated git changed count message * removed git sync error action from error processing module(toast and log) * commented push button on bottom git action bar temperory * added option to use git global config * Added latest deploy preview time: didn't appear until the duration was in minutes * Link open repo button with repo link * fixed of commented code part * upated tooltip of push button on bottom quick git sync toolbar * Update banner styles for error and warning * updated repo publish url pattern and last deployed view part * when the user clicks on the push icon the deploy tab should open * when branch name is too big and user hover on it the tooltip is not displayed * The dropdown alignment displayed for the git connect should be polished * update tests * fix: minor git sync fixes (#9228) * fixed of Under the merge tab when the user searches for the branch name which is not present the pop up closes all of a sudden * fix: update merge api, use message from api response * fix: update field * added tooltip of long dropdown option and updated merge tab dropdowns * removed log * chore: add connection cypress tests * temp update for running tests locally * fixed long branch name on branch list popup * Use _ as the branch name separator, instead of - * Use large buttons as CTAs * Remove the % from the progress bar * Fix alignment for the skeletons on the deploy tab * Merge CTA moves down when the status is rendered, add offset to prevent that and error branch dropdown on merge tab * Show progress bar after clicking on Merge CTA as the loading state and generate key button * after generating the deploy key before clicking on connect close the pop-up and open it again the Remote URL is not visible in the input box * fixing of conflicting issue * updated git connection design * Provide more spacing between the lines * Learn more does not have a hover state * Heading Merge Changes should be sentence cased like headings on other tabs * Button can trigger CTA call when in loading state * disabled clickable icon on git connect bottom bar * Git connection tab: on error the window doesn't scroll all the way to the bottom * updated temp remote url values on action and reducer * updated ellipsis functions of text * fix: prune branch flag * fix: update page level roomId to include branch name * fix * fix * feat: add a separate feature flag for git import * feat: branch section headers bottom bar branch list * fixed branch list comments * fixed merge issue * fix * feat: hotkey for commit and push * remove pull button on git conflict info * move tempRemoteUrl redux to gitSyncreducer and added messages * splited git error as individual action * removed push button from git sync bottom buttons * feat: section header at the merge dropdown * added comment of converting ssh to https * feat: show connected to git badge * feat: show asterisk when we have uncommitted changes * fix: upate segment header for dropdown * t fix: remove redundant success toasts * removed tempory git repo url from app data * wrapped tooltip with elipsis text * fix: rm unused vars * fix: bottom bar icon updates * updated dropdown option with ellipsis text * added new props named "wrappedOption" on dropdown for wrapping ellipsis option * rename wrappedOption to truncateOption on dropdown component * updated dropdown option with disabled props of tooltip * fix: remove remote branches from merge branch dropdown * reset yarn lock * reset yarn * fix: keeping it same as the existing value * fix: remove branch dropdown border * fix: show merge success indicator * feat: init repo limit error modal * fix: disconnect git wip * added git user config test * removed test data * fix: checkout api * fix: lint * chore: pre connection test specs * added revoking git workflow * renamed revoke to disconnectGit * added setting on git sync action over bottom bar * added analytic on git connection * added learn more for remote url and init module of temp remote url when select new application * . * chore: test learn more ssh url * Verify the functionality of Read documantation link * added git connect with onboarding workflow * Validate the Input Box displayed below Commit to master Text * updated test module for deploy tab with commit comment and deploy preview * test of prune branch name * Validate the error faced when user switches between the branches * verify the functionality when user click on "+" Icon * Verify the functionality of serach input box inside the serach dropdown * Verify the display of the Merge Button * advanced of disconnect git ui * added git disconnect modal test case * updated repo limit error condition * added learn more link test on git disconnect modal * for review of repo limit error modal test script. * fix: issue with intercept * fixes * fixes * add key, misc fixes * fix * revert changes * fix * fix imports * Fix import * Yarn lock update * fix * fix imports * chore: remove timeout for a test run * Increase timeout for jgit APIs * chore: try increasing timeout * try increasing timeout further * Handle git connect error on the basis of error type * Add env variable to CI build script * Fix bad commit for adding env var in workflow * Refactor * FAdd env var for local repo path * fix import * fix specs * fix * fix * try * fix * fix * fix * fix * fix: don't validate error msgs * fix spec * improve spec * chore: rm unused code * chore: update descriptions * rm commented out code * fix * rm comment * chore: rm comments * fix: lint * chore: update comment * fix: wait for widget switch transition * spec updates * fix * fix imports * try waiting for getPagesForViewApp * fix: rm unused file * fix: remove spec * fix: add js collection, comment out repo limit exceeded error since it seems not limited on appsmith instances * Fix server failure * chore: correct bootIntercom import and sort lines Co-authored-by: Rishabh-Rathod <rishabh.rathod@appsmith.com> Co-authored-by: haojin111 <haojin828@outlook.com> Co-authored-by: Arpit Mohan <arpit@appsmith.com> Co-authored-by: Abhijeet <abhijeet@appsmith.com> Co-authored-by: Abhijeet <41686026+abhvsn@users.noreply.github.com> Co-authored-by: Anagh Hegde <anagh@appsmith.com> Co-authored-by: f0c1s <anubhav@appsmith.com> |