Merge pull request #2209 from daostack/feature/CW-2183-commons-sorting

Sort commons by lastActivity in the dropdowns #2183

src/shared/models/Common.tsx

@@ -4,6 +4,7 @@ import { Discussion } from "./Discussion";
 import { DiscussionMessage } from "./DiscussionMessage";
 import { PaymentAmount } from "./Payment";
 import { Proposal } from "./Proposals";
+import { Timestamp } from "./Timestamp";
 import { User } from "./User";
 import {
   AllowedActions,
@@ -119,6 +120,8 @@ export interface Common extends BaseEntity {
   hasPublicItems: boolean;
 
   rootCommonId?: string;
+
+  lastActivity?: Timestamp;
 }
 
 export interface Project extends Common {

src/shared/utils/compareCommonsByLastActivity.ts

@@ -0,0 +1,15 @@
+import { Common } from "@/shared/models";
+
+export const compareCommonsByLastActivity = (
+  prevCommon: Common,
+  nextCommon: Common,
+): number => {
+  if (!nextCommon.lastActivity) {
+    return -1;
+  }
+  if (!prevCommon.lastActivity) {
+    return 1;
+  }
+
+  return nextCommon.lastActivity.seconds - prevCommon.lastActivity.seconds;
+};

src/shared/utils/index.tsx

@@ -15,6 +15,7 @@ export * from "./parseLinksForSubmission";
 export * from "./proposals";
 export * from "./queryParams";
 export { default as request } from "./request";
+export * from "./compareCommonsByLastActivity";
 export * from "./convertDatesToFirestoreTimestamps";
 export * from "./convertLinkToUploadFile";
 export * from "./timeAgo";

src/store/states/commonLayout/saga/getCommons.ts

@@ -3,7 +3,7 @@ import { selectUser } from "@/pages/Auth/store/selectors";
 import { CommonService, GovernanceService, ProjectService } from "@/services";
 import { Awaited } from "@/shared/interfaces";
 import { User } from "@/shared/models";
-import { isError } from "@/shared/utils";
+import { compareCommonsByLastActivity, isError } from "@/shared/utils";
 import { ProjectsStateItem } from "../../projects";
 import * as actions from "../actions";
 import { getPermissionsDataByAllUserCommonMemberInfo } from "./utils";
@@ -80,17 +80,19 @@ export function* getCommons(
       commonId,
       userId,
     )) as Awaited<ReturnType<typeof getProjectsInfo>>;
-    const projectsData: ProjectsStateItem[] = data.map(
-      ({ common, hasMembership, hasPermissionToAddProject }) => ({
+    const projectsData: ProjectsStateItem[] = [...data]
+      .sort((prevItem, nextItem) =>
+        compareCommonsByLastActivity(prevItem.common, nextItem.common),
+      )
+      .map(({ common, hasMembership, hasPermissionToAddProject }) => ({
         commonId: common.id,
         image: common.image,
         name: common.name,
         directParent: common.directParent,
         hasMembership,
         hasPermissionToAddProject,
         notificationsAmount: 0,
-      }),
-    );
+      }));
 
     yield put(
       actions.getCommons.success({

src/store/states/multipleSpacesLayout/saga/fetchBreadcrumbsItemsByCommonId.ts

@@ -4,6 +4,7 @@ import { CommonService, GovernanceService, ProjectService } from "@/services";
 import { InboxItemType } from "@/shared/constants";
 import { Awaited } from "@/shared/interfaces";
 import { Common, User } from "@/shared/models";
+import { compareCommonsByLastActivity } from "@/shared/utils";
 import { getPermissionsDataByAllUserCommonMemberInfo } from "../../commonLayout/saga/utils";
 import * as actions from "../actions";
 import { selectMultipleSpacesLayoutBreadcrumbs } from "../selectors";
@@ -102,16 +103,18 @@ export function* fetchBreadcrumbsItemsByCommonId(
       commonId,
       user?.uid,
     )) as Awaited<ReturnType<typeof fetchProjectsInfoByActiveCommonId>>;
-    const projectsData: ProjectsStateItem[] = projectsInfo.map(
-      ({ common, hasMembership, hasPermissionToAddProject }) => ({
+    const projectsData: ProjectsStateItem[] = [...projectsInfo]
+      .sort((prevItem, nextItem) =>
+        compareCommonsByLastActivity(prevItem.common, nextItem.common),
+      )
+      .map(({ common, hasMembership, hasPermissionToAddProject }) => ({
         commonId: common.id,
         image: common.image,
         name: common.name,
         directParent: common.directParent,
         hasMembership,
         hasPermissionToAddProject,
-      }),
-    );
+      }));
 
     const currentBreadcrumbs = (yield select(
       selectMultipleSpacesLayoutBreadcrumbs,