[chore-245] fix type getInstance function in modal service

This commit is contained in:
MathieuG-P
2023-07-16 17:30:45 +02:00
parent 59896400e0
commit 7d688d3632
14 changed files with 25 additions and 24 deletions
@@ -5,9 +5,11 @@ import { useTranslation } from "renderer/hooks/use-translation.hook";
import { ModalComponent, ModalExitCode, ModalService } from "renderer/services/modale.service";
import BeatImpatient from "../../../../../assets/images/apngs/beat-impatient.png";
import { WhyCredentialsModal } from "./why-credentials-modal.component";
import { useService } from "renderer/hooks/use-service.hook";
export const LoginModal: ModalComponent<{ username: string; password: string; stay: boolean }> = ({ resolver }) => {
const modal = ModalService.getInsance();
const modal = useService(ModalService);
const [username, setUsername] = useState("");
const [password, setPassword] = useState("");
@@ -6,7 +6,7 @@ import { useEffect } from "react";
import { BsmIcon } from "../svgs/bsm-icon.component";
export function Modal() {
const modalSevice = ModalService.getInsance();
const modalSevice = ModalService.getInstance();
const ModalComponent = useObservable(modalSevice.getModalToShow());
@@ -26,7 +26,7 @@ export function ModsSlide({ version, onDisclamerDecline }: { version: BSVersion;
const modsManager = useService(BsModsManagerService);
const configService = useService(ConfigurationService);
const linkOpener = useService(LinkOpenerService);
const modals = ModalService.getInsance();
const modals = useService(ModalService);
const os = useService(OsDiagnosticService);
const ref = useRef(null);
@@ -1,8 +1,7 @@
import { AvailableVersionsSlider } from "../components/available-versions/available-versions-slider.component";
import { BsDownloaderService } from "../services/bs-downloader.service";
import { Slideshow } from "renderer/components/slideshow/slideshow.component";
import { useEffect, useState } from "react";
import { BSVersion } from "shared/bs-version.interface";
import { useState } from "react";
import { BsmButton } from "renderer/components/shared/bsm-button.component";
import { AnimatePresence, motion } from "framer-motion";
import { useTranslation } from "renderer/hooks/use-translation.hook";
@@ -21,7 +20,7 @@ export function AvailableVersionsList() {
const bsDownloaderService = useService(BsDownloaderService);
const versionManagerService = useService(BSVersionManagerService);
const progressBar = useService(ProgressBarService);
const modal = ModalService.getInsance();
const modal = useService(ModalService);
const ipc = useService(IpcService);
const installer = useService(BsDownloaderService);
const notification = useService(NotificationService);
@@ -37,15 +37,15 @@ import { BsmException } from "shared/models/bsm-exception.model";
export function SettingsPage() {
const configService: ConfigurationService = useService(ConfigurationService);
const themeService: ThemeService = useService(ThemeService);
const ipcService: IpcService = useService(IpcService);
const modalService: ModalService = ModalService.getInsance();
const downloaderService: BsDownloaderService = useService(BsDownloaderService);
const progressBarService: ProgressBarService = useService(ProgressBarService);
const notificationService: NotificationService = useService(NotificationService);
const i18nService: I18nService = useService(I18nService);
const linkOpener: LinkOpenerService = useService(LinkOpenerService);
const configService = useService(ConfigurationService);
const themeService = useService(ThemeService);
const ipcService = useService(IpcService);
const modalService = useService(ModalService);
const downloaderService = useService(BsDownloaderService);
const progressBarService = useService(ProgressBarService);
const notificationService = useService(NotificationService);
const i18nService = useService(I18nService);
const linkOpener = useService(LinkOpenerService);
const mapsManager = useService(MapsManagerService);
const playlistsManager = useService(PlaylistsManagerService);
const modelsManager = useService(ModelsManagerService);
@@ -26,7 +26,7 @@ export function VersionViewer() {
const bsUninstallerService = useService(BSUninstallerService);
const bsVersionManagerService = useService(BSVersionManagerService);
const modalService = ModalService.getInsance();
const modalService = useService(ModalService);
const bsDownloaderService = useService(BsDownloaderService);
const ipcService = useService(IpcService);
const bsLauncher = useService(BSLauncherService);
@@ -39,7 +39,7 @@ export class BsDownloaderService {
private constructor() {
this.ipcService = IpcService.getInstance();
this.modalService = ModalService.getInsance();
this.modalService = ModalService.getInstance();
this.bsVersionManager = BSVersionManagerService.getInstance();
this.authService = AuthUserService.getInstance();
this.progressBarService = ProgressBarService.getInstance();
@@ -36,7 +36,7 @@ export class BsModsManagerService {
private constructor() {
this.ipcService = IpcService.getInstance();
this.progressBar = ProgressBarService.getInstance();
this.modals = ModalService.getInsance();
this.modals = ModalService.getInstance();
this.notifications = NotificationService.getInstance();
this.os = OsDiagnosticService.getInstance();
}
@@ -19,7 +19,7 @@ export class BSVersionManagerService {
private constructor() {
this.ipcService = IpcService.getInstance();
this.modalService = ModalService.getInsance();
this.modalService = ModalService.getInstance();
this.notificationService = NotificationService.getInstance();
this.progressBarService = ProgressBarService.getInstance();
this.askAvailableVersions().then(() => this.askInstalledVersions());
@@ -34,7 +34,7 @@ export class MapsDownloaderService {
public readonly progressBarStyle: CSSProperties = { zIndex: 100000, position: "fixed", bottom: "10px", right: 0 };
private constructor() {
this.modals = ModalService.getInsance();
this.modals = ModalService.getInstance();
this.progressBar = ProgressBarService.getInstance();
this.ipc = IpcService.getInstance();
this.os = OsDiagnosticService.getInstance();
@@ -40,7 +40,7 @@ export class MapsManagerService {
private constructor() {
this.ipcService = IpcService.getInstance();
this.modal = ModalService.getInsance();
this.modal = ModalService.getInstance();
this.progressBar = ProgressBarService.getInstance();
this.notifications = NotificationService.getInstance();
this.config = ConfigurationService.getInstance();
+1 -1
View File
@@ -10,7 +10,7 @@ export class ModalService {
private constructor() {}
public static getInsance() {
public static getInstance() {
if (!this.instance) {
this.instance = new ModalService();
}
@@ -34,7 +34,7 @@ export class ModelsDownloaderService {
private constructor() {
this.ipc = IpcService.getInstance();
this.modal = ModalService.getInsance();
this.modal = ModalService.getInstance();
this.progress = ProgressBarService.getInstance();
this._currentDownload$.pipe(filter(v => !!v)).subscribe(model => this.downloadModel(model));
@@ -38,7 +38,7 @@ export class ModelsManagerService {
private constructor() {
this.ipc = IpcService.getInstance();
this.versionFolderLinked = VersionFolderLinkerService.getInstance();
this.modalService = ModalService.getInsance();
this.modalService = ModalService.getInstance();
this.progressBar = ProgressBarService.getInstance();
this.notifications = NotificationService.getInstance();
this.config = ConfigurationService.getInstance();