fix: remove unnecessary config check, add default avatar

jwplayer · Sep 7, 2023 · 57d02df · 57d02df
1 parent e418746
commit 57d02df
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "lint:stylelint": "stylelint '**/*.{css,scss}'",
     "commit-msg": "commitlint --edit $1",
     "codecept:mobile": "cd test-e2e && rm -rf \"./output/mobile\" && codeceptjs --config ./codecept.mobile.js run-workers --suites ${WORKER_COUNT:=8} ",
-    "codecept:desktop": "cd test-e2e && rm -rf \"./output/desktop\" && codeceptjs --config ./codecept.desktop.js run-workers --suites ${WORKER_COUNT:=8} ",
+    "codecept:desktop": "cd test-e2e && rm -rf \"./output/desktop\" && codeceptjs --config ./codecept.desktop.js run-workers --suites ${WORKER_COUNT:=2} ",
     "serve-report:mobile": "cd test-e2e && allure serve \"./output/mobile\"",
     "serve-report:desktop": "cd test-e2e && allure serve \"./output/desktop\"",
     "codecept-serve:mobile": "yarn codecept:mobile ; yarn serve-report:mobile",

diff --git a/src/assets/profiles/default_avatar.png b/src/assets/profiles/default_avatar.png
diff --git a/src/components/ProfileBox/ProfileBox.tsx b/src/components/ProfileBox/ProfileBox.tsx
@@ -6,6 +6,7 @@ import styles from './ProfileBox.module.scss';
 import Edit from '#src/icons/Edit';
 import Check from '#src/icons/Check';
 import IconButton from '#components/IconButton/IconButton';
+import defaultAvatar from '#src/assets/profiles/default_avatar.png';
 
 type Props = {
   name?: string;
@@ -22,7 +23,7 @@ const ProfileBox = ({ name, image, editMode = false, onClick, onEdit, selected =
     <div className={styles.wrapper}>
       <div className={classNames(styles.inner, selected && styles.selected)}>
         <div onClick={onClick} className={styles.box}>
-          <img className={styles.image} src={image} alt="" />
+          <img className={styles.image} src={image || defaultAvatar} alt="" />
         </div>
         {editMode && (
           <IconButton aria-label="edit-profile-button" onClick={onEdit} className={styles.overlay}>

diff --git a/src/components/UserMenu/UserMenu.tsx b/src/components/UserMenu/UserMenu.tsx
@@ -17,6 +17,7 @@ import { useSelectProfile } from '#src/hooks/useProfiles';
 import ProfileCircle from '#src/icons/ProfileCircle';
 import type { AccessModel } from '#types/Config';
 import type { Profile } from '#types/account';
+import defaultAvatar from '#src/assets/profiles/default_avatar.png';
 
 type Props = {
   small?: boolean;
@@ -58,7 +59,7 @@ const UserMenu = ({ showPaymentsItem, small = false, onClick, accessModel, curre
                   small={small}
                   onClick={() => selectProfile.mutate({ id: profile.id, avatarUrl: profile.avatar_url })}
                   label={profile.name}
-                  startIcon={<ProfileCircle src={profile.avatar_url} alt={profile.name} />}
+                  startIcon={<ProfileCircle src={profile.avatar_url || defaultAvatar} alt={profile.name} />}
                 />
               </li>
             ))
@@ -83,7 +84,7 @@ const UserMenu = ({ showPaymentsItem, small = false, onClick, accessModel, curre
             onClick={onClick}
             to={`/u/my-profile/${currentProfile?.id ?? ''}`}
             label={t('nav.profile')}
-            startIcon={<ProfileCircle src={currentProfile?.avatar_url ?? ''} alt={currentProfile?.name ?? ''} />}
+            startIcon={<ProfileCircle src={currentProfile?.avatar_url || defaultAvatar} alt={currentProfile?.name ?? ''} />}
           />
         </li>
       )}

diff --git a/src/hooks/useProfiles.ts b/src/hooks/useProfiles.ts
@@ -4,7 +4,6 @@ import { useNavigate } from 'react-router';
 
 import { initializeAccount } from '#src/stores/AccountController';
 import { useAccountStore } from '#src/stores/AccountStore';
-import { useConfigStore } from '#src/stores/ConfigStore';
 import { useFavoritesStore } from '#src/stores/FavoritesStore';
 import { createProfile, deleteProfile, enterProfile, listProfiles, updateProfile } from '#src/stores/ProfileController';
 import { useProfileStore } from '#src/stores/ProfileStore';
@@ -110,6 +109,5 @@ export const useListProfiles = (
 
 export const useProfilesFeatureEnabled = (): boolean => {
   const canManageProfiles = useAccountStore((s) => s.canManageProfiles);
-  const profilesFeatureEnabled = useConfigStore((s) => s.config.custom?.profilesFeatureEnabled);
-  return canManageProfiles && !!profilesFeatureEnabled;
+  return canManageProfiles;
 };
diff --git a/src/services/inplayer.profile.service.ts b/src/services/inplayer.profile.service.ts
@@ -13,7 +13,14 @@ export const listProfiles: ListProfiles = async () => {
       errors: [],
     };
   } catch {
-    throw new Error('Unable to fetch profiles.');
+    console.error('Unable to list profiles.');
+    return {
+      responseData: {
+        canManageProfiles: false,
+        collection: [],
+      },
+      errors: ['Unable to list profiles.'],
+    };
   }
 };
 

diff --git a/src/stores/ConfigStore.ts b/src/stores/ConfigStore.ts
@@ -46,9 +46,6 @@ export const useConfigStore = createStore<ConfigState>('ConfigStore', (_, get) =
     styling: {
       footerText: '',
     },
-    custom: {
-      profiles_feature_enabled: false,
-    },
   },
   accessModel: 'SVOD',
   adScheduleData: null,