这是indexloc提供的服务，不要输入任何密码
Skip to content

v1.0.0 ready #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 9, 2021
Merged

v1.0.0 ready #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b72b6ed
Closes #42: Remove debugging logs
ttsukagoshi Aug 9, 2021
9aac3df
Merge pull request #45 from ttsukagoshi/cleanup-logging-42
ttsukagoshi Aug 9, 2021
0d43ac6
Closes #43: Activate the monthly reminder
ttsukagoshi Aug 9, 2021
a560582
Merge pull request #46 from ttsukagoshi/activate-monthly-reminder-on-…
ttsukagoshi Aug 9, 2021
6d28012
Change target branch of dependabot to main
ttsukagoshi Aug 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ updates:
commit-message:
prefix: 'github-actions'
include: 'scope'
target-branch: 'dev'
target-branch: 'main'
- package-ecosystem: 'npm'
directory: '/'
schedule:
Expand All @@ -24,4 +24,4 @@ updates:
commit-message:
prefix: 'npm'
include: 'scope'
target-branch: 'dev'
target-branch: 'main'
60 changes: 42 additions & 18 deletions src/websiteMonitoring.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ function setupLogExtractionTrigger() {
* @param {String} frequencyUnit Unit of the value of frequencyKey, i.e., minute, hour, day, or week.
*/
function setupTrigger_(handlerFunction, frequencyKey, frequencyUnit) {
console.info(`[setupTrigger_] Setting trigger for ${handlerFunction}...`);
const ui = SpreadsheetApp.getUi();
const myEmail = Session.getActiveUser().getEmail();
const ss = SpreadsheetApp.getActiveSpreadsheet();
Expand Down Expand Up @@ -193,6 +194,9 @@ function setupTrigger_(handlerFunction, frequencyKey, frequencyUnit) {
localMessage.replaceErrorInvalidFrequencyUnit(frequencyUnit)
);
}
// Set up a trigger for monthly reminders
setupReminderTrigger(true);
console.info('[setupTrigger_] Trigger set up complete.');
ui.alert(
localMessage.replaceAlertTitleCompleteTriggerSetup(handlerFunction),
localMessage.replaceAlertMessageCompleteTriggerSetup(
Expand All @@ -202,6 +206,7 @@ function setupTrigger_(handlerFunction, frequencyKey, frequencyUnit) {
ui.ButtonSet.OK
);
} catch (e) {
console.error(e.stack);
ui.alert(e.stack);
}
}
Expand All @@ -210,34 +215,53 @@ function setupTrigger_(handlerFunction, frequencyKey, frequencyUnit) {
* Set time-based trigger for sending monthly reminders
* of active time-based triggers set by this user in this script.
* Trigger will be set for the first day of each month.
* @param {Boolean} muteUi Will not show any UI alerts when true. Defaults to false.
*/
function setupReminderTrigger() {
const ui = SpreadsheetApp.getUi();
function setupReminderTrigger(muteUi = false) {
console.info(
'[setupReminderTrigger] Setting trigger for the monthly reminder...'
);
if (!muteUi) {
var ui = SpreadsheetApp.getUi();
}
const localMessage = new LocalizedMessage(
SpreadsheetApp.getActiveSpreadsheet().getSpreadsheetLocale()
);
const handlerFunction = 'sendReminder';
// Delete existing trigger for the same handler function.
ScriptApp.getProjectTriggers().forEach((trigger) => {
if (trigger.getHandlerFunction() === handlerFunction) {
ScriptApp.deleteTrigger(trigger);
try {
// Delete existing trigger for the same handler function.
ScriptApp.getProjectTriggers().forEach((trigger) => {
if (trigger.getHandlerFunction() === handlerFunction) {
ScriptApp.deleteTrigger(trigger);
}
});
// Set new trigger
ScriptApp.newTrigger(handlerFunction).timeBased().onMonthDay(1).create();
console.info('[setupReminderTrigger] Trigger set up complete.');
if (!muteUi) {
ui.alert(
localMessage.replaceAlertTitleCompleteTriggerSetup(handlerFunction),
localMessage.replaceAlertMessageCompleteReminderTriggerSetup(
Session.getActiveUser().getEmail()
),
ui.ButtonSet.OK
);
}
});
// Set new trigger
ScriptApp.newTrigger(handlerFunction).timeBased().onMonthDay(1).create();
ui.alert(
localMessage.replaceAlertTitleCompleteTriggerSetup(handlerFunction),
localMessage.replaceAlertMessageCompleteReminderTriggerSetup(
Session.getActiveUser().getEmail()
),
ui.ButtonSet.OK
);
} catch (e) {
console.error(e.stack);
if (!muteUi) {
ui.alert(e.stack);
} else {
throw e;
}
}
}

/**
* Delete existing trigger(s).
*/
function deleteTimeBasedTriggers() {
console.info('[deleteTimeBasedTriggers] Deleting triggers...');
const ui = SpreadsheetApp.getUi();
const myEmail = Session.getActiveUser().getEmail();
const localMessage = new LocalizedMessage(
Expand All @@ -256,12 +280,14 @@ function deleteTimeBasedTriggers() {
ScriptApp.getProjectTriggers().forEach((trigger) =>
ScriptApp.deleteTrigger(trigger)
);
console.info('[deleteTimeBasedTriggers] Deleted triggers.');
ui.alert(
localMessage.messageList.alertTitleComplete,
localMessage.messageList.alertMessageTriggerDelete,
ui.ButtonSet.OK
);
} catch (e) {
console.error(e.stack);
ui.alert(e.stack);
}
}
Expand Down Expand Up @@ -402,7 +428,6 @@ function websiteMonitoring(triggered = false) {
RESPONSE_CODE_WILDCARD,
spreadsheetLocale
);
console.log(JSON.stringify(options)); //////////////////
// Get the actual HTTP response codes
let dashboardStatus = []; // Array to record on the dashboard worksheet
let statusChange = targetWebsites.reduce(
Expand Down Expand Up @@ -474,7 +499,6 @@ function websiteMonitoring(triggered = false) {
.shift();
latestStatusSheet.getDataRange().clearContent();
dashboardStatus = [existingStatusHeader].concat(dashboardStatus);
console.log(dashboardStatus);
latestStatusSheet
.getRange(1, 1, dashboardStatus.length, dashboardStatus[0].length)
.setValues(dashboardStatus);
Expand Down