Merge pull request #252 from sas-fossdev/fix-options-page

Fix options page and remove extension info option

Author: Suhas Hariharan

src/js/helpers.js

@@ -253,6 +253,15 @@ async function getLocalConfig () {
     return data;
 }
 
+/**
+ * Retrieves the default extension config for new users.
+ * @returns {Config} an object representing the default config.
+ */
+function getDefaultConfig () {
+    const data = { opted_in: { changed: false, value: false }, percent_main_page: { changed: false, value: true } };
+    return data;
+}
+
 export {
     gradeToFP,
     grade_fp,
@@ -266,4 +275,6 @@ export {
     calculate_credit_hours,
     getSavedGrades,
     saveGradesLocally,
+    getLocalConfig,
+    getDefaultConfig,
 };

src/js/saspowerschoolff.js

@@ -36,6 +36,8 @@ import {
     gradeToGPA,
     saveGradesLocally,
     getSavedGrades,
+    getLocalConfig,
+    getDefaultConfig,
 } from './helpers';
 
 // Vue Components
@@ -113,20 +115,32 @@ function class_page () {
 
 async function login_page () {
     $('<div id="saspes-info"></div>').insertAfter('div#content');
-    browser.storage.local.get("showExtensionInfo").then(output => {
-        new (Vue.extend(ExtensionInfo))({
-            data: {
-                showInfo: output.showExtensionInfo.value,
-            },
-        }).$mount('#saspes-info');
-    });
+    new (Vue.extend(ExtensionInfo))({
+        data: {
+            showInfo: true,
+        },
+    }).$mount('#saspes-info');
 
     const LastGradesDiv = document.createElement('div');
     LastGradesDiv.classList.add("last-grade-div-fixed");
     LastGradesDiv.id = "saspes-last-grades";
     document.body.appendChild(LastGradesDiv);
 
-    if ((await browser.storage.local.get("opted_in")).opted_in.value) {
+    let current_config = await getLocalConfig();
+    // disables last seen grades temporarily for anyone who has it enabled, until a proper opt in can be added.
+
+    if (current_config.opted_in === undefined) {
+        current_config = getDefaultConfig();
+    } else if (current_config.opted_in.value === undefined) {
+        current_config = getDefaultConfig();
+    } else if (current_config.opted_in.changed !== undefined && current_config.opted_in.changed === false) {
+        current_config.opted_in = {
+            value: false,
+            changed: false,
+        };
+    }
+    await browser.storage.local.set(current_config);
+    if ((await browser.storage.local.get("opted_in"))?.opted_in?.value || false) {
         (browser.storage.local.get("most_recent_user")).then(output => {
             const most_recent_user = output.most_recent_user;
             if (most_recent_user !== undefined) {

src/js/views/Options.vue

@@ -45,8 +45,9 @@ import browser from 'webextension-polyfill';
 function defaultOptions () {
     return {
         id: "Not set yet",
+        ignoreNextReset: false,
         percent_main_page: true,
-        save_last_grades: true,
+        save_last_grades: false,
     };
 }
 
@@ -55,7 +56,6 @@ export default {
     data () {
         return {
             options: defaultOptions(),
-            ignoreNextReset: false,
             copiedRecently: false,
             thirdPartyLibraries: browser.extension.getURL('web_accessible_resources/libraries.txt'),
             version: SASPES_VERSION_NAME,
@@ -64,12 +64,12 @@ export default {
     watch: {
         options: {
             deep: true,
-            handler (val) {
+            async handler (val) {
                 if (this.ignoreNextReset) {
                     this.ignoreNextReset = false;
                     return;
                 }
-                browser.storage.local.set(JSON.parse(JSON.stringify(val)));
+                await browser.storage.local.set({ "percent_main_page": { changed: true, value: val.percent_main_page }, "opted_in": { changed: true, value: val.save_last_grades } });
             },
         },
     },
@@ -79,14 +79,9 @@ export default {
     },
     methods: {
         async resetData () {
-            const options = await browser.storage.local.get(defaultOptions());
+            const stored_options = await browser.storage.local.get(null);
             this.ignoreNextReset = true;
-            this.options = Object.assign({}, this.options, options);
-        },
-        copyId () {
-            this.copiedRecently = true;
-            navigator.clipboard.writeText(this.options.id);
-            setTimeout(() => { this.copiedRecently = false; }, 1500);
+            this.options = { "percent_main_page": stored_options?.percent_main_page?.value || this.options.percent_main_page, "save_last_grades": stored_options?.opted_in?.value || this.options.save_last_grades };
         },
     },
 };