chore(): improvements

AKASHAorg · Sep 20, 2024 · 9ba673c · 9ba673c
1 parent 96f0efc
commit 9ba673c
Show file tree

Hide file tree

Showing 5 changed files with 111 additions and 103 deletions.
diff --git a/extensions/apps/extensions/src/components/pages/extension-submit-page.tsx b/extensions/apps/extensions/src/components/pages/extension-submit-page.tsx
@@ -10,7 +10,7 @@ import Card from '@akashaorg/design-system-core/lib/components/Card';
 import ExtensionReviewAndPublish from '@akashaorg/design-system-components/lib/components/ExtensionReviewAndPublish';
 import { transformSource, useAkashaStore, useRootComponentProps } from '@akashaorg/ui-awf-hooks';
 import { Extension, NotificationEvents, NotificationTypes } from '@akashaorg/typings/lib/ui';
-import { CONTACT_INFO, DRAFT_EXTENSIONS } from '../../constants';
+import { DRAFT_EXTENSIONS } from '../../constants';
 import getSDK from '@akashaorg/core-sdk';
 import { useCreateAppMutation } from '@akashaorg/ui-awf-hooks/lib/generated';
 import { SubmitType } from '../app-routes';
@@ -35,9 +35,8 @@ export const ExtensionSubmitPage: React.FC<ExtensionSubmitPageProps> = ({ extens
 
   const [createAppMutation] = useCreateAppMutation({
     context: { source: sdk.current.services.gql.contextSources.composeDB },
-
     onError: () => {
-      showAlertNotification(`${t(`Something went wrong when creating the extension`)}.`);
+      showAlertNotification(`${t(`Something went wrong when publishing the extension`)}.`);
     },
   });
 
@@ -69,11 +68,39 @@ export const ExtensionSubmitPage: React.FC<ExtensionSubmitPageProps> = ({ extens
 
   const extensionData = draftExtensions.find(draftExtension => draftExtension.id === extensionId);
 
-  const extData = {
-    ...extensionData,
-    links: extensionData.links?.filter(link => link.label !== `${extensionId}-${CONTACT_INFO}`),
-    contactInfo: extensionData.links?.find(link => link.label === `${extensionId}-${CONTACT_INFO}`)
-      ?.href,
+  const handleClickSubmit = () => {
+    const extData = {
+      applicationType: extensionData?.applicationType,
+      contributors: extensionData?.contributors,
+      coverImage: extensionData?.coverImage,
+      createdAt: new Date().toISOString(),
+      description: extensionData?.description,
+      displayName: extensionData?.displayName,
+      gallery: extensionData?.gallery,
+      keywords: extensionData?.keywords,
+      license: extensionData?.license,
+      links: extensionData?.links,
+      logoImage: extensionData?.logoImage,
+      name: extensionData?.name,
+      nsfw: extensionData?.nsfw,
+    };
+    createAppMutation({
+      variables: {
+        i: {
+          content: extData,
+        },
+      },
+    });
+    navigate({
+      to: '/post-submit',
+      search: { type: SubmitType.EXTENSION },
+    });
+  };
+
+  const handleClickCancel = () => {
+    navigate({
+      to: '/my-extensions',
+    });
   };
 
   if (!authenticatedDID) {
@@ -97,15 +124,14 @@ export const ExtensionSubmitPage: React.FC<ExtensionSubmitPageProps> = ({ extens
           </Text>
         </Stack>
         <ExtensionReviewAndPublish
-          extensionData={extData}
+          extensionData={extensionData}
           title={t('Review Extension')}
           subtitle={{
             part1: 'Please note that fields marked with',
             part2: 'cannot be edited once submitted.',
           }}
           extensionNameLabel={t('Extension Name')}
           extensionDisplayNameLabel={t('Extension Display Name')}
-          sourceFileLabel={t('Github Repository')}
           nsfwLabel={t('Extension NSFW')}
           nsfwDescription={t('You marked it as Not Safe For Work')}
           descriptionLabel={t('Description')}
@@ -120,24 +146,8 @@ export const ExtensionSubmitPage: React.FC<ExtensionSubmitPageProps> = ({ extens
           backButtonLabel={t('Cancel')}
           publishButtonLabel={t('Submit')}
           transformSource={transformSource}
-          onClickCancel={() => {
-            navigate({
-              to: '/my-extensions',
-            });
-          }}
-          onClickSubmit={() => {
-            createAppMutation({
-              variables: {
-                i: {
-                  content: extensionData,
-                },
-              },
-            });
-            navigate({
-              to: '/post-submit',
-              search: { type: SubmitType.EXTENSION },
-            });
-          }}
+          onClickCancel={handleClickCancel}
+          onClickSubmit={handleClickSubmit}
         />
       </Stack>
     </Card>

diff --git a/extensions/apps/extensions/src/components/pages/my-extensions/extension-element.tsx b/extensions/apps/extensions/src/components/pages/my-extensions/extension-element.tsx
@@ -146,7 +146,7 @@ export const ExtensionElement: React.FC<ExtensionElement> = ({
             onClick: () => {},
           },
           {
-            label: t('Submit'),
+            label: t('Submit Release'),
             icon: <PaperAirplaneIcon />,
             onClick: handleReleaseSubmit,
           },
@@ -159,7 +159,7 @@ export const ExtensionElement: React.FC<ExtensionElement> = ({
             onClick: () => {},
           },
           {
-            label: t('Submit'),
+            label: t('Submit Release'),
             icon: <PaperAirplaneIcon />,
             onClick: handleReleaseSubmit,
           },
@@ -178,7 +178,7 @@ export const ExtensionElement: React.FC<ExtensionElement> = ({
       case ExtensionStatus.Draft:
         return [
           {
-            label: t('Submit'),
+            label: t('Publish'),
             icon: <PaperAirplaneIcon />,
             onClick: handleExtensionSubmit,
           },

diff --git a/extensions/apps/extensions/src/components/pages/release-submit-page.tsx b/extensions/apps/extensions/src/components/pages/release-submit-page.tsx
@@ -64,6 +64,39 @@ export const ExtensionReleaseSubmitPage: React.FC<ExtensionReleaseSubmitPageProp
     });
   };
 
+  const handleClickSubmit = appReleaseFormData => {
+    const appReleaseContent = {
+      applicationID: extensionId,
+      version: appReleaseFormData?.versionNumber,
+      source: appReleaseFormData?.sourceURL,
+      createdAt: new Date().toISOString(),
+      meta: [
+        {
+          provider: 'AkashaApp',
+          property: 'description',
+          value: appReleaseFormData?.description,
+        },
+      ],
+    };
+    setAppReleaseMutation({
+      variables: {
+        i: {
+          content: appReleaseContent,
+        },
+      },
+    });
+    navigate({
+      to: `/post-submit`,
+      search: { type: SubmitType.EXTENSION },
+    });
+  };
+
+  const handleClickCancel = () => {
+    navigate({
+      to: '/my-extensions',
+    });
+  };
+
   if (!authenticatedDID) {
     return (
       <ErrorLoader
@@ -90,41 +123,11 @@ export const ExtensionReleaseSubmitPage: React.FC<ExtensionReleaseSubmitPageProp
           sourceURLPlaceholderLabel={t('Webpack dev server / ipfs')}
           cancelButton={{
             label: t('Cancel'),
-            disabled: false,
-            handleClick: () => {
-              navigate({
-                to: '/my-extensions',
-              });
-            },
+            handleClick: handleClickCancel,
           }}
           nextButton={{
             label: t('Submit'),
-            handleClick: appReleaseData => {
-              const appReleaseContent = {
-                applicationID: extensionId,
-                version: appReleaseData?.versionNumber,
-                source: appReleaseData?.sourceURL,
-                createdAt: new Date().toISOString(),
-                meta: [
-                  {
-                    provider: 'AkashaApp',
-                    property: 'description',
-                    value: appReleaseData?.description,
-                  },
-                ],
-              };
-              setAppReleaseMutation({
-                variables: {
-                  i: {
-                    content: appReleaseContent,
-                  },
-                },
-              });
-              navigate({
-                to: `/post-submit`,
-                search: { type: SubmitType.EXTENSION },
-              });
-            },
+            handleClick: handleClickSubmit,
           }}
         />
       </Stack>

diff --git a/libs/design-system-components/src/components/ExtensionReleaseSubmitForm/index.tsx b/libs/design-system-components/src/components/ExtensionReleaseSubmitForm/index.tsx
@@ -169,15 +169,9 @@ export default ExtensionReleaseSubmit;
 const schema = z.object({
   versionNumber: z.string(),
   description: z
-    .union([
-      z
-        .string()
-        .trim()
-        .min(10, { message: 'Must be at least 10 characters' })
-        .max(2000, { message: 'Must be less than 2000 characters' }),
-      z.string().length(0),
-    ])
-    .optional()
-    .transform(e => (e === '' ? undefined : e)),
-  sourceURL: z.string().url({ message: 'URL is required' }).optional(),
+    .string()
+    .trim()
+    .min(10, { message: 'Must be at least 10 characters' })
+    .max(2000, { message: 'Must be less than 2000 characters' }),
+  sourceURL: z.string().url({ message: 'URL is required' }),
 });