MERL-1004: fixed missing edit button in the Faust toolbar when previe…

…wing a post (#1556) * Added preview typeName query to edit functionality Co-authored-by: Joe Fusco <[email protected]> Co-authored-by: Blake Wilson <[email protected]> * Fixed TypeScript error * Create funny-starfishes-melt.md * Update postID and postType to accept edge case of undefined Co-authored-by: Blake Wilson <[email protected]> * Fixed moderate severity vulnerability in css-tools * Revert test for failing E2E toolbar.test.tsx * Revert "Revert test for failing E2E toolbar.test.tsx" This reverts commit d8e86df. * Update .changeset/funny-starfishes-melt.md Co-authored-by: John Parris <[email protected]> * Test implementation of mocked useRouter call * Added mocked useRouter call to additional tests * Added databaseId to failing tests * Added regression testing for edit button in preview * Added databaseId to test * Reordered tests to fix test package check on GitHub * Merged updated package-lock.json --------- Co-authored-by: Joe Fusco <[email protected]> Co-authored-by: Blake Wilson <[email protected]> Co-authored-by: Blake Wilson <[email protected]> Co-authored-by: John Parris <[email protected]>
wpengine · Sep 1, 2023 · cf887d3 · cf887d3 · headless-platform-by-wp-engine · Sep 1, 2023
1 parent 031eee6
commit cf887d3
Show file tree

Hide file tree

Showing 4 changed files with 245 additions and 58 deletions.
diff --git a/.changeset/funny-starfishes-melt.md b/.changeset/funny-starfishes-melt.md
@@ -0,0 +1,5 @@
+---
+"@faustwp/core": patch
+---
+
+Fixed bug where the "Edit Post" link was missing in the Faust Toolbar
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/faustwp-core/src/components/Toolbar/nodes/Edit.tsx b/packages/faustwp-core/src/components/Toolbar/nodes/Edit.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { useRouter } from 'next/router.js';
 import { SeedNode } from '../../../queries/seedQuery.js';
 import { getAdminUrl } from '../../../lib/getAdminUrl.js';
 import { ToolbarItem } from '../index.js';
@@ -8,17 +9,22 @@ type Props = {
 };
 
 export function Edit({ seedNode }: Props) {
-  if (
-    seedNode === undefined ||
-    seedNode?.isFrontPage ||
-    seedNode?.isPostsPage
-  ) {
+  const {
+    query: { p, typeName },
+  } = useRouter();
+
+  if (seedNode?.isFrontPage || seedNode?.isPostsPage) {
     return null;
   }
 
   // eslint-disable-next-line no-underscore-dangle
-  const postType = seedNode?.__typename || '';
-  const postId = seedNode?.databaseId || '';
+  // eslint-disable-next-line no-underscore-dangle
+  const postType = seedNode?.__typename ?? (typeName as string | undefined);
+  const postId = seedNode?.databaseId ?? (p as string | undefined);
+
+  if (!postId || !postType) {
+    return null;
+  }
 
   const editPostUrl = getAdminUrl(`post.php?post=${postId}&action=edit`);