mirror of
https://github.com/coder/coder.git
synced 2025-07-06 15:41:45 +00:00
fix: change notifications actions url (#17083)
Related to #17082 Some notifications ( workspace created and workspace manually updated ) are using wrong variables to build the Action URL. Fixing it.
This commit is contained in:
@ -0,0 +1,23 @@
|
||||
UPDATE notification_templates
|
||||
SET
|
||||
actions = '[
|
||||
{
|
||||
"label": "View workspace",
|
||||
"url": "{{base_url}}/@{{.UserUsername}}/{{.Labels.workspace}}"
|
||||
}
|
||||
]'::jsonb
|
||||
WHERE id = '281fdf73-c6d6-4cbb-8ff5-888baf8a2fff';
|
||||
|
||||
UPDATE notification_templates
|
||||
SET
|
||||
actions = '[
|
||||
{
|
||||
"label": "View workspace",
|
||||
"url": "{{base_url}}/@{{.UserUsername}}/{{.Labels.workspace}}"
|
||||
},
|
||||
{
|
||||
"label": "View template version",
|
||||
"url": "{{base_url}}/templates/{{.Labels.organization}}/{{.Labels.template}}/versions/{{.Labels.version}}"
|
||||
}
|
||||
]'::jsonb
|
||||
WHERE id = 'd089fe7b-d5c5-4c0c-aaf5-689859f7d392';
|
@ -0,0 +1,23 @@
|
||||
UPDATE notification_templates
|
||||
SET
|
||||
actions = '[
|
||||
{
|
||||
"label": "View workspace",
|
||||
"url": "{{base_url}}/@{{.Labels.workspace_owner_username}}/{{.Labels.workspace}}"
|
||||
}
|
||||
]'::jsonb
|
||||
WHERE id = '281fdf73-c6d6-4cbb-8ff5-888baf8a2fff';
|
||||
|
||||
UPDATE notification_templates
|
||||
SET
|
||||
actions = '[
|
||||
{
|
||||
"label": "View workspace",
|
||||
"url": "{{base_url}}/@{{.Labels.workspace_owner_username}}/{{.Labels.workspace}}"
|
||||
},
|
||||
{
|
||||
"label": "View template version",
|
||||
"url": "{{base_url}}/templates/{{.Labels.organization}}/{{.Labels.template}}/versions/{{.Labels.version}}"
|
||||
}
|
||||
]'::jsonb
|
||||
WHERE id = 'd089fe7b-d5c5-4c0c-aaf5-689859f7d392';
|
@ -1074,9 +1074,10 @@ func TestNotificationTemplates_Golden(t *testing.T) {
|
||||
UserEmail: "bobby@coder.com",
|
||||
UserUsername: "bobby",
|
||||
Labels: map[string]string{
|
||||
"workspace": "bobby-workspace",
|
||||
"template": "bobby-template",
|
||||
"version": "alpha",
|
||||
"workspace": "bobby-workspace",
|
||||
"template": "bobby-template",
|
||||
"version": "alpha",
|
||||
"workspace_owner_username": "mrbobby",
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -1088,11 +1089,12 @@ func TestNotificationTemplates_Golden(t *testing.T) {
|
||||
UserEmail: "bobby@coder.com",
|
||||
UserUsername: "bobby",
|
||||
Labels: map[string]string{
|
||||
"organization": "bobby-organization",
|
||||
"initiator": "bobby",
|
||||
"workspace": "bobby-workspace",
|
||||
"template": "bobby-template",
|
||||
"version": "alpha",
|
||||
"organization": "bobby-organization",
|
||||
"initiator": "bobby",
|
||||
"workspace": "bobby-workspace",
|
||||
"template": "bobby-template",
|
||||
"version": "alpha",
|
||||
"workspace_owner_username": "mrbobby",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
@ -16,7 +16,7 @@ The workspace bobby-workspace has been created from the template bobby-temp=
|
||||
late using version alpha.
|
||||
|
||||
|
||||
View workspace: http://test.com/@bobby/bobby-workspace
|
||||
View workspace: http://test.com/@mrbobby/bobby-workspace
|
||||
|
||||
--bbe61b741255b6098bb6b3c1f41b885773df633cb18d2a3002b68e4bc9c4
|
||||
Content-Transfer-Encoding: quoted-printable
|
||||
@ -53,9 +53,9 @@ ha</strong>.</p>
|
||||
</div>
|
||||
<div style=3D"text-align: center; margin-top: 32px;">
|
||||
=20
|
||||
<a href=3D"http://test.com/@bobby/bobby-workspace" style=3D"display=
|
||||
: inline-block; padding: 13px 24px; background-color: #020617; color: #f8fa=
|
||||
fc; text-decoration: none; border-radius: 8px; margin: 0 4px;">
|
||||
<a href=3D"http://test.com/@mrbobby/bobby-workspace" style=3D"displ=
|
||||
ay: inline-block; padding: 13px 24px; background-color: #020617; color: #f8=
|
||||
fafc; text-decoration: none; border-radius: 8px; margin: 0 4px;">
|
||||
View workspace
|
||||
</a>
|
||||
=20
|
||||
|
@ -16,7 +16,7 @@ A new workspace build has been manually created for your workspace bobby-wo=
|
||||
rkspace by bobby to update it to version alpha of template bobby-template.
|
||||
|
||||
|
||||
View workspace: http://test.com/@bobby/bobby-workspace
|
||||
View workspace: http://test.com/@mrbobby/bobby-workspace
|
||||
|
||||
View template version: http://test.com/templates/bobby-organization/bobby-t=
|
||||
emplate/versions/alpha
|
||||
@ -57,9 +57,9 @@ g>.</p>
|
||||
</div>
|
||||
<div style=3D"text-align: center; margin-top: 32px;">
|
||||
=20
|
||||
<a href=3D"http://test.com/@bobby/bobby-workspace" style=3D"display=
|
||||
: inline-block; padding: 13px 24px; background-color: #020617; color: #f8fa=
|
||||
fc; text-decoration: none; border-radius: 8px; margin: 0 4px;">
|
||||
<a href=3D"http://test.com/@mrbobby/bobby-workspace" style=3D"displ=
|
||||
ay: inline-block; padding: 13px 24px; background-color: #020617; color: #f8=
|
||||
fafc; text-decoration: none; border-radius: 8px; margin: 0 4px;">
|
||||
View workspace
|
||||
</a>
|
||||
=20
|
||||
|
@ -12,13 +12,14 @@
|
||||
"actions": [
|
||||
{
|
||||
"label": "View workspace",
|
||||
"url": "http://test.com/@bobby/bobby-workspace"
|
||||
"url": "http://test.com/@mrbobby/bobby-workspace"
|
||||
}
|
||||
],
|
||||
"labels": {
|
||||
"template": "bobby-template",
|
||||
"version": "alpha",
|
||||
"workspace": "bobby-workspace"
|
||||
"workspace": "bobby-workspace",
|
||||
"workspace_owner_username": "mrbobby"
|
||||
},
|
||||
"data": null,
|
||||
"targets": null
|
||||
|
@ -12,7 +12,7 @@
|
||||
"actions": [
|
||||
{
|
||||
"label": "View workspace",
|
||||
"url": "http://test.com/@bobby/bobby-workspace"
|
||||
"url": "http://test.com/@mrbobby/bobby-workspace"
|
||||
},
|
||||
{
|
||||
"label": "View template version",
|
||||
@ -24,7 +24,8 @@
|
||||
"organization": "bobby-organization",
|
||||
"template": "bobby-template",
|
||||
"version": "alpha",
|
||||
"workspace": "bobby-workspace"
|
||||
"workspace": "bobby-workspace",
|
||||
"workspace_owner_username": "mrbobby"
|
||||
},
|
||||
"data": null,
|
||||
"targets": null
|
||||
|
@ -517,11 +517,12 @@ func (api *API) notifyWorkspaceUpdated(
|
||||
receiverID,
|
||||
notifications.TemplateWorkspaceManuallyUpdated,
|
||||
map[string]string{
|
||||
"organization": template.OrganizationName,
|
||||
"initiator": initiator.Name,
|
||||
"workspace": workspace.Name,
|
||||
"template": template.Name,
|
||||
"version": version.Name,
|
||||
"organization": template.OrganizationName,
|
||||
"initiator": initiator.Name,
|
||||
"workspace": workspace.Name,
|
||||
"template": template.Name,
|
||||
"version": version.Name,
|
||||
"workspace_owner_username": owner.Username,
|
||||
},
|
||||
map[string]any{
|
||||
"workspace": map[string]any{"id": workspace.ID, "name": workspace.Name},
|
||||
|
@ -801,9 +801,10 @@ func (api *API) notifyWorkspaceCreated(
|
||||
receiverID,
|
||||
notifications.TemplateWorkspaceCreated,
|
||||
map[string]string{
|
||||
"workspace": workspace.Name,
|
||||
"template": template.Name,
|
||||
"version": version.Name,
|
||||
"workspace": workspace.Name,
|
||||
"template": template.Name,
|
||||
"version": version.Name,
|
||||
"workspace_owner_username": owner.Username,
|
||||
},
|
||||
map[string]any{
|
||||
"workspace": map[string]any{"id": workspace.ID, "name": workspace.Name},
|
||||
|
Reference in New Issue
Block a user