diff --git a/kdb-web/src/app/modules/admin/settings/components/settings/settings.component.ts b/kdb-web/src/app/modules/admin/settings/components/settings/settings.component.ts
index d543c7ad..38258504 100644
--- a/kdb-web/src/app/modules/admin/settings/components/settings/settings.component.ts
+++ b/kdb-web/src/app/modules/admin/settings/components/settings/settings.component.ts
@@ -11,12 +11,13 @@ import { SpinnerService } from "src/app/services/spinner/spinner.service";
import { ToastService } from "src/app/services/toast/toast.service";
import { forkJoin, throwError } from "rxjs";
import { TechnicianConfig } from "../../../../../models/config/technician-config.model";
-import { TechnicianConfigQuery } from "../../../../../models/graphql/query.model";
+import { SingleDiscordQuery, TechnicianConfigQuery } from "../../../../../models/graphql/query.model";
import { Queries } from "../../../../../models/graphql/queries.model";
import { DataService } from "../../../../../services/data/data.service";
import { TechnicianConfigMutationResult } from "../../../../../models/graphql/result.model";
import { Mutations } from "../../../../../models/graphql/mutations.model";
import { AuthService } from "../../../../../services/auth/auth.service";
+import { ChannelType, DiscordUser } from "../../../../../models/data/discord.model";
@Component({
@@ -54,6 +55,8 @@ export class SettingsComponent implements OnInit {
technicianIds: []
};
+ possibleTechnicians?: DiscordUser[];
+
constructor(
private dataService: DataService,
private settingsService: SettingsService,
@@ -76,7 +79,8 @@ export class SettingsComponent implements OnInit {
this.spinnerService.hideSpinner();
return throwError(() => error);
})),
- this.dataService.query
(Queries.technicianConfigQuery)
+ this.dataService.query(Queries.technicianConfigQuery),
+ this.dataService.query(Queries.discordUsersQuery)
]).subscribe(data => {
this.data = data[0];
this.data.webVersion = this.settingsService.getWebVersion()?.getVersionString() ?? "0.0.0";
@@ -86,6 +90,7 @@ export class SettingsComponent implements OnInit {
}
this.config = data[1].technicianConfig;
+ this.possibleTechnicians = data[2].discord.users ?? undefined;
this.initForms();
this.spinnerService.hideSpinner();
});
diff --git a/kdb-web/src/app/modules/shared/components/config-list/config-list.component.html b/kdb-web/src/app/modules/shared/components/config-list/config-list.component.html
index ee893a09..8b695e47 100644
--- a/kdb-web/src/app/modules/shared/components/config-list/config-list.component.html
+++ b/kdb-web/src/app/modules/shared/components/config-list/config-list.component.html
@@ -19,10 +19,13 @@
-
+
+
+
- {{value.value}}
+
+
|
diff --git a/kdb-web/src/app/modules/shared/components/config-list/config-list.component.ts b/kdb-web/src/app/modules/shared/components/config-list/config-list.component.ts
index 7fc92215..047b345e 100644
--- a/kdb-web/src/app/modules/shared/components/config-list/config-list.component.ts
+++ b/kdb-web/src/app/modules/shared/components/config-list/config-list.component.ts
@@ -10,6 +10,9 @@ export class ConfigListComponent {
internal_data: any[] = [];
@Input() translationKey: string = "";
+ @Input() options?: Array;
+ @Input() optionLabel?: string = "";
+ @Input() optionValue?: string = "";
@Input()
set data(val: any[]) {
diff --git a/kdb-web/src/app/modules/shared/guards/auth/auth.guard.ts b/kdb-web/src/app/modules/shared/guards/auth/auth.guard.ts
index c3608a54..28769084 100644
--- a/kdb-web/src/app/modules/shared/guards/auth/auth.guard.ts
+++ b/kdb-web/src/app/modules/shared/guards/auth/auth.guard.ts
@@ -1,10 +1,11 @@
import { Injectable } from "@angular/core";
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router";
+import { ActivatedRoute, ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router";
import { catchError } from "rxjs/operators";
import { AuthService } from "src/app/services/auth/auth.service";
import { ThemeService } from "src/app/services/theme/theme.service";
import { SidebarService } from "../../../../services/sidebar/sidebar.service";
import { MemberRoles } from "../../../../models/auth/auth-user.dto";
+import { DataService } from "../../../../services/data/data.service";
@Injectable({
providedIn: "root"
@@ -14,7 +15,9 @@ export class AuthGuard implements CanActivate {
private router: Router,
private authService: AuthService,
private themeService: ThemeService,
- private sidebarService: SidebarService
+ private sidebarService: SidebarService,
+ private data: DataService,
+ private route: ActivatedRoute
) {
}
@@ -47,8 +50,13 @@ export class AuthGuard implements CanActivate {
if (memberRole !== undefined) {
let userHasAccess = false;
let authUser = await this.authService.getLoggedInUser();
+ let server = route.params["serverId"];
+
+ if (!authUser || !authUser.users) {
+ return true;
+ }
authUser?.users?.forEach(u => {
- if (u.server === +(this.sidebarService.server$.value?.id ?? 0)) {
+ if (u.server === +(server ?? 0)) {
if (
memberRole === MemberRoles.Moderator && u.isModerator ||
memberRole === MemberRoles.Admin && u.isAdmin ||
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 67025784..42e3ea00 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
@@ -105,9 +105,11 @@ export class AutoRolesRulesComponent extends ComponentWithTable implements OnIni
filter: {
id: server.discordId
}
- }
+ },
).subscribe(data => {
- this.guild = data.guilds[0];
+ if (data.discord.guilds) {
+ this.guild = data.discord.guilds[0];
+ }
this.emojis = this.guild.emojis
.map(x => {
return { label: x.name, value: x };
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 34151775..0fec2ef1 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
@@ -77,7 +77,7 @@ export class AutoRolesComponent extends ComponentWithTable implements OnInit, On
private sidebar: SidebarService,
private route: ActivatedRoute
) {
- super('auto-role', ['id', 'channel_id', 'channel_name', 'message_id', 'rule_count'])
+ super("auto-role", ["id", "channel_id", "channel_name", "message_id", "rule_count"]);
}
public ngOnInit(): void {
@@ -87,14 +87,16 @@ export class AutoRolesComponent extends ComponentWithTable implements OnInit, On
this.server = server;
this.spinner.showSpinner();
this.data.query(Queries.guildsQuery, {
+ id: server?.discordId,
filter: {
- id: server?.discordId
+ type: ChannelType.text
}
}
).subscribe(data => {
- this.guild = data.guilds[0];
+ if (data.discord.guilds) {
+ this.guild = data.discord.guilds[0];
+ }
this.channels = this.guild.channels
- .filter(x => x.type === ChannelType.text)
.map(x => {
return { label: x.name, value: x };
});
diff --git a/kdb-web/src/app/modules/view/server/config/components/config/config.component.html b/kdb-web/src/app/modules/view/server/config/components/config/config.component.html
index 405dbe26..89b1372e 100644
--- a/kdb-web/src/app/modules/view/server/config/components/config/config.component.html
+++ b/kdb-web/src/app/modules/view/server/config/components/config/config.component.html
@@ -13,106 +13,113 @@
{{'view.server.config.bot.notification_chat_id' | translate}}:
-
+
{{'view.server.config.bot.afk_command_channel_id' | translate}}:
-
+
{{'view.server.config.bot.help_voice_channel_id' | translate}}:
-
+
{{'view.server.config.bot.team_channel_id' | translate}}:
-
+
{{'view.server.config.bot.login_message_channel_id' | translate}}:
-
+
-
-
-
+
+
+
diff --git a/kdb-web/src/app/modules/view/server/config/components/config/config.component.ts b/kdb-web/src/app/modules/view/server/config/components/config/config.component.ts
index 122cab63..70855220 100644
--- a/kdb-web/src/app/modules/view/server/config/components/config/config.component.ts
+++ b/kdb-web/src/app/modules/view/server/config/components/config/config.component.ts
@@ -6,8 +6,8 @@ import { GuiService } from "src/app/services/gui/gui.service";
import { SettingsService } from "src/app/services/settings/settings.service";
import { SpinnerService } from "src/app/services/spinner/spinner.service";
import { ToastService } from "src/app/services/toast/toast.service";
-import { throwError } from "rxjs";
-import { Query, ServerConfigQuery } from "../../../../../../models/graphql/query.model";
+import { forkJoin, throwError } from "rxjs";
+import { Query, ServerConfigQuery, SingleDiscordQuery } from "../../../../../../models/graphql/query.model";
import { Queries } from "../../../../../../models/graphql/queries.model";
import { DataService } from "../../../../../../services/data/data.service";
import { ServerConfigMutationResult } from "../../../../../../models/graphql/result.model";
@@ -16,7 +16,7 @@ import { AuthService } from "../../../../../../services/auth/auth.service";
import { ServerConfig } from "../../../../../../models/config/server-config.model";
import { Server } from "../../../../../../models/data/server.model";
import { ActivatedRoute } from "@angular/router";
-import { UserDTO } from "../../../../../../models/auth/auth-user.dto";
+import { Channel, ChannelType, Role } from "../../../../../../models/data/discord.model";
type AFKChannelId = {
id: number;
@@ -43,6 +43,9 @@ export class ConfigComponent implements OnInit {
private server: Server = {};
isTechnician: boolean = false;
+ roles?: Role[];
+ voiceChannels: Channel[] = [];
+ textChannels: Channel[] = [];
constructor(
private data: DataService,
@@ -71,20 +74,29 @@ export class ConfigComponent implements OnInit {
}
loadConfig() {
- this.data.query(Queries.serverConfigQuery, {
- serverId: this.server.id
- },
- (data: Query) => {
- return data.servers[0];
- }).subscribe(data => {
- this.config = data.config;
-
+ forkJoin([
+ this.data.query(Queries.serverConfigQuery, {
+ serverId: this.server.id
+ },
+ (data: Query) => {
+ return data.servers[0];
+ }),
+ this.data.query(Queries.serverConfigDiscordQuery)
+ ]).subscribe(data => {
+ this.config = data[0].config;
let id = 0;
for (const afkChannelId of this.config.afkChannelIds ?? []) {
this.afkChannelIds.push({ id: id, value: afkChannelId });
id++;
}
+ if (data[1].discord.guilds) {
+ const guild = data[1].discord.guilds.filter(g => g.id === this.server.discordId)[0];
+ this.roles = guild.roles ?? undefined;
+ this.voiceChannels = guild.channels.filter(x => x.type == ChannelType.voice) ?? undefined;
+ this.textChannels = guild.channels.filter(x => x.type == ChannelType.text) ?? undefined;
+ }
+
this.spinnerService.hideSpinner();
});
}
diff --git a/kdb-web/src/assets/version.json b/kdb-web/src/assets/version.json
index 2e25f08e..2cedf04e 100644
--- a/kdb-web/src/assets/version.json
+++ b/kdb-web/src/assets/version.json
@@ -2,6 +2,6 @@
"WebVersion": {
"Major": "1",
"Minor": "1",
- "Micro": "0.rc3"
+ "Micro": "0.rc4"
}
}
\ No newline at end of file
diff --git a/kdb-web/src/styles.scss b/kdb-web/src/styles.scss
index 3f86883e..2a75ada2 100644
--- a/kdb-web/src/styles.scss
+++ b/kdb-web/src/styles.scss
@@ -175,6 +175,10 @@ header {
align-items: center;
font-size: 18px;
+
+ input {
+ width: 100% !important;
+ }
}
.content-data-value-row {
@@ -458,6 +462,10 @@ header {
align-items: center;
font-size: 18px;
+
+ input {
+ width: 100% !important;
+ }
}
.content-divider {
@@ -620,3 +628,8 @@ footer {
.hidden-column {
display: none;
}
+
+p-inputNumber {
+ padding: 0 !important;
+ border: none !important;
+}
diff --git a/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss b/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss
index 117949d4..ff205f0f 100644
--- a/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss
+++ b/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss
@@ -348,9 +348,11 @@
}
p-dropdown {
+
.p-dropdown {
- background-color: $primaryBackgroundColor !important;
- border-color: $primaryTextColor !important;
+ border: $default-border;
+ border-radius: 10px;
+ background-color: $secondaryBackgroundColor !important;
color: $primaryTextColor !important;
span {
@@ -681,4 +683,7 @@
box-shadow: none !important;
}
+ p-inputNumber {
+ background-color: $primaryBackgroundColor !important;
+ }
}