+
+
+
+
+
+
+
+ Code
+
+
-
diff --git a/webapp/wiremock/src/app/components/list-view/list-view.component.scss b/webapp/wiremock/src/app/components/list-view/list-view.component.scss
index fb7809659f..124047cb69 100644
--- a/webapp/wiremock/src/app/components/list-view/list-view.component.scss
+++ b/webapp/wiremock/src/app/components/list-view/list-view.component.scss
@@ -48,3 +48,16 @@
border-top-right-radius: $btn-border-radius !important;
}
}
+
+.wmFileIconContainer {
+ padding-left: 4px;
+ padding-right: 4px;
+ align-self: flex-start;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
+
+.wmProxyContainer {
+ align-self: flex-start;
+}
diff --git a/webapp/wiremock/src/app/components/mappings/mapping-helper.service.ts b/webapp/wiremock/src/app/components/mappings/mapping-helper.service.ts
index e8b1ac296a..8cf2f90c28 100644
--- a/webapp/wiremock/src/app/components/mappings/mapping-helper.service.ts
+++ b/webapp/wiremock/src/app/components/mappings/mapping-helper.service.ts
@@ -129,4 +129,20 @@ export class MappingHelperService {
}
return undefined;
}
+
+ static helperSetBodyFileName(mapping?: StubMapping, fileName?: string): StubMapping | undefined {
+ if (mapping && mapping.response) {
+ mapping.response.bodyFileName = fileName || "some-file.txt";
+ return mapping;
+ }
+ return undefined;
+ }
+
+ static helperRemoveBodyFileName(mapping?: StubMapping): StubMapping | undefined {
+ if (mapping && mapping.response && mapping.response.bodyFileName) {
+ delete mapping.response.bodyFileName;
+ return mapping;
+ }
+ return undefined;
+ }
}
diff --git a/webapp/wiremock/src/app/components/mappings/mappings.component.html b/webapp/wiremock/src/app/components/mappings/mappings.component.html
index 3ea4355ba3..c44c172318 100644
--- a/webapp/wiremock/src/app/components/mappings/mappings.component.html
+++ b/webapp/wiremock/src/app/components/mappings/mappings.component.html
@@ -101,6 +101,28 @@
+
+
+ {
diff --git a/webapp/wiremock/src/app/components/list-view/list-view.component.html b/webapp/wiremock/src/app/components/list-view/list-view.component.html
index 1bc3e90e9b..92aef513cc 100644
--- a/webapp/wiremock/src/app/components/list-view/list-view.component.html
+++ b/webapp/wiremock/src/app/components/list-view/list-view.component.html
@@ -19,45 +19,49 @@
- {{ item.getTitle() }}
{{ item.getSubtitle() }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/webapp/wiremock/src/app/components/mappings/mappings.component.ts b/webapp/wiremock/src/app/components/mappings/mappings.component.ts
index 115a749d94..dce28cd012 100644
--- a/webapp/wiremock/src/app/components/mappings/mappings.component.ts
+++ b/webapp/wiremock/src/app/components/mappings/mappings.component.ts
@@ -5,7 +5,7 @@ import { UtilService } from "../../services/util.service";
import { StubMapping } from "../../model/wiremock/stub-mapping";
import { WebSocketService } from "../../services/web-socket.service";
import { WebSocketListener } from "../../interfaces/web-socket-listener";
-import { debounceTime, filter, takeUntil } from "rxjs/operators";
+import { debounceTime, filter, map, switchMap, takeUntil, tap } from "rxjs/operators";
import { MappingHelperService } from "./mapping-helper.service";
import { Message, MessageService, MessageType } from "../message/message.service";
import { Item } from "../../model/wiremock/item";
@@ -14,6 +14,9 @@ import { ProxyConfig } from "../../model/wiremock/proxy-config";
import { Tab, TabSelectionService } from "../../services/tab-selection.service";
import { AutoRefreshService } from "../../services/auto-refresh.service";
import { CodeEditorComponent } from "../code-editor/code-editor.component";
+import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
+import { FileNameComponent } from "../../dialogs/file-name/file-name.component";
+import { fromPromise } from "rxjs/internal/observable/innerFrom";
@Component({
selector: "wm-mappings",
@@ -33,6 +36,7 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
result?: ListStubMappingsResult;
activeItemId?: string;
+ bodyFileName?: string;
editorText?: string;
currentMappingText?: string;
@@ -40,59 +44,8 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
editMode?: State;
State = State;
- codeOptions = {
- selectionStyle: "text",
- highlightActiveLine: true,
- highlightSelectedWord: true,
- readOnly: false,
- cursorStyle: "ace",
- mergeUndoDeltas: "true",
- behavioursEnabled: true,
- wrapBehavioursEnabled: true,
- copyWithEmptySelection: true,
- autoScrollEditorIntoView: true, // we need that
- useSoftTabs: true,
- // ...
- highlightGutterLine: false,
- showPrintMargin: false,
- printMarginColumn: false,
- printMargin: false,
- showGutter: true,
- displayIndentGuides: true,
- fontSize: 14,
- fontFamily: 'SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
- showLineNumbers: true,
- // ..
- wrap: true,
- enableMultiselect: true,
- };
-
- codeReadOnlyOptions = {
- selectionStyle: "text",
- highlightActiveLine: true, // readOnly
- highlightSelectedWord: true,
- readOnly: true, // readOnly
- cursorStyle: "ace",
- mergeUndoDeltas: "true",
- behavioursEnabled: true,
- wrapBehavioursEnabled: true,
- copyWithEmptySelection: true,
- autoScrollEditorIntoView: true, // we need that
- useSoftTabs: true,
- // ...
- highlightGutterLine: false,
- showPrintMargin: false,
- printMarginColumn: false,
- printMargin: false,
- showGutter: true,
- displayIndentGuides: true,
- fontSize: 14,
- fontFamily: 'SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
- showLineNumbers: true,
- // ..
- wrap: true,
- enableMultiselect: true,
- };
+ codeOptions = UtilService.aceWriteOptions();
+ codeReadOnlyOptions = UtilService.aceReadOnlyOptions();
RAW = Tab.RAW;
@@ -105,8 +58,10 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
private webSocketService: WebSocketService,
private messageService: MessageService,
private tabSelectionService: TabSelectionService,
- private autoRefreshService: AutoRefreshService
- ) {}
+ private autoRefreshService: AutoRefreshService,
+ private modalService: NgbModal,
+ ) {
+ }
ngOnInit() {
this.webSocketService
@@ -114,7 +69,7 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
.pipe(
filter(() => this.autoRefreshService.isAutoRefreshEnabled()),
takeUntil(this.ngUnsubscribe),
- debounceTime(100)
+ debounceTime(100),
)
.subscribe(() => {
this.loadMappings();
@@ -163,7 +118,7 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
this.wiremockService.saveNewMapping(this.editorText).subscribe({
next: data => {
this.activeItemId = data.getId();
- this.messageService.setMessage(new Message("save successful", MessageType.INFO, 2000));
+ this.messageService.setMessage(new Message("save successful", MessageType.INFO));
},
error: err => {
UtilService.showErrorMessage(this.messageService, err);
@@ -185,7 +140,7 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
this.wiremockService.saveMapping(item.getId(), this.editorText).subscribe({
next: data => {
this.activeItemId = data.getId();
- this.messageService.setMessage(new Message("save successful", MessageType.INFO, 2000));
+ this.messageService.setMessage(new Message("save successful", MessageType.INFO));
},
error: err => {
UtilService.showErrorMessage(this.messageService, err);
@@ -198,8 +153,10 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
onActiveItemChange(item: Item) {
if (item) {
this.editorText = item.getCode();
+ this.bodyFileName = item.getBodyFileName();
} else {
this.editorText = "";
+ this.bodyFileName = undefined;
}
this.editMode = State.NORMAL;
}
@@ -240,7 +197,7 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
removeAllMappings() {
this.wiremockService.deleteAllMappings().subscribe({
next: () => {
- this.messageService.setMessage(new Message("All mappings removed", MessageType.INFO, 3000));
+ this.messageService.setMessage(new Message("All mappings removed", MessageType.INFO));
},
error: err => {
UtilService.showErrorMessage(this.messageService, err);
@@ -251,7 +208,7 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
resetAllScenarios() {
this.wiremockService.resetScenarios().subscribe({
next: () => {
- this.messageService.setMessage(new Message("Reset of all scenarios successful", MessageType.INFO, 3000));
+ this.messageService.setMessage(new Message("Reset of all scenarios successful", MessageType.INFO));
},
error: err => {
UtilService.showErrorMessage(this.messageService, err);
@@ -270,8 +227,7 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
new Message(
err.name + ": message=" + err.message + ", lineNumber=" + err.lineNumber + ", columnNumber=" + err.columnNumber,
MessageType.ERROR,
- 10000
- )
+ ),
);
}
@@ -326,7 +282,7 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
this.setMappingForHelper(MappingHelperService.helperToJsonBody(this.getMappingForHelper()));
} catch (err) {
this.messageService.setMessage(
- new Message(MappingsComponent.ACTION_FAILURE_PREFIX + "Probably no json", MessageType.ERROR, 10000)
+ new Message(MappingsComponent.ACTION_FAILURE_PREFIX + "Probably no json", MessageType.ERROR),
);
}
}
@@ -354,25 +310,25 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
helpersCopyJsonPath() {
if (UtilService.copyToClipboard("{{jsonPath request.body '$.'}}")) {
- this.messageService.setMessage(new Message("jsonPath copied to clipboard", MessageType.INFO, 3000));
+ this.messageService.setMessage(new Message("jsonPath copied to clipboard", MessageType.INFO));
} else {
- this.messageService.setMessage(new Message(MappingsComponent.COPY_FAILURE, MessageType.ERROR, 10000));
+ this.messageService.setMessage(new Message(MappingsComponent.COPY_FAILURE, MessageType.ERROR));
}
}
helpersCopyXpath() {
if (UtilService.copyToClipboard("{{xPath request.body '/'}}")) {
- this.messageService.setMessage(new Message("xPath copied to clipboard", MessageType.INFO, 3000));
+ this.messageService.setMessage(new Message("xPath copied to clipboard", MessageType.INFO));
} else {
- this.messageService.setMessage(new Message(MappingsComponent.COPY_FAILURE, MessageType.ERROR, 10000));
+ this.messageService.setMessage(new Message(MappingsComponent.COPY_FAILURE, MessageType.ERROR));
}
}
helpersCopySoap() {
if (UtilService.copyToClipboard("{{soapXPath request.body '/'}}")) {
- this.messageService.setMessage(new Message("soapXPath copied to clipboard", MessageType.INFO, 3000));
+ this.messageService.setMessage(new Message("soapXPath copied to clipboard", MessageType.INFO));
} else {
- this.messageService.setMessage(new Message(MappingsComponent.COPY_FAILURE, MessageType.ERROR, 10000));
+ this.messageService.setMessage(new Message(MappingsComponent.COPY_FAILURE, MessageType.ERROR));
}
}
@@ -413,6 +369,71 @@ export class MappingsComponent implements OnInit, OnDestroy, WebSocketListener {
this.editMode = State.NORMAL;
this.editorText = this.currentMappingText;
}
+
+ downloadFile() {
+ if (this.bodyFileName) {
+ this.wiremockService.downloadFile(this.bodyFileName).subscribe({
+ error: err => {
+ this.messageService.setMessage(new Message(`Download failed.\n${err.message}`, MessageType.ERROR));
+ },
+ });
+ }
+ }
+
+ uploadFile(event: any) {
+ const fileList = event.target.files as FileList;
+
+ if (fileList && fileList.length > 0) {
+ const file = fileList[0];
+
+ const dialog = this.modalService.open(FileNameComponent);
+ dialog.componentInstance.fileName = file.name;
+
+ fromPromise(dialog.result).pipe(switchMap(fileName => this.wiremockService.uploadFile(file, fileName)
+ .pipe(map(() => fileName))),
+ tap(fileName => {
+ if (this.editorText) {
+ this.setMappingForHelper(
+ MappingHelperService.helperSetBodyFileName(this.getMappingForHelper(), fileName),
+ );
+ }
+ })).subscribe({
+ next: () => {
+ this.messageService.setMessage(
+ new Message(`File "${file.name}" uploaded.`, MessageType.INFO),
+ );
+ },
+ error: err => {
+ this.messageService.setMessage(
+ new Message(`File upload failed.\n${err.message || err}`, MessageType.ERROR),
+ );
+ },
+ });
+ }
+
+ }
+
+ deleteFile() {
+ if (this.bodyFileName) {
+ this.wiremockService.deleteFile(this.bodyFileName).subscribe({
+ next: () => {
+ this.messageService.setMessage(
+ new Message(`File "${this.bodyFileName}" deleted.`, MessageType.INFO),
+ );
+ if (this.editorText) {
+ this.setMappingForHelper(
+ MappingHelperService.helperRemoveBodyFileName(this.getMappingForHelper()),
+ );
+ }
+ },
+ error: err => {
+ this.messageService.setMessage(
+ new Message(`File deletion failed.\n${err.message || err}`, MessageType.ERROR),
+ );
+ },
+ });
+ }
+ }
}
export enum State {
diff --git a/webapp/wiremock/src/app/components/matched/matched.component.ts b/webapp/wiremock/src/app/components/matched/matched.component.ts
index 951cc073a5..07a2ce6fc6 100644
--- a/webapp/wiremock/src/app/components/matched/matched.component.ts
+++ b/webapp/wiremock/src/app/components/matched/matched.component.ts
@@ -29,8 +29,9 @@ export class MatchedComponent implements OnInit, OnDestroy {
private webSocketService: WebSocketService,
private messageService: MessageService,
private autoRefreshService: AutoRefreshService,
- private modalService: NgbModal
- ) {}
+ private modalService: NgbModal,
+ ) {
+ }
ngOnInit() {
this.webSocketService
@@ -38,7 +39,7 @@ export class MatchedComponent implements OnInit, OnDestroy {
.pipe(
filter(() => this.autoRefreshService.isAutoRefreshEnabled()),
takeUntil(this.ngUnsubscribe),
- debounceTime(100)
+ debounceTime(100),
)
.subscribe(() => {
this.loadMappings();
@@ -54,15 +55,15 @@ export class MatchedComponent implements OnInit, OnDestroy {
},
err => {
UtilService.showErrorMessage(this.messageService, err);
- }
+ },
);
}
copyCurl(request: ServeEvent) {
if (UtilService.copyToClipboard(CurlExtractor.copyCurl(request))) {
- this.messageService.setMessage(new Message("Curl copied to clipboard", MessageType.INFO, 3000));
+ this.messageService.setMessage(new Message("Curl copied to clipboard", MessageType.INFO));
} else {
- this.messageService.setMessage(new Message("Was not able to copy. Details in log", MessageType.ERROR, 10000));
+ this.messageService.setMessage(new Message("Was not able to copy. Details in log", MessageType.ERROR));
}
}
@@ -82,7 +83,7 @@ export class MatchedComponent implements OnInit, OnDestroy {
},
err => {
UtilService.showErrorMessage(this.messageService, err);
- }
+ },
);
}
diff --git a/webapp/wiremock/src/app/components/message/message.component.html b/webapp/wiremock/src/app/components/message/message.component.html
index efc8a36f3c..b83a369b79 100644
--- a/webapp/wiremock/src/app/components/message/message.component.html
+++ b/webapp/wiremock/src/app/components/message/message.component.html
@@ -1,6 +1,16 @@
-
-
+(undefined);
- constructor() {}
+ constructor() {
+ }
getSubject(): BehaviorSubject {
return this.message;
@@ -24,11 +25,17 @@ export class Message {
type: MessageType;
duration: number;
- constructor(message: string, type: MessageType, duration: number, html?: string) {
+ constructor(message: string, type: MessageType, duration?: number, html?: string) {
this.message = message;
this.html = html;
this.type = type;
- this.duration = duration;
+ if (duration) {
+ this.duration = duration;
+ } else if (type === MessageType.ERROR) {
+ this.duration = 6000;
+ } else {
+ this.duration = 3000;
+ }
}
}
diff --git a/webapp/wiremock/src/app/components/separated/separated.component.html b/webapp/wiremock/src/app/components/separated/separated.component.html
index f87d0de523..2c2c7c6e0a 100644
--- a/webapp/wiremock/src/app/components/separated/separated.component.html
+++ b/webapp/wiremock/src/app/components/separated/separated.component.html
@@ -4,27 +4,27 @@
-
@@ -38,29 +38,33 @@
-
@@ -73,12 +77,12 @@
-
diff --git a/webapp/wiremock/src/app/components/separated/separated.component.scss b/webapp/wiremock/src/app/components/separated/separated.component.scss
index f84d9fa11d..e4e8613cc6 100644
--- a/webapp/wiremock/src/app/components/separated/separated.component.scss
+++ b/webapp/wiremock/src/app/components/separated/separated.component.scss
@@ -41,3 +41,13 @@
padding: 7px;
font-size: 14px;
}
+
+
+.wmBodyFileName {
+ display: flex;
+ align-items: center;
+
+ button {
+ border-radius: 0;
+ }
+}
diff --git a/webapp/wiremock/src/app/components/separated/separated.component.ts b/webapp/wiremock/src/app/components/separated/separated.component.ts
index 817172a5dc..6b3f23a495 100644
--- a/webapp/wiremock/src/app/components/separated/separated.component.ts
+++ b/webapp/wiremock/src/app/components/separated/separated.component.ts
@@ -20,6 +20,7 @@ export class SeparatedComponent implements OnChanges {
color: string[] = ["bg-info", "bg-warning", "bg-danger", "bg-primary", "bg-secondary", "bg-dark"];
+ bodyFileName?: string;
bodyFileData?: string;
bodyGroupKey?: string;
@@ -36,7 +37,8 @@ export class SeparatedComponent implements OnChanges {
}
}
- constructor(private wiremockService: WiremockService) {}
+ constructor(private wiremockService: WiremockService) {
+ }
ngOnChanges(): void {
if (this._activeItem) {
@@ -51,12 +53,21 @@ export class SeparatedComponent implements OnChanges {
responseDefinition = undefined;
}
+ this.bodyFileName = responseDefinition?.bodyFileName;
+
// body from file
if (responseDefinition && responseDefinition.bodyFileName) {
this.wiremockService
- .getFileBody(responseDefinition.bodyFileName)
+ .getFile(responseDefinition.bodyFileName)
.pipe(debounceTime(500))
- .subscribe(body => (this.bodyFileData = body));
+ .subscribe({
+ next: body => {
+ this.bodyFileData = body;
+ },
+ error: (err: Error) => {
+ this.bodyFileData = `An error occurred while requesting file content:\n${err.message}`;
+ },
+ });
} else {
this.bodyFileData = undefined;
this.bodyGroupKey = undefined;
@@ -98,4 +109,8 @@ export class SeparatedComponent implements OnChanges {
asServeEvent(item: Item): ServeEvent {
return item;
}
+
+ downloadFile() {
+ this.wiremockService.downloadFile(this.bodyFileName!).subscribe();
+ }
}
diff --git a/webapp/wiremock/src/app/components/state/state.component.ts b/webapp/wiremock/src/app/components/state/state.component.ts
index fb894abcd7..2cdf81cb35 100644
--- a/webapp/wiremock/src/app/components/state/state.component.ts
+++ b/webapp/wiremock/src/app/components/state/state.component.ts
@@ -33,8 +33,9 @@ export class StateComponent implements OnInit, OnDestroy {
private webSocketService: WebSocketService,
private messageService: MessageService,
private tabSelectionService: TabSelectionService,
- private autoRefreshService: AutoRefreshService
- ) {}
+ private autoRefreshService: AutoRefreshService,
+ ) {
+ }
ngOnInit() {
this.webSocketService
@@ -42,7 +43,7 @@ export class StateComponent implements OnInit, OnDestroy {
.pipe(
filter(() => this.autoRefreshService.isAutoRefreshEnabled()),
takeUntil(this.ngUnsubscribe),
- debounceTime(100)
+ debounceTime(100),
)
.subscribe(() => {
this.loadScenarios();
@@ -53,7 +54,7 @@ export class StateComponent implements OnInit, OnDestroy {
.pipe(
filter(() => this.autoRefreshService.isAutoRefreshEnabled()),
takeUntil(this.ngUnsubscribe),
- debounceTime(100)
+ debounceTime(100),
)
.subscribe(() => {
this.loadScenarios();
@@ -94,7 +95,7 @@ export class StateComponent implements OnInit, OnDestroy {
resetAllScenarios() {
this.wiremockService.resetScenarios().subscribe({
next: () => {
- this.messageService.setMessage(new Message("Reset of all scenarios successful", MessageType.INFO, 3000));
+ this.messageService.setMessage(new Message("Reset of all scenarios successful", MessageType.INFO));
},
error: err => {
UtilService.showErrorMessage(this.messageService, err);
diff --git a/webapp/wiremock/src/app/components/tree-view/tree-view.component.html b/webapp/wiremock/src/app/components/tree-view/tree-view.component.html
index 130a753591..7d734a0b43 100644
--- a/webapp/wiremock/src/app/components/tree-view/tree-view.component.html
+++ b/webapp/wiremock/src/app/components/tree-view/tree-view.component.html
@@ -23,45 +23,47 @@
-
+
+
+
{{ message.message }}
-
+
diff --git a/webapp/wiremock/src/app/components/message/message.component.scss b/webapp/wiremock/src/app/components/message/message.component.scss
index 049a07c97d..0a4cf6ec32 100644
--- a/webapp/wiremock/src/app/components/message/message.component.scss
+++ b/webapp/wiremock/src/app/components/message/message.component.scss
@@ -21,3 +21,12 @@
.wmAlertText {
white-space: pre-wrap;
}
+
+img {
+ height: 16px;
+}
+
+.wmMessageHeader {
+ display: flex;
+ align-items: center;
+}
diff --git a/webapp/wiremock/src/app/components/message/message.component.ts b/webapp/wiremock/src/app/components/message/message.component.ts
index e3c07a1231..e0826a139f 100644
--- a/webapp/wiremock/src/app/components/message/message.component.ts
+++ b/webapp/wiremock/src/app/components/message/message.component.ts
@@ -1,38 +1,27 @@
import { Component } from "@angular/core";
-import { Message, MessageService } from "./message.service";
+import { Message, MessageService, MessageType } from "./message.service";
@Component({
- // selector: 'wm-message',
selector: "wm-message",
templateUrl: "./message.component.html",
styleUrls: ["./message.component.scss"],
})
export class MessageComponent {
- // @HostBinding('class') classes = 'wmAlert';
- message?: Message;
+ messages: Message[] = [];
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- timeout?: any;
+ type = MessageType;
constructor(private messageService: MessageService) {
- this.message = undefined;
-
+ this.messages = [];
this.messageService.getSubject().subscribe(next => {
- this.message = next;
-
- if (next && next.duration) {
- if (this.timeout) {
- clearTimeout(this.timeout);
- }
- this.timeout = setTimeout(() => {
- this.closeAlert();
- }, next.duration);
+ if (next) {
+ this.messages.push(next);
}
});
}
- closeAlert() {
- this.message = undefined;
+ remove(message: Message) {
+ this.messages = this.messages.filter(m => m != message);
}
}
diff --git a/webapp/wiremock/src/app/components/message/message.service.ts b/webapp/wiremock/src/app/components/message/message.service.ts
index 93f9cc1fb2..d1cae34b51 100644
--- a/webapp/wiremock/src/app/components/message/message.service.ts
+++ b/webapp/wiremock/src/app/components/message/message.service.ts
@@ -7,7 +7,8 @@ import { BehaviorSubject } from "rxjs/internal/BehaviorSubject";
export class MessageService {
private message = new BehaviorSubject
+ ![WireMock]()
+ WireMock
+
+ | stubMapping | -- + | stubMapping | ++ {{ asServeEvent(activeItem).stubMapping.uuid }} + class="wmStubMappingLink" + >{{ asServeEvent(activeItem).stubMapping.uuid }} + | +
| {{ property.key }} | +
+ |
||
| {{ property.key }} | -
- |
-
| {{ subProperty.key }} | - -
- |
- ||||
| {{ subProperty.key }} | - -
- |
- ||||
| bodyFileContent | - +|||||
| {{ subProperty.key }} | +
+ |
+
+ |
+ |||
| {{ subProperty.key }} |
- |
||||
| bodyFileContent | +
+ |
+
| body | -
- |
-
| body | +
+ |
+
{{ node.value.getTitle() }}
{{ node.value.getSubtitle() }}
-
diff --git a/webapp/wiremock/src/app/dialogs/dialog-recording/dialog-recording.component.ts b/webapp/wiremock/src/app/dialogs/dialog-recording/dialog-recording.component.ts
index 1e9ee1af22..e5042f618e 100644
--- a/webapp/wiremock/src/app/dialogs/dialog-recording/dialog-recording.component.ts
+++ b/webapp/wiremock/src/app/dialogs/dialog-recording/dialog-recording.component.ts
@@ -7,5 +7,6 @@ import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
styleUrls: ["./dialog-recording.component.scss"],
})
export class DialogRecordingComponent {
- constructor(public activeModal: NgbActiveModal) {}
+ constructor(public activeModal: NgbActiveModal) {
+ }
}
diff --git a/webapp/wiremock/src/app/dialogs/file-name/file-name.component.html b/webapp/wiremock/src/app/dialogs/file-name/file-name.component.html
new file mode 100644
index 0000000000..8bcf06d25f
--- /dev/null
+++ b/webapp/wiremock/src/app/dialogs/file-name/file-name.component.html
@@ -0,0 +1,17 @@
+
+
+
diff --git a/webapp/wiremock/src/app/components/tree-view/tree-view.component.scss b/webapp/wiremock/src/app/components/tree-view/tree-view.component.scss
index 758fc62bc4..868d4f2d7d 100644
--- a/webapp/wiremock/src/app/components/tree-view/tree-view.component.scss
+++ b/webapp/wiremock/src/app/components/tree-view/tree-view.component.scss
@@ -89,3 +89,16 @@ $color-mode-type: data;
border-top-right-radius: $btn-border-radius !important;
}
}
+
+.wmIndicatorContainer {
+ padding-left: 4px;
+ padding-right: 4px;
+ align-self: flex-start;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
+
+.wmProxyContainer {
+ align-self: flex-start;
+}
diff --git a/webapp/wiremock/src/app/components/unmatched/unmatched.component.ts b/webapp/wiremock/src/app/components/unmatched/unmatched.component.ts
index c34735828f..0fc5b347d9 100644
--- a/webapp/wiremock/src/app/components/unmatched/unmatched.component.ts
+++ b/webapp/wiremock/src/app/components/unmatched/unmatched.component.ts
@@ -29,8 +29,9 @@ export class UnmatchedComponent implements OnInit, OnDestroy {
private webSocketService: WebSocketService,
private messageService: MessageService,
private autoRefreshService: AutoRefreshService,
- private modalService: NgbModal
- ) {}
+ private modalService: NgbModal,
+ ) {
+ }
ngOnInit() {
this.webSocketService
@@ -38,7 +39,7 @@ export class UnmatchedComponent implements OnInit, OnDestroy {
.pipe(
filter(() => this.autoRefreshService.isAutoRefreshEnabled()),
takeUntil(this.ngUnsubscribe),
- debounceTime(100)
+ debounceTime(100),
)
.subscribe(() => {
this.loadMappings();
@@ -54,7 +55,7 @@ export class UnmatchedComponent implements OnInit, OnDestroy {
},
err => {
UtilService.showErrorMessage(this.messageService, err);
- }
+ },
);
}
@@ -77,9 +78,9 @@ export class UnmatchedComponent implements OnInit, OnDestroy {
copyCurl(request: LoggedRequest) {
if (UtilService.copyToClipboard(CurlExtractor.copyCurl(request))) {
- this.messageService.setMessage(new Message("Curl copied to clipboard", MessageType.INFO, 3000));
+ this.messageService.setMessage(new Message("Curl copied to clipboard", MessageType.INFO));
} else {
- this.messageService.setMessage(new Message("Was not able to copy. Details in log", MessageType.ERROR, 10000));
+ this.messageService.setMessage(new Message("Was not able to copy. Details in log", MessageType.ERROR));
}
}
@@ -94,19 +95,19 @@ export class UnmatchedComponent implements OnInit, OnDestroy {
private copyMappingTemplateToClipboard(message?: string) {
if (message && UtilService.copyToClipboard(message)) {
- this.messageService.setMessage(new Message("Mapping template copied to clipboard", MessageType.INFO, 3000));
+ this.messageService.setMessage(new Message("Mapping template copied to clipboard", MessageType.INFO));
} else {
- this.messageService.setMessage(new Message("Was not able to copy. Details in log", MessageType.ERROR, 10000));
+ this.messageService.setMessage(new Message("Was not able to copy. Details in log", MessageType.ERROR));
}
}
private createMapping(request: LoggedRequest): string {
return UtilService.prettify(
- '{"request": {"method": "' +
- request.method +
- '","url": "' +
- request.url +
- '"},"response": {"status": 200,"body": "","headers": {"Content-Type": "text/plain"}}}'
+ "{\"request\": {\"method\": \"" +
+ request.method +
+ "\",\"url\": \"" +
+ request.url +
+ "\"},\"response\": {\"status\": 200,\"body\": \"\",\"headers\": {\"Content-Type\": \"text/plain\"}}}",
);
}
@@ -153,19 +154,19 @@ export class UnmatchedComponent implements OnInit, OnDestroy {
} else {
first = false;
}
- printedNamespaces += '"' + key + '": "' + nameSpaces[key] + '"';
+ printedNamespaces += "\"" + key + "\": \"" + nameSpaces[key] + "\"";
}
let message =
- '{"request": {"method": "' +
+ "{\"request\": {\"method\": \"" +
method +
- '","url": "' +
+ "\",\"url\": \"" +
url +
- '","bodyPatterns": [{"matchesXPath": "' +
+ "\",\"bodyPatterns\": [{\"matchesXPath\": \"" +
xPath +
- '","xPathNamespaces": {' +
+ "\",\"xPathNamespaces\": {" +
printedNamespaces +
- '}}]},"response": {"status": 200,"body": "","headers": {"Content-Type": "text/xml"}}}';
+ "}}]},\"response\": {\"status\": 200,\"body\": \"\",\"headers\": {\"Content-Type\": \"text/xml\"}}}";
message = UtilService.prettify(message);
return message;
@@ -178,7 +179,7 @@ export class UnmatchedComponent implements OnInit, OnDestroy {
},
err => {
UtilService.showErrorMessage(this.messageService, err);
- }
+ },
);
}
diff --git a/webapp/wiremock/src/app/dialogs/dialog-recording/dialog-recording.component.html b/webapp/wiremock/src/app/dialogs/dialog-recording/dialog-recording.component.html
index 8c069bdce9..f1338da772 100644
--- a/webapp/wiremock/src/app/dialogs/dialog-recording/dialog-recording.component.html
+++ b/webapp/wiremock/src/app/dialogs/dialog-recording/dialog-recording.component.html
@@ -12,5 +12,5 @@
+
+ Wiremock recorder
+
+Wiremock File
+ +
+
+ You can define folders by using /. E.g.: some/folder/structured/file.txt
+
+
diff --git a/webapp/wiremock/src/app/dialogs/file-name/file-name.component.scss b/webapp/wiremock/src/app/dialogs/file-name/file-name.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/webapp/wiremock/src/app/dialogs/file-name/file-name.component.spec.ts b/webapp/wiremock/src/app/dialogs/file-name/file-name.component.spec.ts
new file mode 100644
index 0000000000..358a792f33
--- /dev/null
+++ b/webapp/wiremock/src/app/dialogs/file-name/file-name.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FileNameComponent } from './file-name.component';
+
+describe('FileNameComponent', () => {
+ let component: FileNameComponent;
+ let fixture: ComponentFixture