Merge branch 'pull/564' into development

server/config/default.yaml

@@ -42,6 +42,7 @@ defaultLanguage: en-US
 # Enabled languages
 enabledLanguages:
 - en-US
+- es-ES
 - fk-FK
 
 # Inject custom scripts in subscription/layout.mjml.hbs
@@ -230,7 +231,7 @@ roles:
       name: Global Master
       admin: true
       description: All permissions
-      permissions: [rebuildPermissions, createJavascriptWithROAccess, manageBlacklist, manageSettings, setupAutomation]
+      permissions: [rebuildPermissions, createJavascriptWithROAccess, manageUserList, manageBlacklist, manageSettings, setupAutomation]
       rootNamespaceRole: master
     campaignsAdmin:
       name: Campaigns Admin

server/lib/translate.js

@@ -13,6 +13,7 @@ function loadLanguage(longCode) {
 }
 
 loadLanguage('en-US');
+loadLanguage('es-ES');
 resourcesCommon['fk-FK'] = convertToFake(resourcesCommon['en-US']);
 
 const resources = {};

server/models/campaigns.js

@@ -76,6 +76,19 @@ async function listDTAjax(context, params) {
     );
 }
 
+async function listByNamespaceDTAjax(context, namespaceId, params) {
+    return await dtHelpers.ajaxListWithPermissions(
+        context,
+        [{ entityTypeId: 'campaign', requiredOperations: ['view'] }],
+        params,
+        builder => builder.from('campaigns')
+            .innerJoin('namespaces', 'namespaces.id', 'campaigns.namespace')
+            .where('namespaces.id', namespaceId)
+            .whereNull('campaigns.parent'),
+        ['campaigns.id', 'campaigns.name', 'campaigns.cid', 'campaigns.description', 'campaigns.type', 'campaigns.status', 'campaigns.scheduled', 'campaigns.source', 'campaigns.created', 'namespaces.name']
+    );
+}
+
 async function listChildrenDTAjax(context, campaignId, params) {
     return await dtHelpers.ajaxListWithPermissions(
         context,
@@ -543,7 +556,7 @@ async function updateWithConsistencyCheck(context, entity, content) {
 
         } else if (content === Content.WITHOUT_SOURCE_CUSTOM) {
             filteredEntity.data.sourceCustom = existing.data.sourceCustom;
-            await namespaceHelpers.validateMove(context, filteredEntity, existing, 'campaign', 'createCampaign', 'delete');
+            await namespaceHelpers.validateMove(context, entity, existing, 'campaign', 'createCampaign', 'delete'); //Doesn't works with filteredEntity
 
         } else if (content === Content.ONLY_SOURCE_CUSTOM) {
             const data = existing.data;
@@ -730,9 +743,9 @@ async function changeStatusByCampaignCidAndSubscriptionIdTx(tx, context, campaig
         ])
         .first();
 
-    if (!message) {
+    //if (!message) {
         throw new Error('Invalid campaign.')
-    }
+    //}
 
     await _changeStatusByMessageTx(tx, context, message, subscriptionStatus);
 }
@@ -934,6 +947,7 @@ module.exports.Content = Content;
 module.exports.hash = hash;
 
 module.exports.listDTAjax = listDTAjax;
+module.exports.listByNamespaceDTAjax = listByNamespaceDTAjax;
 module.exports.listChildrenDTAjax = listChildrenDTAjax;
 module.exports.listWithContentDTAjax = listWithContentDTAjax;
 module.exports.listOthersWhoseListsAreIncludedDTAjax = listOthersWhoseListsAreIncludedDTAjax;

server/models/lists.js

@@ -53,6 +53,34 @@ async function listDTAjax(context, params) {
     );
 }
 
+async function listByNamespaceDTAjax(context, namespaceId, params) {
+    const campaignEntityType = entitySettings.getEntityType('campaign');
+
+    return await dtHelpers.ajaxListWithPermissions(
+        context,
+        [{ entityTypeId: 'list', requiredOperations: ['view'] }],
+        params,
+        builder => builder
+            .from('lists')
+            .innerJoin('namespaces', 'namespaces.id', 'lists.namespace')
+            .where('lists.namespace', namespaceId),
+        ['lists.id', 'lists.name', 'lists.cid', 'lists.subscribers', 'lists.description', 'namespaces.name',
+            {
+                name: 'triggerCount',
+                query: builder =>
+                    builder.from('campaigns')
+                        .innerJoin('campaign_lists', 'campaigns.id', 'campaign_lists.campaign')
+                        .innerJoin('triggers', 'campaigns.id', 'triggers.campaign')
+                        .innerJoin(campaignEntityType.permissionsTable, 'campaigns.id', `${campaignEntityType.permissionsTable}.entity`)
+                        .whereRaw('campaign_lists.list = lists.id')
+                        .where(`${campaignEntityType.permissionsTable}.operation`, 'viewTriggers')
+                        .count()
+                        .as('triggerCount')
+            }
+        ]
+    );
+}
+
 async function listWithSegmentByCampaignDTAjax(context, campaignId, params) {
     return await dtHelpers.ajaxListWithPermissions(
         context,
@@ -260,6 +288,7 @@ async function remove(context, id) {
 module.exports.UnsubscriptionMode = UnsubscriptionMode;
 module.exports.hash = hash;
 module.exports.listDTAjax = listDTAjax;
+module.exports.listByNamespaceDTAjax = listByNamespaceDTAjax;
 module.exports.listWithSegmentByCampaignDTAjax = listWithSegmentByCampaignDTAjax;
 module.exports.getByIdTx = getByIdTx;
 module.exports.getById = getById;

server/models/send-configurations.js

@@ -34,6 +34,19 @@ async function listDTAjax(context, params) {
     );
 }
 
+async function listDTAjaxByNamespace(context, namespaceId, params) {
+    return await dtHelpers.ajaxListWithPermissions(
+        context,
+        [{ entityTypeId: 'sendConfiguration', requiredOperations: ['viewPublic'] }],
+        params,
+        builder => builder
+            .from('send_configurations')
+            .innerJoin('namespaces', 'namespaces.id', 'send_configurations.namespace')
+            .where('send_configurations.namespace', namespaceId),
+        ['send_configurations.id', 'send_configurations.name', 'send_configurations.cid', 'send_configurations.description', 'send_configurations.mailer_type', 'send_configurations.created', 'namespaces.name']
+    );
+}
+
 async function listWithSendPermissionDTAjax(context, params) {
     return await dtHelpers.ajaxListWithPermissions(
         context,
@@ -175,6 +188,7 @@ async function getSystemSendConfiguration() {
 
 module.exports.hash = hash;
 module.exports.listDTAjax = listDTAjax;
+module.exports.listDTAjaxByNamespace = listDTAjaxByNamespace;
 module.exports.listWithSendPermissionDTAjax = listWithSendPermissionDTAjax;
 module.exports.getByIdTx = getByIdTx;
 module.exports.getById = getById;

server/models/templates.js

@@ -46,6 +46,16 @@ async function listDTAjax(context, params) {
     );
 }
 
+async function listByNamespaceDTAjax(context, params, namespaceId) {
+    return await dtHelpers.ajaxListWithPermissions(
+        context,
+        [{ entityTypeId: 'template', requiredOperations: ['view'] }],
+        params,
+        builder => builder.from('templates').innerJoin('namespaces', 'namespaces.id', 'templates.namespace').where('namespaces.id', namespaceId),
+        [ 'templates.id', 'templates.name', 'templates.description', 'templates.type', 'templates.created', 'namespaces.name' ]
+    );
+}
+
 async function _validateAndPreprocess(tx, entity) {
     await namespaceHelpers.validateEntity(tx, entity);
 
@@ -135,6 +145,7 @@ module.exports.hash = hash;
 module.exports.getByIdTx = getByIdTx;
 module.exports.getById = getById;
 module.exports.listDTAjax = listDTAjax;
+module.exports.listByNamespaceDTAjax = listByNamespaceDTAjax;
 module.exports.create = create;
 module.exports.updateWithConsistencyCheck = updateWithConsistencyCheck;
 module.exports.remove = remove;

server/routes/rest/campaigns.js

@@ -19,6 +19,10 @@ router.postAsync('/campaigns-others-by-list-table/:campaignId/:listIds', passpor
     return res.json(await campaigns.listOthersWhoseListsAreIncludedDTAjax(req.context, castToInteger(req.params.campaignId), req.params.listIds.split(';').map(x => castToInteger(x)), req.body));
 });
 
+router.postAsync('/campaigns-namespace/:namespaceId', passport.loggedIn, async (req, res) => {
+    return res.json(await campaigns.listByNamespaceDTAjax(req.context, castToInteger(req.params.namespaceId), req.body));
+});
+
 router.postAsync('/campaigns-children/:campaignId', passport.loggedIn, async (req, res) => {
     return res.json(await campaigns.listChildrenDTAjax(req.context, castToInteger(req.params.campaignId), req.body));
 });

server/routes/rest/lists.js

@@ -11,6 +11,10 @@ router.postAsync('/lists-table', passport.loggedIn, async (req, res) => {
     return res.json(await lists.listDTAjax(req.context, req.body));
 });
 
+router.postAsync('/users-table-byNamespace/:namespaceId', passport.loggedIn, async (req, res) => {
+    return res.json(await lists.listByNamespaceDTAjax(req.context, castToInteger(req.params.namespaceId), req.body));
+});
+
 router.postAsync('/lists-with-segment-by-campaign-table/:campaignId', passport.loggedIn, async (req, res) => {
     return res.json(await lists.listWithSegmentByCampaignDTAjax(req.context, castToInteger(req.params.campaignId), req.body));
 });

server/routes/rest/send-configurations.js

@@ -40,6 +40,10 @@ router.postAsync('/send-configurations-table', passport.loggedIn, async (req, re
     return res.json(await sendConfigurations.listDTAjax(req.context, req.body));
 });
 
+router.postAsync('/send-configurations-table-byNamespace/:namespaceId', passport.loggedIn, async (req, res) => {
+    return res.json(await sendConfigurations.listDTAjaxByNamespace(req.context, castToInteger(req.params.namespaceId), req.body));
+});
+
 router.postAsync('/send-configurations-with-send-permission-table', passport.loggedIn, async (req, res) => {
     return res.json(await sendConfigurations.listWithSendPermissionDTAjax(req.context, req.body));
 });

server/routes/rest/templates.js

@@ -35,6 +35,10 @@ router.postAsync('/templates-table', passport.loggedIn, async (req, res) => {
     return res.json(await templates.listDTAjax(req.context, req.body));
 });
 
+router.postAsync('/templates-table-byNamespace/:namespaceId', passport.loggedIn, async (req, res) => {
+    return res.json(await templates.listByNamespaceDTAjax(req.context, req.body, castToInteger(req.params.namespaceId)));
+});
+
 router.postAsync('/template-test-send', passport.loggedIn, passport.csrfProtection, async (req, res) => {
     const data = req.body;
     const result = await CampaignSender.testSend(req.context, data.listCid, data.subscriptionCid, data.campaignId, data.sendConfigurationId, data.html, data.text);

server/services/workers/reports/config/default.yaml

@@ -11,6 +11,7 @@ defaultLanguage: en-US
 # Enabled languages
 enabledLanguages:
 - en-US
+- es-ES
 - fk-FK
 
 mysql: