fix: app market go live fixes (#8001)

* fix: app market go live fixes * fix: app market go live fixes
reapit · Oct 26, 2022 · 40c8d07 · 40c8d07
1 parent c13ec22
commit 40c8d07
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 71 deletions.
diff --git a/...ages/app-marketplace-admin/src/components/apps-market-manager/app-browse-upsert-modal.tsx b/...ages/app-marketplace-admin/src/components/apps-market-manager/app-browse-upsert-modal.tsx
@@ -126,7 +126,6 @@ export const AppBrowseUpsertModal: FC<AppBrowseUpsertModalDefaultProps> = ({
   closeModal,
   upsertItem,
 }) => {
-  console.log(defaultValues?.live?.timeFrom)
   const {
     register,
     handleSubmit,

diff --git a/packages/app-marketplace-admin/src/components/apps-market-manager/app-browse-upsert.tsx b/packages/app-marketplace-admin/src/components/apps-market-manager/app-browse-upsert.tsx
@@ -106,18 +106,20 @@ export const AppBrowseUpsert: FC<{}> = () => {
             />
           ))
         )}
-        <AppBrowseUpsertModal
-          modalIsOpen={typeof configType !== 'undefined'}
-          defaultValues={
-            {
-              configType: configType as AppsBrowseConfigEnum,
-              index: items.filter((item) => item.configType === configType).length,
-            } as AppsBrowseConfigItemInterface
-          }
-          closeModal={closeModal}
-          connectSession={connectSession as ReapitConnectSession}
-          upsertItem={upsertItem}
-        />
+        {configType && (
+          <AppBrowseUpsertModal
+            modalIsOpen={typeof configType !== 'undefined'}
+            defaultValues={
+              {
+                configType: configType as AppsBrowseConfigEnum,
+                index: items.filter((item) => item.configType === configType).length,
+              } as AppsBrowseConfigItemInterface
+            }
+            closeModal={closeModal}
+            connectSession={connectSession as ReapitConnectSession}
+            upsertItem={upsertItem}
+          />
+        )}
         {selectedItem && (
           <AppBrowseUpsertModal
             modalIsOpen={typeof selectedItem !== 'undefined'}

diff --git a/...per-portal/src/components/apps/edit/__tests__/__snapshots__/app-listing-tab.test.tsx.snap b/...per-portal/src/components/apps/edit/__tests__/__snapshots__/app-listing-tab.test.tsx.snap
@@ -192,7 +192,7 @@ Object {
               class="e1urjlvd-el-input"
               id="test-static-id"
               name="videoUrl1"
-              placeholder="Video embed url instructing users"
+              placeholder="Video embed url instructing users (YouTube or Vimeo)"
               type="text"
             />
             <label
@@ -213,7 +213,7 @@ Object {
               class="e1urjlvd-el-input"
               id="test-static-id"
               name="videoUrl2"
-              placeholder="Video embed url marketing your app"
+              placeholder="Video embed url marketing your app (YouTube or Vimeo)"
               type="text"
             />
             <label
@@ -642,7 +642,7 @@ Object {
             class="e1urjlvd-el-input"
             id="test-static-id"
             name="videoUrl1"
-            placeholder="Video embed url instructing users"
+            placeholder="Video embed url instructing users (YouTube or Vimeo)"
             type="text"
           />
           <label
@@ -663,7 +663,7 @@ Object {
             class="e1urjlvd-el-input"
             id="test-static-id"
             name="videoUrl2"
-            placeholder="Video embed url marketing your app"
+            placeholder="Video embed url marketing your app (YouTube or Vimeo)"
             type="text"
           />
           <label
@@ -1269,7 +1269,7 @@ Object {
               class="e1urjlvd-el-input"
               id="test-static-id"
               name="videoUrl1"
-              placeholder="Video embed url instructing users"
+              placeholder="Video embed url instructing users (YouTube or Vimeo)"
               type="text"
             />
             <label
@@ -1290,7 +1290,7 @@ Object {
               class="e1urjlvd-el-input"
               id="test-static-id"
               name="videoUrl2"
-              placeholder="Video embed url marketing your app"
+              placeholder="Video embed url marketing your app (YouTube or Vimeo)"
               type="text"
             />
             <label
@@ -1938,7 +1938,7 @@ Object {
             class="e1urjlvd-el-input"
             id="test-static-id"
             name="videoUrl1"
-            placeholder="Video embed url instructing users"
+            placeholder="Video embed url instructing users (YouTube or Vimeo)"
             type="text"
           />
           <label
@@ -1959,7 +1959,7 @@ Object {
             class="e1urjlvd-el-input"
             id="test-static-id"
             name="videoUrl2"
-            placeholder="Video embed url marketing your app"
+            placeholder="Video embed url marketing your app (YouTube or Vimeo)"
             type="text"
           />
           <label

diff --git a/...oper-portal/src/components/apps/edit/__tests__/__snapshots__/edit-page-tabs.test.tsx.snap b/...oper-portal/src/components/apps/edit/__tests__/__snapshots__/edit-page-tabs.test.tsx.snap
@@ -367,7 +367,7 @@ Object {
               class="e1urjlvd-el-input"
               id="test-static-id"
               name="videoUrl1"
-              placeholder="Video embed url instructing users"
+              placeholder="Video embed url instructing users (YouTube or Vimeo)"
               type="text"
             />
             <label
@@ -388,7 +388,7 @@ Object {
               class="e1urjlvd-el-input"
               id="test-static-id"
               name="videoUrl2"
-              placeholder="Video embed url marketing your app"
+              placeholder="Video embed url marketing your app (YouTube or Vimeo)"
               type="text"
             />
             <label
@@ -902,7 +902,7 @@ Object {
             class="e1urjlvd-el-input"
             id="test-static-id"
             name="videoUrl1"
-            placeholder="Video embed url instructing users"
+            placeholder="Video embed url instructing users (YouTube or Vimeo)"
             type="text"
           />
           <label
@@ -923,7 +923,7 @@ Object {
             class="e1urjlvd-el-input"
             id="test-static-id"
             name="videoUrl2"
-            placeholder="Video embed url marketing your app"
+            placeholder="Video embed url marketing your app (YouTube or Vimeo)"
             type="text"
           />
           <label

diff --git a/packages/developer-portal/src/components/apps/edit/form-schema/form-fields.ts b/packages/developer-portal/src/components/apps/edit/form-schema/form-fields.ts
@@ -239,13 +239,13 @@ export const formFields: Record<keyof AppEditFormSchema, InputGroupProps & { nam
   videoUrl1: {
     name: 'videoUrl1',
     label: 'Getting Started Video URL',
-    placeholder: 'Video embed url instructing users',
+    placeholder: 'Video embed url instructing users (YouTube or Vimeo)',
     type: 'text',
   },
   videoUrl2: {
     name: 'videoUrl2',
     label: 'Why Use Us Video URL',
-    placeholder: 'Video embed url marketing your app',
+    placeholder: 'Video embed url marketing your app (YouTube or Vimeo)',
     type: 'text',
   },
 }
diff --git a/packages/developer-portal/src/components/apps/edit/form-schema/validation-schema.ts b/packages/developer-portal/src/components/apps/edit/form-schema/validation-schema.ts
@@ -258,54 +258,24 @@ export const appEditValidationSchema = object().shape({
   [videoUrl1.name]: string()
     .trim()
     .test({
-      name: 'isValidYoutube1',
-      message: 'If YouTube, video needs to be in https://www.youtube.com/embed/<<videoId>> format',
-      test: (value) => {
-        if (!value || (!value.includes('youtube') && !value.includes('youtu.be'))) return true
-        return value.includes('https://www.youtube.com/embed/')
-      },
-    })
-    .test({
-      name: 'isValidVimeo1',
-      message: 'If Vimeo, video needs to be in https://player.vimeo.com/video/<<videoId>> format',
-      test: (value) => {
-        if (!value || !value.includes('vimeo.com')) return true
-        return value.includes('https://player.vimeo.com/video/')
-      },
-    })
-    .test({
-      name: 'isValidVideo1Url',
-      message: 'Must be a secure https host if supplied',
+      name: 'isValidVideo1',
+      message:
+        'Video needs to be in https://player.vimeo.com/video/<<videoId>> or https://www.youtube.com/embed/<<videoId>> format',
       test: (value) => {
         if (!value) return true
-        return isValidHttpsUrl(value)
+        return value.includes('https://player.vimeo.com/video/') || value.includes('https://www.youtube.com/embed/')
       },
     }),
 
   [videoUrl2.name]: string()
     .trim()
     .test({
-      name: 'isValidYoutube2',
-      message: 'If YouTube, video needs to be in https://www.youtube.com/embed/<<videoId>> format',
-      test: (value) => {
-        if (!value || (!value.includes('youtube') && !value.includes('youtu.be'))) return true
-        return value.includes('https://www.youtube.com/embed/')
-      },
-    })
-    .test({
-      name: 'isValidVimeo2',
-      message: 'If Vimeo, video needs to be in https://player.vimeo.com/video/<<videoId>> format',
-      test: (value) => {
-        if (!value || !value.includes('vimeo.com')) return true
-        return value.includes('https://player.vimeo.com/video/')
-      },
-    })
-    .test({
-      name: 'isValidVideo2Url',
-      message: 'Must be a secure https host if supplied',
+      name: 'isValidVideo2',
+      message:
+        'Video needs to be in https://player.vimeo.com/video/<<videoId>> or https://www.youtube.com/embed/<<videoId>> format',
       test: (value) => {
         if (!value) return true
-        return isValidHttpsUrl(value)
+        return value.includes('https://player.vimeo.com/video/') || value.includes('https://www.youtube.com/embed/')
       },
     }),
 

diff --git a/packages/marketplace/src/components/apps-support/index.tsx b/packages/marketplace/src/components/apps-support/index.tsx
@@ -66,10 +66,7 @@ export const AppsSupportPage: FC = () => {
         <SmallText hasGreyText>
           In addition we have provided comprehensive documentation on using the AppMarket at the below link.
         </SmallText>
-        <Button
-          onClick={openNewPage('https://marketplace-documentation.reapit.cloud/#uninstalling-an-app')}
-          intent="neutral"
-        >
+        <Button onClick={openNewPage('https://marketplace-documentation.reapit.cloud/')} intent="neutral">
           View Docs
         </Button>
       </SecondaryNavContainer>

diff --git a/packages/marketplace/src/utils/navigation.ts b/packages/marketplace/src/utils/navigation.ts
@@ -1,11 +1,17 @@
 import { History } from 'history'
 import { trackEvent } from '../core/analytics'
 import { TrackingEvent } from '../core/analytics-events'
+const DESKTOP_CONTEXT_KEY = '__REAPIT_MARKETPLACE_GLOBALS__'
 
 export const openNewPage = (uri: string) => () => {
   trackEvent(TrackingEvent.OpenExternalPage, true, { url: uri })
+  const isDesktop = Boolean(window[DESKTOP_CONTEXT_KEY])
 
-  window.open(uri, '_blank')
+  if (isDesktop) {
+    window.location.href = `agencycloud://process/webpage?url=${uri}`
+  } else {
+    window.open(uri, '_blank')
+  }
 }
 
 export const navigate = (history: History, route: string) => (): void => {
@@ -22,8 +28,13 @@ export const navigateBack = (history: History) => (): void => {
 
 export const navigateExternal = (uri: string) => (): void => {
   trackEvent(TrackingEvent.NavigateExternalPage, true, { url: uri })
+  const isDesktop = Boolean(window[DESKTOP_CONTEXT_KEY])
 
-  window.location.href = uri
+  if (isDesktop) {
+    window.location.href = `agencycloud://process/webpage?url=${uri}`
+  } else {
+    window.location.href = uri
+  }
 }
 
 export const handleLaunchApp = (connectIsDesktop: boolean, id?: string, launchUri?: string) => () => {