Merge pull request #613 from BalticAmadeus/develop

Release 1.8.0
BalticAmadeus · Nov 8, 2024 · 25d6e6a · 25d6e6a
2 parents 9b8f33a + 908be17
commit 25d6e6a
Show file tree

Hide file tree

Showing 57 changed files with 1,781 additions and 1,027 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,54 +1,55 @@
 version: 2.1
 
 jobs:
-  test-and-compile-front-end:
-    docker:
-      - image: circleci/node:16
-    steps:
-      - checkout
-      - run:
-          name: Install Dependencies
-          command: npm install
-      - run:
-          name: Compile Extension
-          command: npm run compile:extension
-      - run:
-          name: Compile Views
-          command: npm run compile:views
-      - run:
-          name: Run Tests
-          command: npm run jestTest
-      - store_test_results:
-          path: test-results/jest
-  test-and-compile-back-end:
-    docker:
-      - image: kherring/oedb:latest
-    steps:
-      - checkout
-      - run: tr ' ' '\n' \<<< "$PROGRESS_CFG_BASE64" | base64 --decode > /psc/dlc/progress.cfg
-      - run: ant compile
-      - run: ant test
-      - persist_to_workspace:
-          root: .
-          paths: [ '.' ]
-      - store_artifacts:
-          path: target/results.xml
-      - store_test_results:
-          path: target/results.xml
-  build:
-    docker:
-      - image: circleci/node:16
-    steps:
-      - checkout
-      - run: 
-          name: Install vsce
-          command: npm install vsce
-      - run: 
-          name: Build Extension
-          command: npm run vsce
+    test-and-compile-front-end:
+        docker:
+            - image: cimg/node:18.0
+        steps:
+            - checkout
+            - run:
+                  name: Install Dependencies
+                  command: npm install
+            - run:
+                  name: Compile Extension
+                  command: npm run compile:extension
+            - run:
+                  name: Compile Views
+                  command: npm run compile:views
+            - run:
+                  name: Run Tests
+                  command: npm run jestTest
+            - store_test_results:
+                  path: test-results/jest
+    test-and-compile-back-end:
+        docker:
+            - image: kherring/oedb:latest
+
+        steps:
+            - checkout
+            - run: tr ' ' '\n' \<<< "$PROGRESS_CFG_BASE64" | base64 --decode > /psc/dlc/progress.cfg
+            - run: ant compile
+            - run: ant test
+            - persist_to_workspace:
+                  root: .
+                  paths: ['.']
+            - store_artifacts:
+                  path: target/results.xml
+            - store_test_results:
+                  path: target/results.xml
+    build:
+        docker:
+            - image: cimg/node:18.0
+        steps:
+            - checkout
+            - run:
+                  name: Install vsce
+                  command: npm install vsce
+            - run:
+                  name: Build Extension
+                  command: npm run vsce
 workflows:
-  build:
-    jobs:
-      - test-and-compile-front-end
-      - test-and-compile-back-end
-      - build
+    build:
+        jobs:
+            - test-and-compile-front-end
+            - test-and-compile-back-end
+            - build
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,6 @@ resources/oe/oeSocket.pro
 .builder/**
 docker/.builder/**
 .scannerwork
+connectionPF.pf
+resources/oe/results.xml
+target/**
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,7 +4,10 @@
         "PowerShell": {
             "source": "PowerShell",
             "icon": "terminal-powershell",
-            "args": ["-ExecutionPolicy", "Bypass"]
+            "args": [
+                "-ExecutionPolicy",
+                "Bypass"
+            ]
         }
     },
     "terminal.integrated.defaultProfile.windows": "PowerShell",
@@ -26,5 +29,6 @@
     },
     "[typescriptreact]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
-    }
+    },
+    "workbench.colorCustomizations": {}
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Change Log
 
+## 1.8.0 (2024-11-08)
+
+### Changed
+
+- Fixed create, edit and delete issue.
+- Windows OS theme adaptabtability bug fix.
+- Fixed logical fields disappearing in JSON format.
+- Fixed issue where query errors prevented proceeding, subsequent valid queries can be executed to obtain results.
+- Refresh button works both for workspace and global connections.
+- Fixed various small bugs.
+
+### Added
+
+- Support for multiple OE versions.
+- Data Administration, Data Dictionary or Procedure Editor tools open with connection to selected database.
+- Interactive modals with improved UI.
+
 ## 1.7.0 (2024-04-08)
 
 ### Changed

diff --git a/README.md b/README.md
@@ -18,13 +18,16 @@ This open source project is in active development. Our goal is to simplify the a
   - Connection status indicator
   - Shortcuts to OE tools
   - Possibility to import from `openedge-project.json`
+  - Data Administration, Data Dictionary or Procedure Editor tools open with connection to selected database (_new_)
+  - Support for multiple OE versions (_new_)
 
 - Tables
   - Hidden tables
   - Launch query
   - Launch query on double click
   - Select tables form multiple databases
-  - Favourite tables (_new_)
+  - Favourite tables
+  - Interactive modals with improved UI (_new_)
 - Indexes
 - Fields
   - Filtering

diff --git a/build.xml b/build.xml
@@ -1,7 +1,9 @@
 <project name="ProBro" default="compile">
   <property environment="env" />
-  <taskdef resource="PCT.properties" classpath="${user.home}/.ant/lib/PCT.jar;/usr/share/ant/lib/PCT.jar" />
-  <typedef resource="types.properties" classpath="${user.home}/.ant/lib/PCT.jar;/usr/share/ant/lib/PCT.jar" />
+  <taskdef resource="PCT.properties"
+    classpath="${user.home}/.ant/lib/PCT.jar;/usr/share/ant/lib/PCT.jar;${env.DLC}/pct/PCT.jar" />
+  <typedef resource="types.properties"
+    classpath="${user.home}/.ant/lib/PCT.jar;/usr/share/ant/lib/PCT.jar;${env.DLC}/pct/PCT.jar" />
   <DlcHome value="${env.DLC}" />
   <echo>DLC=${env.DLC}</echo>
 
@@ -12,14 +14,19 @@
     <pathelement location="${env.DLC}/tty/OpenEdge.Core.pl" />
   </path>
 
-  <condition property="DB_DIR" value="/psc/wrk/sp2k" else="target/db/sp2k" >
+  <condition property="DB_DIR" value="/psc/wrk/sp2k" else="target/db/sp2k">
     <os family="unix" />
   </condition>
-  
+
   <property name="tempDir" value="target/temp" />
 
+  <target name="create_db">
+    <mkdir dir="${DB_DIR}" />
+    <PCTCreateDatabase sourceDb="${env.DLC}/sports2020" dbName="sp2k" destDir="${DB_DIR}" />
+  </target>
+
   <target name="compile">
-    <echo message="Compiling ProBro Back-End"/> 
+    <echo message="Compiling ProBro Back-End" />
     <PCTCompile destDir="target/rcode" keepXref="true" xmlXref="true" forceCompile="true">
       <fileset dir="resources/oe/src" includes="**/*.cls,**/*.p" />
       <fileset dir="resources/oe/tests" includes="**/*.cls,**/*.p" />
@@ -28,12 +35,13 @@
     </PCTCompile>
   </target>
 
-    <target name="test" depends="compile">
-    <condition property="fileset.includes" value="${file}" else="**/*Test.cls,**/*Test.p" >
+  <target name="test" depends="compile">
+    <condition property="fileset.includes" value="${file}" else="**/*Test.cls,**/*Test.p">
       <isset property="file" />
     </condition>
     <mkdir dir="${tempDir}" />
-    <ABLUnit writeLog="true" destDir="target" failOnError="true" haltOnFailure="true" tempDir="${tempDir}">
+    <ABLUnit writeLog="true" destDir="target" failOnError="true" haltOnFailure="true"
+      tempDir="${tempDir}">
       <fileset dir="resources/oe/tests" includes="**/*.p,**/*.cls" />
       <propath refid="propath" />
       <Profiler enabled="true" outputDir="target/profiler" coverage="true" />

diff --git a/openedge-project.json b/openedge-project.json
@@ -1,7 +1,7 @@
 {
   "name": "pro-bro",
   "version": "1.0",
-  "oeversion": "12.6",
+  "oeversion": "12.8",
   "graphicalMode": false,
   "charset": "utf-8",
   "extraParameters": "",