Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Fix and imporve bulk deletion in campaigns and queries.

Kailash Nadh373682aafc5f
diff --git a/cmd/campaigns.go b/cmd/campaigns.go
index dfd6e4c1..d1134289 100644
--- a/cmd/campaigns.go
+++ b/cmd/campaigns.go
@@ -442,6 +442,7 @@ func (a *App) DeleteCampaigns(c echo.Context) error {
var (
ids []int
query string
+ all bool
)
// Check for IDs in query params.
@@ -455,10 +456,11 @@ func (a *App) DeleteCampaigns(c echo.Context) error {
} else {
// Check for query param.
query = strings.TrimSpace(c.FormValue("query"))
+ all = c.FormValue("all") == "true"
}
// Validate that either IDs or query is provided.
- if len(ids) == 0 && query == "" {
+ if len(ids) == 0 && (query == "" && !all) {
return echo.NewHTTPError(http.StatusBadRequest,
a.i18n.Ts("globals.messages.errorInvalidIDs", "error", "id or query required"))
}
diff --git a/cmd/lists.go b/cmd/lists.go
index 81d0d0c1..68481219 100644
--- a/cmd/lists.go
+++ b/cmd/lists.go
@@ -169,6 +169,7 @@ func (a *App) DeleteLists(c echo.Context) error {
var (
ids []int
query string
+ all bool
)
// Check for IDs in query params.
@@ -182,10 +183,11 @@ func (a *App) DeleteLists(c echo.Context) error {
} else {
// Check for query param.
query = strings.TrimSpace(c.FormValue("query"))
+ all = c.FormValue("all") == "true"
}
// Validate that either IDs or query is provided.
- if len(ids) == 0 && query == "" {
+ if len(ids) == 0 && (query == "" && !all) {
return echo.NewHTTPError(http.StatusBadRequest,
a.i18n.Ts("globals.messages.errorInvalidIDs", "error", "id or query required"))
}
diff --git a/frontend/cypress/e2e/campaigns.cy.js b/frontend/cypress/e2e/campaigns.cy.js
index a86d38d9..ff9dcf06 100644
--- a/frontend/cypress/e2e/campaigns.cy.js
+++ b/frontend/cypress/e2e/campaigns.cy.js
@@ -25,7 +25,8 @@ describe('Campaigns', () => {
cy.wait(500);
cy.get('a[data-cy=btn-attach]').click();
- cy.get('[data-cy=btn-toggle-upload]').click();
+ cy.get('button[data-cy=btn-toggle-upload]').click();
+ cy.wait(500);
cy.get('input[type=file]').attachFile('example.json');
cy.get('form[data-cy="upload"] button').click();
cy.get('.modal button.is-primary:eq(0)').click();
@@ -196,7 +197,7 @@ describe('Campaigns', () => {
cy.get('input[name=query]').clear().type('{enter}');
});
- it('Deletes campaign', () => {
+ it('Deletes campaigns', () => {
cy.wait(1000);
// Delete all visible lists.
cy.get('tbody tr').each(() => {
@@ -377,4 +378,46 @@ describe('Campaigns', () => {
cy.wait(250);
});
});
+
+ it('Bulk deletes campaigns', () => {
+ const apiUrl = Cypress.env('apiUrl');
+
+ const params = {
+ name: 'test-campaign-bulk',
+ subject: 'subject',
+ type: 'regular',
+ content_type: 'richtext',
+ template_id: 1,
+ lists: [1],
+ };
+
+ // Create 30 in a loop.
+ for (let i = 0; i < 30; i += 1) {
+ cy.request('POST', `${apiUrl}/api/campaigns`, params);
+ }
+
+ cy.loginAndVisit('/admin/campaigns');
+
+ // Bulk delete with the `all` flag.
+ cy.window().scrollTo('top');
+ cy.wait(500);
+ cy.get('thead input[type="checkbox"]').click({ force: true });
+ cy.get('a[data-cy=select-all-campaigns]').click();
+ cy.get('a[data-cy=btn-delete-campaigns]').click();
+ cy.get('.modal button.is-primary:eq(0)').click();
+ cy.get('table tr.is-empty');
+
+ // Bulk delete with the selected IDs.
+ // Create 5 campaigns in a loop.
+ for (let i = 0; i < 5; i += 1) {
+ cy.request('POST', `${apiUrl}/api/campaigns`, params);
+ }
+
+ cy.visit('/admin/campaigns');
+ cy.wait(500);
+ cy.get('thead input[type="checkbox"]').click({ force: true });
+ cy.get('a[data-cy=btn-delete-campaigns]').click();
+ cy.get('.modal button.is-primary:eq(0)').click();
+ cy.get('table tr.is-empty');
+ });
});
diff --git a/frontend/cypress/e2e/lists.cy.js b/frontend/cypress/e2e/lists.cy.js
index 33c31ff0..1d194994 100644
--- a/frontend/cypress/e2e/lists.cy.js
+++ b/frontend/cypress/e2e/lists.cy.js
@@ -145,4 +145,37 @@ describe('Lists', () => {
});
});
});
+
+ it('Bulk deletes lists', () => {
+ const apiUrl = Cypress.env('apiUrl');
+
+ // Create 30 in a loop.
+ for (let i = 0; i < 30; i += 1) {
+ cy.request('POST', `${apiUrl}/api/lists`, { name: `test-list-${i}`, type: 'public', optin: 'single' });
+ }
+
+ cy.loginAndVisit('/admin/lists');
+
+ // Bulk delete with the `all` flag.
+ cy.window().scrollTo('top');
+ cy.wait(500);
+ cy.get('thead input[type="checkbox"]').click({ force: true });
+ cy.get('a[data-cy=select-all-lists]').click();
+ cy.get('a[data-cy=btn-delete-lists]').click();
+ cy.get('.modal button.is-primary:eq(0)').click();
+ cy.get('table tr.is-empty');
+
+ // Bulk delete with the selected IDs.
+ // Create 5 lists in a loop.
+ for (let i = 0; i < 5; i += 1) {
+ cy.request('POST', `${apiUrl}/api/lists`, { name: `test-list-bulk-${i}`, type: 'public', optin: 'single' });
+ }
+
+ cy.visit('/admin/lists');
+ cy.wait(500);
+ cy.get('thead input[type="checkbox"]').click({ force: true });
+ cy.get('a[data-cy=btn-delete-lists]').click();
+ cy.get('.modal button.is-primary:eq(0)').click();
+ cy.get('table tr.is-empty');
+ });
});
diff --git a/frontend/package.json b/frontend/package.json
index ddb80f56..a50c1a8a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -47,7 +47,7 @@
"@types/js-beautify": "^1.14.3",
"@vitejs/plugin-vue2": "^2.3.1",
"@vue/eslint-config-airbnb": "^7.0.1",
- "cypress": "13.15.0",
+ "cypress": "15.8.1",
"cypress-file-upload": "^5.0.2",
"cypress-wait-until": "^3.0.2",
"eslint": "^8.56.0",
diff --git a/frontend/src/views/Campaigns.vue b/frontend/src/views/Campaigns.vue
index 987f6edf..87533ae8 100644
--- a/frontend/src/views/Campaigns.vue
+++ b/frontend/src/views/Campaigns.vue
@@ -45,7 +45,7 @@
{{ $tc('globals.messages.numSelected', numSelectedCampaigns, { num: numSelectedCampaigns }) }}
<span v-if="!bulk.all && campaigns.total > campaigns.perPage">
&mdash;
- <a href="#" @click.prevent="onSelectAll">
+ <a href="#" @click.prevent="onSelectAll" data-cy="select-all-campaigns">
{{ $tc('globals.messages.selectAll', campaigns.total, { num: campaigns.total }) }}
</a>
</span>
@@ -279,8 +279,8 @@ import dayjs from 'dayjs';
import Vue from 'vue';
import { mapState } from 'vuex';
import CampaignPreview from '../components/CampaignPreview.vue';
-import EmptyPlaceholder from '../components/EmptyPlaceholder.vue';
import CopyText from '../components/CopyText.vue';
+import EmptyPlaceholder from '../components/EmptyPlaceholder.vue';
export default Vue.extend({
components: {
@@ -501,6 +501,7 @@ export default Vue.extend({
} else {
// 'All' is selected, delete by query.
params.query = this.queryParams.query.replace(/[^\p{L}\p{N}\s]/gu, ' ');
+ params.all = this.bulk.all;
}
this.$api.deleteCampaigns(params)
diff --git a/frontend/src/views/Lists.vue b/frontend/src/views/Lists.vue
index d5b5c0a0..a9365714 100644
--- a/frontend/src/views/Lists.vue
+++ b/frontend/src/views/Lists.vue
@@ -51,7 +51,7 @@
{{ $tc('globals.messages.numSelected', numSelectedLists, { num: numSelectedLists }) }}
<span v-if="!bulk.all && lists.total > lists.perPage">
&mdash;
- <a href="#" @click.prevent="onSelectAll">
+ <a href="#" @click.prevent="onSelectAll" data-cy="select-all-lists">
{{ $tc('globals.messages.selectAll', lists.total, { num: lists.total }) }}
</a>
</span>
@@ -316,6 +316,7 @@ export default Vue.extend({
} else {
// 'All' is selected, delete by query.
params.query = this.queryParams.query.replace(/[^\p{L}\p{N}\s]/gu, ' ');
+ params.all = this.bulk.all;
}
this.$api.deleteLists(params)
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 128c69d6..e06e7688 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -357,15 +357,10 @@
style-mod "^4.1.0"
w3c-keyname "^2.2.4"
-"@colors/[email protected]":
- version "1.5.0"
- resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
- integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
-
-"@cypress/request@^3.0.4":
- version "3.0.7"
- resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.7.tgz#6a74a4da98d9e5ae9121d6e2d9c14780c9b5cf1a"
- integrity sha512-LzxlLEMbBOPYB85uXrDqvD4MgcenjRBLIns3zyhx7vTPj/0u2eQhzXvPiGcaJrV38Q9dbkExWp6cOHPJ+EtFYg==
+"@cypress/request@^3.0.9":
+ version "3.0.9"
+ resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.9.tgz#8ed6e08fea0c62998b5552301023af7268f11625"
+ integrity sha512-I3l7FdGRXluAS44/0NguwWlO83J18p0vlr2FYHrJkWdNYhgVoiYo61IXPqaOsL+vNxU1ZqMACzItGK3/KKDsdw==
dependencies:
aws-sign2 "~0.7.0"
aws4 "^1.8.0"
@@ -373,14 +368,14 @@
combined-stream "~1.0.6"
extend "~3.0.2"
forever-agent "~0.6.1"
- form-data "~4.0.0"
+ form-data "~4.0.4"
http-signature "~1.4.0"
is-typedarray "~1.0.0"
isstream "~0.1.2"
json-stringify-safe "~5.0.1"
mime-types "~2.1.19"
performance-now "^2.1.0"
- qs "6.13.1"
+ qs "6.14.0"
safe-buffer "^5.1.2"
tough-cookie "^5.0.0"
tunnel-agent "^0.6.0"
@@ -981,6 +976,11 @@
resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.9.tgz#d4597dbd4618264c414d7429363e3f50acb66ea2"
integrity sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==
+"@types/tmp@^0.2.3":
+ version "0.2.6"
+ resolved "https://registry.yarnpkg.com/@types/tmp/-/tmp-0.2.6.tgz#d785ee90c52d7cc020e249c948c36f7b32d1e217"
+ integrity sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==
+
"@types/yauzl@^2.9.1":
version "2.10.3"
resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999"
@@ -1214,11 +1214,6 @@ astral-regex@^2.0.0:
resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-async@^3.2.0:
- version "3.2.6"
- resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
- integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
-
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1400,11 +1395,6 @@ chart.js@^4.4.1:
dependencies:
"@kurkle/color" "^0.3.0"
-check-more-types@^2.24.0:
- version "2.24.0"
- resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
- integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==
-
chokidar@^4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30"
@@ -1412,10 +1402,10 @@ chokidar@^4.0.0:
dependencies:
readdirp "^4.0.1"
-ci-info@^3.2.0:
- version "3.9.0"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
- integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
+ci-info@^4.1.0:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.3.1.tgz#355ad571920810b5623e11d40232f443f16f1daa"
+ integrity sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==
clean-stack@^2.0.0:
version "2.2.0"
@@ -1429,14 +1419,14 @@ cli-cursor@^3.1.0:
dependencies:
restore-cursor "^3.1.0"
-cli-table3@~0.6.1:
- version "0.6.5"
- resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.5.tgz#013b91351762739c16a9567c21a04632e449bf2f"
- integrity sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
+ integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
dependencies:
string-width "^4.2.0"
optionalDependencies:
- "@colors/colors" "1.5.0"
+ colors "1.4.0"
cli-truncate@^2.1.0:
version "2.1.0"
@@ -1485,6 +1475,11 @@ colorette@^2.0.16:
resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+ integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
combined-stream@^1.0.8, combined-stream@~1.0.6:
version "1.0.8"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -1564,24 +1559,25 @@ cypress-wait-until@^3.0.2:
resolved "https://registry.yarnpkg.com/cypress-wait-until/-/cypress-wait-until-3.0.2.tgz#c90dddfa4c46a2c422f5b91d486531c560bae46e"
integrity sha512-iemies796dD5CgjG5kV0MnpEmKSH+s7O83ZoJLVzuVbZmm4lheMsZqAVT73hlMx4QlkwhxbyUzhOBUOZwoOe0w==
- version "13.15.0"
- resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.15.0.tgz#5eca5387ef34b2e611cfa291967c69c2cd39381d"
- integrity sha512-53aO7PwOfi604qzOkCSzNlWquCynLlKE/rmmpSPcziRH6LNfaDUAklQT6WJIsD8ywxlIy+uVZsnTMCCQVd2kTw==
+ version "15.8.1"
+ resolved "https://registry.yarnpkg.com/cypress/-/cypress-15.8.1.tgz#48fcb0859b8b656534c9bb3f3abbf37554a2bb2d"
+ integrity sha512-ogc62stTQGh1395ipKxfCE5hQuSApTzeH5e0d9U6m7wYO9HQeCpgnkYtBtd0MbkN2Fnch5Od2mX9u4hoTlrH4Q==
dependencies:
- "@cypress/request" "^3.0.4"
+ "@cypress/request" "^3.0.9"
"@cypress/xvfb" "^1.2.4"
"@types/sinonjs__fake-timers" "8.1.1"
"@types/sizzle" "^2.3.2"
+ "@types/tmp" "^0.2.3"
arch "^2.2.0"
blob-util "^2.0.2"
bluebird "^3.7.2"
buffer "^5.7.1"
cachedir "^2.3.0"
chalk "^4.1.0"
- check-more-types "^2.24.0"
+ ci-info "^4.1.0"
cli-cursor "^3.1.0"
- cli-table3 "~0.6.1"
+ cli-table3 "0.6.1"
commander "^6.2.1"
common-tags "^1.8.0"
dayjs "^1.10.4"
@@ -1593,10 +1589,8 @@ [email protected]:
extract-zip "2.0.1"
figures "^3.2.0"
fs-extra "^9.1.0"
- getos "^3.2.1"
- is-ci "^3.0.1"
+ hasha "5.2.2"
is-installed-globally "~0.4.0"
- lazy-ass "^1.6.0"
listr2 "^3.8.3"
lodash "^4.17.21"
log-symbols "^4.0.0"
@@ -1606,9 +1600,10 @@ [email protected]:
process "^0.11.10"
proxy-from-env "1.0.0"
request-progress "^3.0.0"
- semver "^7.5.3"
supports-color "^8.1.1"
- tmp "~0.2.3"
+ systeminformation "^5.27.14"
+ tmp "~0.2.4"
+ tree-kill "1.2.2"
untildify "^4.0.0"
yauzl "^2.10.0"
@@ -2312,7 +2307,7 @@ forever-agent@~0.6.1:
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
-form-data@^4.0.4, form-data@~4.0.0:
+form-data@^4.0.4:
version "4.0.4"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
@@ -2323,6 +2318,17 @@ form-data@^4.0.4, form-data@~4.0.0:
hasown "^2.0.2"
mime-types "^2.1.12"
+form-data@~4.0.4:
+ version "4.0.5"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"
+ integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.8"
+ es-set-tostringtag "^2.1.0"
+ hasown "^2.0.2"
+ mime-types "^2.1.12"
+
fs-extra@^9.1.0:
version "9.1.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
@@ -2405,13 +2411,6 @@ get-symbol-description@^1.1.0:
es-errors "^1.3.0"
get-intrinsic "^1.2.6"
-getos@^3.2.1:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
- integrity sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==
- dependencies:
- async "^3.2.0"
-
getpass@^0.1.1:
version "0.1.7"
resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -2523,6 +2522,14 @@ has-tostringtag@^1.0.2:
dependencies:
has-symbols "^1.0.3"
+ version "5.2.2"
+ resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"
+ integrity sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==
+ dependencies:
+ is-stream "^2.0.0"
+ type-fest "^0.8.0"
+
hasown@^2.0.0, hasown@^2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
@@ -2658,13 +2665,6 @@ is-callable@^1.1.3, is-callable@^1.2.7:
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-is-ci@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
- integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
- dependencies:
- ci-info "^3.2.0"
-
is-core-module@^2.13.0, is-core-module@^2.15.1, is-core-module@^2.16.0:
version "2.16.1"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
@@ -2984,11 +2984,6 @@ language-tags@^1.0.9:
dependencies:
language-subtag-registry "^0.3.20"
-lazy-ass@^1.6.0:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
- integrity sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==
-
levn@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -3445,7 +3440,14 @@ punycode@^2.1.0:
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
[email protected], qs@^6.10.1:
+ version "6.14.0"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
+ integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
+ dependencies:
+ side-channel "^1.1.0"
+
+qs@^6.10.1:
version "6.13.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.1.tgz#3ce5fc72bd3a8171b85c99b93c65dd20b7d1b16e"
integrity sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==
@@ -3908,6 +3910,11 @@ supports-preserve-symlinks-flag@^1.0.0:
resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+systeminformation@^5.27.14:
+ version "5.28.5"
+ resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.28.5.tgz#a7b82bf3f35bfc3245c8ab67737d0a865961d0bd"
+ integrity sha512-tmeFgL7UceTaRi8uGBs2kxL7L70G07vqYnigSn2P3+elPQ+6q5YlD/c67ZV2PIxixZYw2RCURSNK1JH+zGJ0Hg==
+
text-table@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -3945,10 +3952,10 @@ tldts@^6.1.32:
dependencies:
tldts-core "^6.1.71"
-tmp@~0.2.3:
- version "0.2.4"
- resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.4.tgz#c6db987a2ccc97f812f17137b36af2b6521b0d13"
- integrity sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==
+tmp@~0.2.4:
+ version "0.2.5"
+ resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8"
+ integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==
to-regex-range@^5.0.1:
version "5.0.1"
@@ -3964,6 +3971,11 @@ tough-cookie@^5.0.0:
dependencies:
tldts "^6.1.32"
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+ integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
+
tsconfig-paths@^3.15.0:
version "3.15.0"
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
@@ -4015,6 +4027,11 @@ type-fest@^0.21.3:
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+type-fest@^0.8.0:
+ version "0.8.1"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+ integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
typed-array-buffer@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
diff --git a/internal/auth/models.go b/internal/auth/models.go
index a864a52f..96498d95 100644
--- a/internal/auth/models.go
+++ b/internal/auth/models.go
@@ -191,13 +191,13 @@ func (u *User) HasListPerm(types PermType, listIDs ...int) error {
for _, id := range listIDs {
if id > 0 {
- if u.hasListPerm(perm, id) {
- return nil
+ if !u.hasListPerm(perm, id) {
+ return ErrPermDenied
}
}
}
- return ErrPermDenied
+ return nil
}
func (u *User) hasListPerm(perm string, listID int) bool {
diff --git a/internal/core/campaigns.go b/internal/core/campaigns.go
index d4965146..f11fb34e 100644
--- a/internal/core/campaigns.go
+++ b/internal/core/campaigns.go
@@ -336,10 +336,8 @@ func (c *Core) DeleteCampaigns(ids []int, query string, hasAllPerm bool, permitt
if len(ids) > 0 {
queryStr = ""
- } else if query != "" {
- queryStr = makeSearchString(query)
} else {
- return echo.NewHTTPError(http.StatusBadRequest, c.i18n.T("globals.messages.invalidData"))
+ queryStr = makeSearchString(query)
}
if _, err := c.q.DeleteCampaigns.Exec(pq.Array(ids), queryStr, hasAllPerm, pq.Array(permittedLists)); err != nil {
diff --git a/internal/core/lists.go b/internal/core/lists.go
index fb09f19d..6b023d03 100644
--- a/internal/core/lists.go
+++ b/internal/core/lists.go
@@ -204,10 +204,8 @@ func (c *Core) DeleteLists(ids []int, query string, getAll bool, permittedIDs []
if len(ids) > 0 {
queryStr = ""
- } else if query != "" {
- queryStr = makeSearchString(query)
} else {
- return echo.NewHTTPError(http.StatusBadRequest, c.i18n.T("globals.messages.invalidData"))
+ queryStr = makeSearchString(query)
}
if _, err := c.q.DeleteLists.Exec(pq.Array(ids), queryStr, getAll, pq.Array(permittedIDs)); err != nil {