@activepieces/piece-pipedrive 0.6.3 → 0.7.0

package/src/lib/trigger/new-organization.js

@@ -7,6 +7,7 @@ const pieces_framework_1 = require("@activepieces/pieces-framework");
 const pieces_common_1 = require("@activepieces/pieces-common");
 const common_1 = require("../common");
 const shared_1 = require("@activepieces/shared");
+const constants_1 = require("../common/constants");
 exports.newOrganizationTrigger = (0, pieces_framework_1.createTrigger)({
     auth: __1.pipedriveAuth,
     name: 'new-organization',
@@ -17,7 +18,7 @@ exports.newOrganizationTrigger = (0, pieces_framework_1.createTrigger)({
     onEnable(context) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            const webhook = yield common_1.pipedriveCommon.subscribeWebhook('organization', 'added', context.webhookUrl, context.auth.data['api_domain'], context.auth.access_token);
+            const webhook = yield common_1.pipedriveCommon.subscribeWebhook('organization', 'create', context.webhookUrl, context.auth.data['api_domain'], context.auth.access_token);
             yield ((_a = context.store) === null || _a === void 0 ? void 0 : _a.put('_new_organization_trigger', {
                 webhookId: webhook.data.id,
             }));
@@ -38,17 +39,22 @@ exports.newOrganizationTrigger = (0, pieces_framework_1.createTrigger)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: '/organizations',
-                query: { limit: 10, sort: 'update_time DESC' },
+                resourceUri: '/v2/organizations',
+                query: {
+                    limit: 10,
+                    sort_by: 'update_time',
+                    sort_direction: 'desc',
+                    include_fields: constants_1.ORGANIZATION_OPTIONAL_FIELDS.join(','),
+                },
             });
             if ((0, shared_1.isNil)(response.data)) {
                 return [];
             }
-            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedApiCall)({
+            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedV1ApiCall)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: '/organizationFields',
+                resourceUri: '/v1/organizationFields',
             });
             const result = [];
             for (const org of response.data) {
@@ -65,13 +71,16 @@ exports.newOrganizationTrigger = (0, pieces_framework_1.createTrigger)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: `/organizations/${payloadBody.current.id}`,
+                resourceUri: `/v2/organizations/${payloadBody.data.id}`,
+                query: {
+                    include_fields: constants_1.ORGANIZATION_OPTIONAL_FIELDS.join(','),
+                },
             });
-            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedApiCall)({
+            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedV1ApiCall)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: '/organizationFields',
+                resourceUri: '/v1/organizationFields',
             });
             const updatedOrgProperties = (0, common_1.pipedriveTransformCustomFields)(customFieldsResponse, orgResponse.data);
             return [updatedOrgProperties];
@@ -79,61 +88,26 @@ exports.newOrganizationTrigger = (0, pieces_framework_1.createTrigger)({
     },
     sampleData: {
         id: 1,
-        company_id: 13937255,
-        owner_id: {
-            id: 22701301,
-            name: 'john',
-            email: 'john@test.com',
-            has_pic: 0,
-            pic_hash: null,
-            active_flag: true,
-            value: 22701301,
-        },
-        name: 'Pipedrive',
-        open_deals_count: 3,
-        related_open_deals_count: 1,
-        closed_deals_count: 0,
-        related_closed_deals_count: 0,
-        email_messages_count: 0,
-        people_count: 3,
-        activities_count: 1,
-        done_activities_count: 0,
-        undone_activities_count: 1,
-        files_count: 0,
-        notes_count: 4,
-        followers_count: 1,
-        won_deals_count: 0,
-        related_won_deals_count: 0,
-        lost_deals_count: 0,
-        related_lost_deals_count: 0,
-        active_flag: true,
+        owner_id: 22701301,
+        name: 'Pipedrive Sample Org',
+        add_time: '2024-12-04T03:49:06Z',
+        update_time: '2024-12-14T11:03:19Z',
+        is_deleted: false,
+        visible_to: 3,
         picture_id: null,
-        country_code: null,
-        first_char: 'a',
-        update_time: '2024-12-14 11:03:19',
-        delete_time: null,
-        add_time: '2024-12-04 03:49:06',
-        visible_to: '3',
-        next_activity_date: '2024-12-04',
-        next_activity_time: null,
-        next_activity_id: 4,
-        last_activity_id: null,
-        last_activity_date: null,
-        label: null,
         label_ids: [],
-        address: null,
-        address_subpremise: null,
-        address_street_number: null,
-        address_route: null,
-        address_sublocality: null,
-        address_locality: null,
-        address_admin_area_level_1: null,
-        address_admin_area_level_2: null,
-        address_country: null,
-        address_postal_code: null,
-        address_formatted_address: null,
-        owner_name: 'John',
-        cc_email: null,
+        address: {
+            value: 'Mustamäe tee 3, Tallinn, Estonia',
+            street_number: '3',
+            route: 'Mustamäe tee',
+            sublocality: 'Kristiine',
+            locality: 'Tallinn',
+            admin_area_level_1: 'Harju maakond',
+            admin_area_level_2: null,
+            country: 'Estonia',
+            postal_code: '10616',
+            formatted_address: 'Mustamäe tee 3, 10616 Tallinn, Estonia',
+        },
     },
 });
 //# sourceMappingURL=new-organization.js.map

package/src/lib/trigger/new-organization.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-organization.js","sourceRoot":"","sources":["../../../../../../../../packages/pieces/community/pipedrive/src/lib/trigger/new-organization.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new-organization.js","sourceRoot":"","sources":["../../../../../../../../packages/pieces/community/pipedrive/src/lib/trigger/new-organization.ts"],"names":[],"mappings":"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"}

package/src/lib/trigger/new-person.js

@@ -3,22 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.newPerson = void 0;
 const tslib_1 = require("tslib");
 const pieces_framework_1 = require("@activepieces/pieces-framework");
-const pieces_framework_2 = require("@activepieces/pieces-framework");
-const common_1 = require("../common");
-const __1 = require("../..");
 const pieces_common_1 = require("@activepieces/pieces-common");
+const __1 = require("../../");
+const common_1 = require("../common");
 const shared_1 = require("@activepieces/shared");
+const constants_1 = require("../common/constants");
 exports.newPerson = (0, pieces_framework_1.createTrigger)({
     auth: __1.pipedriveAuth,
     name: 'new_person',
     displayName: 'New Person',
     description: 'Triggers when a new person is created',
     props: {},
-    type: pieces_framework_2.TriggerStrategy.WEBHOOK,
+    type: pieces_framework_1.TriggerStrategy.WEBHOOK,
     onEnable(context) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            const webhook = yield common_1.pipedriveCommon.subscribeWebhook('person', 'added', context.webhookUrl, context.auth.data['api_domain'], context.auth.access_token);
+            const webhook = yield common_1.pipedriveCommon.subscribeWebhook('person', 'create', context.webhookUrl, context.auth.data['api_domain'], context.auth.access_token);
             yield ((_a = context.store) === null || _a === void 0 ? void 0 : _a.put('_new_person_trigger', {
                 webhookId: webhook.data.id,
             }));
@@ -39,14 +39,19 @@ exports.newPerson = (0, pieces_framework_1.createTrigger)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: '/persons',
-                query: { limit: 5, sort: 'update_time DESC' },
+                resourceUri: '/v2/persons',
+                query: {
+                    limit: 5,
+                    sort_by: 'update_time',
+                    sort_direction: 'desc',
+                    include_fields: constants_1.PERSON_OPTIONAL_FIELDS.join(','),
+                },
             });
-            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedApiCall)({
+            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedV1ApiCall)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: '/personFields',
+                resourceUri: '/v1/personFields',
             });
             if ((0, shared_1.isNil)(personsResponse.data)) {
                 return [];
@@ -61,19 +66,21 @@ exports.newPerson = (0, pieces_framework_1.createTrigger)({
     },
     run(context) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            // Pipedrive will always return a list of Persons even if we are looking up a specific person
             const payloadBody = context.payload.body;
             const personResponse = yield (0, common_1.pipedriveApiCall)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: `/persons/${payloadBody.current.id}`,
+                resourceUri: `/v2/persons/${payloadBody.data.id}`,
+                query: {
+                    include_fields: constants_1.PERSON_OPTIONAL_FIELDS.join(','),
+                },
             });
-            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedApiCall)({
+            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedV1ApiCall)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: '/personFields',
+                resourceUri: '/v1/personFields',
             });
             const updatedPersonProperties = (0, common_1.pipedriveTransformCustomFields)(customFieldsResponse, personResponse.data);
             return [updatedPersonProperties];
@@ -81,90 +88,36 @@ exports.newPerson = (0, pieces_framework_1.createTrigger)({
     },
     sampleData: {
         id: 1,
-        company_id: 12,
-        owner_id: {
-            id: 123,
-            name: 'Jane Doe',
-            email: 'jane@pipedrive.com',
-            has_pic: 1,
-            pic_hash: '2611ace8ac6a3afe2f69ed56f9e08c6b',
-            active_flag: true,
-            value: 123,
-        },
-        org_id: {
-            name: 'Org Name',
-            people_count: 1,
-            owner_id: 123,
-            address: 'Mustamäe tee 3a, 10615 Tallinn',
-            active_flag: true,
-            cc_email: 'org@pipedrivemail.com',
-            value: 1234,
-        },
+        owner_id: 123,
+        org_id: 1234,
         name: 'Will Smith',
         first_name: 'Will',
         last_name: 'Smith',
-        open_deals_count: 2,
-        related_open_deals_count: 2,
-        closed_deals_count: 3,
-        related_closed_deals_count: 3,
-        participant_open_deals_count: 1,
-        participant_closed_deals_count: 1,
-        email_messages_count: 1,
-        activities_count: 1,
-        done_activities_count: 1,
-        undone_activities_count: 2,
-        files_count: 2,
-        notes_count: 2,
-        followers_count: 3,
-        won_deals_count: 3,
-        related_won_deals_count: 3,
-        lost_deals_count: 1,
-        related_lost_deals_count: 1,
-        active_flag: true,
-        phone: [
+        is_deleted: false,
+        phones: [
             {
                 value: '12345',
                 primary: true,
                 label: 'work',
             },
         ],
-        email: [
+        emails: [
             {
-                value: '12345@email.com',
+                value: 'will.smith@example.com',
                 primary: true,
                 label: 'work',
             },
         ],
-        primary_email: '12345@email.com',
-        first_char: 'w',
-        update_time: '2020-05-08 05:30:20',
-        add_time: '2017-10-18 13:23:07',
-        visible_to: '3',
-        marketing_status: 'no_consent',
-        picture_id: {
-            item_type: 'person',
-            item_id: 25,
-            active_flag: true,
-            add_time: '2020-09-08 08:17:52',
-            update_time: '0000-00-00 00:00:00',
-            added_by_user_id: 967055,
-            pictures: {
-                '128': 'https://pipedrive-profile-pics.s3.example.com/f8893852574273f2747bf6ef09d11cfb4ac8f269_128.jpg',
-                '512': 'https://pipedrive-profile-pics.s3.example.com/f8893852574273f2747bf6ef09d11cfb4ac8f269_512.jpg',
-            },
-            value: 4,
-        },
-        next_activity_date: '2019-11-29',
-        next_activity_time: '11:30:00',
+        add_time: '2017-10-18T13:23:07Z',
+        update_time: '2020-05-08T05:30:20Z',
+        visible_to: 3,
+        picture_id: 4,
         next_activity_id: 128,
         last_activity_id: 34,
-        last_activity_date: '2019-11-28',
-        last_incoming_mail_time: '2019-05-29 18:21:42',
-        last_outgoing_mail_time: '2019-05-30 03:45:35',
-        label: 1,
-        org_name: 'Organization name',
-        owner_name: 'Jane Doe',
-        cc_email: 'org@pipedrivemail.com',
+        last_incoming_mail_time: '2019-05-29T18:21:42Z',
+        last_outgoing_mail_time: '2019-05-30T03:45:35Z',
+        label_ids: [1],
+        marketing_status: 'no_consent',
     },
 });
 //# sourceMappingURL=new-person.js.map

package/src/lib/trigger/new-person.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-person.js","sourceRoot":"","sources":["../../../../../../../../packages/pieces/community/pipedrive/src/lib/trigger/new-person.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new-person.js","sourceRoot":"","sources":["../../../../../../../../packages/pieces/community/pipedrive/src/lib/trigger/new-person.ts"],"names":[],"mappings":"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"}

package/src/lib/trigger/organization-matching-filter.js

@@ -8,11 +8,12 @@ const pieces_framework_1 = require("@activepieces/pieces-framework");
 const props_1 = require("../common/props");
 const common_1 = require("../common");
 const shared_1 = require("@activepieces/shared");
+const constants_1 = require("../common/constants");
 exports.organizationMatchingFilterTrigger = (0, pieces_framework_1.createTrigger)({
     auth: index_1.pipedriveAuth,
     name: 'organization-matching-filter',
     displayName: 'Organization Matching Filter',
-    description: 'Trigges when an organization newly matches a Pipedrive filter for the first time.',
+    description: 'Triggers when an organization newly matches a Pipedrive filter for the first time.',
     type: pieces_framework_1.TriggerStrategy.POLLING,
     props: {
         filterId: (0, props_1.filterIdProp)('org', true),
@@ -20,12 +21,16 @@ exports.organizationMatchingFilterTrigger = (0, pieces_framework_1.createTrigger
     onEnable(context) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const ids = [];
-            const response = yield (0, common_1.pipedrivePaginatedApiCall)({
+            const response = yield (0, common_1.pipedrivePaginatedV2ApiCall)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: '/organizations:(id)',
-                query: { sort: 'update_time DESC', filter_id: context.propsValue.filterId },
+                resourceUri: '/v2/organizations',
+                query: {
+                    sort_by: 'update_time',
+                    sort_direction: 'desc',
+                    filter_id: context.propsValue.filterId,
+                },
             });
             if (!(0, shared_1.isNil)(response)) {
                 response.forEach((organization) => {
@@ -47,11 +52,13 @@ exports.organizationMatchingFilterTrigger = (0, pieces_framework_1.createTrigger
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: '/organizations',
+                resourceUri: '/v2/organizations',
                 query: {
                     limit: 10,
-                    sort: 'update_time DESC',
+                    sort_by: 'update_time',
+                    sort_direction: 'desc',
                     filter_id: context.propsValue.filterId,
+                    include_fields: constants_1.ORGANIZATION_OPTIONAL_FIELDS.join(','),
                 },
             });
             if ((0, shared_1.isNil)(response.data)) {
@@ -60,11 +67,11 @@ exports.organizationMatchingFilterTrigger = (0, pieces_framework_1.createTrigger
             for (const org of response.data) {
                 organizations.push(org);
             }
-            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedApiCall)({
+            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedV1ApiCall)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: '/organizationFields',
+                resourceUri: '/v1/organizationFields',
             });
             const result = [];
             for (const org of organizations) {
@@ -79,32 +86,34 @@ exports.organizationMatchingFilterTrigger = (0, pieces_framework_1.createTrigger
             var _a;
             const existingIds = (_a = (yield context.store.get('organizations'))) !== null && _a !== void 0 ? _a : '[]';
             const parsedExistingIds = JSON.parse(existingIds);
-            const response = yield (0, common_1.pipedrivePaginatedApiCall)({
+            const response = yield (0, common_1.pipedrivePaginatedV2ApiCall)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: '/organizations',
-                query: { sort: 'update_time DESC', filter_id: context.propsValue.filterId },
+                resourceUri: '/v2/organizations',
+                query: {
+                    sort_by: 'update_time',
+                    sort_direction: 'desc',
+                    filter_id: context.propsValue.filterId,
+                    include_fields: constants_1.ORGANIZATION_OPTIONAL_FIELDS.join(','),
+                },
             });
             if ((0, shared_1.isNil)(response) || response.length === 0) {
                 return [];
             }
-            // Filter valid organizations
             const newOrganizations = response.filter((organization) => !parsedExistingIds.includes(organization.id));
             const newIds = newOrganizations.map((organization) => organization.id);
             if (newIds.length === 0) {
                 return [];
             }
-            // Store new IDs
             yield context.store.put('organizations', JSON.stringify([...newIds, ...parsedExistingIds]));
-            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedApiCall)({
+            const customFieldsResponse = yield (0, common_1.pipedrivePaginatedV1ApiCall)({
                 accessToken: context.auth.access_token,
                 apiDomain: context.auth.data['api_domain'],
                 method: pieces_common_1.HttpMethod.GET,
-                resourceUri: '/organizationFields',
+                resourceUri: '/v1/organizationFields',
             });
             const result = [];
-            // Transform valid organizations fields
             for (const org of newOrganizations) {
                 const updatedOrgProperties = (0, common_1.pipedriveTransformCustomFields)(customFieldsResponse, org);
                 result.push(updatedOrgProperties);
@@ -114,61 +123,29 @@ exports.organizationMatchingFilterTrigger = (0, pieces_framework_1.createTrigger
     },
     sampleData: {
         id: 1,
-        company_id: 13937255,
-        owner_id: {
-            id: 22701301,
-            name: 'john',
-            email: 'john@test.com',
-            has_pic: 0,
-            pic_hash: null,
-            active_flag: true,
-            value: 22701301,
-        },
-        name: 'Pipedrive',
-        open_deals_count: 3,
-        related_open_deals_count: 1,
-        closed_deals_count: 0,
-        related_closed_deals_count: 0,
-        email_messages_count: 0,
-        people_count: 3,
-        activities_count: 1,
-        done_activities_count: 0,
-        undone_activities_count: 1,
-        files_count: 0,
-        notes_count: 4,
-        followers_count: 1,
-        won_deals_count: 0,
-        related_won_deals_count: 0,
-        lost_deals_count: 0,
-        related_lost_deals_count: 0,
-        active_flag: true,
+        owner_id: 22701301,
+        name: 'Pipedrive Sample Org',
+        add_time: '2024-12-04T03:49:06Z',
+        update_time: '2024-12-14T11:03:19Z',
+        is_deleted: false,
+        visible_to: 3,
         picture_id: null,
-        country_code: null,
-        first_char: 'a',
-        update_time: '2024-12-14 11:03:19',
-        delete_time: null,
-        add_time: '2024-12-04 03:49:06',
-        visible_to: '3',
-        next_activity_date: '2024-12-04',
-        next_activity_time: null,
-        next_activity_id: 4,
-        last_activity_id: null,
-        last_activity_date: null,
-        label: null,
         label_ids: [],
-        address: null,
-        address_subpremise: null,
-        address_street_number: null,
-        address_route: null,
-        address_sublocality: null,
-        address_locality: null,
-        address_admin_area_level_1: null,
-        address_admin_area_level_2: null,
-        address_country: null,
-        address_postal_code: null,
-        address_formatted_address: null,
-        owner_name: 'John',
-        cc_email: null,
+        address: {
+            value: 'Mustamäe tee 3, Tallinn, Estonia',
+            street_number: '3',
+            route: 'Mustamäe tee',
+            sublocality: 'Kristiine',
+            locality: 'Tallinn',
+            admin_area_level_1: 'Harju maakond',
+            admin_area_level_2: null,
+            country: 'Estonia',
+            postal_code: '10616',
+            formatted_address: 'Mustamäe tee 3, 10616 Tallinn, Estonia',
+        },
+        custom_fields: {
+            your_custom_field_key: 'your_custom_field_value',
+        },
     },
 });
 //# sourceMappingURL=organization-matching-filter.js.map

package/src/lib/trigger/organization-matching-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"organization-matching-filter.js","sourceRoot":"","sources":["../../../../../../../../packages/pieces/community/pipedrive/src/lib/trigger/organization-matching-filter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"organization-matching-filter.js","sourceRoot":"","sources":["../../../../../../../../packages/pieces/community/pipedrive/src/lib/trigger/organization-matching-filter.ts"],"names":[],"mappings":"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"}