From 4da1419f76d8b3a4835d87a79e17cfb0837eecd5 Mon Sep 17 00:00:00 2001 From: vikranth Date: Sat, 12 Nov 2016 14:24:33 +0530 Subject: [PATCH 1/7] Added email notification to manual intervention Signed-off-by: vikranth --- .../resources.resjson/en-US/resources.resjson | 3 ++- Tasks/ManualIntervention/task.json | 12 ++++++++++-- Tasks/ManualIntervention/task.loc.json | 12 ++++++++++-- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson index b2bab3807499..cbd8116b58dc 100644 --- a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson @@ -4,5 +4,6 @@ "loc.description": "Pause deployment and wait for intervention", "loc.instanceNameFormat": "Manual Intervention", "loc.input.label.instructions": "Instructions", - "loc.input.help.instructions": "These instructions will be shown to the user for resuming or rejecting the manual intervention. Based on these instructions the user will take an informed decision about this manual intervention." + "loc.input.help.instructions": "These instructions will be shown to the user for resuming or rejecting the manual intervention. Based on these instructions the user will take an informed decision about this manual intervention.", + "loc.input.help.SendEmailNotification": "Send a manual intervention pending email to all users who have Manage deployment permission. Only users with Manage deployment permission can act on a manual intervention." } \ No newline at end of file diff --git a/Tasks/ManualIntervention/task.json b/Tasks/ManualIntervention/task.json index e47bbd884e46..ee7e559c2e82 100644 --- a/Tasks/ManualIntervention/task.json +++ b/Tasks/ManualIntervention/task.json @@ -15,7 +15,7 @@ "version": { "Major": 8, "Minor": 0, - "Patch": 2 + "Patch": 3 }, "inputs": [ { @@ -30,7 +30,15 @@ "rows": "10", "maxLength": "500" } - } + }, + { + "name": "SendEmailNotification", + "type": "boolean", + "label": "Send email notification", + "defaultValue": "false", + "required": false, + "helpMarkDown": "Send a manual intervention pending email to all users who have Manage deployment permission. Only users with Manage deployment permission can act on a manual intervention." + } ], "instanceNameFormat": "Manual Intervention", "execution": { diff --git a/Tasks/ManualIntervention/task.loc.json b/Tasks/ManualIntervention/task.loc.json index f0bb4c3d528b..14d9df6a38de 100644 --- a/Tasks/ManualIntervention/task.loc.json +++ b/Tasks/ManualIntervention/task.loc.json @@ -15,7 +15,7 @@ "version": { "Major": 8, "Minor": 0, - "Patch": 2 + "Patch": 3 }, "inputs": [ { @@ -30,7 +30,15 @@ "rows": "10", "maxLength": "500" } - } + }, + { + "name": "SendEmailNotification", + "type": "boolean", + "label": "Send email notification", + "defaultValue": "false", + "required": false, + "helpMarkDown": "ms-resource:loc.input.help.SendEmailNotification" + } ], "instanceNameFormat": "ms-resource:loc.instanceNameFormat", "execution": { From 47fb249316f85b444bdfe3456318c60d20328ffc Mon Sep 17 00:00:00 2001 From: vikranth Date: Wed, 7 Dec 2016 18:28:46 +0530 Subject: [PATCH 2/7] Revert "Added email notification to manual intervention" This reverts commit 4da1419f76d8b3a4835d87a79e17cfb0837eecd5. --- .../resources.resjson/en-US/resources.resjson | 3 +-- Tasks/ManualIntervention/task.json | 12 ++---------- Tasks/ManualIntervention/task.loc.json | 12 ++---------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson index cbd8116b58dc..b2bab3807499 100644 --- a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson @@ -4,6 +4,5 @@ "loc.description": "Pause deployment and wait for intervention", "loc.instanceNameFormat": "Manual Intervention", "loc.input.label.instructions": "Instructions", - "loc.input.help.instructions": "These instructions will be shown to the user for resuming or rejecting the manual intervention. Based on these instructions the user will take an informed decision about this manual intervention.", - "loc.input.help.SendEmailNotification": "Send a manual intervention pending email to all users who have Manage deployment permission. Only users with Manage deployment permission can act on a manual intervention." + "loc.input.help.instructions": "These instructions will be shown to the user for resuming or rejecting the manual intervention. Based on these instructions the user will take an informed decision about this manual intervention." } \ No newline at end of file diff --git a/Tasks/ManualIntervention/task.json b/Tasks/ManualIntervention/task.json index ee7e559c2e82..e47bbd884e46 100644 --- a/Tasks/ManualIntervention/task.json +++ b/Tasks/ManualIntervention/task.json @@ -15,7 +15,7 @@ "version": { "Major": 8, "Minor": 0, - "Patch": 3 + "Patch": 2 }, "inputs": [ { @@ -30,15 +30,7 @@ "rows": "10", "maxLength": "500" } - }, - { - "name": "SendEmailNotification", - "type": "boolean", - "label": "Send email notification", - "defaultValue": "false", - "required": false, - "helpMarkDown": "Send a manual intervention pending email to all users who have Manage deployment permission. Only users with Manage deployment permission can act on a manual intervention." - } + } ], "instanceNameFormat": "Manual Intervention", "execution": { diff --git a/Tasks/ManualIntervention/task.loc.json b/Tasks/ManualIntervention/task.loc.json index 14d9df6a38de..f0bb4c3d528b 100644 --- a/Tasks/ManualIntervention/task.loc.json +++ b/Tasks/ManualIntervention/task.loc.json @@ -15,7 +15,7 @@ "version": { "Major": 8, "Minor": 0, - "Patch": 3 + "Patch": 2 }, "inputs": [ { @@ -30,15 +30,7 @@ "rows": "10", "maxLength": "500" } - }, - { - "name": "SendEmailNotification", - "type": "boolean", - "label": "Send email notification", - "defaultValue": "false", - "required": false, - "helpMarkDown": "ms-resource:loc.input.help.SendEmailNotification" - } + } ], "instanceNameFormat": "ms-resource:loc.instanceNameFormat", "execution": { From 059101a073cca91309607401b3dd3658487e77c1 Mon Sep 17 00:00:00 2001 From: Vikranth Thati Date: Mon, 13 Mar 2017 14:19:21 +0530 Subject: [PATCH 3/7] Added Resume on timeout input. --- .../resources.resjson/en-US/resources.resjson | 4 +++- Tasks/ManualIntervention/task.json | 10 +++++++++- Tasks/ManualIntervention/task.loc.json | 12 ++++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson index 5a3fc282f2fe..ea08649b1950 100644 --- a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson @@ -6,5 +6,7 @@ "loc.input.label.instructions": "Instructions", "loc.input.help.instructions": "These instructions will be shown to the user for resuming or rejecting the manual intervention. Based on these instructions the user will take an informed decision about this manual intervention.", "loc.input.label.emailRecipients": "Notify users", - "loc.input.help.emailRecipients": "Send a manual intervention pending email to specific users (or groups). Only users with manage deployment permission can act on a manual intervention." + "loc.input.help.emailRecipients": "Send a manual intervention pending email to specific users (or groups). Only users with manage deployment permission can act on a manual intervention.", + "loc.input.label.resumeOnTimeout": "Resume on timeout", + "loc.input.help.resumeOnTimeout": "Resume this manual intervention automatically after it is pending for the specified timeout or 30 days, whichever is earlier." } \ No newline at end of file diff --git a/Tasks/ManualIntervention/task.json b/Tasks/ManualIntervention/task.json index f21440c5f998..11b3c40dce19 100644 --- a/Tasks/ManualIntervention/task.json +++ b/Tasks/ManualIntervention/task.json @@ -14,7 +14,7 @@ ], "version": { "Major": 8, - "Minor": 1, + "Minor": 2, "Patch": 3 }, "inputs": [ @@ -38,6 +38,14 @@ "defaultValue": "", "required": false, "helpMarkDown": "Send a manual intervention pending email to specific users (or groups). Only users with manage deployment permission can act on a manual intervention." + }, + { + "name": "resumeOnTimeout", + "type": "boolean", + "label": "Resume on timeout", + "defaultValue": false, + "required": false, + "helpMarkDown": "Resume this manual intervention automatically after it is pending for the specified timeout or 30 days, whichever is earlier." } ], "instanceNameFormat": "Manual Intervention", diff --git a/Tasks/ManualIntervention/task.loc.json b/Tasks/ManualIntervention/task.loc.json index 8e39bf3e81b2..63413c779b05 100644 --- a/Tasks/ManualIntervention/task.loc.json +++ b/Tasks/ManualIntervention/task.loc.json @@ -14,7 +14,7 @@ ], "version": { "Major": 8, - "Minor": 1, + "Minor": 2, "Patch": 3 }, "inputs": [ @@ -38,7 +38,15 @@ "defaultValue": "", "required": false, "helpMarkDown": "ms-resource:loc.input.help.emailRecipients" - } + }, + { + "name": "resumeOnTimeout", + "type": "boolean", + "label": "ms-resource:loc.input.label.resumeOnTimeout", + "defaultValue": false, + "required": false, + "helpMarkDown": "ms-resource:loc.input.help.resumeOnTimeout" + } ], "instanceNameFormat": "ms-resource:loc.instanceNameFormat", "execution": { From 34122963c1aa25c5954d4ace165d145a22042b28 Mon Sep 17 00:00:00 2001 From: Vikranth Thati Date: Tue, 14 Mar 2017 16:46:40 +0530 Subject: [PATCH 4/7] Changed help text. --- .../Strings/resources.resjson/en-US/resources.resjson | 2 +- Tasks/ManualIntervention/task.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson index ea08649b1950..ba9ce7619126 100644 --- a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson @@ -8,5 +8,5 @@ "loc.input.label.emailRecipients": "Notify users", "loc.input.help.emailRecipients": "Send a manual intervention pending email to specific users (or groups). Only users with manage deployment permission can act on a manual intervention.", "loc.input.label.resumeOnTimeout": "Resume on timeout", - "loc.input.help.resumeOnTimeout": "Resume this manual intervention automatically after it is pending for the specified timeout or 30 days, whichever is earlier." + "loc.input.help.resumeOnTimeout": "Resume this manual intervention automatically after it is pending for the specified timeout or 60 days, whichever is earlier." } \ No newline at end of file diff --git a/Tasks/ManualIntervention/task.json b/Tasks/ManualIntervention/task.json index 11b3c40dce19..0e04cdb1d07c 100644 --- a/Tasks/ManualIntervention/task.json +++ b/Tasks/ManualIntervention/task.json @@ -45,7 +45,7 @@ "label": "Resume on timeout", "defaultValue": false, "required": false, - "helpMarkDown": "Resume this manual intervention automatically after it is pending for the specified timeout or 30 days, whichever is earlier." + "helpMarkDown": "Resume this manual intervention automatically after it is pending for the specified timeout or 60 days, whichever is earlier." } ], "instanceNameFormat": "Manual Intervention", From 99b269439d0bfe1407531b0e858488f31ee6ddf2 Mon Sep 17 00:00:00 2001 From: Vikranth Thati Date: Wed, 15 Mar 2017 11:17:25 +0530 Subject: [PATCH 5/7] 1 Revert "Changed help text." This reverts commit 34122963c1aa25c5954d4ace165d145a22042b28. --- .../Strings/resources.resjson/en-US/resources.resjson | 2 +- Tasks/ManualIntervention/task.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson index ba9ce7619126..ea08649b1950 100644 --- a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson @@ -8,5 +8,5 @@ "loc.input.label.emailRecipients": "Notify users", "loc.input.help.emailRecipients": "Send a manual intervention pending email to specific users (or groups). Only users with manage deployment permission can act on a manual intervention.", "loc.input.label.resumeOnTimeout": "Resume on timeout", - "loc.input.help.resumeOnTimeout": "Resume this manual intervention automatically after it is pending for the specified timeout or 60 days, whichever is earlier." + "loc.input.help.resumeOnTimeout": "Resume this manual intervention automatically after it is pending for the specified timeout or 30 days, whichever is earlier." } \ No newline at end of file diff --git a/Tasks/ManualIntervention/task.json b/Tasks/ManualIntervention/task.json index 0e04cdb1d07c..11b3c40dce19 100644 --- a/Tasks/ManualIntervention/task.json +++ b/Tasks/ManualIntervention/task.json @@ -45,7 +45,7 @@ "label": "Resume on timeout", "defaultValue": false, "required": false, - "helpMarkDown": "Resume this manual intervention automatically after it is pending for the specified timeout or 60 days, whichever is earlier." + "helpMarkDown": "Resume this manual intervention automatically after it is pending for the specified timeout or 30 days, whichever is earlier." } ], "instanceNameFormat": "Manual Intervention", From f7ca40a035d40c3ecc8e8ffc8cd1ce46be5027de Mon Sep 17 00:00:00 2001 From: Vikranth Thati Date: Wed, 15 Mar 2017 14:40:08 +0530 Subject: [PATCH 6/7] Added onTimeout input. --- .../resources.resjson/en-US/resources.resjson | 4 ++-- Tasks/ManualIntervention/task.json | 18 ++++++++++------- Tasks/ManualIntervention/task.loc.json | 20 +++++++++++-------- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson index ea08649b1950..139acf64bd29 100644 --- a/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson +++ b/Tasks/ManualIntervention/Strings/resources.resjson/en-US/resources.resjson @@ -7,6 +7,6 @@ "loc.input.help.instructions": "These instructions will be shown to the user for resuming or rejecting the manual intervention. Based on these instructions the user will take an informed decision about this manual intervention.", "loc.input.label.emailRecipients": "Notify users", "loc.input.help.emailRecipients": "Send a manual intervention pending email to specific users (or groups). Only users with manage deployment permission can act on a manual intervention.", - "loc.input.label.resumeOnTimeout": "Resume on timeout", - "loc.input.help.resumeOnTimeout": "Resume this manual intervention automatically after it is pending for the specified timeout or 30 days, whichever is earlier." + "loc.input.label.onTimeout": "On timeout", + "loc.input.help.onTimeout": "Reject or resume this manual intervention automatically after it is pending for the specified timeout or 60 days, whichever is earlier." } \ No newline at end of file diff --git a/Tasks/ManualIntervention/task.json b/Tasks/ManualIntervention/task.json index 11b3c40dce19..44302ff1479d 100644 --- a/Tasks/ManualIntervention/task.json +++ b/Tasks/ManualIntervention/task.json @@ -39,13 +39,17 @@ "required": false, "helpMarkDown": "Send a manual intervention pending email to specific users (or groups). Only users with manage deployment permission can act on a manual intervention." }, - { - "name": "resumeOnTimeout", - "type": "boolean", - "label": "Resume on timeout", - "defaultValue": false, - "required": false, - "helpMarkDown": "Resume this manual intervention automatically after it is pending for the specified timeout or 30 days, whichever is earlier." + { + "name": "onTimeout", + "type": "radio", + "label": "On timeout", + "defaultValue": "Reject", + "required": true, + "options": { + "Reject": "Reject", + "Resume": "Resume" + }, + "helpMarkDown": "Reject or resume this manual intervention automatically after it is pending for the specified timeout or 60 days, whichever is earlier." } ], "instanceNameFormat": "Manual Intervention", diff --git a/Tasks/ManualIntervention/task.loc.json b/Tasks/ManualIntervention/task.loc.json index 63413c779b05..581f183d3ec7 100644 --- a/Tasks/ManualIntervention/task.loc.json +++ b/Tasks/ManualIntervention/task.loc.json @@ -39,14 +39,18 @@ "required": false, "helpMarkDown": "ms-resource:loc.input.help.emailRecipients" }, - { - "name": "resumeOnTimeout", - "type": "boolean", - "label": "ms-resource:loc.input.label.resumeOnTimeout", - "defaultValue": false, - "required": false, - "helpMarkDown": "ms-resource:loc.input.help.resumeOnTimeout" - } + { + "name": "onTimeout", + "type": "radio", + "label": "ms-resource:loc.input.label.onTimeout", + "defaultValue": "Reject", + "required": true, + "options": { + "Reject": "Reject", + "Resume": "Resume" + }, + "helpMarkDown": "ms-resource:loc.input.help.onTimeout" + } ], "instanceNameFormat": "ms-resource:loc.instanceNameFormat", "execution": { From 311bc5b1a1f46684866427456feeab35e1290d67 Mon Sep 17 00:00:00 2001 From: Vikranth Thati Date: Thu, 16 Mar 2017 14:45:02 +0530 Subject: [PATCH 7/7] changed required field. --- Tasks/ManualIntervention/task.json | 2 +- Tasks/ManualIntervention/task.loc.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/ManualIntervention/task.json b/Tasks/ManualIntervention/task.json index 44302ff1479d..bedd70d34eae 100644 --- a/Tasks/ManualIntervention/task.json +++ b/Tasks/ManualIntervention/task.json @@ -44,7 +44,7 @@ "type": "radio", "label": "On timeout", "defaultValue": "Reject", - "required": true, + "required": false, "options": { "Reject": "Reject", "Resume": "Resume" diff --git a/Tasks/ManualIntervention/task.loc.json b/Tasks/ManualIntervention/task.loc.json index 581f183d3ec7..ba41547df189 100644 --- a/Tasks/ManualIntervention/task.loc.json +++ b/Tasks/ManualIntervention/task.loc.json @@ -44,7 +44,7 @@ "type": "radio", "label": "ms-resource:loc.input.label.onTimeout", "defaultValue": "Reject", - "required": true, + "required": false, "options": { "Reject": "Reject", "Resume": "Resume"