Merge branch 'master' into VM/NotificationsPreferences

apps/red-ui/src/app/models/file/file.ts

@@ -90,7 +90,7 @@ export class File implements IFile, IListable {
         this.numberOfAnalyses = file.numberOfAnalyses;
         this.status = ['REPROCESS', 'FULLREPROCESS'].includes(file.status) ? FileStatuses.PROCESSING : file.status;
         this.isError = this.status === FileStatuses.ERROR;
-        this.numberOfPages = this.isError ? -1 : file.numberOfPages ?? 0;
+        this.numberOfPages = this.isError ? 0 : file.numberOfPages ?? 0;
         this.rulesVersion = file.rulesVersion;
         this.uploader = file.uploader;
         this.excludedPages = file.excludedPages;

docker/red-ui/Dockerfile

@@ -23,8 +23,7 @@ COPY versions.sh version.sh
 COPY paligo-styles paligo-styles
 
 ## Build the angular app in production mode and store the artifacts in dist folder
-RUN yarn lint
-RUN yarn build --configuration production --project=red-ui --base-href /ui/ --verbose
+RUN yarn run build-lint-all
 RUN yarn run build-paligo-styles
 CMD ["/bin/cp", "-r", "/ng-app/dist/paligo-styles", "/tmp/styles-export"]
 

libs/red-ui-http/src/lib/api/smtpConfigurationController.service.ts

@@ -17,7 +17,7 @@ import { Observable } from 'rxjs';
 
 import { BASE_PATH } from '../variables';
 import { Configuration } from '../configuration';
-import { SMTPConfiguration } from '../model/SMTPConfiguration';
+import { SMTPConfiguration } from '../model/sMTPConfiguration';
 
 @Injectable()
 export class SmtpConfigurationControllerService {

package.json

@@ -1,30 +1,15 @@
 {
   "name": "redaction",
-  "version": "2.235.0",
+  "version": "2.236.0",
   "private": true,
   "license": "MIT",
   "scripts": {
-    "affected": "nx affected",
-    "affected:apps": "nx affected:apps",
-    "affected:build": "nx affected:build",
-    "affected:dep-graph": "nx affected:dep-graph",
-    "affected:e2e": "nx affected:e2e",
-    "affected:libs": "nx affected:libs",
-    "affected:lint": "nx affected:lint",
-    "affected:test": "nx affected:test",
     "build": "nx build",
-    "build-lint-all": "ng lint --project=red-ui-http --fix && ng build --project=red-ui-http && ng lint --project=red-ui --fix && ng build --project=red-ui --configuration production",
+    "build-lint-all": "ng lint --project=red-ui-http --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix  && ng build --project=red-ui --configuration production --base-href /ui/",
     "build-paligo-styles": "mkdir -p dist/paligo-styles && sass --load-path=. paligo-styles/style.scss > dist/paligo-styles/redacto-theme.css && cp -r apps/red-ui/src/assets/font dist/paligo-styles/fonts",
-    "dep-graph": "nx dep-graph",
-    "e2e": "nx e2e",
-    "format": "nx format:write",
-    "format:check": "nx format:check",
-    "format:write": "nx format:write",
-    "help": "nx help",
     "i18n:extract": "ngx-translate-extract --input ./apps/red-ui/src ./libs/common-ui/src --output apps/red-ui/src/assets/i18n/en.json --clean --sort --format namespaced-json && prettier apps/red-ui/src/assets/i18n/*.json --write",
     "postinstall": "ngcc --properties es2015 browser module main",
-    "lint": "nx workspace-lint && nx lint",
-    "lint-fix": "nx workspace-lint --fix && nx lint --fix",
+    "lint": "ng lint --project=red-ui-http --fix && ng lint --project=red-ui --fix && ng lint --project=common-ui --fix",
     "nx": "nx",
     "start": "nx serve",
     "test": "nx test",