From f3024d2ea528c3a60e0ceb80e5e474c8caf01e56 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Tue, 21 Feb 2023 17:24:18 +0100 Subject: [PATCH] Fixed changes of rebase #133 --- .../mutations/auto_role_mutation.py | 6 +- kdb-web/package.json | 2 +- .../auto-roles-rules.component.ts | 5 +- .../auto-roles/auto-roles.component.ts | 2 + .../components/levels/levels.component.ts | 77 ++++++++++--------- .../view/server/members/members.component.ts | 1 - kdb-web/src/assets/config.json | 2 +- 7 files changed, 49 insertions(+), 46 deletions(-) diff --git a/kdb-bot/src/bot_graphql/mutations/auto_role_mutation.py b/kdb-bot/src/bot_graphql/mutations/auto_role_mutation.py index 28bd9b2d..d936fc6e 100644 --- a/kdb-bot/src/bot_graphql/mutations/auto_role_mutation.py +++ b/kdb-bot/src/bot_graphql/mutations/auto_role_mutation.py @@ -33,9 +33,9 @@ class AutoRoleMutation(QueryABC): def get_new(x: AutoRole): return ( - x.server.id == input["serverId"] - and x.discord_channel_id == input["channelId"] - and x.discord_message_id == input["messageId"] + x.server.id == int(input["serverId"]) + and x.discord_channel_id == int(input["channelId"]) + and x.discord_message_id == int(input["messageId"]) ) return self._auto_roles.get_auto_roles_by_server_id(auto_role.server.id).where(get_new).last() diff --git a/kdb-web/package.json b/kdb-web/package.json index 13ddc1d0..7d88a478 100644 --- a/kdb-web/package.json +++ b/kdb-web/package.json @@ -1,6 +1,6 @@ { "name": "kdb-web", - "version": "1.0.0", + "version": "1.0.dev133", "scripts": { "ng": "ng", "update-version": "ts-node-esm update-version.ts", diff --git a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.ts b/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.ts index 2b6a0251..2c351051 100644 --- a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.ts +++ b/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.ts @@ -121,7 +121,7 @@ export class AutoRolesRulesComponent implements OnInit { public loadNextPage(): void { this.loading = true; this.data.query(Queries.autoRoleRulesQuery, { - id: this.sidebar.server$.value?.id, filter: this.filter, page: this.page, sort: this.sort + serverId: this.sidebar.server$.value?.id, autoRoleId: this.autoRoleId, filter: this.filter, page: this.page, sort: this.sort }, (x: { servers: Server[] }) => { if (!x.servers[0].autoRoles || x.servers[0].autoRoles?.length == 0) { @@ -212,13 +212,14 @@ export class AutoRolesRulesComponent implements OnInit { roleId: newAutoRoleRule.roleId } ).pipe(catchError(err => { + this.isEditingNew = false; this.spinner.hideSpinner(); this.toastService.error(this.translate.instant("view.server.auto_roles.rules.message.auto_role_rule_create_failed"), this.translate.instant("view.server.auto_roles.rules.message.auto_role_rule_create_failed_d")); return throwError(err); })).subscribe(result => { + this.isEditingNew = false; this.spinner.hideSpinner(); this.toastService.success(this.translate.instant("view.server.auto_roles.rules.message.auto_role_rule_created"), this.translate.instant("view.server.auto_roles.rules.message.auto_role_rule_create_d", { id: result.autoRoleRule.createAutoRoleRule?.id })); - this.isEditingNew = false; this.loadNextPage(); }); return; diff --git a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.ts b/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.ts index 03d6b2f8..838a8c59 100644 --- a/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.ts +++ b/kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.ts @@ -195,10 +195,12 @@ export class AutoRolesComponent implements OnInit { messageId: newAutoRole.messageId } ).pipe(catchError(err => { + this.isEditingNew = false; this.spinner.hideSpinner(); this.toastService.error(this.translate.instant("view.server.auto_roles.message.auto_role_create_failed"), this.translate.instant("view.server.auto_roles.message.auto_role_create_failed_d")); return throwError(err); })).subscribe(result => { + this.isEditingNew = false; this.spinner.hideSpinner(); this.toastService.success(this.translate.instant("view.server.auto_roles.message.auto_role_created"), this.translate.instant("view.server.auto_roles.message.auto_role_create_d", { id: result.autoRole.createAutoRole?.id })); this.loadNextPage(); diff --git a/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.ts b/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.ts index 65052d71..9ab6b264 100644 --- a/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.ts +++ b/kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.ts @@ -1,30 +1,30 @@ -import {Component} from '@angular/core'; -import {AuthService} from "../../../../../../services/auth/auth.service"; -import {SpinnerService} from "../../../../../../services/spinner/spinner.service"; -import {ToastService} from "../../../../../../services/toast/toast.service"; -import {ConfirmationDialogService} from "../../../../../../services/confirmation-dialog/confirmation-dialog.service"; -import {FormBuilder, FormControl, FormGroup} from "@angular/forms"; -import {TranslateService} from "@ngx-translate/core"; -import {DataService} from "../../../../../../services/data/data.service"; -import {SidebarService} from "../../../../../../services/sidebar/sidebar.service"; -import {ActivatedRoute} from "@angular/router"; -import {Page} from "../../../../../../models/graphql/filter/page.model"; -import {Sort, SortDirection} from "../../../../../../models/graphql/filter/sort.model"; -import {Level, LevelFilter} from "../../../../../../models/data/level.model"; -import {LevelListQuery} from "../../../../../../models/graphql/query.model"; -import {Queries} from "../../../../../../models/graphql/queries.model"; -import {catchError, debounceTime} from "rxjs/operators"; -import {LazyLoadEvent} from "primeng/api"; -import {Table} from "primeng/table"; -import {User} from "../../../../../../models/data/user.model"; -import {LevelMutationResult, UpdateUserMutationResult} from "../../../../../../models/graphql/result.model"; -import {Mutations} from "../../../../../../models/graphql/mutations.model"; -import {throwError} from "rxjs"; +import { Component } from "@angular/core"; +import { AuthService } from "../../../../../../services/auth/auth.service"; +import { SpinnerService } from "../../../../../../services/spinner/spinner.service"; +import { ToastService } from "../../../../../../services/toast/toast.service"; +import { ConfirmationDialogService } from "../../../../../../services/confirmation-dialog/confirmation-dialog.service"; +import { FormBuilder, FormControl, FormGroup } from "@angular/forms"; +import { TranslateService } from "@ngx-translate/core"; +import { DataService } from "../../../../../../services/data/data.service"; +import { SidebarService } from "../../../../../../services/sidebar/sidebar.service"; +import { ActivatedRoute } from "@angular/router"; +import { Page } from "../../../../../../models/graphql/filter/page.model"; +import { Sort, SortDirection } from "../../../../../../models/graphql/filter/sort.model"; +import { Level, LevelFilter } from "../../../../../../models/data/level.model"; +import { LevelListQuery } from "../../../../../../models/graphql/query.model"; +import { Queries } from "../../../../../../models/graphql/queries.model"; +import { catchError, debounceTime } from "rxjs/operators"; +import { LazyLoadEvent } from "primeng/api"; +import { Table } from "primeng/table"; +import { User } from "../../../../../../models/data/user.model"; +import { LevelMutationResult, UpdateUserMutationResult } from "../../../../../../models/graphql/result.model"; +import { Mutations } from "../../../../../../models/graphql/mutations.model"; +import { throwError } from "rxjs"; @Component({ - selector: 'app-levels', - templateUrl: './levels.component.html', - styleUrls: ['./levels.component.scss'] + selector: "app-levels", + templateUrl: "./levels.component.html", + styleUrls: ["./levels.component.scss"] }) export class LevelsComponent { @@ -68,10 +68,10 @@ export class LevelsComponent { } public ngOnInit(): void { - this.data.getServerFromRoute(this.route); - - this.setFilterForm(); - this.loadNextPage(); + this.data.getServerFromRoute(this.route).then(server => { + this.setFilterForm(); + this.loadNextPage(); + }); } public loadNextPage(): void { @@ -93,7 +93,7 @@ export class LevelsComponent { name: new FormControl(null), color: new FormControl(null), min_xp: new FormControl(null), - permissions: new FormControl(null), + permissions: new FormControl(null) }); this.filterForm.valueChanges.pipe( @@ -142,7 +142,7 @@ export class LevelsComponent { } public onRowEditInit(table: Table, user: User, index: number): void { - this.clonedLevels[index] = {...user}; + this.clonedLevels[index] = { ...user }; } public onRowEditSave(table: Table, newLevel: Level, index: number): void { @@ -174,13 +174,14 @@ export class LevelsComponent { serverId: this.sidebar.server$.value?.id } ).pipe(catchError(err => { + this.isEditingNew = false; this.spinner.hideSpinner(); this.toastService.error(this.translate.instant("view.server.levels.message.level_create_failed"), this.translate.instant("view.server.levels.message.level_create_failed_d")); return throwError(err); })).subscribe(result => { this.isEditingNew = false; this.spinner.hideSpinner(); - this.toastService.success(this.translate.instant("view.server.levels.message.level_create"), this.translate.instant("view.server.levels.message.level_create_d", {name: result.level.createLevel?.name})); + this.toastService.success(this.translate.instant("view.server.levels.message.level_create"), this.translate.instant("view.server.levels.message.level_create_d", { name: result.level.createLevel?.name })); this.loadNextPage(); }); return; @@ -192,15 +193,15 @@ export class LevelsComponent { name: newLevel.name, color: newLevel.color, minXp: newLevel.minXp, - permissions: newLevel.permissions, + permissions: newLevel.permissions } ).pipe(catchError(err => { this.spinner.hideSpinner(); - this.toastService.error(this.translate.instant("view.server.levels.message.level_update_failed"), this.translate.instant("view.server.levels.message.level_update_failed_d", {name: newLevel.name})); + this.toastService.error(this.translate.instant("view.server.levels.message.level_update_failed"), this.translate.instant("view.server.levels.message.level_update_failed_d", { name: newLevel.name })); return throwError(err); })).subscribe(_ => { this.spinner.hideSpinner(); - this.toastService.success(this.translate.instant("view.server.levels.message.level_update"), this.translate.instant("view.server.levels.message.level_update_d", {name: newLevel.name})); + this.toastService.success(this.translate.instant("view.server.levels.message.level_update"), this.translate.instant("view.server.levels.message.level_update_d", { name: newLevel.name })); this.loadNextPage(); }); @@ -220,7 +221,7 @@ export class LevelsComponent { public deleteLevel(level: Level): void { this.confirmDialog.confirmDialog( - this.translate.instant("view.server.levels.message.level_delete"), this.translate.instant("view.server.levels.message.level_delete_q", {name: level.name}), + this.translate.instant("view.server.levels.message.level_delete"), this.translate.instant("view.server.levels.message.level_delete_q", { name: level.name }), () => { this.spinner.showSpinner(); this.data.mutation(Mutations.deleteLevel, { @@ -228,11 +229,11 @@ export class LevelsComponent { } ).pipe(catchError(err => { this.spinner.hideSpinner(); - this.toastService.error(this.translate.instant("view.server.levels.message.level_delete_failed"), this.translate.instant("view.server.levels.message.level_delete_failedd", {name: level.name})); + this.toastService.error(this.translate.instant("view.server.levels.message.level_delete_failed"), this.translate.instant("view.server.levels.message.level_delete_failedd", { name: level.name })); return throwError(err); })).subscribe(l => { this.spinner.hideSpinner(); - this.toastService.success(this.translate.instant("view.server.levels.message.level_deleted"), this.translate.instant("view.server.levels.message.level_deleted_d", {name: level.name})); + this.toastService.success(this.translate.instant("view.server.levels.message.level_deleted"), this.translate.instant("view.server.levels.message.level_deleted_d", { name: level.name })); this.loadNextPage(); }); }); diff --git a/kdb-web/src/app/modules/view/server/members/members.component.ts b/kdb-web/src/app/modules/view/server/members/members.component.ts index 3728cc50..a684cb33 100644 --- a/kdb-web/src/app/modules/view/server/members/members.component.ts +++ b/kdb-web/src/app/modules/view/server/members/members.component.ts @@ -88,7 +88,6 @@ export class MembersComponent implements OnInit { private fb: FormBuilder, private translate: TranslateService, private data: DataService, - private sidebar: SidebarService, private route: ActivatedRoute ) { } diff --git a/kdb-web/src/assets/config.json b/kdb-web/src/assets/config.json index c055d5cb..89caec01 100644 --- a/kdb-web/src/assets/config.json +++ b/kdb-web/src/assets/config.json @@ -3,7 +3,7 @@ "WebVersion": { "Major": "1", "Minor": "0", - "Micro": "0" + "Micro": "dev133" }, "Themes": [ {