Increasing flashmessage display duration to human-readable length

Makefile

@@ -0,0 +1,12 @@
+
+publish:
+	git checkout $(TAG)
+	docker build -f back/Dockerfile.prod -t git.dorfsvald.net/ewandor/cht-lawfirm-back-prod back
+	docker tag git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:latest git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:$(TAG)
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:latest
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:$(TAG)
+	docker build -f front/Dockerfile.prod -t git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod front
+	docker tag git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:latest git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:$(TAG)
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:latest
+	docker push git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:$(TAG)
+	git switch -

back/Dockerfile

@@ -5,13 +5,10 @@ RUN apt update && apt install -y xfonts-base xfonts-75dpi python3-pip python3-cf
 
 WORKDIR /code
 
-# copy both 'package.json' and 'package-lock.json' (if available)
 COPY ./requirements.txt /code/requirements.txt
 
-# install project dependencies
 RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
 
-# copy project files and folders to the current working directory (i.e. 'app' folder)
 COPY ./app /code/app
 
 EXPOSE 8000

back/Dockerfile.prod

@@ -0,0 +1,15 @@
+FROM python:3.10
+
+RUN apt update && apt install -y xfonts-base xfonts-75dpi python3-pip python3-cffi python3-brotli libpango-1.0-0 libpangoft2-1.0-0 \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /code
+
+COPY ./requirements.txt /code/requirements.txt
+
+RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
+
+COPY ./app /code/app
+
+EXPOSE 8000
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

back/app/contract/print/__init__.py

@@ -81,7 +81,7 @@ async def render_css(root_url, contract):
 async def preview_draft(draft_id: str, request: Request) -> str:
     draft = await build_model(await ContractDraft.get(draft_id))
 
-    return await render_print(f'{request.url.scheme}://{request.url.hostname}', draft)
+    return await render_print('', draft)
 
 
 @print_router.get("/preview/signature/{signature_id}", response_class=HTMLResponse)
@@ -91,7 +91,7 @@ async def preview_contract_by_signature(signature_id: str, request: Request) ->
         if p.signature_affixed:
             p.signature_png = retrieve_signature_png(f'media/signatures/{p.signature_uuid}.png')
 
-    return await render_print(f'{request.url.scheme}://{request.url.hostname}', contract)
+    return await render_print('', contract)
 
 
 @print_router.get("/preview/{contract_id}", response_class=HTMLResponse)
@@ -101,7 +101,7 @@ async def preview_contract(contract_id: str, request: Request) -> str:
         if p.signature_affixed:
             p.signature_png = retrieve_signature_png(f'media/signatures/{p.signature_uuid}.png')
 
-    return await render_print(f'{request.url.scheme}://{request.url.hostname}', contract)
+    return await render_print('', contract)
 
 
 @print_router.get("/pdf/{contract_id}", response_class=FileResponse)

docker-compose.prod.yml

@@ -1,19 +1,13 @@
 version: "3.9"
 services:
   back:
-    build:
+    image: git.dorfsvald.net/ewandor/cht-lawfirm-back-prod:latest
-      context: ${ROOT_PATH}/back
-    image: cht-lawfirm-back-prod
     restart: always
     volumes:
-      - ${ROOT_PATH}/back/app:/code/app
       - ${ROOT_PATH}/back/media:/code/media
 
   nginx:
-    build:
+    image: git.dorfsvald.net/ewandor/cht-lawfirm-nginx-prod:latest
-      context: ${ROOT_PATH}/front
-      dockerfile: prod.Dockerfile
-    image: cht-lawfirm-nginx-prod
     restart: always
     ports:
       - "3820:80"

docker-compose.prod.yml.back

@@ -0,0 +1,42 @@
+version: "3.9"
+services:
+  back:
+    build:
+      context: ${ROOT_PATH}/back
+    restart: always
+    ports:
+      - "8000:8000"
+    volumes:
+      - ${ROOT_PATH}/back/app:/code/app
+      - ${ROOT_PATH}/back/media:/code/media
+
+  front:
+    build:
+      context: ${ROOT_PATH}/front
+    restart: always
+    ports:
+      - "4200:4200"
+    volumes:
+      - ${ROOT_PATH}/front/app/src:/app/src
+      - ${ROOT_PATH}/front/app/public:/app/public
+
+  nginx:
+    build:
+      context: ${ROOT_PATH}/nginx
+    restart: always
+    ports:
+      - "3820:80"
+
+  mongo:
+    image: "mongo:4.4.18"
+    restart: always
+    ports:
+      - "27017:27017"
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: IBO3eber0mdw2R9pnInLdtFykQFY2f06
+    volumes:
+    - database:/data/db
+
+volumes:
+  database:

front/app/src/app/layout/flashmessages/flashmessages.component.html

@@ -1,7 +1,7 @@
 <div class="toast-container position-fixed bottom-0 end-0 p-3">
     <ngb-toast
       *ngFor="let flashmessage of flashmessagesService.toasts"
-      [header]="flashmessage.type" [autohide]="true" [delay]="flashmessage.delay || 1500"
+      [header]="flashmessage.type" [autohide]="true" [delay]="flashmessage.delay || 5000"
       (hiddden)="flashmessagesService.remove(flashmessage)"
     >
         <ng-container [ngSwitch]="flashmessage.type">

front/app/src/app/views/contracts/drafts.component.ts

@@ -6,6 +6,7 @@ import { CrudService } from "@common/crud/crud.service";
 import { ActivatedRoute, ParamMap, Router } from "@angular/router";
 
 import { formatDate } from "@angular/common";
+import {FlashmessagesService} from "../../layout/flashmessages/flashmessages.service";
 
 
 export class BaseDraftsComponent {
@@ -142,6 +143,7 @@ export class DraftsCardComponent extends BaseDraftsComponent implements OnInit {
         private formlyJsonschema: CrudFormlyJsonschemaService,
         private crudService: CrudService,
         private router: Router,
+        private flashService: FlashmessagesService,
     ) {
         super();
     }
@@ -159,8 +161,9 @@ export class DraftsCardComponent extends BaseDraftsComponent implements OnInit {
     }
 
     publish() {
-        this.crudService.create('contract', this.newContractModel).subscribe((response: any) => {
+        this.crudService.create('contract', this.newContractModel).subscribe({
-            this.router.navigate([`../../${response.id}`], {relativeTo: this.route});
+            next: (response: any) => this.router.navigate([`../../${response.id}`], {relativeTo: this.route}),
+            error: (err) => this.flashService.error(err)
         });
     }
 

front/app/src/common/crud/card/card.component.ts

@@ -112,10 +112,10 @@ export class CardComponent implements OnInit {
         model._id = this.resource_id;
         this.crudService.update(this.resource!, model).subscribe( {
             next: (model: any) => {
-                this.model = model;
-                this._modelLoading$.next(false);
                 this.resourceUpdated.emit(model._id);
                 this.resourceReceived.emit(model);
+                this.model = model;
+                this._modelLoading$.next(false);
             },
             error: (err) => this.error.emit("Error updating the entity:" + err)
         });

front/app/src/common/crud/list/list.component.css

@@ -0,0 +1,3 @@
+.table-row-link {
+  cursor: pointer;
+}

front/app/src/common/crud/list/list.component.html

@@ -19,15 +19,15 @@
 		<span class="col col-form-label" i18n *ngIf="loading$ | async">Loading...</span>
 	</div>
 	<div class="table-responsive-md">
-		<table class="table table-striped">
+		<table class="table table-striped table-hover">
 			<thead>
 				<tr>
 					<th *ngFor="let col of this.displayedColumns" scope="col" sortable="name" (sort)="onSort($event)">{{ col.title }}</th>
 				</tr>
 			</thead>
 			<tbody>
-				<tr *ngFor="let row of listData$ | async" (click)="onSelect(row._id)">
+				<tr *ngFor="let row of listData$ | async" (click)="onRowClick(row._id)" (auxclick)="onRowMiddleClick(row._id);" class="table-row-link">
-					<td *ngFor="let col of this.displayedColumns">
+					<td class="text-truncate" *ngFor="let col of this.displayedColumns"  style="max-width: 150px;">
 						<ngb-highlight [result]="getColumnValue(row, col.path)" [term]="searchTerm"></ngb-highlight>
 					</td>
 				</tr>

front/app/src/common/crud/list/list.component.ts

@@ -100,7 +100,7 @@ export class ListComponent implements OnInit {
                 parent = parent[key];
             }
         }
-        return parent;
+        return parent.replace(/<[^>]*>/g, '');
     }
 
     private _search() {
@@ -144,10 +144,15 @@ export class ListComponent implements OnInit {
       this.sortDirection = direction;
   }
 
-  onSelect(id: string) {
+  onRowClick(id: string) {
       this.router.navigate([`../${id}`], {relativeTo: this.route});
   }
 
+  onRowMiddleClick(id: string) {
+      let newUrl = window.location.href.replace('list', id)
+      window.open(newUrl, '_blank');
+  }
+
   onCreate() {
       this.router.navigate([`../new`], {relativeTo: this.route});
   }

front/app/src/common/crud/types/richtext.type.ts

@@ -44,6 +44,7 @@ export class RichtextTypeComponent extends FormlyFieldInput implements OnInit {
         autoresize_bottom_margin: 0,
         body_class: "contract-body",
         content_style: ".contract-body { font-family: 'Century Schoolbook', 'sans-serif' }",
+        entity_encoding: 'raw',
         paste_preprocess: function (plugin: any, args: any) {
             console.log(args.content)
             let container = document.createElement('div');
@@ -80,7 +81,7 @@ export class RichtextTypeComponent extends FormlyFieldInput implements OnInit {
         }
     }
 
-    getInitConfig() {
+    getInitConfig(): any {
         return {...this.init_common, ...( this.multiline ? this.init_multiline : this.init_singleline)};
     }