Toxophilist/sprint dev

.github/workflows/build-desktop-application.yml

@@ -54,13 +54,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest]
-        version: [latest]
+        os: [macos-latest, windows-latest, ubuntu-latest]
+        version: [22.11.0]
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       RELEASE_TAG: ${{ needs.generate-variables.outputs.okit_release_tag }}
       OCD_VERSION: ${{ needs.generate-variables.outputs.ocd_version }}
+      NODE_OPTIONS: "--max-old-space-size=8192"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -74,24 +75,31 @@ jobs:
       - run: npm run github-action-install
       - run: npm run github-action-compile-for-codegen
       - run: npm run github-action-generate
-      - run: npm run github-action-compile
-      - run: npm run github-action-pack
-      - run: npm run github-action-build-react
-      - run: npm run github-action-build-electron
+      - run: npm run github-action-build
+      # - run: npm run github-action-compile
+      # - run: npm run github-action-pack
+      # - run: npm run github-action-build-react
+      # - run: npm run github-action-build-electron
       - run: ls -R ./ocd/dist
         if: always()
       - name: Upload Mac Artifact to Release
         if: matrix.os == 'macos-latest'
         run: |
-          gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/mac/ocd-${{ env.OCD_VERSION }}-*.dmg --clobber
+          npm run github-action-build-macos-x86
+          gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/make/ocd-${{ env.OCD_VERSION }}-*.dmg --clobber
+          # gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/mac/ocd-${{ env.OCD_VERSION }}-*.dmg --clobber
       - name: Upload Windows Artifact to Release
         if: matrix.os == 'windows-latest'
         run: |
-          gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/win/ocd-${{ env.OCD_VERSION }}-x64.exe --clobber
+          ls ./ocd/dist/make/squirrel.windows/x64
+          gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/make/squirrel.windows/x64/ocd-${{ env.OCD_VERSION }}*.exe --clobber
+          # gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/win/ocd-${{ env.OCD_VERSION }}-x64.exe --clobber
       - name: Upload Linux Artifact to Release
         if: matrix.os == 'ubuntu-latest'
         run: |
+          gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/make/rpm/x64/ocd-${{ env.OCD_VERSION }}-*.rpm --clobber
+          gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/make/deb/x64/ocd_${{ env.OCD_VERSION }}*.deb --clobber
           # gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}.rpm --clobber
           # gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}.deb --clobber
-          gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.snap --clobber
-          gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.AppImage --clobber
+          # gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.snap --clobber
+          # gh release upload ${{ env.RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.AppImage --clobber

.github/workflows/development-build-desktop-application.yml

@@ -68,7 +68,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        version: [latest]
+        version: [22.11.0]
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -78,6 +78,7 @@ jobs:
       OCD_VERSION: ${{ needs.generate-variables.outputs.ocd_version }}
       # BRANCH_OCD_VERSION: ${{ needs.generate-variables.outputs.ocd_version }}-${{ github.head_ref || github.ref_name }}
       BRANCH_RELEASE_TAG: ocd.${{ github.head_ref || github.ref_name }}
+      NODE_OPTIONS: "--max-old-space-size=8192"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -91,25 +92,30 @@ jobs:
       - run: npm run github-action-install
       - run: npm run github-action-compile-for-codegen
       - run: npm run github-action-generate
-      - run: npm run github-action-compile
-      - run: npm run github-action-pack
-      - run: npm run github-action-build-react
-      - run: npm run github-action-build-electron
+      - run: npm run github-action-build
+      # - run: npm run github-action-compile
+      # - run: npm run github-action-pack
+      # - run: npm run github-action-build-react
+      # - run: npm run github-action-build-electron
       - name: Upload Mac Artifact to Release
         if: matrix.os == 'macos-latest'
         run: |
-          ls -lash ./ocd/dist/mac
-          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/mac/ocd-${{ env.OCD_VERSION }}-*.dmg --clobber
+          npm run github-action-build-macos-x86
+          ls -lashR ./ocd/dist
+          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/make/ocd-${{ env.OCD_VERSION }}-*.dmg --clobber
+          # gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/release/${{ env.OCD_VERSION }}/ocd-${{ env.OCD_VERSION }}-*.dmg --clobber
       - name: Upload Windows Artifact to Release
-        if: matrix.os == 'windows-latest'
+        if: matrix.os == 'windows-latest' && (failure() || success())
         run: |
-          ls ./ocd/dist/win
-          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/win/ocd-${{ env.OCD_VERSION }}-x64.exe --clobber
+          ls -R ./ocd/dist
+          ls ./ocd/dist/make/squirrel.windows/x64
+          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/make/squirrel.windows/x64/ocd-${{ env.OCD_VERSION }}-Setup.exe --clobber
+          # gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/release/${{ env.OCD_VERSION }}/ocd-Windows-${{ env.OCD_VERSION }}*x64.exe --clobber
       - name: Upload Linux Artifact to Release
-        if: matrix.os == 'ubuntu-latest'
+        if: matrix.os == 'ubuntu-latest' && (failure() || success())
         run: |
-          ls -lash ./ocd/dist/linux
-          # gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.rpm --clobber
-          # gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.deb --clobber
-          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.snap --clobber
+          ls -lashR ./ocd/dist
+          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/make/rpm/x64/ocd-${{ env.OCD_VERSION }}-*.rpm --clobber
+          gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/make/deb/x64/ocd_${{ env.OCD_VERSION }}*.deb --clobber
+          # gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/release/${{ env.OCD_VERSION }}/ocd-${{ env.OCD_VERSION }}-*.snap --clobber
           # gh release upload ${{ env.BRANCH_RELEASE_TAG }} ./ocd/dist/linux/ocd-${{ env.OCD_VERSION }}-*.AppImage --clobber

.gitignore

@@ -20,12 +20,13 @@ __pycache__/
 *.egg-info/
 okit.wpr
 
-# Node / React / Electron
+# Node / React / Electron / Vite
 **/dist/
 **/build/
 **/node_modules
 **/out/
 **/lib/
+**/.vite/
 # **/package-lock.json
 
 # Terraform
@@ -70,3 +71,5 @@ workspace
 # Others
 .coverage
 htmlcov/
+
+# Build

CHANGELOG.md

@@ -1,6 +1,23 @@
 # Release Notes
 
 
+## Version 0.66.0
+**Release Date**: 30th November 2024
+### Features
+1. OKIT-Ocd: Convert @ocd/core to ES6 Module (#OKIT-307)
+1. OKIT-Ocd: Convert @ocd/model to ES6 Module (#OKIT-308)
+1. OKIT-Ocd: Convert @ocd/query to ES6 Module (#OKIT-309)
+1. OKIT-Ocd: Convert @ocd/export to ES6 Module (#OKIT-310)
+1. OKIT-Ocd: Convert @ocd/import to ES6 Module (#OKIT-311)
+1. OKIT-Ocd: Convert @ocd/codegen to ES6 Module (#OKIT-312)
+1. OKIT-Ocd: Convert @ocd/codegen-cli to ES6 Module (#OKIT-313)
+1. OKIT-Ocd: Convert @ocd/cli to ES6 Module (#OKIT-314)
+1. OKIT-Ocd: Convert @ocd/desktop to ES6 Module (#OKIT-315)
+1. OKIT-Ocd: Switch build process from Create React App / Webpack to Vite (#OKIT-305)
+1. OKIT-Ocd: Switch to Electron Forge for building.
+### Bug Fixes
+
+
 ## Version 0.65.0
 **Release Date**: 30th October 2024
 ### Features

Dockerfile

@@ -6,7 +6,7 @@ FROM oraclelinux:8
 ARG BRANCH=master
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.65.0" \
+      "version"="0.66.0" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, 2024, Oracle and/or its affiliates."
 # SHELL ["/bin/bash", "-c"]

README.md

@@ -1,9 +1,9 @@
 [![License: UPL](https://img.shields.io/badge/license-UPL-green)](https://img.shields.io/badge/license-UPL-green) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=oracle_oci-designer-toolkit&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=oracle_oci-designer-toolkit)
-# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.65.0](CHANGELOG.md#version-0.65.0)
+# Oracle Cloud Infrastructure Designer and Visualisation Toolkit [0.66.0](CHANGELOG.md#version-0.66.0)
 
-Full Release Details Can Found [0.65.0 Release](https://github.com/oracle/oci-designer-toolkit/releases/tag/v0.65.0).
+Full Release Details Can Found [0.66.0 Release](https://github.com/oracle/oci-designer-toolkit/releases/tag/v0.66.0).
 
-**OKIT - Open Cloud Designer** Public Beta is now Available see [0.65.0 Release](https://github.com/oracle/oci-designer-toolkit/releases/tag/v0.65.0) for details.
+**OKIT - Open Cloud Designer** Public Beta is now Available see [0.66.0 Release](https://github.com/oracle/oci-designer-toolkit/releases/tag/v0.66.0) for details.
 _____
 
 OCI designer and visualisation toolKIT (OKIT) is a browser based tool that allows the user to [design](https://www.ateam-oracle.com/introduction-to-okit-the-oci-designer-toolkit), 
@@ -38,7 +38,7 @@ OCI environments through a graphical web based interface.
 
 ## Changes
 
-[Changes for the current release (0.65.0) are documented here.](CHANGELOG.md#version-0.65.0)
+[Changes for the current release (0.66.0) are documented here.](CHANGELOG.md#version-0.66.0)
 
 
 ## Releases

RELEASE_NOTES.md

@@ -1,17 +1,24 @@
 [![License: UPL](https://img.shields.io/badge/license-UPL-green)](https://img.shields.io/badge/license-UPL-green) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=oracle_oci-designer-toolkit&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=oracle_oci-designer-toolkit)
-# October 2024 Release (Version 0.65.0)
+# November 2024 Release (Version 0.66.0)
 ____
-**Update 0.65.0**: This update addresses the following issues.
-1. OKIT-Web: Resolve issue with queried node_pool where the availability dodamin was still the full name. (#723)
+**Update 0.66.0**: This update addresses the following issues.
 ____
-Welcome to the October 2024 release of OKIT. This release updates the Azure and Google based on the released terraform providers.
+Welcome to the November 2024 release of OKIT. This release switches the exiat Create React App based build format to Vite and Electron Forge.
 
 ## OKIT (Web) Features
-1. OKIT-Web: Create PCA specific OKIT Cache classes for use when accessing the pca link.
 
 ## OKIT - Open Cloud Designer
-1. OKIT-Ocd: Update initial Azure resources to match released terraform providers. (#OKIT-316)
-2. OKIT-Ocd: Update initial Google resources to match released terraform providers . (#OKIT-317)
+1. OKIT-Ocd: Convert @ocd/core to ES6 Module (#OKIT-307)
+1. OKIT-Ocd: Convert @ocd/model to ES6 Module (#OKIT-308)
+1. OKIT-Ocd: Convert @ocd/query to ES6 Module (#OKIT-309)
+1. OKIT-Ocd: Convert @ocd/export to ES6 Module (#OKIT-310)
+1. OKIT-Ocd: Convert @ocd/import to ES6 Module (#OKIT-311)
+1. OKIT-Ocd: Convert @ocd/codegen to ES6 Module (#OKIT-312)
+1. OKIT-Ocd: Convert @ocd/codegen-cli to ES6 Module (#OKIT-313)
+1. OKIT-Ocd: Convert @ocd/cli to ES6 Module (#OKIT-314)
+1. OKIT-Ocd: Convert @ocd/desktop to ES6 Module (#OKIT-315)
+1. OKIT-Ocd: Switch build process from Create React App / Webpack to Vite (#OKIT-305)
+1. OKIT-Ocd: Switch to Electron Forge for building.
 
 ### Beta Overview
 

containers/docker/Dockerfile

@@ -5,7 +5,7 @@
 FROM oraclelinux:8
 LABEL "provider"="Oracle" \
       "issues"="https://github.com/oracle/oci-designer-toolkit/issues" \
-      "version"="0.65.0" \
+      "version"="0.66.0" \
       "description"="OKIT Web Server Container." \
       "copyright"="Copyright (c) 2020, 2024, Oracle and/or its affiliates."
 # SHELL ["/bin/bash", "-c"]

ocd/documentation/Development.md

@@ -52,7 +52,7 @@ export class GoogleTerraformSchemaImporter extends OcdTerraformSchemaImporter {
 }
 
 export default GoogleTerraformSchemaImporter
-module.exports = { GoogleTerraformSchemaImporter }
+// module.exports = { GoogleTerraformSchemaImporter }
 ```
 
 #### src/importer/data/GoogleResourceMap.ts
@@ -243,7 +243,7 @@ export class GoogleMarkdownGenerator extends OcdMarkdownGenerator {
 }
 
 export default GoogleMarkdownGenerator
-module.exports = { GoogleMarkdownGenerator }
+// module.exports = { GoogleMarkdownGenerator }
 ```
 
 #### src/generator/GoogleModelGenerator.ts
@@ -266,7 +266,7 @@ export class GoogleModelGenerator extends OcdModelGenerator {
 }
 
 export default GoogleModelGenerator
-module.exports = { GoogleModelGenerator }
+// module.exports = { GoogleModelGenerator }
 ```
 
 #### src/generator/GooglePropertiesGenerator.ts
@@ -289,7 +289,7 @@ export class GooglePropertiesGenerator extends OcdPropertiesGenerator {
 }
 
 export default GooglePropertiesGenerator
-module.exports = { GooglePropertiesGenerator }
+// module.exports = { GooglePropertiesGenerator }
 ```
 
 #### src/generator/GoogleTabularGenerator.ts
@@ -312,7 +312,7 @@ export class GoogleTabularGenerator extends OcdTabularGenerator {
 }
 
 export default GoogleTabularGenerator
-module.exports = { GoogleTabularGenerator }
+// module.exports = { GoogleTabularGenerator }
 ```
 
 #### src/generator/GoogleTerraformGenerator.ts
@@ -337,7 +337,7 @@ export class GoogleTerraformGenerator extends OcdTerraformGenerator {
 }
 
 export default GoogleTerraformGenerator
-module.exports = { GoogleTerraformGenerator }
+// module.exports = { GoogleTerraformGenerator }
 ```
 
 #### src/generator/GoogleValidatorGenerator.ts
@@ -360,7 +360,7 @@ export class GoogleValidatorGenerator extends OcdValidatorGenerator {
 }
 
 export default GoogleValidatorGenerator
-module.exports = { GoogleValidatorGenerator }
+// module.exports = { GoogleValidatorGenerator }
 ```
 
 #### src/generator/data/GoogleCommonResourceProperties.ts