fix: fix cors issues and tracking id

revert thing

jlsdkf

Author: drew-harris

clients/trieve-shopify-extension/extensions/enrich-content-block/shopify.extension.toml

@@ -9,7 +9,7 @@ type = "ui_extension"
 
 # Only 1 target can be specified for each Admin action extension
 [[extensions.targeting]]
-module = "./src/ActionExtension.tsx"
+module = "./src/BlockExtension.tsx"
 target = "admin.product-details.block.render"
 
 

…ch-content-block/src/ActionExtension.tsx …ich-content-block/src/BlockExtension.tsxclients/trieve-shopify-extension/extensions/enrich-content-block/src/ActionExtension.tsx renamed to clients/trieve-shopify-extension/extensions/enrich-content-block/src/BlockExtension.tsx clients/trieve-shopify-extension/extensions/enrich-content-block/src/ActionExtension.tsx renamed to clients/trieve-shopify-extension/extensions/enrich-content-block/src/BlockExtension.tsx

@@ -2,15 +2,15 @@ import { useEffect, useState } from "react";
 import {
   reactExtension,
   BlockStack,
-  Text,
   AdminBlock,
   useApi,
   TextField,
   Button,
   InlineStack,
   Banner,
+  TextArea,
 } from "@shopify/ui-extensions-react/admin";
-import { TrieveProvider, useTrieve } from "./TrieveProvider";
+import { TrieveProvider } from "./TrieveProvider";
 import { useChunkExtraContent } from "./useChunkExtraContent";
 
 const TARGET = "admin.product-details.block.render";
@@ -37,7 +37,7 @@ function App() {
   const [isSaving, setIsSaving] = useState(false);
   const [showSuccess, setShowSuccess] = useState(false);
 
-  const { extraContent, loading, updateContent } =
+  const { extraContent, updateContent } =
     useChunkExtraContent(simplifiedProductId);
 
   useEffect(() => {
@@ -51,8 +51,6 @@ function App() {
     try {
       await updateContent(content);
       setShowSuccess(true);
-      // Hide success message after 3 seconds
-      setTimeout(() => setShowSuccess(false), 3000);
     } finally {
       setIsSaving(false);
     }
@@ -66,7 +64,7 @@ function App() {
             Content saved successfully
           </Banner>
         )}
-        <TextField
+        <TextArea
           label="Product Content"
           value={content}
           onChange={setContent}

clients/trieve-shopify-extension/extensions/enrich-content-block/src/TrieveProvider.tsx

@@ -1,11 +1,5 @@
 import { createContext, useContext, useEffect, useState } from "react";
 import { TrieveSDK } from "trieve-ts-sdk";
-import {
-  getAppId,
-  getTrieveApiKeyDatasetId,
-  sdkFromKey,
-  TrieveKey,
-} from "extensions/admin-block-pdp-questions/src/BlockExtension";
 import { InlineStack } from "@shopify/ui-extensions-react/admin";
 import { Text } from "@shopify/ui-extensions-react/admin";
 import { ProgressIndicator } from "@shopify/ui-extensions-react/admin";
@@ -15,6 +9,88 @@ type TrieveContextShape = {
   trieveSdk: TrieveSDK;
 } | null;
 
+export const sdkFromKey = (key: TrieveKey): TrieveSDK => {
+  const trieve = new TrieveSDK({
+    baseUrl: "https://api.trieve.ai",
+    apiKey: key.key,
+    datasetId: key.currentDatasetId ? key.currentDatasetId : undefined,
+    organizationId: key.organizationId,
+    omitCredentials: true,
+  });
+
+  return trieve;
+};
+
+export type TrieveKey = {
+  id?: string;
+  userId?: string;
+  organizationId?: string;
+  currentDatasetId: string | null;
+  key: string;
+};
+async function makeGraphQLQuery(
+  query: string,
+  variables: {
+    ownerId?: any;
+    namespace?: string;
+    key?: string;
+    type?: string;
+    value?: string;
+    id?: any;
+    appId?: string;
+    metafieldsSetInput?: any;
+  },
+) {
+  const graphQLQuery = {
+    query,
+    variables,
+  };
+
+  const res = await fetch("shopify:admin/api/graphql.json", {
+    method: "POST",
+    body: JSON.stringify(graphQLQuery),
+  });
+
+  if (!res.ok) {
+    console.error("Network error");
+  }
+
+  return await res.json();
+}
+export async function getAppId() {
+  return await makeGraphQLQuery(
+    `query {
+      currentAppInstallation {
+        id
+      }
+    }
+  `,
+    {},
+  );
+}
+
+export async function getTrieveApiKeyDatasetId(appId: string) {
+  return await makeGraphQLQuery(
+    `query GetAppMetafields($appId: ID!) {
+      appInstallation(id: $appId) {
+        id
+        metafields(first: 10, namespace: "trieve") {
+          edges {
+            node {
+              id
+              namespace
+              key
+              value
+              type
+            }
+          }
+        }
+      }
+    }`,
+    { appId },
+  );
+}
+
 const TrieveContext = createContext<TrieveContextShape>(null);
 
 export const useTrieve = () => {

clients/trieve-shopify-extension/extensions/enrich-content-block/src/useChunkExtraContent.ts

@@ -5,26 +5,29 @@ export const useChunkExtraContent = (productId: string | undefined) => {
   const trieve = useTrieve();
   const [extraContent, setExtraContent] = useState<string>("");
 
-  const [loading, setLoading] = useState(true);
-
   // Fetch current product extra content chunk
   const getData = async () => {
     if (!productId) {
       console.info("Tried to fetch product content without id");
       return;
     }
-    const result = await trieve.getChunkByTrackingId({
-      trackingId: `${productId}-pdp-content`,
-    });
-    if (!result) {
-      setExtraContent("");
-      return;
-    }
-    if (!result.chunk_html) {
+    try {
+      const result = await trieve.getChunkByTrackingId({
+        trackingId: `${productId}-pdp-content`,
+      });
+
+      if (!result) {
+        setExtraContent("");
+        return;
+      }
+      if (!result.chunk_html) {
+        setExtraContent("");
+        return;
+      }
+      setExtraContent(result.chunk_html);
+    } catch {
       setExtraContent("");
-      return;
     }
-    setExtraContent(result.chunk_html);
   };
 
   const updateContent = async (content: string) => {
@@ -35,8 +38,10 @@ export const useChunkExtraContent = (productId: string | undefined) => {
 
     const result = await trieve.createChunk({
       chunk_html: content,
-      tracking_id: productId,
+      tracking_id: `${productId}-pdp-content`,
       upsert_by_tracking_id: true,
+      weight: 100,
+      group_tracking_ids: [productId],
     });
   };
 
@@ -49,7 +54,6 @@ export const useChunkExtraContent = (productId: string | undefined) => {
 
   return {
     extraContent,
-    loading,
     updateContent,
   };
 };