Skip to content

Commit e7eaec8

Browse files
committed
dependencies updated to latest version
1 parent 252fdf0 commit e7eaec8

File tree

11 files changed

+5751
-4293
lines changed

11 files changed

+5751
-4293
lines changed

client/app/main.ts

+17-21
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import {marked, Tokens} from "marked";
12

23

34
const translationModule = TranslateModule.forRoot({
@@ -55,7 +56,21 @@ import {provideRouter} from "@angular/router";
5556

5657

5758
import { ApplicationRef } from '@angular/core';
58-
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
59+
const renderer = new marked.Renderer();
60+
renderer.link = function (token: Tokens.Link): string {
61+
const { href, title, text } = token;
62+
const isImage = text.startsWith('![') && text.includes('](');
63+
if (isImage) {
64+
const match = text.match(/!\[(.*?)\]\((.*?)\)/);
65+
if (match) {
66+
const alt = match[1];
67+
const src = match[2];
68+
return `<a target="_blank" href="${href}"><img src="${src}" alt="${alt}" /></a>`;
69+
}
70+
}
71+
return `<a target="_blank" href="${href}">${text}</a>`;
72+
};
73+
5974

6075
bootstrapApplication(AppComponent, {
6176
providers: [
@@ -65,26 +80,7 @@ bootstrapApplication(AppComponent, {
6580
provide: MARKED_OPTIONS,
6681
useValue: {
6782
breaks: true,
68-
renderer: {
69-
link({ href, title, text, tokens }: { href: string; title?: string; text: string; tokens?: any[] }): string {
70-
// Check if the text contains an image tag (Markdown image syntax is wrapped in `![](...)`)
71-
const isImage = text.startsWith('![') && text.includes('](');
72-
73-
if (isImage) {
74-
// Extract the image Markdown (e.g., ![Alt](src))
75-
const match = text.match(/!\[(.*?)\]\((.*?)\)/); // Regex to parse image Markdown
76-
if (match) {
77-
const alt = match[1]; // Alt text
78-
const src = match[2]; // Image URL
79-
// Render clickable image
80-
return `<a target="_blank" href="${href}"><img src="${src}" alt="${alt}" /></a>`;
81-
}
82-
}
83-
84-
// Fallback to standard link rendering for non-image links
85-
return `<a target="_blank" href="${href}">${text}</a>`;
86-
},
87-
},
83+
renderer: renderer,
8884
}
8985
}
9086
}), NgxFlowModule, NgOptimizedImage),

client/app/src/pages/recipient/whistleblower-identity-receiver/whistleblower-identity-receiver.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
} from "@app/shared/modals/tip-operation-file-identity-access-request/tip-operation-file-identity-access-request.component";
77
import {HttpService} from "@app/shared/services/http.service";
88
import {UtilsService} from "@app/shared/services/utils.service";
9-
import {NgClass, DatePipe} from "@angular/common";
9+
import {DatePipe} from "@angular/common";
1010
import {TipFieldComponent} from "@app/shared/partials/tip-field/tip-field.component";
1111
import {TranslateModule} from "@ngx-translate/core";
1212
import {TranslatorPipe} from "@app/shared/pipes/translate";
@@ -16,7 +16,7 @@ import {TranslatorPipe} from "@app/shared/pipes/translate";
1616
selector: "src-whistleblower-identity-receiver",
1717
templateUrl: "./whistleblower-identity-receiver.component.html",
1818
standalone: true,
19-
imports: [TipFieldComponent, NgbTooltipModule, NgClass, DatePipe, TranslateModule, TranslatorPipe]
19+
imports: [TipFieldComponent, NgbTooltipModule, DatePipe, TranslateModule, TranslatorPipe]
2020
})
2121
export class WhistleBlowerIdentityReceiverComponent {
2222
protected tipService = inject(ReceiverTipService);

client/app/src/pages/whistleblower/context-selection/context-selection.component.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import {Component, EventEmitter, Input, Output, inject} from "@angular/core";
22
import {AppDataService} from "@app/app-data.service";
33
import {Context} from "@app/models/app/public-model";
44
import {UtilsService} from "@app/shared/services/utils.service";
5-
import {NgOptimizedImage} from "@angular/common";
65
import {MarkdownComponent} from "ngx-markdown";
76
import {StripHtmlPipe} from "@app/shared/pipes/strip-html.pipe";
87
import {OrderByPipe} from "@app/shared/pipes/order-by.pipe";
@@ -11,7 +10,7 @@ import {OrderByPipe} from "@app/shared/pipes/order-by.pipe";
1110
selector: "src-context-selection",
1211
templateUrl: "./context-selection.component.html",
1312
standalone: true,
14-
imports: [MarkdownComponent, NgOptimizedImage, StripHtmlPipe, OrderByPipe]
13+
imports: [MarkdownComponent, StripHtmlPipe, OrderByPipe]
1514
})
1615
export class ContextSelectionComponent {
1716
protected appDataService = inject(AppDataService);

client/app/src/pages/whistleblower/receiver-card/receiver-card.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Component, Input, inject} from "@angular/core";
22
import {Receiver} from "@app/models/app/public-model";
33
import {SubmissionService} from "@app/services/helper/submission.service";
44
import {TranslateService} from "@ngx-translate/core";
5-
import {NgClass, NgOptimizedImage} from "@angular/common";
5+
import {NgClass} from "@angular/common";
66
import {FormsModule} from "@angular/forms";
77
import {MarkdownComponent} from "ngx-markdown";
88
import {StripHtmlPipe} from "@app/shared/pipes/strip-html.pipe";
@@ -11,7 +11,7 @@ import {StripHtmlPipe} from "@app/shared/pipes/strip-html.pipe";
1111
selector: "src-receiver-card",
1212
templateUrl: "./receiver-card.component.html",
1313
standalone: true,
14-
imports: [FormsModule, MarkdownComponent, NgClass, NgOptimizedImage, StripHtmlPipe]
14+
imports: [FormsModule, MarkdownComponent, NgClass, StripHtmlPipe]
1515
})
1616
export class ReceiverCardComponent {
1717
protected translate = inject(TranslateService);

client/app/src/shared/components/date-selector/date-selector.component.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import {Component, EventEmitter, Input, Output} from "@angular/core";
22
import {NgbDate, NgbDatepickerModule} from "@ng-bootstrap/ng-bootstrap";
33
import {FormsModule} from "@angular/forms";
4-
import {JsonPipe} from "@angular/common";
54

65
@Component({
76
selector: "ngbd-datepicker-range",
87
standalone: true,
9-
imports: [NgbDatepickerModule, FormsModule, JsonPipe],
8+
imports: [NgbDatepickerModule, FormsModule],
109
templateUrl: "./date-selector.component.html"
1110
})
1211
export class DateRangeSelectorComponent {

client/app/src/shared/modals/reopen-submission/reopen-submission.component.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {Component, inject} from "@angular/core";
22
import {NgbActiveModal, NgbModal, NgbTooltipModule} from "@ng-bootstrap/ng-bootstrap";
33
import {FormsModule} from "@angular/forms";
4-
import {NgClass} from "@angular/common";
54
import {TranslateModule} from "@ngx-translate/core";
65
import {TranslatorPipe} from "@app/shared/pipes/translate";
76

@@ -12,7 +11,6 @@ import {TranslatorPipe} from "@app/shared/pipes/translate";
1211
imports: [
1312
FormsModule,
1413
NgbTooltipModule,
15-
NgClass,
1614
TranslateModule,
1715
TranslatorPipe
1816
],

client/app/src/shared/partials/enable-2fa/enable-2fa.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ import {UtilsService} from "@app/shared/services/utils.service";
33
import {PreferenceResolver} from "@app/shared/resolvers/preference.resolver";
44
import {FormBuilder, FormGroup, FormsModule, ReactiveFormsModule} from "@angular/forms";
55
import {TwoFactorAuthData} from "@app/services/helper/2fa.data.service";
6-
import {QRCodeModule} from "angularx-qrcode";
76
import {NgClass} from "@angular/common";
87
import {TranslateModule} from "@ngx-translate/core";
98
import {TranslatorPipe} from "@app/shared/pipes/translate";
109
import {NgbTooltipModule} from '@ng-bootstrap/ng-bootstrap';
10+
import {QRCodeComponent} from "angularx-qrcode";
1111

1212
@Component({
1313
selector: "src-enable-2fa",
1414
templateUrl: "./enable-2fa.html",
1515
standalone: true,
16-
imports: [QRCodeModule, FormsModule, ReactiveFormsModule, NgbTooltipModule, NgClass, TranslateModule, TranslatorPipe]
16+
imports: [FormsModule, ReactiveFormsModule, NgbTooltipModule, NgClass, TranslateModule, TranslatorPipe, QRCodeComponent]
1717
})
1818
export class Enable2fa implements OnInit{
1919
protected utils = inject(UtilsService);

client/app/src/shared/partials/image-upload/image-upload.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {NgbTooltipModule} from '@ng-bootstrap/ng-bootstrap';
1616
selector: "src-image-upload",
1717
templateUrl: "./image-upload.component.html",
1818
standalone: true,
19-
imports: [FormsModule, NgbTooltipModule, NgxFlowModule, NgOptimizedImage, TranslateModule, TranslatorPipe]
19+
imports: [FormsModule, NgbTooltipModule, NgxFlowModule, TranslateModule, TranslatorPipe]
2020
})
2121
export class ImageUploadComponent implements AfterViewInit, OnDestroy, OnInit {
2222
private http = inject(HttpClient);

client/cypress/plugins/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default (on, config) => {
2525
return new Promise((resolve, reject) => {
2626
const language = config.env.language;
2727

28-
const destPath = __dirname + "/../../../documentation/images/" + details.path.replace(".png", "").split('/').slice(-2).join('/') + "." + language + ".png";
28+
const destPath = __dirname + "/../../../documentation/images/" + details.path.replace(".png", "").replace(".cy.ts", "").split('/').slice(-2).join('/') + "." + language + ".png";
2929

3030
const destDir = path.dirname(destPath);
3131

0 commit comments

Comments
 (0)