chore(core): remove old favorite

packages/common/env/src/global.ts

@@ -31,13 +31,6 @@ export const runtimeFlagsSchema = z.object({
   enableExperimentalFeature: z.boolean(),
   enableInfoModal: z.boolean(),
   enableOrganize: z.boolean(),
-  // show the new favorite, which exclusive to each user
-  enableNewFavorite: z.boolean(),
-  // show the old favorite
-  enableOldFavorite: z.boolean(),
-  // before 0.16, enableNewFavorite = false and enableOldFavorite = true
-  // after 0.16, enableNewFavorite = true and enableOldFavorite = false
-  // for debug purpose, we can enable both
 });
 
 export type RuntimeConfig = z.infer<typeof runtimeFlagsSchema>;

packages/frontend/core/src/components/page-list/collections/select-collection.tsx

@@ -1,6 +1,6 @@
 import { toast } from '@affine/component';
 import { CollectionService } from '@affine/core/modules/collection';
-import { FavoriteItemsAdapter } from '@affine/core/modules/properties';
+import { CompatibleFavoriteItemsAdapter } from '@affine/core/modules/properties';
 import { useI18n } from '@affine/i18n';
 import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
 import { useCallback, useMemo, useState } from 'react';
@@ -16,7 +16,7 @@ import { VirtualizedList } from '../virtualized-list';
 
 const FavoriteOperation = ({ collection }: { collection: ListItem }) => {
   const t = useI18n();
-  const favAdapter = useService(FavoriteItemsAdapter);
+  const favAdapter = useService(CompatibleFavoriteItemsAdapter);
   const isFavorite = useLiveData(
     favAdapter.isFavorite$(collection.id, 'collection')
   );

packages/frontend/core/src/components/page-list/operation-cell.tsx

@@ -211,16 +211,14 @@ export const PageOperationCell = ({
   );
   return (
     <>
-      {runtimeConfig.enableNewFavorite && (
-        <ColWrapper
-          hideInSmallContainer
-          data-testid="page-list-item-favorite"
-          data-favorite={favourite ? true : undefined}
-          className={styles.favoriteCell}
-        >
-          <FavoriteTag onClick={onToggleFavoritePage} active={favourite} />
-        </ColWrapper>
-      )}
+      <ColWrapper
+        hideInSmallContainer
+        data-testid="page-list-item-favorite"
+        data-favorite={favourite ? true : undefined}
+        className={styles.favoriteCell}
+      >
+        <FavoriteTag onClick={onToggleFavoritePage} active={favourite} />
+      </ColWrapper>
       <ColWrapper alignment="start">
         <Menu
           items={OperationMenu}

packages/frontend/core/src/components/page-list/tags/select-tag.tsx

@@ -1,8 +1,11 @@
+import { toast } from '@affine/component';
+import { FavoriteService } from '@affine/core/modules/favorite';
 import { TagService } from '@affine/core/modules/tag';
 import { useI18n } from '@affine/i18n';
 import { useLiveData, useService, WorkspaceService } from '@toeverything/infra';
 import { useCallback, useMemo, useState } from 'react';
 
+import { FavoriteTag } from '../components/favorite-tag';
 import { tagHeaderColsDef } from '../header-col-def';
 import { TagListItemRenderer } from '../page-group';
 import { ListTableHeader } from '../page-header';
@@ -11,32 +14,29 @@ import { SelectorLayout } from '../selector/selector-layout';
 import type { ListItem, TagMeta } from '../types';
 import { VirtualizedList } from '../virtualized-list';
 
-// TODO(@EYHN): add tag to favourite support
-const FavoriteOperation = ({ tag: _ }: { tag: ListItem }) => {
-  //   const t = useI18n();
-  //   const favAdapter = useService(FavoriteItemsAdapter);
-  //   const isFavorite = useLiveData(
-  //     favAdapter.isFavorite$(tag.id, 'tag')
-  //   );
-
-  //   const onToggleFavoriteCollection = useCallback(() => {
-  //     favAdapter.toggle(tag.id, 'tag');
-  //     toast(
-  //       isFavorite
-  //         ? t['com.affine.toastMessage.removedFavorites']()
-  //         : t['com.affine.toastMessage.addedFavorites']()
-  //     );
-  //   }, [tag.id, favAdapter, isFavorite, t]);
+const FavoriteOperation = ({ tag }: { tag: ListItem }) => {
+  const t = useI18n();
+  const favoriteService = useService(FavoriteService);
+  const isFavorite = useLiveData(
+    favoriteService.favoriteList.isFavorite$('tag', tag.id)
+  );
 
-  //   return (
-  //     <FavoriteTag
-  //       style={{ marginRight: 8 }}
-  //       onClick={onToggleFavoriteCollection}
-  //       active={isFavorite}
-  //     />
-  //   );
+  const onToggleFavoriteCollection = useCallback(() => {
+    favoriteService.favoriteList.toggle('tag', tag.id);
+    toast(
+      isFavorite
+        ? t['com.affine.toastMessage.removedFavorites']()
+        : t['com.affine.toastMessage.addedFavorites']()
+    );
+  }, [favoriteService.favoriteList, tag.id, isFavorite, t]);
 
-  return null;
+  return (
+    <FavoriteTag
+      style={{ marginRight: 8 }}
+      onClick={onToggleFavoriteCollection}
+      active={isFavorite}
+    />
+  );
 };
 
 export const SelectTag = ({

packages/frontend/core/src/components/root-app-sidebar/index.tsx

@@ -5,7 +5,6 @@ import {
   ExplorerCollections,
   ExplorerFavorites,
   ExplorerMigrationFavorites,
-  ExplorerOldFavorites,
   ExplorerOrganize,
 } from '@affine/core/modules/explorer';
 import { ExplorerTags } from '@affine/core/modules/explorer/views/sections/tags';
@@ -169,10 +168,9 @@ export const RootAppSidebar = (): ReactElement => {
         </MenuItem>
       </SidebarContainer>
       <SidebarScrollableContainer>
-        {runtimeConfig.enableNewFavorite && <ExplorerFavorites />}
+        <ExplorerFavorites />
         {runtimeConfig.enableOrganize && <ExplorerOrganize />}
-        {runtimeConfig.enableNewFavorite && <ExplorerMigrationFavorites />}
-        {runtimeConfig.enableOldFavorite && <ExplorerOldFavorites />}
+        <ExplorerMigrationFavorites />
         <ExplorerCollections />
         <ExplorerTags />
         <CategoryDivider label={t['com.affine.rootAppSidebar.others']()} />

packages/frontend/core/src/modules/explorer/index.ts

@@ -11,7 +11,6 @@ export type { CollapsibleSectionName } from './types';
 export { ExplorerCollections } from './views/sections/collections';
 export { ExplorerFavorites } from './views/sections/favorites';
 export { ExplorerMigrationFavorites } from './views/sections/migration-favorites';
-export { ExplorerOldFavorites } from './views/sections/old-favorites';
 export { ExplorerOrganize } from './views/sections/organize';
 
 export function configureExplorerModule(framework: Framework) {

packages/frontend/core/src/modules/explorer/views/nodes/folder/index.tsx

@@ -675,15 +675,10 @@ export const ExplorerFolderNodeFolder = ({
         ),
       },
 
-      // favorite, only new favorite available
-      ...(runtimeConfig.enableNewFavorite && node.id
-        ? [
-            {
-              index: 200,
-              view: <FavoriteFolderOperation id={node.id} />,
-            },
-          ]
-        : []),
+      {
+        index: 200,
+        view: node.id ? <FavoriteFolderOperation id={node.id} /> : null,
+      },
 
       {
         index: 9999,

packages/frontend/core/src/modules/explorer/views/nodes/tag/operations.tsx

@@ -133,33 +133,29 @@ export const useExplorerTagNodeOperations = (
             },
           ]
         : []),
-      ...(runtimeConfig.enableNewFavorite
-        ? [
-            {
-              index: 199,
-              view: (
-                <MenuItem
-                  preFix={
-                    <MenuIcon>
-                      {favorite ? (
-                        <FavoritedIcon
-                          style={{ color: 'var(--affine-primary-color)' }}
-                        />
-                      ) : (
-                        <FavoriteIcon />
-                      )}
-                    </MenuIcon>
-                  }
-                  onClick={handleToggleFavoriteTag}
-                >
-                  {favorite
-                    ? t['com.affine.favoritePageOperation.remove']()
-                    : t['com.affine.favoritePageOperation.add']()}
-                </MenuItem>
-              ),
-            },
-          ]
-        : []),
+      {
+        index: 199,
+        view: (
+          <MenuItem
+            preFix={
+              <MenuIcon>
+                {favorite ? (
+                  <FavoritedIcon
+                    style={{ color: 'var(--affine-primary-color)' }}
+                  />
+                ) : (
+                  <FavoriteIcon />
+                )}
+              </MenuIcon>
+            }
+            onClick={handleToggleFavoriteTag}
+          >
+            {favorite
+              ? t['com.affine.favoritePageOperation.remove']()
+              : t['com.affine.favoritePageOperation.add']()}
+          </MenuItem>
+        ),
+      },
       {
         index: 9999,
         view: <MenuSeparator key="menu-separator" />,

packages/frontend/core/src/modules/explorer/views/sections/migration-favorites/index.tsx

@@ -25,7 +25,7 @@ export const ExplorerMigrationFavorites = () => {
   const { openConfirmModal } = useConfirmModal();
 
   const favorites = useLiveData(
-    favoriteItemsAdapter.orderedFavorites$.map(favs => {
+    favoriteItemsAdapter.favorites$.map(favs => {
       return favs.filter(fav => {
         if (fav.type === 'doc') {
           return (