1.5-rc1 -> master prepare for release

rabix · Sep 17, 2020 · 0223849 · 0223849
2 parents c4a6e89 + e02ab0d
commit 0223849
Show file tree

Hide file tree

Showing 14 changed files with 206 additions and 69 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macOS-10.14, windows-2016, ubuntu-18.04]
+        os: [macOS-latest, windows-2016, ubuntu-18.04]
 
     steps:
       - name: Context
@@ -21,23 +21,24 @@ jobs:
       - uses: actions/checkout@v1
         with:
           fetch-depth: 1
-      - name: Use Node.js 8.x
+      - name: Use Node.js 13.x
         uses: actions/setup-node@v1
         with:
-          node-version: 8.x
+          node-version: 13.x
       - name: yarn install
         run: |
           yarn install
+          
       - name: Build
         run: |
           yarn run build
-
+      
       # - name: Cleanup artifacts
       #   run: |
       #     npx rimraf "dist/!(*.exe|*.deb|*.AppImage|*.dmg)"
 
       - name: Upload macOS artifacts
-        if: matrix.os == 'macOS-10.14'
+        if: matrix.os == 'macOS-latest'
         uses: actions/upload-artifact@v1
         with:
           name: ${{ matrix.os }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - macOS-10.14
+          - macOS-latest
           #- windows-2016  #until we can figure out cross-platform command line
           - ubuntu-18.04
 
@@ -24,10 +24,10 @@ jobs:
       - uses: actions/checkout@v1
         with:
           fetch-depth: 1
-      - name: Use Node.js 8.x
+      - name: Use Node.js 13.x
         uses: actions/setup-node@v1
         with:
-          node-version: 8.x
+          node-version: 13.x
       - name: Install and test
         run: |
           yarn install

diff --git a/.travis.yml b/.travis.yml
diff --git a/electron-build.js b/electron-build.js
@@ -92,7 +92,7 @@ builder.build({
             ext: "cwl",
             name: "CWL"
         }],
-        // afterSign: projectRoot + "/build-scripts/notarize.js",
+        afterSign: projectRoot + "/build-scripts/notarize.js",
         dmg: {
             sign: false
         }

diff --git a/electron/package.json b/electron/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rabix-composer",
-    "version": "1.0.2",
+    "version": "1.5.0-rc1",
     "main": "dist/main.js",
     "scripts": {
         "test": "./node_modules/mocha/bin/_mocha -r ts-node/register ./src/**/*.spec.ts",

diff --git a/package-lock.json → package-lock.old.json b/package-lock.json → package-lock.old.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rabix-composer",
-    "version": "1.0.3",
+    "version": "1.5.0-rc1",
     "executorVersion": "1.0.5",
     "executorDownloadURL": "https://github.com/rabix/bunny/releases/download/v1.0.5-1/rabix-1.0.5.tar.gz",
     "license": "Apache-2.0",
@@ -59,7 +59,7 @@
         "brace": "^0.11.0",
         "core-js": "^2.5.3",
         "cwl-svg": "2.0.1",
-        "cwlts": "1.15.29",
+        "cwlts": "^1.19.2",
         "font-awesome": "^4.7.0",
         "jquery": "^3.2.1",
         "js-yaml": "^3.10.0",
@@ -107,6 +107,7 @@
         "karma-jasmine": "~1.1.1",
         "karma-jasmine-html-reporter": "^0.2.2",
         "markdown-it": "^8.3.2",
+        "node-sass": "^4.13",
         "request": "^2.83.0",
         "rimraf": "^2.6.1",
         "spectron": "^3.7.2",
@@ -116,4 +117,4 @@
         "typescript": "~2.6.2",
         "webdriverio": "~4.10.2"
     }
-}
+}
diff --git a/src/app/core/data-gateway/data-gateway.service.ts b/src/app/core/data-gateway/data-gateway.service.ts
@@ -64,11 +64,7 @@ export class DataGatewayService {
             if (parse) {
                 return fetch.pipe(
                     map(content => {
-                        try {
-                            return YAML.safeLoad(content, {json: true, onWarning: noop} as any);
-                        } catch (err) {
-                            return new Error(err);
-                        }
+                            return YAML.safeLoad(content, {json: true, onWarning: noop} as any) as string;
                     })
                 );
             }

diff --git a/src/app/editor-common/app-editor-base/app-editor-base.ts b/src/app/editor-common/app-editor-base/app-editor-base.ts
@@ -790,7 +790,7 @@ export abstract class AppEditorBase extends DirectiveBase implements StatusContr
 
                 const jobWithAbspaths = appIsLocal ? ensureAbsolutePaths(path.dirname(appID), job) : job;
 
-                return executor.execute(appID, this.dataModel, jobWithAbspaths, executorPath, executionParams).pipe(
+                return executor.execute(appID, appContent, this.dataModel, jobWithAbspaths, executorPath, executionParams).pipe(
                     finalize(() => this.fileRepository.reloadPath(executionParams.outDir.value))
                 );
             })

diff --git a/src/app/execution/services/executor/executor.service.ts b/src/app/execution/services/executor/executor.service.ts
@@ -83,9 +83,8 @@ export class ExecutorService2 {
 
     }
 
-    execute(appID: string, model: WorkflowModel | CommandLineToolModel, jobValue: Object = {}, executorPath: string = "", executionParams: Partial<CWLExecutionParamsConfig> = {}): Observable<any> {
+    execute(appID: string, appContent: string, model: WorkflowModel | CommandLineToolModel, jobValue: Object = {}, executorPath: string = "", executionParams: Partial<CWLExecutionParamsConfig> = {}): Observable<any> {
 
-        const appContent = serializeModel(model, true, false, true);
         const executor = new CWLExecutor({ executorPath: executorPath });
         const stepList = this.getStepList(model);
 

diff --git a/src/app/layout/action-bar/action-bar.component.scss b/src/app/layout/action-bar/action-bar.component.scss
@@ -14,7 +14,7 @@
         $buttonMargins: 2px;
         $buttonHeight: $action-bar-height - 2*$borderSize - 2*$buttonMargins;
 
-        &:not(".text-inherit") {
+        &:not(.text-inherit) {
             font-size: $font-size-base;
         }
         padding: 0 $btn-padding-x-sm;

diff --git a/src/app/platform-providers/electron-system.service.ts b/src/app/platform-providers/electron-system.service.ts
@@ -7,7 +7,7 @@ const {shell, webFrame} = window["require"]("electron");
 export class ElectronSystemService extends SystemService {
 
     boot() {
-        webFrame.setZoomLevelLimits(1, 1);
+        webFrame.setVisualZoomLevelLimits(1, 1);
     }
 
     openLink(url: string, event?: MouseEvent) {

diff --git a/src/app/repository/platform-repository.service.ts b/src/app/repository/platform-repository.service.ts
@@ -187,6 +187,10 @@ export class PlatformRepositoryService {
 
 
     createApp(appID: string, content: string): Promise<string> {
+
+        const appContent = Yaml.safeLoad(content, { json: true } as LoadOptions);
+        content = JSON.stringify(appContent, null, 4);
+
         return this.ipc.request("createPlatformApp", {
             id: appID,
             content: content