Merge remote-tracking branch 'origin/master'

webiny · Dec 12, 2024 · 58e2122 · 58e2122
2 parents ef72dd2 + 59f44c5
commit 58e2122
Show file tree

Hide file tree

Showing 22 changed files with 19 additions and 333 deletions.
diff --git a/....x/extensions/smartSeoOpenAi/package.json → ...ensions/smartSeoOpenAi/admin/package.json b/....x/extensions/smartSeoOpenAi/package.json → ...ensions/smartSeoOpenAi/admin/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "smart-seo-open-ai",
+  "name": "smart-seo-open-ai-admin",
   "main": "src/index.tsx",
   "version": "1.0.0",
   "keywords": [

diff --git a/...eoOpenAi/src/DecorateContentEntryForm.tsx → ...Ai/admin/src/DecorateContentEntryForm.tsx b/...eoOpenAi/src/DecorateContentEntryForm.tsx → ...Ai/admin/src/DecorateContentEntryForm.tsx
diff --git a/...dmin/src/DecorateContentEntryFormBind.tsx → ...dmin/src/DecorateContentEntryFormBind.tsx b/...dmin/src/DecorateContentEntryFormBind.tsx → ...dmin/src/DecorateContentEntryFormBind.tsx
@@ -24,7 +24,7 @@ export const DecorateContentEntryFormBind = useBind.createDecorator(baseHook =>
             const { model } = useModel();
 
             // Skip tracking for non-article models
-            if (model.modelId !== "article") {
+            if (model.modelId !== "article-smart-seo") {
                 return baseHook(params);
             }
 

diff --git a/...sions/smartSeoOpenAi/src/FieldTracker.tsx → ...smartSeoOpenAi/admin/src/FieldTracker.tsx b/...sions/smartSeoOpenAi/src/FieldTracker.tsx → ...smartSeoOpenAi/admin/src/FieldTracker.tsx
diff --git a/...ions/testPluginsAi/admin/src/SmartSeo.tsx → ...ons/smartSeoOpenAi/admin/src/SmartSeo.tsx b/...ions/testPluginsAi/admin/src/SmartSeo.tsx → ...ons/smartSeoOpenAi/admin/src/SmartSeo.tsx
@@ -7,7 +7,7 @@ import { FieldWithValue, useFieldTracker } from "./FieldTracker";
 import { extractRichTextHtml } from "./extractFromRichText";
 import { useSnackbar } from "@webiny/app-admin";
 
-const OPENAI_API_KEY = String(process.env["REACT_APP_OPEN_AI_API_KEY"]);
+const OPENAI_API_KEY = String(process.env["WEBINY_ADMIN_OPEN_AI_API_KEY"]);
 
 const openai = new OpenAI({ apiKey: OPENAI_API_KEY, dangerouslyAllowBrowser: true });
 
@@ -120,7 +120,7 @@ export const SmartSeo = () => {
             name={"askAi"}
             before={"save"}
             element={<GetSeoData />}
-            modelIds={["article"]}
+            modelIds={["article-smart-seo"]}
         />
     );
 };
diff --git a/...smartSeoOpenAi/src/extractFromRichText.ts → ...eoOpenAi/admin/src/extractFromRichText.ts b/...smartSeoOpenAi/src/extractFromRichText.ts → ...eoOpenAi/admin/src/extractFromRichText.ts
diff --git a/...x/extensions/smartSeoOpenAi/src/index.tsx → ...nsions/smartSeoOpenAi/admin/src/index.tsx b/...x/extensions/smartSeoOpenAi/src/index.tsx → ...nsions/smartSeoOpenAi/admin/src/index.tsx
diff --git a/...x/extensions/smartSeoOpenAi/tsconfig.json → ...nsions/smartSeoOpenAi/admin/tsconfig.json b/...x/extensions/smartSeoOpenAi/tsconfig.json → ...nsions/smartSeoOpenAi/admin/tsconfig.json
diff --git a/headless-cms/smart-seo-open-ai/5.41.x/extensions/smartSeoOpenAi/api/package.json b/headless-cms/smart-seo-open-ai/5.41.x/extensions/smartSeoOpenAi/api/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "smart-seo-open-ai-api",
+  "main": "src/index.ts",
+  "keywords": [
+    "webiny-extension",
+    "webiny-extension-type:api"
+  ],
+  "version": "1.0.0",
+  "dependencies": {
+    "@webiny/api-headless-cms": "5.41.1"
+  }
+}
diff --git a/...tensions/testPluginsAi/api/src/Article.ts → ...ensions/smartSeoOpenAi/api/src/Article.ts b/...tensions/testPluginsAi/api/src/Article.ts → ...ensions/smartSeoOpenAi/api/src/Article.ts
@@ -5,15 +5,11 @@ import {
 
 export const Article = () => {
     return [
-        // Defines a new Ungrouped content models group.
         createCmsModelPlugin({
-            name: "Article",
-            modelId: "article",
+            name: "Article - Smart SEO",
+            modelId: "article-smart-seo",
             description: "Article content model for Smart SEO",
-            group: {
-                id: "673b06847c123c0002c9cfdc",
-                name: "Ungrouped AI 2"
-            },
+            group: {id: "", name: ""},
             fields: [
                 createModelField({
                     fieldId: "content",

diff --git a/...extensions/testPluginsAi/api/src/index.ts → ...xtensions/smartSeoOpenAi/api/src/index.ts b/...extensions/testPluginsAi/api/src/index.ts → ...xtensions/smartSeoOpenAi/api/src/index.ts
diff --git a/...ensions/testPluginsAi/admin/tsconfig.json → ...tensions/smartSeoOpenAi/api/tsconfig.json b/...ensions/testPluginsAi/admin/tsconfig.json → ...tensions/smartSeoOpenAi/api/tsconfig.json
diff --git a/...s/smart-seo-open-ai/5.41.x/extensions/smartSeoOpenAi/src/DecorateContentEntryFormBind.tsx b/...s/smart-seo-open-ai/5.41.x/extensions/smartSeoOpenAi/src/DecorateContentEntryFormBind.tsx
diff --git a/headless-cms/smart-seo-open-ai/5.41.x/extensions/smartSeoOpenAi/src/SmartSeo.tsx b/headless-cms/smart-seo-open-ai/5.41.x/extensions/smartSeoOpenAi/src/SmartSeo.tsx
diff --git a/headless-cms/smart-seo-open-ai/article.json b/headless-cms/smart-seo-open-ai/article.json
diff --git a/headless-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/admin/package.json b/headless-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/admin/package.json
diff --git a/...ms/test-plugins-ai/5.41.x/extensions/testPluginsAi/admin/src/DecorateContentEntryForm.tsx b/...ms/test-plugins-ai/5.41.x/extensions/testPluginsAi/admin/src/DecorateContentEntryForm.tsx
diff --git a/headless-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/admin/src/FieldTracker.tsx b/headless-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/admin/src/FieldTracker.tsx
diff --git a/...less-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/admin/src/extractFromRichText.ts b/...less-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/admin/src/extractFromRichText.ts
diff --git a/headless-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/admin/src/index.tsx b/headless-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/admin/src/index.tsx
diff --git a/headless-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/api/package.json b/headless-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/api/package.json
diff --git a/headless-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/api/tsconfig.json b/headless-cms/test-plugins-ai/5.41.x/extensions/testPluginsAi/api/tsconfig.json