IDE Upgrades for 1.5.0 Release

CHANGELOG.md

@@ -16,12 +16,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Homepage improvements
 - Warning when no connections exist when creating an identity and option to create one
 - Option to backup all workspaces at once
-- Contract editor improvements
 - Key generation using WASM from Rust code - JS implementation takes ~10s, Rust takes ~<2s (Requires testing)
+- Contract editor improvements
 - Terminal GUI for direct SSH/Shell access to servers
 - Node management - Automate adding/removing nodes in an established but not yet asserted network
 - Node management - Transaction signing/Node joining - Automated transaction signing process to enable new nodes to join an asserted network
 
+## [1.5.0] - 2021-03-30
+
+### Changed
+
+- Fixed JSON views
+- Improved Contract editor performance
+- Upgraded Contract editor IntelliSense
+- Upgraded Electron
+- Upgraded Angular
+- Upgraded other dependencies
+
 ## [1.4.0] - 2020-11-05
 
 ### Added

docker-build.sh

@@ -0,0 +1,12 @@
+# Linux yarn && yarn dist
+# Windows yarn && yarn dist -w
+
+docker run --rm -ti \
+ --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
+ --env ELECTRON_CACHE="/root/.cache/electron" \
+ --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
+ -v ${PWD}:/project \
+ -v ${PWD##*/}-node-modules:/project/node_modules \
+ -v ~/.cache/electron:/root/.cache/electron \
+ -v ~/.cache/electron-builder:/root/.cache/electron-builder \
+ electronuserland/builder:wine

e2e/app.e2e-spec.ts

@@ -1,7 +1,7 @@
 import { AngularElectronPage } from "./app.po";
 import { element, by } from "protractor";
 
-describe("Active Harmony", () => {
+describe("Activeledger IDE", () => {
   let page: AngularElectronPage;
 
   beforeEach(() => {

electron-builder.json

@@ -1,5 +1,5 @@
 {
-  "productName": "Active Harmony",
+  "productName": "Activeledger IDE",
   "directories": {
     "output": "app-builds"
   },

main.ts

@@ -91,7 +91,7 @@ function createWindow() {
         label: app.getName(),
         submenu: [
           {
-            label: "About Active Harmony",
+            label: "About Activeledger IDE",
           },
           {
             type: "separator",

package.json

@@ -1,11 +1,10 @@
 {
   "name": "activeharmony",
-  "version": "v1.4.0",
-  "description": "Active Harmony",
-  "homepage": "https://git.asl.direct",
+  "version": "v1.5.0",
+  "description": "Activledger IDE",
+  "homepage": "https://www.activeledger.io",
   "author": {
-    "name": "Chris Holdt",
-    "email": "4070267+Chris-Holdt@users.noreply.github.com"
+    "name": "Activeledger"    
   },
   "main": "main.js",
   "private": true,
@@ -25,113 +24,112 @@
     "test": "karma start ./karma.conf.js",
     "pree2e:build": "webdriver-manager update --gecko false && npm run ng serve",
     "pree2e:protractor": "wait-on http-get://localhost:4201/ && protractor ./protractor.conf.js",
-    "e2e": "npm-run-all --parallel --race pree2e:build pree2e:protractor"
+    "e2e": "npm-run-all --parallel --race pree2e:build pree2e:protractor",
+    "dist": "electron-builder"
   },
-  "optionalDependencies": {},
   "dependencies": {
-    "@activeledger/activecontracts": "2.5.0",
-    "@activeledger/activecrypto": "2.5.0",
-    "@activeledger/activedefinitions": "2.5.0",
-    "@activeledger/activelogger": "2.2.0",
-    "@activeledger/activequery": "2.5.0",
-    "@activeledger/activetoolkits": "2.5.0",
-    "@activeledger/activeutilities": "2.5.0",
+    "@activeledger/activecontracts": "2.5.1",
+    "@activeledger/activecrypto": "2.5.1",
+    "@activeledger/activedefinitions": "2.5.1",
+    "@activeledger/activelogger": "2.5.1",
+    "@activeledger/activequery": "2.5.1",
+    "@activeledger/activetoolkits": "2.5.1",
+    "@activeledger/activeutilities": "2.5.1",
     "@activeledger/sdk": "1.3.4",
-    "@fortawesome/angular-fontawesome": "0.7.0",
+    "@electron/remote": "^1.0.4",
+    "@fortawesome/angular-fontawesome": "0.8.2",
     "@fortawesome/fontawesome": "1.1.8",
     "@fortawesome/fontawesome-free-regular": "5.0.13",
     "@fortawesome/fontawesome-free-solid": "5.0.13",
-    "@fortawesome/fontawesome-svg-core": "1.2.32",
-    "@fortawesome/free-solid-svg-icons": "5.15.1",
-    "@popperjs/core": "^2.5.4",
+    "@fortawesome/fontawesome-svg-core": "1.2.35",
+    "@fortawesome/free-solid-svg-icons": "5.15.3",
+    "@popperjs/core": "^2.9.1",
     "@types/axios": "0.14.0",
     "@types/pouchdb": "6.4.0",
     "ace-builds": "^1.4.12",
-    "ang-jsoneditor": "1.10.3",
-    "angular-split": "4.0.0",
-    "angular2-moment": "1.9.0",
+    "ang-jsoneditor": "1.10.5",
+    "angular-split": "5.0.0",
     "angular2-prettyjson": "3.0.1",
-    "axios": "0.21.0",
-    "bootstrap": "^4.5.3",
+    "axios": "0.21.1",
+    "bootstrap": "^4.6.0",
     "brace": "0.11.1",
-    "echarts": "^4.9.0",
-    "jsoneditor": "9.1.1",
-    "monaco-editor": "^0.21.2",
-    "ng-click-outside": "7.0.0",
+    "echarts": "^5.0.2",
+    "jsoneditor": "9.2.0",
+    "moment": "^2.29.1",
+    "monaco-editor": "^0.23.0",
+    "ng-click-outside": "8.0.0",
     "ngx-clipboard": "^14.0.1",
-    "ngx-color-picker": "10.1.0",
-    "ngx-echarts": "^5.1.2",
-    "ngx-spinner": "10.0.1",
-    "node-sass": "^4.14.1",
+    "ngx-color-picker": "11.0.0",
+    "ngx-echarts": "^6.0.1",
+    "ngx-moment": "^5.0.0",
+    "ngx-spinner": "^11.0.1",
     "node-ssh": "^11.1.1",
-    "pino": "6.7.0",
-    "pouchdb": "7.2.1",
-    "pouchdb-browser": "7.2.1",
-    "pouchdb-find": "7.2.1",
+    "pino": "6.11.2",
+    "pouchdb": "7.2.2",
+    "pouchdb-browser": "7.2.2",
+    "pouchdb-find": "7.2.2",
     "resize-observer-polyfill": "^1.5.1",
-    "rxjs-compat": "^6.6.3",
-    "semver": "7.3.2",
+    "rxjs-compat": "^6.6.7",
+    "sass": "^1.32.6",
+    "semver": "7.3.5",
     "ssh2": "^0.8.9",
     "sshpk": "^1.16.1",
-    "swagger-ui": "3.36.1",
+    "swagger-ui": "3.45.1",
     "unpkg-json": "0.0.6",
-    "xterm": "^4.9.0",
-    "xterm-addon-fit": "^0.4.0"
+    "xterm": "^4.11.0",
+    "xterm-addon-fit": "^0.5.0"
   },
   "devDependencies": {
-    "@activeledger/activedefinitions": "^2.5.0",
-    "@angular-builders/custom-webpack": "^9.2.0",
+    "@activeledger/activedefinitions": "^2.5.1",
+    "@angular-builders/custom-webpack": "^11.1.1",
     "@angular-builders/dev-server": "^7.3.1",
-    "@angular-devkit/build-angular": "~0.1002.0",
-    "@angular/animations": "^10.2.1",
-    "@angular/cdk": "^10.2.7",
-    "@angular/cli": "~10.2.0",
-    "@angular/common": "~10.2.1",
-    "@angular/compiler": "~10.2.1",
-    "@angular/compiler-cli": "~10.2.1",
-    "@angular/core": "~10.2.1",
-    "@angular/forms": "~10.2.1",
-    "@angular/language-service": "~10.2.1",
-    "@angular/material": "^10.2.7",
-    "@angular/platform-browser": "~10.2.1",
-    "@angular/platform-browser-dynamic": "~10.2.1",
-    "@angular/router": "~10.2.1",
+    "@angular-devkit/build-angular": "~0.1102.6",
+    "@angular/animations": "^11.2.7",
+    "@angular/cdk": "^11.2.6",
+    "@angular/cli": "~11.2.6",
+    "@angular/common": "~11.2.7",
+    "@angular/compiler": "~11.2.7",
+    "@angular/compiler-cli": "~11.2.7",
+    "@angular/core": "~11.2.7",
+    "@angular/forms": "~11.2.7",
+    "@angular/language-service": "~11.2.7",
+    "@angular/material": "^11.2.6",
+    "@angular/platform-browser": "~11.2.7",
+    "@angular/platform-browser-dynamic": "~11.2.7",
+    "@angular/router": "~11.2.7",
     "@ngx-translate/core": "13.0.0",
     "@ngx-translate/http-loader": "6.0.0",
-    "@types/jasmine": "3.6.1",
+    "@types/jasmine": "3.6.9",
     "@types/jasminewd2": "2.0.8",
-    "@types/node": "^12.19.3",
+    "@types/node": "^14.14.37",
     "codelyzer": "^6.0.1",
-    "conventional-changelog-cli": "^2.1.0",
-    "core-js": "3.6.5",
-    "cross-env": "7.0.2",
+    "conventional-changelog-cli": "^2.1.1",
+    "core-js": "3.9.1",
+    "cross-env": "7.0.3",
     "dotenv": "8.2.0",
-    "electron": "^10.1.5",
-    "electron-builder": "22.9.1",
+    "electron": "^11.4.1",
+    "electron-builder": "^21.0.10",
     "electron-reload": "^1.5.0",
-    "eslint": "^7.12.1",
+    "eslint": "^7.23.0",
     "eslint-plugin-import": "^2.22.1",
-    "fs-extra": "9.0.1",
+    "fs-extra": "9.1.0",
     "git-describe": "4.0.4",
-    "jasmine-core": "~3.6.0",
+    "jasmine-core": "~3.7.1",
     "jasmine-spec-reporter": "~6.0.0",
-    "karma": "~5.2.3",
+    "karma": "~6.3.2",
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~4.0.1",
     "karma-jasmine-html-reporter": "^1.5.4",
     "npm-run-all": "4.1.5",
-    "replace": "1.2.0",
-    "rxjs": "6.6.3",
-    "ts-node": "9.0.0",
-    "tslib": "^2.0.3",
+    "replace": "1.2.1",
+    "rxjs": "6.6.7",
+    "ts-node": "9.1.1",
+    "tslib": "^2.1.0",
     "tslint": "~6.1.3",
-    "typescript": "4.0.5",
-    "wait-on": "5.2.0",
-    "webdriver-manager": "12.1.7",
-    "webpack-cli": "4.1.0",
-    "zone.js": "~0.11.3"
-  },
-  "engines": {
-    "node": ">=10.13.0"
+    "typescript": "4.1.5",
+    "wait-on": "5.3.0",
+    "webdriver-manager": "12.1.8",
+    "webpack-cli": "4.6.0",
+    "zone.js": "~0.11.4"
   }
 }

src/app/app.component.html

@@ -1,7 +1,7 @@
 <div class="app-wrapper">
   <div *ngIf="!electronService.isMac" class="topBar accent" style="-webkit-app-region: drag">
     <div class="icon"></div>
-    <span class="title">Active Harmony</span>
+    <span class="title">Activeledger IDE</span>
 
     <span class="window-menu">
       <div class="window-menu-item minButt" (click)="minimise()">
@@ -37,7 +37,7 @@
       </div>
     </span>
 
-    <div class="title">Active Harmony</div>
+    <div class="title">Activeledger IDE</div>
   </div>
 
   <app-quick-bar (changeMenuState)="toggleMenu()"></app-quick-bar>

src/app/app.module.ts

@@ -26,7 +26,6 @@ import "reflect-metadata";
 import "../polyfills";
 import { BrowserModule } from "@angular/platform-browser";
 import { NgModule } from "@angular/core";
-import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 
 import { HttpClientModule, HttpClient } from "@angular/common/http";
 
@@ -60,7 +59,6 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 import { NoopAnimationsModule } from "@angular/platform-browser/animations";
 
 import { PrettyJsonModule } from "angular2-prettyjson";
-import { NgxSpinnerModule } from "ngx-spinner";
 
 import { ElectronService } from "./shared/services/electron.service";
 import { ConfigService } from "./shared/services/config.service";
@@ -98,7 +96,6 @@ import { KeysModule } from "./components/tx-components/keys/keys.module";
 import { NamespaceModule } from "./components/tx-components/namespace/namespace.module";
 import { SwaggerModule } from "./components/tx-components/swagger/swagger.module";
 import { SigningModule } from "./components/tx-components/signing/signing.module";
-// import { MonacoEditorModule } from "@materia-ui/ngx-monaco-editor";
 import { MatButtonToggleModule } from "@angular/material/button-toggle";
 import { MainmenuComponent } from "./shared/components/mainmenu/mainmenu.component";
 import { AddSshConnectionDialogComponent } from "./shared/dialogs/add-ssh-connection/add-ssh-connection.component";
@@ -107,7 +104,7 @@ import { SshEditConnectionDialogComponent } from "./shared/dialogs/ssh-edit-conn
 import { SshManageTagsDialogComponent } from "./shared/dialogs/ssh-manage-tags-dialog/ssh-manage-tags-dialog.component";
 import { SshManageTagsConnectionDialogComponent } from "./shared/dialogs/ssh-manage-tags-connection-dialog/ssh-manage-tags-connection-dialog.component";
 import { RollbackSelectDialogComponent } from "./shared/dialogs/rollback-select-dialog/rollback-select-dialog.component";
-import { SharedModule } from "./shared/shared.module";
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 
 // AoT requires an exported function for factories
 export function HttpLoaderFactory(http: HttpClient) {
@@ -139,21 +136,19 @@ export function HttpLoaderFactory(http: HttpClient) {
     RollbackSelectDialogComponent,
   ],
   imports: [
-    NgxSpinnerModule,
     BrowserModule,
-    BrowserAnimationsModule,
     FormsModule,
+    ReactiveFormsModule,
+    BrowserAnimationsModule,
     HttpClientModule,
     AppRoutingModule,
     MatInputModule,
     MatFormFieldModule,
     MatSelectModule,
     MatButtonModule,
-    // BrowserAnimationsModule,
     NoopAnimationsModule,
     PrettyJsonModule,
     MatTabsModule,
-    // AngularSplitModule,
     MatExpansionModule,
     FontAwesomeModule,
     MatListModule,
@@ -171,7 +166,6 @@ export function HttpLoaderFactory(http: HttpClient) {
     MatBadgeModule,
     MatIconModule,
     MatSnackBarModule,
-    // MonacoEditorModule,
     MatRadioModule,
     MatListModule,
     TranslateModule.forRoot({
@@ -191,8 +185,6 @@ export function HttpLoaderFactory(http: HttpClient) {
     SwaggerModule,
     ContractsModule,
     SettingsModule,
-    ReactiveFormsModule,
-    SharedModule,
   ],
   providers: [
     ElectronService,
@@ -209,4 +201,4 @@ export function HttpLoaderFactory(http: HttpClient) {
   ],
   bootstrap: [AppComponent],
 })
-export class AppModule {}
+export class AppModule { }

src/app/components/baas-components/network/network.module.ts

@@ -7,22 +7,22 @@ import { BuilderComponent } from "./builder/builder.component";
 import { MatPaginatorModule } from "@angular/material/paginator";
 import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
 import { MatTableModule } from "@angular/material/table";
-import { ReactiveFormsModule } from "@angular/forms";
 import { MatFormFieldModule } from "@angular/material/form-field";
 import { MatInputModule } from "@angular/material/input";
 import { MatCheckboxModule } from "@angular/material/checkbox";
 import { MatTabsModule } from "@angular/material/tabs";
-import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 
 @NgModule({
   declarations: [ManagementComponent, BuilderComponent],
   imports: [
     CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
     NetworkRoutingModule,
     FontAwesomeModule,
     MatPaginatorModule,
     MatTableModule,
-    ReactiveFormsModule,
     MatFormFieldModule,
     MatInputModule,
     MatCheckboxModule,