Merge pull request #389 from BalticAmadeus/develop

1.4.0
BalticAmadeus · Aug 3, 2023 · c2a47f9 · c2a47f9
2 parents 624ee63 + 68f15fc
commit c2a47f9
Show file tree

Hide file tree

Showing 44 changed files with 5,344 additions and 3,005 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,12 +10,14 @@
 			"type": "extensionHost",
 			"request": "launch",
 			"args": [
-				"--extensionDevelopmentPath=${workspaceFolder}"
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"${workspaceFolder}/docker"
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
 			],
-			"preLaunchTask": "${defaultBuildTask}"
+			"preLaunchTask": "Docker: Start and Watch",
+			"postDebugTask": "Docker: Stop"
 		},
 		{
 			"name": "Extension Tests",
@@ -30,5 +32,10 @@
 			],
 			"preLaunchTask": "${defaultBuildTask}"
 		}
+	],
+	"folders": [
+		{
+			"path": "${workspaceFolder}/docker"
+		}
 	]
-}
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,16 @@
 // Place your settings in this file to overwrite default and user settings.
 {
+    "terminal.integrated.profiles.windows": {
+        "PowerShell": {
+            "source": "PowerShell",
+            "icon": "terminal-powershell",
+            "args": [
+                "-ExecutionPolicy",
+                "Bypass"
+            ]
+        }
+    },
+    "terminal.integrated.defaultProfile.windows": "PowerShell",
     "files.exclude": {
         "out": false // set this to true to hide the "out" folder with the compiled JS files
     },
@@ -8,9 +19,8 @@
     },
     // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
     "typescript.tsc.autoDetect": "off",
-
     "editor.formatOnSave": true,
     "[typescript]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -15,6 +15,50 @@
 				"kind": "build",
 				"isDefault": true
 			}
+		},
+		{
+			"label": "Docker: Start and Watch",
+			"type": "shell",
+			"command": "docker-compose -f ${workspaceFolder}/docker/docker-compose.yml up",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"isBackground": true,
+			"presentation": {
+				"reveal": "never"
+			},
+			"problemMatcher": {
+				"owner": "docker",
+				"fileLocation": [
+					"relative",
+					"${workspaceFolder}/docker"
+				],
+				"background": {
+					"activeOnStart": true,
+					"beginsPattern": "^(.*)$",
+					"endsPattern": "^(.*)$"
+				},
+				"pattern": {
+					"regexp": "^(.*)$",
+					"file": 1,
+					"location": 0,
+					"message": 1
+				}
+			}
+		},
+		{
+			"label": "Docker: Stop",
+			"type": "shell",
+			"command": "docker-compose -f ${workspaceFolder}/docker/docker-compose.yml down",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"presentation": {
+				"reveal": "never"
+			},
+			"problemMatcher": []
 		}
 	]
-}
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,20 @@
 # Change Log
+
+## 1.4.0 (2023-08-03)
+### Changed
+- Fixed various small bugs
+
+### Added
+- Default DLC import from ```settings.json```
+- Default Databases import from ```openedge-project.json```
+- Shortcuts to OE tools (for Windows)
+- Possibility to enable/disable triggers
+
 ## 1.3.2 HF (2023-06-30)
 
 ### Changed
 - Fixed socket server crash on linux
+
 ## 1.3.1 (2023-06-29)
 
 ### Changed
@@ -14,7 +26,6 @@
 - Development process improvements
 
 ## 1.3.0 (2023-06-20)
-
 ### Changed
 - Fixed deleting connections
 - Fixed various small bugs
@@ -23,6 +34,8 @@
 - Field name suggestions
 - Create a copy of record
 - Possibility to have multiple vs code instances
+
+
 ## 1.2.2 (2023-03-03)
 ### Changed
 - Fixed issue with writing socket data

diff --git a/README.md b/README.md
@@ -5,8 +5,6 @@ An extension for Progress DB browsing.
 ## Current status
 This open source project is in active development. Our goal is to simplify the access to Progress DB wen using VS Code as a development environment.
 
-<img src="resources/images/multisorting.gif">
-
 ## Features
 - Connection to Progress DB:
   - Connect to Progress DB via ABL Socket server
@@ -15,6 +13,8 @@ This open source project is in active development. Our goal is to simplify the a
   - Deleting Connections
   - Edit Connections
   - Connection status indicator
+  - Shortcuts to OE tools (*new*)
+  - Default import from ```openedge-project.json``` (*new*)
 - Tables
   - Hidden tables
   - Launch query
@@ -29,7 +29,7 @@ This open source project is in active development. Our goal is to simplify the a
   - Lazy loading
   - JSON/OE formatting
   - Custom queries
-  - Suggest field names (*new*)
+  - Suggest field names
   - View record on double-click
 - Export
   - Formats
@@ -43,25 +43,26 @@ This open source project is in active development. Our goal is to simplify the a
     - Filtered records
 - CRUD operations
   - Delete multiple
-  - Insert/copy (*new*)
+  - Insert/copy
   - Update
+  - Disable/enable triggers (*new*)
 - Extension settings configuration
 - Supported OS
   - Windows
   - Linux
 ## Guide
-- [Install and setup guide](resources/markdown/setup.md)
-- [User manual](resources/markdown/manual.md)
-- [Development setup guide](resources/markdown/dev_env_setup.md)
+- [Install and setup guide](https://github.com/BalticAmadeus/ProBro/blob/main/resources/markdown/setup.md)
+- [User manual](https://github.com/BalticAmadeus/ProBro/blob/main/resources/markdown/manual.md)
+- [Development setup guide](https://github.com/BalticAmadeus/ProBro/blob/main/resources/markdown/dev_env_setup.md)
 
 ## Related work
 - [DataDigger](https://datadigger.wordpress.com/) developed by Patrick Tingen. A great source of features and examples when working on this project.
 - [vscode-abl](https://github.com/chriscamicas/vscode-abl) a VSCode plugin for ABL.
 
 ## Changelog
 
-Full changelog is available [here](CHANGELOG.md)
+Full changelog is available [here](https://github.com/BalticAmadeus/ProBro/blob/main/CHANGELOG.md)
 
 ## Sponsored by [Baltic Amadeus](https://www.ba.lt/en).
 
-[![BA](resources/images/Balticmadeus_RGB-01.jpg)](https://www.ba.lt/en)<br>
+[![BA](https://raw.githubusercontent.com/BalticAmadeus/ProBro/main/resources/images/Balticmadeus_RGB-01.jpg)](https://www.ba.lt/en)
diff --git a/docker/openedge-project.json b/docker/openedge-project.json
@@ -0,0 +1,26 @@
+{
+    "name": "pro-bro",
+    "version": "1.0",
+    "oeversion": "12.6",
+    "graphicalMode": false,
+    "charset": "utf-8",
+    "extraParameters": "",
+    "buildPath": [],
+    "dbConnections": [
+        {
+            "name": "sports2020",
+            "connect": "-db sports2020 -S 30000",
+            "dumpFile": "",
+            "aliases": []
+        },
+        {
+            "name": "notWorking",
+            "connect": "-db notWorking -S 99999",
+            "dumpFile": "",
+            "aliases": []
+        }
+    ],
+    "numThreads": 1,
+    "procedures": [],
+    "profiles": []
+}
diff --git a/openedge-project.json b/openedge-project.json
@@ -1,17 +1,33 @@
 {
-    "name": "pro-bro",
-    "version": "1.0",
-    "oeversion": "12.6",
-    "graphicalMode": false,
-    "charset": "utf-8",
-    "extraParameters": "",
-    "buildPath": [
-      { "type": "source", "path": "resources/oe/src" },
-      { "type": "propath", "path": "resources/oe" },
-      { "type": "propath", "path": "resources/oe/src" }
-    ],
-    "dbConnections": [],
-    "numThreads": 1,
-    "procedures": [ ],
-    "profiles": [ ]
-  }
+  "name": "pro-bro",
+  "version": "1.0",
+  "oeversion": "12.6",
+  "graphicalMode": false,
+  "charset": "utf-8",
+  "extraParameters": "",
+  "buildPath": [
+    {
+      "type": "source",
+      "path": "resources/oe/src"
+    },
+    {
+      "type": "propath",
+      "path": "resources/oe"
+    },
+    {
+      "type": "propath",
+      "path": "resources/oe/src"
+    }
+  ],
+  "dbConnections": [
+    {
+      "name": "sports2020",
+      "connect": "-db sports2020 -H localhost -S 30000",
+      "dumpFile": "",
+      "aliases": []
+    }
+  ],
+  "numThreads": 1,
+  "procedures": [],
+  "profiles": []
+}