Merge pull request #125 from santeacademie/develop

santeacademie · Apr 3, 2023 · d8c03a0 · d8c03a0
2 parents 6773b40 + 94729b4
commit d8c03a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/lib/controller/Pipedrive/ContentStudioTools/ContentStudioTools.ts b/src/lib/controller/Pipedrive/ContentStudioTools/ContentStudioTools.ts
@@ -21,15 +21,17 @@ class ContentStudioTools extends TamperController {
 
 	run = (request: TamperRequest): void => {
 		this.controllerKey = request.routeName;
+
 		this.csBridge = WssqlBridge.connect(WssqlRemoteDatabase.ContentStudio);
 		this.bsBridge = WssqlBridge.connect(WssqlRemoteDatabase.Backstage);
+
 		this.dealSyncAction(request);
 	};
 
 	dealSyncAction = (request: TamperRequest) => {
 		const checkKey = `${this.controllerKey}_dealSyncAction`;
 		const getAnchorEmail = () => {
-			return $('[data-test=email-label]:visible').eq(0);
+			return PipedriveHelper.getCustomFieldValueElementByName('E-mail').find('a').first();
 		};
 		const getAnchorSession = () => {
 			return PipedriveHelper.getCustomFieldValueElementByName('Session');
@@ -38,7 +40,7 @@ class ContentStudioTools extends TamperController {
 		this.checkFor(
 			checkKey,
 			() => {
-				return getAnchorSession().length !== 0 && getAnchorEmail().length !== 0 && document.location.href.match('/deal/');
+				return getAnchorEmail().text().trim() !== '' && getAnchorSession().text().trim() !== '' && document.location.href.match('/deal/');
 			},
 			(elementMarker: ElementMarkerCallback): DealCheckPayload => {
 				const $anchorEmail = getAnchorEmail();

diff --git a/src/lib/controller/Pipedrive/PipedriveHelper.ts b/src/lib/controller/Pipedrive/PipedriveHelper.ts
@@ -2,13 +2,14 @@ import $ from 'jquery';
 
 class PipedriveHelper {
 	static getCustomFieldValueElementByName = (label: string): JQuery => {
-		return $('[data-test=field-label]:visible')
+		return $('[data-testid=field-name]:visible')
 			.filter(function () {
 				return $(this).text().trim() == label;
 			})
-			.eq(0)
-			.parents('.editable')
-			.find('.value');
+			.first()
+			.parents('[data-testid=fields-list-row]')
+			.find('[data-testid=fields-list-row-field-components] div')
+			.first();
 	};
 
 	static getBadgeValueView = (id: string, value: any): string => {