Fixes after review

frontend-park-mail-ru · Dec 15, 2024 · 699e4d5 · 699e4d5
1 parent beb954a
commit 699e4d5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 32 deletions.
diff --git a/public/components/UsersList/UsersList.ts b/public/components/UsersList/UsersList.ts
@@ -7,10 +7,10 @@ export class UsersList {
 
   constructor(parent: HTMLElement, users: UserNew[]) {
     this.#parent = parent;
-    this.#users = this.getUniqueUsers(users);
+    this.#users = this.#getUniqueUsers(users);
   }
 
-  getUniqueUsers(users: UserNew[]) {
+  #getUniqueUsers(users: UserNew[]) {
     const seenUsernames = new Set<string>();
     const uniqueUsers: UserNew[] = [];
 

diff --git a/public/store/AuthPageStore.ts b/public/store/AuthPageStore.ts
@@ -6,7 +6,6 @@ import { router } from 'modules/Router';
 import { userStore } from 'store/UserStore';
 import { throwBackendError, removeBackendError } from 'modules/BackendErrors';
 import { roomPageStore } from './RoomPageStore';
-import { User } from 'types/user';
 
 class AuthPageStore {
   constructor() {
@@ -21,11 +20,13 @@ class AuthPageStore {
     );
 
     const userAuthListener = userStore.isUserAuthEmmiter$.addListener(() => {
-      if (router.getCurrentPath() === '/auth') {
-        if (roomPageStore.getGlobalRoomId() && userStore.getUser().username) {
-          roomPageStore.setIsModalConfirm(false);
-          router.go('/room', roomPageStore.getGlobalRoomId());
-        }
+      if (
+        router.getCurrentPath() === '/auth' &&
+        roomPageStore.getGlobalRoomId() &&
+        userStore.getUser().username
+      ) {
+        roomPageStore.setIsModalConfirm(false);
+        router.go('/room', roomPageStore.getGlobalRoomId());
       }
     });
 

diff --git a/public/store/FavoritesPageStore.ts b/public/store/FavoritesPageStore.ts
@@ -15,15 +15,6 @@ class FavoritesPageStore {
   #movies: Movie[] | null = null;
 
   constructor() {
-    // const unsubscribe = userStore.isUserAuthEmmiter$.addListener(
-    //   async (status) => {
-    //     if (status && router.getCurrentPath() === `/favorites`) {
-    //       await this.getFavorites();
-    //       favoritePage.render();
-    //     }
-    //   },
-    // );
-
     const unsubscribe = userStore.isUserLoadingEmmiter$.addListener(() => {
       if (router.getCurrentPath() === '/favorites') {
         this.renderFavoritesPage();
@@ -106,13 +97,6 @@ class FavoritesPageStore {
   async reduce(action: any) {
     switch (action.type) {
       case ActionTypes.RENDER_FAVORITES_PAGE:
-        // this.#movies = null;
-        // favoritePage.render();
-        // if (userStore.getUser().username) {
-        //   await this.getFavorites();
-        //   favoritePage.render();
-        // }
-
         this.renderFavoritesPage(); // TK
         break;
       case ActionTypes.ADD_TO_FAVORITES:

diff --git a/public/store/RoomPageStore.ts b/public/store/RoomPageStore.ts
@@ -190,11 +190,7 @@ class RoomPageStore {
             }
             break;
           case 'change_movie':
-            if (
-              this.#room &&
-              messageData['movie'] &&
-              messageData['movie'].id !== this.#room.movie.id
-            ) {
+            if (this.#room && messageData['movie'].id !== this.#room.movie.id) {
               this.#room.movie = serializeMovieDetailed(messageData['movie']);
               if (this.#room.movie.seasons && this.#room.movie.seasons.length) {
                 roomPage.renderVideo(

diff --git a/public/store/UserStore.ts b/public/store/UserStore.ts
@@ -124,9 +124,6 @@ class UserStore {
         path: 'auth/session',
       });
 
-      // TODO: Убрать после тестирование
-      // response.user_data.subscription_expiration_date = '2025-1-2';
-      // response.user_data.subscription_status = true;
       response.user_data.email = response.user_data.email.replace(
         /&#34;/g,
         '"',