refactor: Remove userId param

techmatters · Dec 7, 2023 · b58f57b · b58f57b
1 parent fc7769e
commit b58f57b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/selectors.test.ts b/src/selectors.test.ts
@@ -244,18 +244,18 @@ test('select user sites with project role', () => {
 test('select user role when site owned', () => {
   const user = generateUser();
   const site = generateSite({ owner: user });
-  const store = createStore(initState([], [user], [site]));
+  const store = createStore(initState([], [user], [site], user.id));
 
-  const siteRole = selectUserRoleSite(store.getState(), site.id, user.id);
+  const siteRole = selectUserRoleSite(store.getState(), site.id);
   expect(siteRole).toStrictEqual({ kind: 'site', role: 'owner' });
 });
 
 test('select user role in project of site', () => {
   const user = generateUser();
   const project = generateProject([generateMembership(user.id, 'viewer')]);
   const site = generateSite({ project });
-  const store = createStore(initState([project], [user], [site]));
+  const store = createStore(initState([project], [user], [site], user.id));
 
-  const siteRole = selectUserRoleSite(store.getState(), site.id, user.id);
+  const siteRole = selectUserRoleSite(store.getState(), site.id);
   expect(siteRole).toStrictEqual({ kind: 'project', role: 'viewer' });
 });
diff --git a/src/selectors.ts b/src/selectors.ts
@@ -119,14 +119,11 @@ export type SiteUserRole =
   | { kind: 'site'; role: 'owner' }
   | { kind: 'project'; role: UserRole };
 
-const selectSiteId = (_state: any, siteId: string, userId: string) => [
-  siteId,
-  userId,
-];
+const selectSiteId = (_state: any, siteId: string) => siteId;
 
 export const selectUserRoleSite = createSelector(
-  [selectSites, selectProjects, selectSiteId],
-  (sites, projects, [siteId, userId]) => {
+  [selectSites, selectProjects, selectSiteId, selectCurrentUserID],
+  (sites, projects, siteId, userId) => {
     const site = sites[siteId];
     if (!site) {
       return null;