Removed Ember members implementation

apps/admin/src/ember-bridge/ember-bridge.test.tsx

@@ -137,6 +137,39 @@ describe('useEmberDataSync', () => {
         expect(invalidateSpy).not.toHaveBeenCalled();
     });
 
+    queryTest('invalidates comment queries for mapped Ember comment events', async ({ queryClient, wrapper }) => {
+        const mock = createMockStateBridge();
+        window.EmberBridge = { state: mock.stateBridge };
+
+        queryClient.setQueryData(['MembersResponseType', '/members'], { members: [] });
+        queryClient.setQueryData(['CommentsResponseType', '/comments'], { comments: [] });
+        queryClient.setQueryData(['PostsResponseType', '/posts'], { posts: [] });
+
+        renderHook(() => useEmberDataSync(), { wrapper });
+
+        await waitFor(() => {
+            expect(mock.onSpy).toHaveBeenCalledWith('emberDataChange', expect.any(Function));
+        });
+
+        act(() => {
+            mock.emit('emberDataChange', {
+                operation: 'update',
+                modelName: 'comment',
+                id: 'member-1',
+                data: null
+            });
+        });
+
+        await waitFor(() => {
+            const queries = queryClient.getQueryCache().getAll();
+            const commentQueries = queries.filter(q => q.queryKey[0] === 'CommentsResponseType');
+            const nonCommentQueries = queries.filter(q => q.queryKey[0] !== 'CommentsResponseType');
+
+            expect(commentQueries.every(q => q.state.isInvalidated)).toBe(true);
+            expect(nonCommentQueries.every(q => !q.state.isInvalidated)).toBe(true);
+        });
+    });
+
     queryTest('does not subscribe if unmounted before the bridge becomes available', async ({ wrapper }) => {
         vi.useFakeTimers();
         const mock = createMockStateBridge();
@@ -383,4 +416,3 @@ describe('useEmberRouting', () => {
         });
     });
 });
-

apps/admin/src/ember-bridge/ember-bridge.tsx

@@ -77,6 +77,7 @@ const EMBER_TO_REACT_TYPE_MAPPING: Record<string, string> = {
     'user': 'UsersResponseType',
     'post': 'PostsResponseType',
     'member': 'MembersResponseType',
+    'comment': 'CommentsResponseType',
     'tag': 'TagsResponseType',
     'label': 'LabelsResponseType',
     'webhook': 'WebhooksResponseType'
@@ -310,4 +311,3 @@ export function useForceUpgrade(): boolean {
 
     return true;
 }
-

e2e/helpers/pages/admin/members/members-list-page.ts

@@ -7,15 +7,7 @@ export interface ExportedFile {
     content: string;
 }
 
-export interface MembersListSurface {
-    goto(): Promise<unknown>;
-    openActionsMenu(): Promise<void>;
-    applyLabelFilter(labelName: string): Promise<void>;
-    getVisibleMemberCount(): Promise<number>;
-    exportMembers(): Promise<ExportedFile>;
-}
-
-export class MembersListPage extends AdminPage implements MembersListSurface {
+export class MembersListPage extends AdminPage {
     readonly memberRows: Locator;
     readonly searchInput: Locator;
     readonly actionsButton: Locator;

e2e/helpers/pages/admin/members/members-page.ts

@@ -1,151 +1,27 @@
 import {AdminPage} from '@/admin-pages';
-import {BasePage} from '@/helpers/pages';
-import {Download, JSHandle, Locator, Page} from '@playwright/test';
-import {readFileSync} from 'fs';
-import type {ExportedFile, MembersListSurface} from './members-list-page';
+import {JSHandle, Locator, Page} from '@playwright/test';
 
-class FilterSection extends BasePage {
-    readonly actionsButton: Locator;
-    readonly applyFilterButton: Locator;
-
-    readonly selectType: Locator;
-    readonly input: Locator;
-
-    constructor(page: Page) {
-        super(page);
-
-        this.actionsButton = page.getByTestId('members-filter-actions');
-        this.applyFilterButton = page.getByTestId('members-apply-filter');
-        this.selectType = page.getByTestId('members-filter');
-        this.input = page.getByTestId('token-input-search');
-    }
-
-    async applyLabel(labelName: string): Promise<void> {
-        await this.actionsButton.click();
-        await this.selectType.selectOption('label');
-
-        await this.addLabelToLabelFilter(labelName);
-
-        await this.applyFilterButton.click();
-    }
-
-    private async addLabelToLabelFilter(labelName: string) {
-        await this.input.fill(labelName);
-        await this.page.keyboard.press('Tab');
-    }
-}
-
-class SettingsSection extends BasePage {
-    readonly addLabelForSelectedMembersButton: Locator;
-    readonly removeLabelForSelectedMembersButton: Locator;
-    readonly selectLabel: Locator;
-    readonly confirmAddLabelButton: Locator;
-    readonly confirmRemoveLabelButton: Locator;
-    readonly closeModalButton: Locator;
-
-    private readonly labelRemoved: Locator;
-    private readonly labelAdded: Locator;
-
-    constructor(page: Page) {
-        super(page);
-
-        this.addLabelForSelectedMembersButton = page.getByTestId('add-label-selected');
-        this.removeLabelForSelectedMembersButton = page.getByTestId('remove-label-selected');
-
-        this.selectLabel = page.getByTestId('label-select');
-        this.confirmAddLabelButton = page.getByTestId('confirm');
-        this.confirmRemoveLabelButton = page.getByTestId('confirm');
-        this.closeModalButton = page.getByTestId('close-modal');
-
-        this.labelAdded = page.getByTestId('add-label-complete');
-        this.labelRemoved = page.getByTestId('remove-label-complete');
-    }
-
-    async addLabelToSelectedMembers(labelName: string): Promise<void> {
-        await this.addLabelForSelectedMembersButton.click();
-        await this.selectLabel.waitFor({state: 'visible'});
-        await this.selectLabelOption(labelName);
-
-        await this.confirmAddLabelButton.click();
-        await this.labelAdded.waitFor({state: 'visible'});
-    }
-
-    async removeLabelFromSelectedMembers(labelName: string): Promise<void> {
-        await this.removeLabelForSelectedMembersButton.click();
-        await this.selectLabel.waitFor({state: 'visible'});
-        await this.selectLabelOption(labelName);
-
-        await this.confirmRemoveLabelButton.click();
-        await this.labelRemoved.waitFor({state: 'visible'});
-    }
-
-    getSuccessMessage(): Locator {
-        return this.page.getByTestId('label-success-message');
-    }
-
-    private async selectLabelOption(labelName: string): Promise<void> {
-        await this.selectLabel.waitFor({state: 'visible'});
-        await this.selectLabel.click();
-
-        const dropdown = this.page.locator('.ember-power-select-dropdown').last();
-        await dropdown.waitFor({state: 'visible'});
-
-        const searchInput = dropdown.locator('.ember-power-select-search input');
-        await searchInput.waitFor({state: 'visible'});
-        await searchInput.fill(labelName);
-
-        const option = dropdown.getByRole('option', {name: labelName, exact: true});
-        await option.waitFor({state: 'visible'});
-        await option.click();
-    }
-}
-
-export class MembersPage extends AdminPage implements MembersListSurface {
+export class MembersPage extends AdminPage {
     readonly newMemberButton: Locator;
     public readonly loadMoreButton: Locator;
     public readonly membersListScrollRoot: Locator;
     readonly memberListItems: Locator;
-    readonly emptyStateHeading: Locator;
-
-    readonly membersActionsButton: Locator;
-    readonly exportMembersButton: Locator;
-
-    readonly filterSection: FilterSection;
-    readonly settingsSection: SettingsSection;
 
     constructor(page: Page, {route = 'members'}: {route?: string} = {}) {
         super(page);
         this.pageUrl = `/ghost/#/${route}`;
 
-        this.membersActionsButton = page.getByTestId('members-actions');
         this.newMemberButton = page.getByRole('link', {name: 'New member'});
-        this.exportMembersButton = page.getByTestId('export-members');
 
         this.loadMoreButton = page.getByRole('button', {name: 'Load more'});
         this.membersListScrollRoot = page.getByTestId('members-list-scroll-root');
         this.memberListItems = page.getByTestId('members-list-item');
-        this.emptyStateHeading = page.getByRole('heading', {name: 'Start building your audience'});
-
-        this.filterSection = new FilterSection(page);
-        this.settingsSection = new SettingsSection(page);
     }
 
     async clickMemberByEmail(email: string): Promise<void> {
         await this.memberListItems.filter({hasText: email}).click();
     }
 
-    async openActionsMenu(): Promise<void> {
-        await this.membersActionsButton.click();
-    }
-
-    async applyLabelFilter(labelName: string): Promise<void> {
-        await this.filterSection.applyLabel(labelName);
-    }
-
-    async getVisibleMemberCount(): Promise<number> {
-        return await this.memberListItems.count();
-    }
-
     async getMaxRenderedIndex(): Promise<number> {
         return await this.memberListItems.evaluateAll((rows) => {
             return rows.reduce((maxIndex, row) => {
@@ -213,38 +89,7 @@ export class MembersPage extends AdminPage implements MembersListSurface {
         return maxRenderedIndex;
     }
 
-    getMemberListItemByIndex(index: number): Locator {
-        return this.page.locator(`[data-testid="members-list-item"][data-index="${index}"]`);
-    }
-
     getMemberByName(name: string): Locator {
         return this.memberListItems.filter({hasText: name});
     }
-
-    getMemberEmail(memberName: string): Locator {
-        return this.memberListItems.filter({hasText: memberName}).getByRole('paragraph');
-    }
-
-    async getMemberCount(): Promise<number> {
-        return await this.memberListItems.count();
-    }
-
-    async exportMembers(): Promise<ExportedFile> {
-        const download = await this.exportMembersData();
-        const suggestedFilename = download.suggestedFilename();
-
-        const downloadPath = await download.path();
-        const downloadContent = readFileSync(downloadPath as string, 'utf-8');
-
-        return {
-            suggestedFilename: suggestedFilename,
-            content: downloadContent
-        };
-    }
-
-    async exportMembersData(): Promise<Download> {
-        const downloadPromise = this.page.waitForEvent('download');
-        await this.exportMembersButton.click();
-        return await downloadPromise;
-    }
 }