feat: automatically remove success notification

Closes #8.
dessant · May 16, 2019 · 8b912f1 · 8b912f1
1 parent 62b780d
commit 8b912f1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/src/background/main.js b/src/background/main.js
@@ -144,7 +144,10 @@ async function clearDataType(dataType, options = null, enDataTypes = null) {
       await browser.browsingData.remove({since}, dataTypes);
     }
   } catch (err) {
-    await showNotification('error_dataTypeNotCleared');
+    await showNotification({
+      messageId: 'error_dataTypeNotCleared',
+      type: 'error'
+    });
     throw err;
   }
 
@@ -154,7 +157,12 @@ async function clearDataType(dataType, options = null, enDataTypes = null) {
   }
 
   if (options.notifyOnSuccess) {
-    await showNotification('info_dataTypeCleared');
+    const notification = await showNotification({
+      messageId: 'info_dataTypeCleared'
+    });
+    window.setTimeout(() => {
+      browser.notifications.clear(notification);
+    }, 6000); // 6 seconds
   }
 
   if (options.reloadTabs !== 'false') {
@@ -191,7 +199,10 @@ async function onActionClick() {
   const enDataTypes = await getEnabledDataTypes(options);
 
   if (enDataTypes.length === 0) {
-    await showNotification('error_allDataTypesDisabled');
+    await showNotification({
+      messageId: 'error_allDataTypesDisabled',
+      type: 'error'
+    });
     return;
   }
 

diff --git a/src/utils/app.js b/src/utils/app.js
@@ -25,11 +25,17 @@ function getOptionLabels(data, scope = 'optionValue') {
   return labels;
 }
 
-function showNotification(messageId) {
-  return browser.notifications.create('cbd-notification', {
+function showNotification({message, messageId, title, type = 'info'}) {
+  if (!title) {
+    title = getText('extensionName');
+  }
+  if (messageId) {
+    message = getText(messageId);
+  }
+  return browser.notifications.create(`cbd-notification-${type}`, {
     type: 'basic',
-    title: getText('extensionName'),
-    message: getText(messageId),
+    title: title,
+    message: message,
     iconUrl: '/src/icons/app/icon-48.png'
   });
 }