Apple Silicon Support

README.md

@@ -268,6 +268,17 @@ When the video playback bar is present, it allows the following shortcuts to sel
 * Multi-select - Hold down Shift while selecting regions
 * Exclusive Tracking mode - Ctrl + N to block frame UI allowing a user to create a region on top of existing regions
 
+## Release Process
+
+![alt text](./docs/images/release-process.png "Create Release Process")
+
+For more details on github/web releases and versions -- please review our [release process document](./docs/RELEASE_GUIDE.md)
+
+To build VoTT executable using command:
+```
+npm run release
+```
+For details on packaging executable for the release -- please review our [PACKAGING.md](./docs/PACKAGING.md)
 
 ## Collaborators
 

azure-pipelines.yml

@@ -5,6 +5,9 @@ pr:
   - dev* # kick off for pr targeting dev or prefix dev
   - master # trigger build for pr targeting master
 
+variables:
+- group: CODE_COV
+
 jobs:
 - job: Linux
   pool:

config/webpack.dev.js

@@ -4,4 +4,4 @@ const common = require('./webpack.common.js')
 module.exports = merge(common, {
   mode: 'development',
   devtool: "inline-source-map",
-})
+})

RELEASE_GUIDE.md → docs/RELEASE_GUIDE.md

@@ -6,7 +6,7 @@ Instruction on how to create new GitHub & Web Releases.
 
 ## Release Process
 
-![alt text](./docs/images/release-process.png "Create Release Process")
+![alt text](./images/release-process.png "Create Release Process")
 
 ### AzDO Tasks
 

electron-builder.yml

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

package.json

@@ -15,15 +15,15 @@
     "private": true,
     "main": "build/main.js",
     "dependencies": {
-        "@azure/storage-blob": "10.3.0",
+        "@azure/storage-blob": "^10.3.0",
         "@tensorflow/tfjs": "^1.0.3",
+        "@types/snapsvg": "^0.4.35",
         "axios": "^0.18.0",
         "bootstrap": "^4.1.3",
         "buffer-reverse": "^1.0.1",
         "crypto-js": "^3.1.9-1",
         "dotenv": "^7.0.0",
         "express-request-id": "^1.4.1",
-        "fibers": "^5.0.0",
         "google-protobuf": "^3.6.1",
         "jpeg-js": "^0.3.4",
         "json2csv": "^4.5.0",
@@ -38,15 +38,15 @@
         "react": "^16.7.0",
         "react-appinsights": "^3.0.0-rc.5",
         "react-color": "^2.17.0",
-        "react-dnd": "^5.0.0",
-        "react-dnd-html5-backend": "^3.0.2",
+        "react-dnd": "^14.0.4",
+        "react-dnd-html5-backend": "^14.0.2",
         "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": "4.0.0",
+        "react-router-dom": "^4.3.1",
+        "react-scripts": "4.0.3",
         "react-split-pane": "^0.1.87",
         "react-tag-input": "^6.1.0",
         "react-toastify": "^4.5.2",
@@ -56,7 +56,6 @@
         "redux": "^4.0.1",
         "redux-thunk": "^2.3.0",
         "rimraf": "^2.6.2",
-        "sass": "^1.28.0",
         "shortid": "^2.2.14",
         "video-react": "^0.13.2",
         "vott-ct": "2.1.24",
@@ -79,8 +78,8 @@
         "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",
-        "pretest": "npx eslint \"src/**/*.ts*\"",
-        "lintfix": "npx eslint \"src/**/*.ts*\" --fix",
+        "pretest": "./node_modules/.bin/tslint 'src/**/*.ts*'",
+        "lintfix": "./node_modules/.bin/tslint 'src/**/*.ts*' --fix",
         "test": "react-scripts test --env=jsdom --silent",
         "test:ci": "cross-env CI=true npm run test",
         "test:coverage": "npm run test -- --coverage",
@@ -91,53 +90,52 @@
     "eslintConfig": {
         "extends": "react-app"
     },
-    "browserslist": {
-        "production": [
-            ">0.2%",
-            "not dead",
-            "not op_mini all"
-        ],
-        "development": [
-            "last 1 chrome version",
-            "last 1 firefox version",
-            "last 1 safari version"
-        ]
-    },
+    "browserslist": [
+        ">0.2%",
+        "not dead",
+        "not ie <= 11",
+        "not op_mini all"
+    ],
     "devDependencies": {
         "@fortawesome/fontawesome-free": "^5.5.0",
+        "@types/axios": "^0.14.0",
         "@types/dotenv": "^6.1.0",
         "@types/enzyme": "^3.1.15",
-        "@types/jest": "26.0.15",
+        "@types/jest": "23.3.9",
         "@types/json2csv": "^4.4.0",
-        "@types/node": "12.19.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": "5.0.0",
-        "@types/react-router-dom": "4.3.1",
+        "@types/react-router-dom": "^4.3.1",
+        "@types/react-split-pane": "^0.1.67",
+        "@types/react-toastify": "^4.0.1",
         "@types/reactstrap": "^6.4.3",
         "@types/redux-logger": "^3.0.6",
         "@types/redux-mock-store": "^1.0.0",
-        "@types/snapsvg": "^0.4.35",
         "cross-env": "^5.2.0",
-        "electron": "^10.1.5",
-        "electron-builder": "^22.9.1",
+        "electron": "^13.6.1",
+        "electron-builder": "^22.13.1",
         "enzyme": "^3.7.0",
         "enzyme-adapter-react-16": "^1.7.0",
         "foreman": "^3.0.1",
         "jest-enzyme": "^7.0.1",
         "jquery": "^3.3.1",
-        "node-sass": "^4.14.1",
+        "mock-fs": "^4.13.0",
+        "node-sass": "^6.0.1",
         "popper.js": "^1.14.6",
         "redux-immutable-state-invariant": "^2.1.0",
         "redux-logger": "^3.0.6",
         "redux-mock-store": "^1.5.3",
         "ts-loader": "^5.3.0",
-        "typescript": "^4.0.5",
-        "webpack-cli": "^4.1.0"
+        "tslint": "^5.11.0",
+        "typescript": "^3.1.6",
+        "webpack": "4.44.2",
+        "webpack-cli": "^3.1.2",
+        "webpack-merge": "^4.1.5"
     },
     "engines": {
-        "node": ">=12.19.0",
-        "npm": ">=6.14.8"
+        "node": ">=10.14.2",
+        "npm": ">=6.4.1"
     }
 }

scripts/build.sh

@@ -15,4 +15,4 @@ export REACT_APP_COMMIT_SHA=${COMMIT_SHA}
 
 npx react-scripts build
 npx webpack -p --config ./config/webpack.prod.js
-npx electron-builder
+npm exec electron-builder

src/common/localization/en-us.ts

@@ -84,6 +84,10 @@ export const english: IAppStrings = {
             title: "Security Token",
             description: "Used to encrypt sensitive data within project files",
         },
+        useSecurityToken: {
+            title: "Use Security Token",
+            description: "When enabled will encrypt sensitive data within provider configuration",
+        },
         save: "Save Project",
         sourceConnection: {
             title: "Source Connection",
@@ -194,15 +198,54 @@ export const english: IAppStrings = {
             },
             bing: {
                 title: "Bing Image Search",
-                options: "Bing Image Search Options",
-                apiKey: "API Key",
-                query: "Query",
+                options: {
+                    title: "Bing Image Search Options",
+                },
+                endpoint: {
+                    title: "Endpoint",
+                    description: "The endpoint listed within the Bing Search Azure resource",
+                },
+                apiKey: {
+                    title: "API Key",
+                    description: "An API key listed within the Bing Search Azure resource",
+                },
+                query: {
+                    title: "Query",
+                    description: "The search query used to populate your connection",
+                },
                 aspectRatio: {
                     title: "Aspect Ratio",
-                    all: "All",
-                    square: "Square",
-                    wide: "Wide",
-                    tall: "Tall",
+                    description: "Filters the results by the specified aspect ratio",
+                    options: {
+                        all: "All",
+                        square: "Square",
+                        wide: "Wide",
+                        tall: "Tall",
+                    },
+                },
+                licenseType: {
+                    title: "License Type",
+                    description: "Filters the results by the specified license type",
+                    options: {
+                        all: "All (does not filter any images)",
+                        any: "Any images with any license type",
+                        public: "Public domain",
+                        share: "Free to share and use",
+                        shareCommercially: "Free to share and use commercially",
+                        modify: "Free to modify, share and use",
+                        modifyCommercially: "Free to modify, share and use commercially",
+                    },
+                },
+                size: {
+                    title: "Size",
+                    description: "Filters the results by the specified size",
+                    options: {
+                        all: "All",
+                        small: "Small (Less than 200x200)",
+                        medium: "Medium (Less than 500x500)",
+                        large: "Large (Greater than 500x500)",
+                        wallpaper: "Wallpaper (Extra large images)",
+                    },
                 },
             },
             local: {

src/common/localization/es-cl.ts

@@ -85,6 +85,10 @@ export const spanish: IAppStrings = {
             title: "Token de seguridad",
             description: "Se utiliza para cifrar datos confidenciales dentro de archivos de proyecto",
         },
+        useSecurityToken: {
+            title: "Usar Token de Seguridad",
+            description: "Si está habilitado, los datos confidenciales se cifrarán",
+        },
         save: "Guardar el Proyecto",
         sourceConnection: {
             title: "Conexión de Origen",
@@ -196,15 +200,54 @@ export const spanish: IAppStrings = {
             },
             bing: {
                 title: "Búsqueda de Imágenes Bing",
-                options: "Opciones de Búsqueda de Imágenes Bing",
-                apiKey: "Clave API",
-                query: "Consulta",
+                options: {
+                    title: "Opciones de Búsqueda de Imágenes Bing",
+                },
+                endpoint: {
+                    title: "Extremo",
+                    description: "El punto de conexión que aparece en el recurso de Bing Search Azure",
+                },
+                apiKey: {
+                    title: "Clave API",
+                    description: "Una clave de API que aparece en el recurso de Bing Search Azure",
+                },
+                query: {
+                    title: "Consulta",
+                    description: "La consulta de búsqueda utilizada para rellenar la conexión",
+                },
                 aspectRatio: {
                     title: "Relación de Aspecto",
-                    all: "Todos",
-                    square: "Cuadrado",
-                    wide: "Ancho",
-                    tall: "Alto",
+                    description: "Filtra los resultados por la relación de aspecto especificada",
+                    options: {
+                        all: "Todos",
+                        square: "Cuadrado",
+                        wide: "Ancho",
+                        tall: "Alto",
+                    },
+                },
+                licenseType: {
+                    title: "Tipo de licencia",
+                    description: "Filtra los resultados según el tipo de licencia especificado",
+                    options: {
+                        all: "Todos (no filtra ninguna imagen)",
+                        any: "Cualquier imagen con cualquier tipo de licencia",
+                        public: "Dominio público",
+                        share: "Libre para compartir y usar",
+                        shareCommercially: "Libre para compartir y usar comercialmente",
+                        modify: "Libre de modificar, compartir y usar",
+                        modifyCommercially: "Libre de modificar, compartir y ues comercialmente",
+                    },
+                },
+                size: {
+                    title: "Tamaño",
+                    description: "Filtra los resultados según el tamaño especificado",
+                    options: {
+                        all: "Todo",
+                        small: "Pequeño (Menos de 200x200)",
+                        medium: "Medio (Menos de 500x500)",
+                        large: "Grande (mayor de 500x500)",
+                        wallpaper: "Fondo de pantalla (imágenes extra grandes)",
+                    },
                 },
             },
             local: {