Merge pull request #1267 from FromDoppler/DOP-1901-add-idThirdPartyApp-param

DOP-1901 - add id third party app param at getsettings request

Author: ck-makingsense

cspell-project-words.txt

@@ -1,19 +1,19 @@
 # code
-CONV
-GETUTCDATE
-MSYS
-NZEC
-PATHCONV
 appsettings
+CONV
 duplicatable
 endregion
 executesql
 getTTFB
+GETUTCDATE
 hideable
 iframe
+MSYS
 nvarchar
+NZEC
 onclick
 ondragstart
+PATHCONV
 preheader
 testid
 valign
@@ -23,33 +23,33 @@ accountname
 ContentXFIeld
 doppler
 dopplerdock
+dp-btnsearch
+dp-rowflex
+dpicon
 dplr
+emailtransaccional
+firstname
 fromdoppler
+iconapp
+lastname
 mseditor
 mydplr
-socialshare
-spanish
-undoredo
-firstname
-lastname
 omnicanalidad
-emailtransaccional
-dp-btnsearch
-dp-rowflex
-dpicon
-iconapp
 prefixe
 PROMOCODE
+socialshare
+spanish
+undoredo
 
 # Technical terms
 automerge
 entitize
+entrypoints
+forbbiden
+gdpr
 Liskov
 nofile
 webfonts
-entrypoints
-gdpr
-forbbiden
 
 # our services and providers
 aspnet
@@ -61,29 +61,30 @@ dotnet
 eclint
 esnext
 firefox
+FormatjsIntl
 gitlint
 hadolint
 hellang
 jenkins
 jenkinsfile
 jorisroovers
+Jumpseller
 koalaman
 linkedin
 loggly
 openssh
 pinterest
 react-cool-onclickoutside
+react-infinite-scroller
 serilog
 shellcheck
 swashbuckle
 tanstack
+Thirdparty
+Tiendanube
 ttionya
 unlayer
-whatsapp
-xunit
-react-infinite-scroller
-FormatjsIntl
-Tiendanube
-Jumpseller
 VTEX
+whatsapp
 Woocomerce
+xunit

src/abstractions/doppler-legacy-client/index.ts

@@ -60,6 +60,7 @@ export interface DopplerLegacyClient {
   getEditorSettings: (
     idCampaign?: string,
     idTemplate?: string,
+    idThirdpartyApp?: string,
   ) => Promise<Result<DopplerEditorSettings>>;
   getPromoCodes: ({
     store,

src/components/UnlayerEditorWrapper.test.tsx

@@ -9,6 +9,7 @@ import { UnlayerEditorWrapper } from "./UnlayerEditorWrapper";
 import { TestDopplerIntlProvider } from "./i18n/TestDopplerIntlProvider";
 import { AssetManifestClient } from "../abstractions/asset-manifest-client";
 import { MfeLoaderAssetManifestClientImpl } from "../implementations/MfeLoaderAssetManifestClientImpl";
+import { MemoryRouter } from "react-router-dom";
 
 const emailEditorPropsTestId = "EmailEditor_props";
 
@@ -92,18 +93,22 @@ describe(UnlayerEditorWrapper.name, () => {
 
     // Act
     render(
-      <QueryClientProvider client={queryClient}>
-        <AppServicesProvider appServices={appServices}>
-          <TestDopplerIntlProvider>
-            <AppSessionStateContext.Provider value={authenticatedSession}>
-              <UnlayerEditorWrapper
-                setUnlayerEditorObject={jest.fn()}
-                hidden={true}
-              />
-            </AppSessionStateContext.Provider>
-          </TestDopplerIntlProvider>
-        </AppServicesProvider>
-      </QueryClientProvider>,
+      <MemoryRouter
+        initialEntries={["/editors/campaigns/36371440?idThirdPartyApp=1"]}
+      >
+        <QueryClientProvider client={queryClient}>
+          <AppServicesProvider appServices={appServices}>
+            <TestDopplerIntlProvider>
+              <AppSessionStateContext.Provider value={authenticatedSession}>
+                <UnlayerEditorWrapper
+                  setUnlayerEditorObject={jest.fn()}
+                  hidden={true}
+                />
+              </AppSessionStateContext.Provider>
+            </TestDopplerIntlProvider>
+          </AppServicesProvider>
+        </QueryClientProvider>
+      </MemoryRouter>,
     );
 
     // Assert
@@ -161,16 +166,22 @@ describe(UnlayerEditorWrapper.name, () => {
 
       // Act
       render(
-        <QueryClientProvider client={queryClient}>
-          <AppServicesProvider appServices={appServices}>
-            <TestDopplerIntlProvider>
-              <UnlayerEditorWrapper
-                setUnlayerEditorObject={jest.fn()}
-                hidden={true}
-              />
-            </TestDopplerIntlProvider>
-          </AppServicesProvider>
-        </QueryClientProvider>,
+        <MemoryRouter
+          initialEntries={["/editors/campaigns/36371440?idThirdPartyApp=1"]}
+        >
+          <QueryClientProvider client={queryClient}>
+            <AppServicesProvider appServices={appServices}>
+              <TestDopplerIntlProvider>
+                <AppSessionStateContext.Provider value={authenticatedSession}>
+                  <UnlayerEditorWrapper
+                    setUnlayerEditorObject={jest.fn()}
+                    hidden={true}
+                  />
+                </AppSessionStateContext.Provider>
+              </TestDopplerIntlProvider>
+            </AppServicesProvider>
+          </QueryClientProvider>
+        </MemoryRouter>,
       );
 
       // Assert

src/components/UnlayerEditorWrapper.tsx

@@ -16,7 +16,7 @@ import { promisifyProps } from "../utils";
 import { useCustomFields } from "./useCustomFields";
 import { useGetEditorSettings } from "../queries/editor-settings-queries";
 import { keyBy } from "lodash";
-import { useParams } from "react-router-dom";
+import { useParams, useLocation } from "react-router-dom";
 
 const prepareUnlayerEditorObject = (
   editorObject: Editor,
@@ -48,7 +48,15 @@ export const UnlayerEditorWrapper = ({
     idCampaign: string;
     idTemplate: string;
   }>;
-  const editorSettings = useGetEditorSettings(idCampaign, idTemplate);
+
+  const location = useLocation();
+  const searchParams = new URLSearchParams(location.search);
+  const idThirdPartyApp = searchParams.get("idThirdPartyApp") ?? "";
+  const editorSettings = useGetEditorSettings(
+    idCampaign,
+    idTemplate,
+    idThirdPartyApp,
+  );
   const userFieldsQuery = useGetUserFields();
   const mergeTags = keyBy(
     useCustomFields(userFieldsQuery.data) || [],

src/implementations/DopplerLegacyClientImpl.test.ts

@@ -422,7 +422,7 @@ describe(DopplerLegacyClientImpl.name, () => {
         withCredentials: true,
       });
       expect(axiosGet).toBeCalledWith(
-        "/MSEditor/Editor/GetSettings?idCampaign=0&idTemplate=0",
+        "/MSEditor/Editor/GetSettings?idCampaign=0&idTemplate=0&idThirdpartyApp=0",
       );
     });
 

src/implementations/DopplerLegacyClientImpl.ts

@@ -248,12 +248,17 @@ export class DopplerLegacyClientImpl implements DopplerLegacyClient {
     }
   }
 
-  async getEditorSettings(idCampaign?: string, idTemplate?: string) {
+  async getEditorSettings(
+    idCampaign?: string,
+    idTemplate?: string,
+    idThirdpartyApp?: string,
+  ) {
     // fix to resolve call GetSettings with both parameter
     const _idTemplate = idCampaign && idCampaign !== "0" ? "0" : idTemplate;
     const queryString = new URLSearchParams({
       idCampaign: idCampaign || "0",
       idTemplate: _idTemplate || "0",
+      idThirdpartyApp: idThirdpartyApp || "0",
     });
 
     const response = await this.axios.get(

src/implementations/dummies/doppler-legacy-client.tsx

@@ -264,6 +264,7 @@ export class DummyDopplerLegacyClient implements DopplerLegacyClient {
       crossSellingEnabled: false,
       rssCampaign: false,
       rssShowPreview: false,
+      productDynamic: false,
       isUnlayerExportHTMLEnabled: true,
       stores: [
         {
@@ -423,6 +424,7 @@ export class DummyDopplerLegacyClient implements DopplerLegacyClient {
       value: {
         items,
         continuation: newContinuation,
+        source: "",
       },
     };
 

src/queries/editor-settings-queries.tsx

@@ -5,6 +5,7 @@ import { DopplerEditorSettings } from "../abstractions/domain/DopplerEditorSetti
 export const useGetEditorSettings = (
   idCampaign?: string,
   idTemplate?: string,
+  idThirdPartyApp?: string,
 ) => {
   const { dopplerLegacyClient } = useAppServices();
 
@@ -18,6 +19,7 @@ export const useGetEditorSettings = (
     const result = await dopplerLegacyClient.getEditorSettings(
       idCampaign,
       idTemplate,
+      idThirdPartyApp,
     );
     return result.value;
   };