Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
79e165af96
PromucFlow_constructor/app/client/cypress/fixtures/exportedApp.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>
2022-03-17 15:58:54 +05:30

674 lines
22 KiB
JSON
Raw Blame History

{
"clientSchemaVersion": 1,
"serverSchemaVersion": 2,
"exportedApplication": {
"name": "app2896",
"isPublic": false,
"appIsExample": false,
"unreadCommentThreads": 0,
"color": "#F4FFDE",
"icon": "single-person",
"slug": "app2896",
"evaluationVersion": 2,
"new": true
},
"datasourceList": [
{
"userPermissions": [
"execute:datasources",
"manage:datasources",
"read:datasources"
],
"gitSyncId": "61c2d94747cda83965fe72b5_61c5822385c0bd4ccf7d171c",
"name": "mockdata",
"pluginId": "postgres-plugin",
"invalids": [
"Missing authentication details."
],
"messages": [],
"isConfigured": false,
"isValid": false,
"new": true
}
],
"pageList": [
{
"userPermissions": [
"read:pages",
"manage:pages"
],
"gitSyncId": "61c580d685c0bd4ccf7d1716_61c580d685c0bd4ccf7d1718",
"unpublishedPage": {
"name": "Page1",
"slug": "page1",
"layouts": [
{
"id": "Page1",
"userPermissions": [],
"dsl": {
"widgetName": "MainContainer",
"backgroundColor": "none",
"rightColumn": 816,
"snapColumns": 64,
"detachFromLayout": true,
"widgetId": "0",
"topRow": 0,
"bottomRow": 590,
"containerStyle": "none",
"snapRows": 125,
"parentRowSpace": 1,
"type": "CANVAS_WIDGET",
"canExtend": true,
"version": 52,
"minHeight": 600,
"parentColumnSpace": 1,
"dynamicBindingPathList": [],
"leftColumn": 0,
"children": [
{
"widgetName": "Table1",
"defaultPageSize": 0,
"columnOrder": [
"schema_name"
],
"isVisibleDownload": true,
"dynamicPropertyPathList": [],
"displayName": "Table",
"iconSVG": "/static/media/icon.db8a9cbd.svg",
"topRow": 14,
"bottomRow": 38,
"isSortable": true,
"parentRowSpace": 10,
"type": "TABLE_WIDGET",
"defaultSelectedRow": "0",
"hideCard": false,
"animateLoading": true,
"parentColumnSpace": 12.5625,
"dynamicTriggerPathList": [],
"dynamicBindingPathList": [
{
"key": "tableData"
},
{
"key": "primaryColumns.schema_name.computedValue"
}
],
"leftColumn": 4,
"primaryColumns": {
"schema_name": {
"index": 0,
"width": 150,
"id": "schema_name",
"horizontalAlignment": "LEFT",
"verticalAlignment": "CENTER",
"columnType": "text",
"textSize": "PARAGRAPH",
"enableFilter": true,
"enableSort": true,
"isVisible": true,
"isDisabled": false,
"isCellVisible": true,
"isDerived": false,
"label": "schema_name",
"computedValue": "{{Table1.sanitizedTableData.map((currentRow) => ( currentRow.schema_name))}}"
}
},
"delimiter": ",",
"key": "5ejs55im17",
"derivedColumns": {},
"rightColumn": 25,
"textSize": "PARAGRAPH",
"widgetId": "uyyp0qxfdq",
"isVisibleFilters": true,
"tableData": "{{get_schema.data}}",
"isVisible": true,
"label": "Data",
"searchKey": "",
"enableClientSideSearch": true,
"version": 3,
"totalRecordsCount": 0,
"parentId": "0",
"renderMode": "CANVAS",
"isLoading": false,
"horizontalAlignment": "LEFT",
"isVisibleSearch": true,
"isVisiblePagination": true,
"verticalAlignment": "CENTER",
"columnSizeMap": {
"task": 245,
"step": 62,
"status": 75
}
},
{
"widgetName": "Table2",
"defaultPageSize": 0,
"columnOrder": [
"id",
"title",
"due",
"assignee"
],
"isVisibleDownload": true,
"dynamicPropertyPathList": [],
"displayName": "Table",
"iconSVG": "/static/media/icon.db8a9cbd.svg",
"topRow": 14,
"bottomRow": 38,
"isSortable": true,
"parentRowSpace": 10,
"type": "TABLE_WIDGET",
"defaultSelectedRow": "0",
"hideCard": false,
"animateLoading": true,
"parentColumnSpace": 12.5625,
"dynamicTriggerPathList": [],
"dynamicBindingPathList": [
{
"key": "tableData"
},
{
"key": "primaryColumns.due.computedValue"
},
{
"key": "primaryColumns.assignee.computedValue"
},
{
"key": "primaryColumns.title.computedValue"
},
{
"key": "primaryColumns.id.computedValue"
}
],
"leftColumn": 30,
"primaryColumns": {
"due": {
"index": 0,
"width": 150,
"id": "due",
"horizontalAlignment": "LEFT",
"verticalAlignment": "CENTER",
"columnType": "text",
"textSize": "PARAGRAPH",
"enableFilter": true,
"enableSort": true,
"isVisible": true,
"isDisabled": false,
"isCellVisible": true,
"isDerived": false,
"label": "due",
"computedValue": "{{Table2.sanitizedTableData.map((currentRow) => ( currentRow.due))}}"
},
"assignee": {
"index": 1,
"width": 150,
"id": "assignee",
"horizontalAlignment": "LEFT",
"verticalAlignment": "CENTER",
"columnType": "text",
"textSize": "PARAGRAPH",
"enableFilter": true,
"enableSort": true,
"isVisible": true,
"isDisabled": false,
"isCellVisible": true,
"isDerived": false,
"label": "assignee",
"computedValue": "{{Table2.sanitizedTableData.map((currentRow) => ( currentRow.assignee))}}"
},
"title": {
"index": 2,
"width": 150,
"id": "title",
"horizontalAlignment": "LEFT",
"verticalAlignment": "CENTER",
"columnType": "text",
"textSize": "PARAGRAPH",
"enableFilter": true,
"enableSort": true,
"isVisible": true,
"isDisabled": false,
"isCellVisible": true,
"isDerived": false,
"label": "title",
"computedValue": "{{Table2.sanitizedTableData.map((currentRow) => ( currentRow.title))}}"
},
"id": {
"index": 4,
"width": 150,
"id": "id",
"horizontalAlignment": "LEFT",
"verticalAlignment": "CENTER",
"columnType": "text",
"textSize": "PARAGRAPH",
"enableFilter": true,
"enableSort": true,
"isVisible": true,
"isDisabled": false,
"isCellVisible": true,
"isDerived": false,
"label": "id",
"computedValue": "{{Table2.sanitizedTableData.map((currentRow) => ( currentRow.id))}}"
}
},
"delimiter": ",",
"key": "5ejs55im17",
"derivedColumns": {},
"rightColumn": 61,
"textSize": "PARAGRAPH",
"widgetId": "r1m4lkt7at",
"isVisibleFilters": true,
"tableData": "{{mockApi.data.headers.info}}",
"isVisible": true,
"label": "Data",
"searchKey": "",
"enableClientSideSearch": true,
"version": 3,
"totalRecordsCount": 0,
"parentId": "0",
"renderMode": "CANVAS",
"isLoading": false,
"horizontalAlignment": "LEFT",
"isVisibleSearch": true,
"isVisiblePagination": true,
"verticalAlignment": "CENTER",
"columnSizeMap": {
"task": 245,
"step": 62,
"status": 75,
"id": 60
}
},
{
"widgetName": "Input1",
"displayName": "Input",
"iconSVG": "/static/media/icon.9f505595.svg",
"topRow": 43,
"bottomRow": 47,
"parentRowSpace": 10,
"autoFocus": false,
"type": "INPUT_WIDGET_V2",
"hideCard": false,
"animateLoading": true,
"parentColumnSpace": 12.5625,
"dynamicTriggerPathList": [],
"resetOnSubmit": true,
"leftColumn": 18,
"dynamicBindingPathList": [
{
"key": "defaultText"
}
],
"labelStyle": "",
"inputType": "TEXT",
"isDisabled": false,
"key": "t02w4ix9o5",
"isRequired": false,
"rightColumn": 38,
"widgetId": "9timcor5m5",
"isVisible": true,
"label": "",
"allowCurrencyChange": false,
"version": 1,
"parentId": "0",
"renderMode": "CANVAS",
"isLoading": false,
"iconAlign": "left",
"defaultText": "{{JSObject1.myVar1}}"
}
]
},
"layoutOnLoadActions": [
[
{
"id": "Page1_get_schema",
"name": "get_schema",
"pluginType": "DB",
"jsonPathKeys": [],
"timeoutInMillisecond": 10000
}
],
[
{
"id": "Page1_mockApi",
"name": "mockApi",
"pluginType": "API",
"jsonPathKeys": [],
"timeoutInMillisecond": 10000
}
]
],
"new": false
}
],
"userPermissions": []
},
"publishedPage": {
"name": "Page1",
"slug": "page1",
"layouts": [
{
"id": "Page1",
"userPermissions": [],
"dsl": {
"widgetName": "MainContainer",
"backgroundColor": "none",
"rightColumn": 1224,
"snapColumns": 16,
"detachFromLayout": true,
"widgetId": "0",
"topRow": 0,
"bottomRow": 1254,
"containerStyle": "none",
"snapRows": 33,
"parentRowSpace": 1,
"type": "CANVAS_WIDGET",
"canExtend": true,
"version": 4,
"minHeight": 1292,
"parentColumnSpace": 1,
"dynamicBindingPathList": [],
"leftColumn": 0,
"children": []
},
"new": false
}
],
"userPermissions": []
},
"new": true
}
],
"publishedDefaultPageName": "Page1",
"unpublishedDefaultPageName": "Page1",
"actionList": [
{
"id": "Page1_mockApi",
"userPermissions": [
"read:actions",
"execute:actions",
"manage:actions"
],
"gitSyncId": "61c580d685c0bd4ccf7d1716_61c580e385c0bd4ccf7d171a",
"pluginType": "API",
"pluginId": "restapi-plugin",
"unpublishedAction": {
"name": "mockApi",
"datasource": {
"userPermissions": [],
"name": "DEFAULT_REST_DATASOURCE",
"pluginId": "restapi-plugin",
"datasourceConfiguration": {
"url": "https://mock-api.appsmith.com"
},
"invalids": [],
"messages": [],
"isValid": true,
"new": true
},
"pageId": "Page1",
"actionConfiguration": {
"timeoutInMillisecond": 10000,
"paginationType": "NONE",
"path": "/echo/get",
"headers": [
{
"key": "info",
"value": "[{\"due\":\"2021-11-23\",\"assignee\":\"Dan.Wyman@hotmail.com\",\"title\":\"Recusan\",\"id\":\"1\"},{\"due\":\"2021-11-23\",\"assignee\":\"Dashawn_Maggio30@gmail.com\",\"title\":\"Dignissimos eaque\",\"id\":\"2\"},{\"due\":\"2021-11-24\",\"assignee\":\"Curt50@gmail.com\",\"title\":\"Voluptas explicabo\",\"id\":\"3\"},{\"due\":\"2021-11-23\",\"assignee\":\"Shanna63@hotmail.com\",\"title\":\"Aut omnis.\",\"id\":\"4\"}]"
}
],
"encodeParamsToggle": true,
"queryParameters": [],
"body": "",
"httpMethod": "GET",
"pluginSpecifiedTemplates": [
{
"value": true
}
]
},
"executeOnLoad": true,
"dynamicBindingPathList": [],
"isValid": true,
"invalids": [],
"messages": [],
"jsonPathKeys": [],
"confirmBeforeExecute": false,
"userPermissions": [],
"validName": "mockApi"
},
"publishedAction": {
"datasource": {
"userPermissions": [],
"messages": [],
"isValid": true,
"new": true
},
"messages": [],
"confirmBeforeExecute": false,
"userPermissions": []
},
"new": false
},
{
"id": "Page1_myFun1",
"userPermissions": [
"read:actions",
"execute:actions",
"manage:actions"
],
"gitSyncId": "61c580d685c0bd4ccf7d1716_61c58ced85c0bd4ccf7d1722",
"pluginType": "JS",
"pluginId": "js-plugin",
"unpublishedAction": {
"name": "myFun1",
"fullyQualifiedName": "JSObject1.myFun1",
"datasource": {
"userPermissions": [],
"name": "UNUSED_DATASOURCE",
"pluginId": "js-plugin",
"messages": [],
"isValid": true,
"new": true
},
"pageId": "Page1",
"collectionId": "Page1_JSObject1",
"actionConfiguration": {
"timeoutInMillisecond": 10000,
"paginationType": "NONE",
"encodeParamsToggle": true,
"body": "() => {\n\t\t//write code here\n\t\treturn JSObject1.myVar1;\n\t}",
"jsArguments": [],
"isAsync": false
},
"executeOnLoad": false,
"dynamicBindingPathList": [
{
"key": "body"
}
],
"isValid": true,
"invalids": [],
"messages": [],
"jsonPathKeys": [
"() => {\n\t\t//write code here\n\t\treturn JSObject1.myVar1;\n\t}"
],
"confirmBeforeExecute": false,
"userPermissions": [],
"validName": "JSObject1.myFun1"
},
"publishedAction": {
"datasource": {
"userPermissions": [],
"messages": [],
"isValid": true,
"new": true
},
"messages": [],
"confirmBeforeExecute": false,
"userPermissions": []
},
"new": false
},
{
"id": "Page1_get_schema",
"userPermissions": [
"read:actions",
"execute:actions",
"manage:actions"
],
"gitSyncId": "61c580d685c0bd4ccf7d1716_61c5832685c0bd4ccf7d171e",
"pluginType": "DB",
"pluginId": "postgres-plugin",
"unpublishedAction": {
"name": "get_schema",
"datasource": {
"id": "mockdata",
"userPermissions": [],
"pluginId": "postgres-plugin",
"messages": [],
"isValid": true,
"new": false
},
"pageId": "Page1",
"actionConfiguration": {
"timeoutInMillisecond": 10000,
"paginationType": "NONE",
"encodeParamsToggle": true,
"body": "SELECT schema_name FROM information_schema.schemata;",
"pluginSpecifiedTemplates": [
{
"value": true
}
]
},
"executeOnLoad": true,
"dynamicBindingPathList": [],
"isValid": true,
"invalids": [],
"messages": [],
"jsonPathKeys": [],
"confirmBeforeExecute": false,
"userPermissions": [],
"validName": "get_schema"
},
"publishedAction": {
"datasource": {
"userPermissions": [],
"messages": [],
"isValid": true,
"new": true
},
"messages": [],
"confirmBeforeExecute": false,
"userPermissions": []
},
"new": false
},
{
"id": "Page1_myFun2",
"userPermissions": [
"read:actions",
"execute:actions",
"manage:actions"
],
"gitSyncId": "61c580d685c0bd4ccf7d1716_61c58ced85c0bd4ccf7d1724",
"pluginType": "JS",
"pluginId": "js-plugin",
"unpublishedAction": {
"name": "myFun2",
"fullyQualifiedName": "JSObject1.myFun2",
"datasource": {
"userPermissions": [],
"name": "UNUSED_DATASOURCE",
"pluginId": "js-plugin",
"messages": [],
"isValid": true,
"new": true
},
"pageId": "Page1",
"collectionId": "Page1_JSObject1",
"actionConfiguration": {
"timeoutInMillisecond": 10000,
"paginationType": "NONE",
"encodeParamsToggle": true,
"body": "() => {\n\t\t//write code here\n\t}",
"jsArguments": [],
"isAsync": false
},
"executeOnLoad": false,
"dynamicBindingPathList": [
{
"key": "body"
}
],
"isValid": true,
"invalids": [],
"messages": [],
"jsonPathKeys": [
"() => {\n\t\t//write code here\n\t}"
],
"confirmBeforeExecute": false,
"userPermissions": [],
"validName": "JSObject1.myFun2"
},
"publishedAction": {
"datasource": {
"userPermissions": [],
"messages": [],
"isValid": true,
"new": true
},
"messages": [],
"confirmBeforeExecute": false,
"userPermissions": []
},
"new": false
}
],
"actionCollectionList": [
{
"id": "Page1_JSObject1",
"userPermissions": [
"read:actions",
"execute:actions",
"manage:actions"
],
"gitSyncId": "61c580d685c0bd4ccf7d1716_61c58ced85c0bd4ccf7d1726",
"unpublishedCollection": {
"name": "JSObject1",
"pageId": "Page1",
"pluginId": "js-plugin",
"pluginType": "JS",
"actionIds": [],
"archivedActionIds": [],
"actions": [],
"archivedActions": [],
"body": "export default {\n\tmyVar1: \"Submit\",\n\tmyVar2: {},\n\tmyFun1: () => {\n\t\t//write code here\n\t\treturn this.myVar1;\n\t},\n\tmyFun2: () => {\n\t\t//write code here\n\t}\n}",
"variables": [
{
"name": "myVar1",
"value": "Submit"
},
{
"name": "myVar2",
"value": {}
}
]
},
"new": false
}
],
"editModeTheme": {
"name": "Classic",
"new": true,
"isSystemTheme": true
},
"publishedTheme": {
"name": "Classic",
"new": true,
"isSystemTheme": true
},
"publishedLayoutmongoEscapedWidgets": {},
"unpublishedLayoutmongoEscapedWidgets": {}
}
Reference in New Issue View Git Blame Copy Permalink