diff --git a/apps/red-ui/src/app/models/file/file.ts b/apps/red-ui/src/app/models/file/file.ts index 830e19487..2f7d82d22 100644 --- a/apps/red-ui/src/app/models/file/file.ts +++ b/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; diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile index 341fa55a9..b099b8d23 100644 --- a/docker/red-ui/Dockerfile +++ b/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"] diff --git a/libs/red-ui-http/src/lib/api/smtpConfigurationController.service.ts b/libs/red-ui-http/src/lib/api/smtpConfigurationController.service.ts index 7b4815dc3..3495520e5 100644 --- a/libs/red-ui-http/src/lib/api/smtpConfigurationController.service.ts +++ b/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 { diff --git a/package.json b/package.json index e65c03eeb..7e2ac97b7 100644 --- a/package.json +++ b/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", diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index cca764ef8..daecf7dfc 100644 Binary files a/paligo-theme.tar.gz and b/paligo-theme.tar.gz differ