Skip to content

Commit f9bb6d0

Browse files
committed
Merge remote-tracking branch 'origin/master' into issue-11938
2 parents f3ac489 + a825d26 commit f9bb6d0

File tree

322 files changed

+11164
-1429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+11164
-1429
lines changed

.github/workflows/components-pr.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919

2020
steps:
21-
- uses: actions/checkout@v4.1.6
21+
- uses: actions/checkout@v4.1.7
2222
name: Checkout repo
2323
with:
2424
# See https://github.com/actions/checkout#checkout-v2
@@ -48,7 +48,7 @@ jobs:
4848

4949
steps:
5050
- name: Checkout code
51-
uses: actions/checkout@v4.1.6
51+
uses: actions/checkout@v4.1.7
5252
- uses: pnpm/action-setup@v4.0.0
5353
with:
5454
version: 7.33.6
@@ -137,7 +137,7 @@ jobs:
137137

138138
steps:
139139
- name: Checkout code
140-
uses: actions/checkout@v4.1.6
140+
uses: actions/checkout@v4.1.7
141141
- uses: pnpm/action-setup@v4.0.0
142142
with:
143143
version: 7.33.6

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v4.1.6
21+
- uses: actions/checkout@v4.1.7
2222
name: Checkout repo
2323
with:
2424
# See https://github.com/actions/checkout#checkout-v2

.github/workflows/publish-components.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v4.1.6
14+
uses: actions/checkout@v4.1.7
1515
- uses: pnpm/action-setup@v4.0.0
1616
with:
1717
version: 7.33.6
@@ -117,7 +117,7 @@ jobs:
117117

118118
steps:
119119
- name: Checkout code
120-
uses: actions/checkout@v4.1.6
120+
uses: actions/checkout@v4.1.7
121121
- uses: pnpm/action-setup@v4.0.0
122122
with:
123123
version: 7.33.6

.github/workflows/publish-marketplace-content.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v4.1.6
14+
uses: actions/checkout@v4.1.7
1515
- uses: pnpm/action-setup@v4.0.0
1616
with:
1717
version: 7.33.6

.github/workflows/publish-packages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
concurrency:
2121
group: ${{ github.workflow }}-${{ github.ref }}
2222
steps:
23-
- uses: actions/checkout@v4.1.6
23+
- uses: actions/checkout@v4.1.7
2424
- uses: pnpm/action-setup@v4.0.0
2525
with:
2626
version: 7.33.6

.github/workflows/pull-request-checks.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v4.1.6
19+
- uses: actions/checkout@v4.1.7
2020
name: Checkout
2121
- uses: Ana06/get-changed-files@v2.3.0
2222
id: changed_files
@@ -35,7 +35,7 @@ jobs:
3535
done
3636
3737
echo "files=${files}" >> $GITHUB_ENV
38-
- uses: rojopolis/spellcheck-github-actions@0.37.0
38+
- uses: rojopolis/spellcheck-github-actions@0.38.0
3939
name: Spellcheck
4040
if: ${{ env.files }}
4141
with:
@@ -48,7 +48,7 @@ jobs:
4848

4949
steps:
5050
- name: Checkout Code
51-
uses: actions/checkout@v4.1.6
51+
uses: actions/checkout@v4.1.7
5252
with:
5353
# Full git history is needed to get a proper list of changed files
5454
# within `super-linter`

blog/pi/poetry.lock

Lines changed: 35 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

blog/pi/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ python-dotenv = "^1.0.0"
2121
snowflake-connector-python = "^3.0.2"
2222
openapi3-parser = "^1.1.6"
2323
plotly = "^5.14.0"
24-
scikit-learn = "^1.2.2"
24+
scikit-learn = "^1.5.0"
2525
torch = "^2.0.0"
2626
matplotlib = "^3.7.1"
2727
scikit-optimize = "^0.9.0"
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
import acymailing from "../../acymailing.app.mjs";
2+
import { parseObject } from "../../common/utils.mjs";
3+
4+
export default {
5+
key: "acymailing-add-update-user",
6+
name: "Add or Update User",
7+
description: "Creates a new user or updates an existing user in AcyMailing. If the user exists, will update the user's data with provided information. [See the documentation](https://docs.acymailing.com/v/rest-api/users#create-or-update-a-user)",
8+
version: "0.0.1",
9+
type: "action",
10+
props: {
11+
acymailing,
12+
email: {
13+
type: "string",
14+
label: "Email",
15+
description: "The email address is used when updating an existing user.",
16+
},
17+
name: {
18+
type: "string",
19+
label: "Name",
20+
description: "Any character should be available.",
21+
optional: true,
22+
},
23+
active: {
24+
type: "boolean",
25+
label: "Active",
26+
description: "Defaults to true.",
27+
optional: true,
28+
},
29+
confirmed: {
30+
type: "boolean",
31+
label: "Confirmed",
32+
description: "The confirmation is related to the \"Require confirmation\" option in the configuration, tab \"Subscription\".",
33+
optional: true,
34+
},
35+
cmsId: {
36+
type: "integer",
37+
label: "CMS Id",
38+
description: "The cms_id must match the ID of the corresponding Joomla/WordPress user.",
39+
optional: true,
40+
},
41+
customFields: {
42+
type: "object",
43+
label: "Custom Fields",
44+
description: "An object of field Ids and values.",
45+
optional: true,
46+
},
47+
triggers: {
48+
type: "boolean",
49+
label: "Triggers",
50+
description: "Defaults to true. Defines if the saving of the user triggers automated tasks like follow-up campaigns and automations.",
51+
optional: true,
52+
},
53+
sendConf: {
54+
type: "boolean",
55+
label: "Send Conf",
56+
description: "Defaults to true. Defines if the confirmation email should be sent when a new user is created.",
57+
optional: true,
58+
},
59+
},
60+
async run({ $ }) {
61+
const response = await this.acymailing.createUserOrUpdate({
62+
$,
63+
data: {
64+
email: this.email,
65+
name: this.name,
66+
active: this.active,
67+
confirmed: this.confirmed,
68+
cmsId: this.cmsId,
69+
customFields: parseObject(this.customFields),
70+
triggers: this.triggers,
71+
sendConf: this.sendConf,
72+
},
73+
});
74+
$.export("$summary", `Successfully added or updated user with email with Id: ${response.userId}`);
75+
return response;
76+
},
77+
};
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
import acymailing from "../../acymailing.app.mjs";
2+
import { parseObject } from "../../common/utils.mjs";
3+
4+
export default {
5+
key: "acymailing-email-user",
6+
name: "Email User",
7+
description: "Sends an email to a single AcyMailing user. The user must exist in the AcyMailing database. [See the documentation](https://docs.acymailing.com/v/rest-api/emails#send-an-email-to-a-user)",
8+
version: "0.0.1",
9+
type: "action",
10+
props: {
11+
acymailing,
12+
email: {
13+
type: "string",
14+
label: "Email",
15+
description: "The email address of the receiver.",
16+
},
17+
autoAddUser: {
18+
type: "boolean",
19+
label: "Auto Add User",
20+
description: "Defaults to false. If the email address doesn't match an existing AcyMailing user, one will be automatically created if this option is set to true.",
21+
optional: true,
22+
},
23+
emailId: {
24+
type: "integer",
25+
label: "Email Id",
26+
description: "The mail ID to send. This is not a campaign ID but the mail ID of the table xxx_acym_mail in the database, or the mail_id of a campaign.",
27+
},
28+
trackEmail: {
29+
type: "boolean",
30+
label: "Track Email",
31+
description: "Defaults to true. If true, the open/click statistics will be collected for this email.",
32+
optional: true,
33+
},
34+
params: {
35+
type: "object",
36+
label: "Params",
37+
description: "An object of shortcodes and values to replace in the body of the sent email. Example: { \"shortcode1\": \"value 1\" }. If the body of the sent email contains the text \"{shortcode1}\", it will be replaced by \"value 1\" in the sent version.",
38+
optional: true,
39+
},
40+
},
41+
async run({ $ }) {
42+
const response = await this.acymailing.sendEmailToUser({
43+
$,
44+
data: {
45+
email: this.email,
46+
autoAddUser: this.autoAddUser,
47+
emailId: this.emailId,
48+
trackEmail: this.trackEmail,
49+
params: parseObject(this.params),
50+
},
51+
});
52+
$.export("$summary", `Email successfully sent to ${this.email}`);
53+
return response;
54+
},
55+
};

0 commit comments

Comments
 (0)