stuff

electron-builder.yml

@@ -19,6 +19,6 @@ linux:
   target:
     - snap
 publish: null
-electronVersion: 3.0.13
+electronVersion: 6.0.3
 extraFiles:
   - "cocoSSDModel"

package.json

@@ -15,7 +15,8 @@
     "private": true,
     "main": "build/main.js",
     "dependencies": {
-        "@azure/storage-blob": "^10.3.0",
+        "@azure/storage-blob": "^10.4.0",
+        "@microsoft/applicationinsights-react-js": "^2.2.0",
         "@tensorflow/tfjs": "^1.0.3",
         "@types/snapsvg": "^0.4.35",
         "axios": "^0.18.0",
@@ -35,17 +36,19 @@
         "rc-menu": "^7.4.21",
         "rc-slider": "^8.6.7",
         "react": "^16.7.0",
-        "react-appinsights": "^3.0.0-rc.5",
+        "react-appinsights": "^3.0.0",
         "react-color": "^2.17.0",
+        "react-dnd": "^9.3.4",
+        "react-dnd-html5-backend": "^9.3.4",
         "react-dom": "^16.7.0",
         "react-jsonschema-form": "^1.3.0",
         "react-localization": "^1.0.13",
         "react-modal": "^3.8.1",
         "react-redux": "^5.1.1",
         "react-router-dom": "^4.3.1",
-        "react-scripts": "2.1.1",
+        "react-scripts": "3.1.1",
         "react-split-pane": "^0.1.87",
-        "react-tag-input": "^6.1.0",
+        "react-tag-input": "^6.4.0",
         "react-toastify": "^4.5.2",
         "react-virtualized": "^9.21.0",
         "react-vis": "^1.11.6",
@@ -60,24 +63,24 @@
     },
     "scripts": {
         "start": "nf start -p 3000",
-        "compile": "tsc",
-        "build": "react-scripts build",
+        "compile": "npx tsc",
+        "build": "npx react-scripts build",
         "webpack:dev": "webpack --config ./config/webpack.dev.js",
         "webpack:prod": "webpack -p --config ./config/webpack.prod.js",
         "react-start": "react-scripts start",
-        "electron:run:dev": "npm run webpack:dev && electron . --remote-debugging-port=9223",
-        "electron:run:prod": "npm run webpack:prod && electron . --remote-debugging-port=9223",
-        "electron:start:dev": "npm run webpack:dev && npm run electron-start",
-        "electron:start:prod": "npm run webpack:prod && npm run electron-start",
+        "electron:run:dev": "electron . --remote-debugging-port=9223",
+        "electron:run:prod": "electron . --remote-debugging-port=9223",
+        "electron:start:dev": "npm run electron-start",
+        "electron:start:prod": "npm run electron-start",
         "electron-start": "node src/electron/start",
         "eject": "react-scripts eject",
         "release-pr": "./scripts/release-pr.sh",
         "release-web": "npm run build && npm run webpack:prod",
         "release-ci": "bash ./scripts/build.sh",
-        "release": "npm run build && npm run webpack:prod && electron-builder",
+        "release": "npm run build && electron-builder",
         "pretest": "./node_modules/.bin/tslint 'src/**/*.ts*'",
         "lintfix": "./node_modules/.bin/tslint 'src/**/*.ts*' --fix",
-        "test": "react-scripts test --env=jsdom --silent",
+        "test": "npx react-scripts test --env=jsdom --silent",
         "test:ci": "cross-env CI=true npm run test",
         "test:coverage": "npm run test -- --coverage",
         "plato": "scripts/generate-report.sh -o report -v $(node -pe \"require('./package.json').version\") -c $(git rev-parse --short HEAD)",
@@ -95,28 +98,26 @@
     ],
     "devDependencies": {
         "@fortawesome/fontawesome-free": "^5.5.0",
-        "@types/axios": "^0.14.0",
         "@types/dotenv": "^6.1.0",
-        "@types/enzyme": "^3.1.15",
-        "@types/jest": "23.3.9",
+        "@types/enzyme": "^3.10.3",
+        "@types/jest": "24.0.18",
         "@types/json2csv": "^4.4.0",
         "@types/node": "10.12.7",
-        "@types/react": "16.7.6",
-        "@types/react-dom": "16.0.9",
-        "@types/react-jsonschema-form": "^1.0.12",
-        "@types/react-router-dom": "^4.3.1",
-        "@types/react-split-pane": "^0.1.67",
-        "@types/react-toastify": "^4.0.1",
+        "@types/react": "16.9.2",
+        "@types/react-dom": "16.9.0",
+        "@types/react-jsonschema-form": "^1.6.2",
+        "@types/react-router-dom": "^4.3.4",
+        "@types/react-toastify": "^4.0.2",
         "@types/reactstrap": "^6.4.3",
-        "@types/redux-logger": "^3.0.6",
-        "@types/redux-mock-store": "^1.0.0",
+        "@types/redux-logger": "^3.0.7",
+        "@types/redux-mock-store": "^1.0.1",
         "cross-env": "^5.2.0",
-        "electron": "^3.0.13",
-        "electron-builder": "^20.38.3",
-        "enzyme": "^3.7.0",
-        "enzyme-adapter-react-16": "^1.7.0",
+        "electron": "^6.0.3",
+        "electron-builder": "^21.2.0",
+        "enzyme": "^3.10.0",
+        "enzyme-adapter-react-16": "^1.14.0",
         "foreman": "^3.0.1",
-        "jest-enzyme": "^7.0.1",
+        "jest-enzyme": "^7.1.0",
         "jquery": "^3.3.1",
         "node-sass": "^4.10.0",
         "popper.js": "^1.14.6",
@@ -125,7 +126,7 @@
         "redux-mock-store": "^1.5.3",
         "ts-loader": "^5.3.0",
         "tslint": "^5.11.0",
-        "typescript": "^3.1.6",
+        "typescript": "^3.5.3",
         "webpack": "^4.19.1",
         "webpack-cli": "^3.1.2",
         "webpack-merge": "^4.1.5"

src/common/mockFactory.ts

@@ -818,16 +818,16 @@ export default class MockFactory {
      */
     public static projectActions(): IProjectActions {
         return {
-            loadProject: jest.fn(() => Promise.resolve()),
-            saveProject: jest.fn(() => Promise.resolve()),
+            loadProject: jest.fn((project: IProject) => Promise.resolve(project)),
+            saveProject: jest.fn((project: IProject) => Promise.resolve(project)),
             deleteProject: jest.fn(() => Promise.resolve()),
             closeProject: jest.fn(() => Promise.resolve()),
-            loadAssets: jest.fn(() => Promise.resolve()),
+            loadAssets: jest.fn((project: IProject) => Promise.resolve([])),
             exportProject: jest.fn(() => Promise.resolve()),
-            loadAssetMetadata: jest.fn(() => Promise.resolve()),
-            saveAssetMetadata: jest.fn(() => Promise.resolve()),
-            updateProjectTag: jest.fn(() => Promise.resolve()),
-            deleteProjectTag: jest.fn(() => Promise.resolve()),
+            loadAssetMetadata: jest.fn((project: IProject) => Promise.resolve(null)),
+            saveAssetMetadata: jest.fn((project: IProject) => Promise.resolve(null)),
+            updateProjectTag: jest.fn((project: IProject) => Promise.resolve([])),
+            deleteProjectTag: jest.fn((project: IProject) => Promise.resolve([])),
         };
     }
 
@@ -836,8 +836,8 @@ export default class MockFactory {
      */
     public static connectionActions(): IConnectionActions {
         return {
-            loadConnection: jest.fn((connection: IConnection) => Promise.resolve()),
-            saveConnection: jest.fn((connection: IConnection) => Promise.resolve()),
+            loadConnection: jest.fn((connection: IConnection) => Promise.resolve(connection)),
+            saveConnection: jest.fn((connection: IConnection) => Promise.resolve(connection)),
             deleteConnection: jest.fn((connection: IConnection) => Promise.resolve()),
         };
     }
@@ -1036,7 +1036,7 @@ export default class MockFactory {
     }
 
     public static mockElement(assetTestCache: Map<string, IAsset>) {
-        document.createElement = jest.fn((elementType) => {
+        document.createElement = jest.fn((elementType: string) => {
             switch (elementType) {
                 case "img":
                     const mockImage = MockFactory.mockImage(assetTestCache);

src/electron/main.ts

@@ -1,6 +1,6 @@
 import {
     app, ipcMain, BrowserWindow, BrowserWindowConstructorOptions,
-    Menu, MenuItemConstructorOptions,
+    Menu, MenuItemConstructorOptions, MenuItem,
 } from "electron";
 import { IpcMainProxy } from "./common/ipcMainProxy";
 import LocalFileSystem from "./providers/storage/localFileSystem";
@@ -70,20 +70,21 @@ function onToggleDevTools() {
  */
 function registerContextMenu(browserWindow: BrowserWindow): void {
     const selectionMenu = Menu.buildFromTemplate([
-        { role: "copy", accelerator: "CmdOrCtrl+C" },
-        { type: "separator" },
-        { role: "selectall", accelerator: "CmdOrCtrl+A" },
+        new MenuItem({ role: "copy", accelerator: "CmdOrCtrl+C" }),
+        new MenuItem({ role: "copy", accelerator: "CmdOrCtrl+C" }),
+        new MenuItem({ type: "separator" }),
+        new MenuItem({ role: "selectAll", accelerator: "CmdOrCtrl+A" }),
     ]);
 
     const inputMenu = Menu.buildFromTemplate([
-        { role: "undo", accelerator: "CmdOrCtrl+Z" },
-        { role: "redo", accelerator: "CmdOrCtrl+Shift+Z" },
-        { type: "separator" },
-        { role: "cut", accelerator: "CmdOrCtrl+X" },
-        { role: "copy", accelerator: "CmdOrCtrl+C" },
-        { role: "paste", accelerator: "CmdOrCtrl+V" },
-        { type: "separator" },
-        { role: "selectall", accelerator: "CmdOrCtrl+A" },
+        new MenuItem({ role: "undo", accelerator: "CmdOrCtrl+Z" }),
+        new MenuItem({ role: "redo", accelerator: "CmdOrCtrl+Shift+Z" }),
+        new MenuItem({ type: "separator" }),
+        new MenuItem({ role: "cut", accelerator: "CmdOrCtrl+X" }),
+        new MenuItem({ role: "copy", accelerator: "CmdOrCtrl+C" }),
+        new MenuItem({ role: "paste", accelerator: "CmdOrCtrl+V" }),
+        new MenuItem({ type: "separator" }),
+        new MenuItem({ role: "selectAll", accelerator: "CmdOrCtrl+A" }),
     ]);
 
     browserWindow.webContents.on("context-menu", (e, props) => {
@@ -107,16 +108,16 @@ function registerContextMenu(browserWindow: BrowserWindow): void {
         },
         { role: "editMenu" },
         {
-            label: "View", submenu: [
-                { role: "reload" },
-                { type: "separator" },
-                { role: "toggleDevTools" },
-                { role: "toggleFullScreen" },
-                { type: "separator" },
-                { role: "resetZoom" },
-                { role: "zoomIn" },
-                { role: "zoomOut" },
-            ],
+            label: "View", submenu: Menu.buildFromTemplate([
+                new MenuItem({ role: "reload" }),
+                new MenuItem({ type: "separator" }),
+                new MenuItem({ role: "toggleDevTools" }),
+                new MenuItem({ role: "togglefullscreen" }),
+                new MenuItem({ type: "separator" }),
+                new MenuItem({ role: "resetZoom" }),
+                new MenuItem({ role: "zoomIn" }),
+                new MenuItem({ role: "zoomOut" }),
+            ]),
         },
         { role: "windowMenu" },
     ];

src/electron/providers/storage/localFileSystem.ts

@@ -13,13 +13,14 @@ export default class LocalFileSystem implements IStorageProvider {
     constructor(private browserWindow: BrowserWindow) { }
 
     public selectContainer(): Promise<string> {
-        return new Promise<string>((resolve, reject) => {
-            const filePaths = dialog.showOpenDialog(this.browserWindow, {
+        return new Promise<string>(async (resolve, reject) => {
+            const dialogResults = await dialog.showOpenDialog(this.browserWindow, {
                 title: strings.connections.providers.local.selectFolder,
                 buttonLabel: strings.connections.providers.local.chooseFolder,
                 properties: ["openDirectory", "createDirectory"],
             });
 
+            const filePaths = dialogResults.filePaths;
             if (!filePaths || filePaths.length !== 1) {
                 return reject();
             }

src/providers/storage/azureBlobStorage.ts

@@ -5,7 +5,6 @@ import {
     TokenCredential, AnonymousCredential, ContainerURL,
     StorageURL, ServiceURL, Credential, Aborter, BlockBlobURL,
 } from "@azure/storage-blob";
-import { BlobDeleteResponse } from "@azure/storage-blob/typings/lib/generated/lib/models";
 
 /**
  * Options for Azure Cloud Storage

src/react/components/common/connectionPicker/connectionPicker.tsx

@@ -85,4 +85,5 @@ export class ConnectionPicker extends React.Component<IConnectionPickerProps, IC
     }
 }
 
-export const ConnectionPickerWithRouter = withRouter<IConnectionPickerProps>(ConnectionPicker);
+// tslint:disable-next-line:max-line-length
+export const ConnectionPickerWithRouter = withRouter<IConnectionPickerProps, React.ComponentType<IConnectionPickerProps>>(ConnectionPicker);

src/redux/reducers/currentProjectReducer.ts

@@ -50,7 +50,7 @@ export const reducer = (state: IProject = null, action: AnyAction): IProject =>
                 if (!state.tags || state.tags.length === 0 ||
                     !state.tags.find((projectTag) => tag === projectTag.name)) {
                     newTags.push({
-                        name: tag,
+                        name: tag as string,
                         color: tagColors[newTags.length % tagColors.length],
                     });
                     updateTags = true;

tsconfig.json

@@ -25,5 +25,9 @@
     },
     "include": [
         "src"
+    ],
+    "exclude": [
+      "**/*.test.ts",
+      "**/*.test.tsx"
     ]
 }

tslint.json

@@ -11,7 +11,8 @@
         "ordered-imports": false,
         "no-string-literal": false,
         "no-bitwise": false,
-        "function-constructor": false
+        "function-constructor": false,
+        "interface-name": false
     },
     "rulesDirectory": []
-}
+}