Skip to content

Commit d010dd8

Browse files
committed
Fix mission list returning in wrong fields
1 parent d10df4a commit d010dd8

4 files changed

Lines changed: 17 additions & 2 deletions

File tree

src/main/java/pl/bartlomiejstepien/armaserverwebgui/web/MissionRestController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public record GetMissionsResponse(List<MissionApiModel> disabledMissions, List<M
8686
{
8787
private static GetMissionsResponse of(List<MissionApiModel> enabled, List<MissionApiModel> disabled)
8888
{
89-
return new GetMissionsResponse(enabled, disabled);
89+
return new GetMissionsResponse(disabled, enabled);
9090
}
9191
}
9292

src/web-ui/src/app/tabs/missions/mission-list/mission-list.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h2 class="mission-list-header">
22
{{ listHeader }} <span class="brightness-50">({{ missions().length }})</span>
33
</h2>
4-
<div class="mod-list-buttons">
4+
<div class="mission-list-buttons">
55
<button mat-button (click)="moveAllMissions()">
66
{{moveAllMissionsButtonName}}<mat-icon>{{moveAllMissionsButtonIcon}}</mat-icon>
77
</button>

src/web-ui/src/app/tabs/missions/mission-list/mission-list.component.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
.mission-list-buttons {
2+
display: flex;
3+
justify-content: space-between;
4+
align-items: center;
5+
margin-bottom: 1rem;
6+
}
7+
8+
.mission-list-buttons .mat-icon {
9+
color: white !important;
10+
}
11+
112
.list-wrapper {
213
width: 100%;
314
max-width: 100%;

src/web-ui/vitest.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ const { defineConfig, configDefaults} = require("vitest/config");
33
module.exports = defineConfig({
44
...configDefaults,
55
test: {
6+
exclude: [
7+
...configDefaults.exclude,
8+
"./testing/**"
9+
],
610
environment: 'jsdom',
711
coverage: {
812
provider: 'v8',

0 commit comments

Comments
 (0)