Remove favorites flag system, consolidate to collection-based grouping

src/extension/ExtensionStateManger.ts

@@ -1,7 +1,6 @@
 import * as vscode from "vscode";
 
 import { COLLECTION } from "./constants";
-import { filterDuplicatesFromObject } from "./utils";
 import { IUserRequestSidebarState } from "./utils/type";
 
 class ExtentionStateManager {
@@ -32,38 +31,6 @@ class ExtentionStateManager {
     await this.context.globalState.update(state, history);
   }
 
-  async updateExtensionContext(state: string, id: string, status?: string) {
-    const currentTime = new Date().getTime();
-    const globalHistoryState: IUserRequestSidebarState[] | undefined =
-      this.context.globalState.get(state);
-    const globalFavoritesState: IUserRequestSidebarState[] | undefined =
-      this.context.globalState.get(COLLECTION.FAVORITES_COLLECTION);
-
-    if (!globalHistoryState || !globalFavoritesState) return;
-
-    globalHistoryState.map(
-      (history) =>
-        history.id === id &&
-        ((history.isUserFavorite = !history.isUserFavorite),
-        (history.favoritedTime = currentTime)),
-    );
-
-    await this.context.globalState.update(state, [...globalHistoryState]);
-
-    if (status) {
-      const duplicateFilteredUserFavoriteCollection =
-        filterDuplicatesFromObject(
-          globalHistoryState,
-          globalFavoritesState,
-          id,
-        );
-
-      await this.context.globalState.update(COLLECTION.FAVORITES_COLLECTION, [
-        ...duplicateFilteredUserFavoriteCollection,
-      ]);
-    }
-  }
-
   async deleteExtensionContext(targetExtensionContext: string, id?: string) {
     const targetGlobalState: IUserRequestSidebarState[] | undefined =
       this.context.globalState.get(targetExtensionContext);

src/extension/MainWebViewPanel.ts

@@ -155,8 +155,6 @@ class MainWebViewPanel {
         headers,
         responseType,
         requestedTime,
-        favoritedTime: null,
-        isUserFavorite: false,
         id: requestId,
         requestObject,
       };
@@ -177,7 +175,6 @@ class MainWebViewPanel {
       // Update sidebar
       this.sidebarWebViewPanel.postMainWebViewPanelMessage(
         this.stateManager.getExtensionContext(COLLECTION.HISTORY_COLLECTION),
-        this.stateManager.getExtensionContext(COLLECTION.FAVORITES_COLLECTION),
       );
 
     } catch (error) {
@@ -269,8 +266,6 @@ class MainWebViewPanel {
               {
                 ...axiosConfiguration,
                 requestedTime,
-                favoritedTime: null,
-                isUserFavorite: false,
                 id: uuidv4(),
                 requestObject,
               },
@@ -287,8 +282,6 @@ class MainWebViewPanel {
               {
                 ...axiosConfiguration,
                 requestedTime,
-                favoritedTime: null,
-                isUserFavorite: false,
                 id: uuidv4(),
                 requestObject,
               },
@@ -302,12 +295,10 @@ class MainWebViewPanel {
     if (this.mainPanel) {
       console.log(
         this.stateManager.getExtensionContext(COLLECTION.HISTORY_COLLECTION),
-        this.stateManager.getExtensionContext(COLLECTION.FAVORITES_COLLECTION),
       );
       this.mainPanel.webview.postMessage(responseObject);
       this.sidebarWebViewPanel.postMainWebViewPanelMessage(
         this.stateManager.getExtensionContext(COLLECTION.HISTORY_COLLECTION),
-        this.stateManager.getExtensionContext(COLLECTION.FAVORITES_COLLECTION),
       );
     }
   }

src/extension/SidebarWebViewPanel.ts

@@ -54,15 +54,11 @@ class SidebarWebViewPanel {
       history: this.stateManager.getExtensionContext(
         COLLECTION.HISTORY_COLLECTION,
       ),
-      favorites: this.stateManager.getExtensionContext(
-        COLLECTION.FAVORITES_COLLECTION,
-      ),
       collections: collections,
     });
 
     console.log('Initial sidebar data sent:', {
       history: this.stateManager.getExtensionContext(COLLECTION.HISTORY_COLLECTION),
-      favorites: this.stateManager.getExtensionContext(COLLECTION.FAVORITES_COLLECTION),
       collections: collections
     });
 
@@ -73,9 +69,6 @@ class SidebarWebViewPanel {
     userHistoryData: {
       userRequestHistory: IUserRequestSidebarState[] | undefined;
     },
-    userFavoritesData: {
-      userRequestHistory: IUserRequestSidebarState[] | undefined;
-    },
   ) {
     if (!this.sidebarWebview) {
       console.log('Sidebar webview not available, skipping update');
@@ -87,14 +80,12 @@ class SidebarWebViewPanel {
 
     console.log('Updating sidebar with data:', {
       history: userHistoryData,
-      favorites: userFavoritesData,
       collections: collections
     });
 
     this.sidebarWebview.webview.postMessage({
       messageCategory: CATEGORY.COLLECTION_DATA,
       history: userHistoryData,
-      favorites: userFavoritesData,
       collections: collections,
     });
   }
@@ -114,74 +105,7 @@ class SidebarWebViewPanel {
       }) => {
         if (command === COMMAND.START_APP) {
           vscode.commands.executeCommand(COMMAND.MAIN_WEB_VIEW_PANEL);
-        } else if (command === COMMAND.ADD_TO_FAVORITES) {
-          // Get the request from history
-          const historyData = this.stateManager.getExtensionContext(COLLECTION.HISTORY_COLLECTION);
-          const historyItem = historyData?.userRequestHistory?.find((item: any) => item.id === id);
-
-          if (historyItem) {
-            // Mark as favorite in history
-            const updatedItem = {
-              ...historyItem,
-              isUserFavorite: true,
-              favoritedTime: new Date().getTime(),
-            };
-
-            // Add to favorites collection
-            const favoritesData = this.stateManager.getExtensionContext(COLLECTION.FAVORITES_COLLECTION);
-            const favorites = favoritesData?.userRequestHistory || [];
-
-            await this.stateManager.addExtensionContext(COLLECTION.FAVORITES_COLLECTION, {
-              history: [updatedItem, ...favorites],
-            });
-
-            // Update history to mark as favorite
-            const history = historyData?.userRequestHistory || [];
-            const updatedHistory = history.map((item: any) => 
-              item.id === id ? updatedItem : item
-            );
-
-            await this.stateManager.addExtensionContext(COLLECTION.HISTORY_COLLECTION, {
-              history: updatedHistory,
-            });
-          }
-        } else if (command === COMMAND.REMOVE_FROM_FAVORITES) {
-          // Get the request from history
-          const historyData = this.stateManager.getExtensionContext(COLLECTION.HISTORY_COLLECTION);
-          const historyItem = historyData?.userRequestHistory?.find((item: any) => item.id === id);
-
-          if (historyItem) {
-            // Mark as not favorite in history
-            const updatedItem = {
-              ...historyItem,
-              isUserFavorite: false,
-              favoritedTime: null,
-            };
-
-            // Update history
-            const history = historyData?.userRequestHistory || [];
-            const updatedHistory = history.map((item: any) => 
-              item.id === id ? updatedItem : item
-            );
-
-            await this.stateManager.addExtensionContext(COLLECTION.HISTORY_COLLECTION, {
-              history: updatedHistory,
-            });
-          }
-
-          // Remove from favorites collection
-          await this.stateManager.deleteExtensionContext(
-            COLLECTION.FAVORITES_COLLECTION,
-            id,
-          );
         } else if (command === COMMAND.DELETE) {
-          if (target === COLLECTION.FAVORITES_COLLECTION) {
-            await this.stateManager.updateExtensionContext(
-              COLLECTION.HISTORY_COLLECTION,
-              id,
-            );
-          }
-
           await this.stateManager.deleteExtensionContext(target, id);
         } else if (command === COMMAND.DELETE_ALL_COLLECTION) {
           const answer = await vscode.window.showWarningMessage(

src/extension/constants/collection.ts

@@ -1,12 +1,9 @@
 const COLLECTION = {
-  FAVORITES_COLLECTION: "userFavorites",
   HISTORY_COLLECTION: "userRequestHistory",
   COLLECTION_REQUEST: "Collection Request",
   FILTERABLE_OBJECT_KEY: [
-    "favoritedTime",
     "id",
     "requestedTime",
-    "isUserFavorite",
   ],
 };
 

src/extension/constants/command.ts

@@ -3,10 +3,8 @@ const COMMAND = {
   DELETE: "Delete",
   START_APP: "Start App",
   ALERT_COPY: "Alert Copy",
-  ADD_TO_FAVORITES: "Add to favorites",
   MAIN_WEB_VIEW_PANEL: "opencall.newRequest",
   SIDEBAR_WEB_VIEW_PANEL: "opencall.collectionMenu",
-  REMOVE_FROM_FAVORITES: "Remove from favorites",
   DELETE_ALL_COLLECTION: "Delete all collection",
 };
 

src/extension/extension.ts

@@ -130,12 +130,6 @@ export async function activate(context: vscode.ExtensionContext) {
     });
   }
 
-  if (!StateManager.getExtensionContext(COLLECTION.FAVORITES_COLLECTION)) {
-    await StateManager.addExtensionContext(COLLECTION.FAVORITES_COLLECTION, {
-      history: [],
-    });
-  }
-
   vscode.window.showInformationMessage(MESSAGE.WELCOME_MESSAGE);
 
   // Collections are now shown in the webview sidebar tabs

src/extension/utils/index.ts

@@ -1,4 +1,3 @@
-export { default as filterDuplicatesFromObject } from "./filterDuplicatesFromObject";
 export { default as filterObjectKey } from "./filterObjectKey";
 export { default as generateArrayObjectFromData } from "./generateArrayObjectFromData";
 export { default as generateResponseObject } from "./generateResponseObject";

src/extension/utils/type.d.ts

@@ -4,8 +4,6 @@ export interface IUserRequestSidebarState {
   headers: Headers;
   responseType: string;
   requestedTime: number;
-  favoritedTime: number | null;
-  isUserFavorite: boolean;
   id: string;
   requestObject: RequestObject;
 }

src/utils/index.ts

@@ -1,4 +1,3 @@
-export { default as filterDuplicatesFromObject } from "./filterDuplicatesFromObject";
 export { default as filterObjectKey } from "./filterObjectKey";
 export { default as generateArrayObjectFromData } from "./generateArrayObjectFromData";
 export { default as generateResponseObject } from "./generateResponseObject";

src/utils/type.d.ts

@@ -4,8 +4,6 @@ export interface IUserRequestSidebarState {
   headers: Headers;
   responseType: string;
   requestedTime: number;
-  favoritedTime: number | null;
-  isUserFavorite: boolean;
   id: string;
   requestObject: RequestObject;
 }

webview/components/MoreInformation.tsx

@@ -30,10 +30,6 @@ const MoreInformationWrapper = styled.div`
       opacity: 0.45;
     }
   }
-
-  .favorite {
-    fill: var(--vscode-errorForeground, #f48771);
-  }
 `;
 
 export default MoreInformation;

webview/constants/options.ts

@@ -57,7 +57,7 @@ const OPTION = {
   READ_ONLY_TRUE_OPTION: { readOnly: true, lineNumbers: "on" },
   READ_ONLY_FALSE_OPTION: { readOnly: false, lineNumbers: "on" },
   LINE_NUMBER_OPTION: { readOnly: true, lineNumbers: "off" },
-  SIDEBAR_MENU_OPTIONS: ["Collections", "History", "Favorites"],
+  SIDEBAR_MENU_OPTIONS: ["Collections", "History"],
   CODE_SNIPPET_OPTIONS: [
     {
       key: "c",

webview/constants/sidebar.ts

@@ -2,14 +2,10 @@ const SIDEBAR = {
   DELETE: "Delete",
   HISTORY: "History",
   START_APP: "Start App",
-  FAVORITES: "Favorites",
   COLLECTIONS: "Collections",
   COLLECTION_DATA: "Collection Data",
-  ADD_TO_FAVORITES: "Add to favorites",
   DELETE_COMPLETE: "Deletion Complete",
-  USER_FAVORITES_COLLECTION: "userFavorites",
   DELETE_ALL_COLLECTION: "Delete all collection",
-  REMOVE_FROM_FAVORITES: "Remove from favorites",
   USER_REQUEST_HISTORY_COLLECTION: "userRequestHistory",
 };