Add hiddenOnPage

na7lara9mia · Jan 13, 2019 · 12ebb2c · 12ebb2c
1 parent 91f1a9b
commit 12ebb2c
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 14 deletions.
diff --git a/src/renderer/app.config.js b/src/renderer/app.config.js
@@ -1,3 +1,6 @@
+
+const DEFAULT_THREAD_COUNT = 2
+
 export default {
   ENDPOINTS: {
     addBlock: 'api/2.0/dbfs/add-block',
@@ -11,5 +14,8 @@ export default {
     put: 'api/2.0/dbfs/put',
     read: 'api/2.0/dbfs/read'
   },
-  defaultThreadCount: 4
+  defaultThreadCount: DEFAULT_THREAD_COUNT,
+  defaultSettings: [
+    { key: 'thread-count', value: DEFAULT_THREAD_COUNT }
+  ]
 }
diff --git a/src/renderer/components/Layouts/ApplicationBar.vue b/src/renderer/components/Layouts/ApplicationBar.vue
@@ -30,7 +30,7 @@
         v-for="item in buttons.right"
         :key="item.id">
         <v-btn
-          v-if="checkPlatform(item)"
+          v-if="checkPlatform(item) && hiddenOnPage(item)"
           class="drag-safe btn"
           small
           icon
@@ -80,7 +80,8 @@ export default {
             icon: 'fa-download',
             callback: () => { this.toggleDialog({ name: 'transferState' }) },
             platforms: ['darwin', 'win32', 'linux'],
-            tooltip: 'Download/Upload Activity'
+            tooltip: 'Download/Upload Activity',
+            hiddenOnPages: []
           }
         ],
         right: [
@@ -90,24 +91,26 @@ export default {
             icon: 'fa-cog',
             callback: () => { this.openDialog({ name: 'settings' }) },
             platforms: ['darwin', 'win32', 'linux'],
-            tooltip: 'Settings'
+            tooltip: 'Settings',
+            hiddenOnPages: ['auth']
           },
           {
             id: 'id-app-about',
             text: 'About',
             icon: 'fa-star',
             callback: () => { this.openDialog({ name: 'about' }) },
             platforms: ['darwin', 'win32', 'linux'],
-            tooltip: 'About'
-          },
+            tooltip: 'About',
+            hiddenOnPages: []
+          }/* ,
           {
             id: 'id-app-logout',
             text: 'Logout',
             icon: 'fa-power-off',
             callback: () => { console.log(this.isLoggedIn()) },
             platforms: ['darwin', 'win32', 'linux'],
             tooltip: 'Logout'
-          }
+          } */
         ]
       }
     }
@@ -125,6 +128,17 @@ export default {
     },
     checkPlatform: function (item) {
       return (item.platforms.findIndex(x => x === this.getPlatform()) > -1)
+    },
+    hiddenOnPage: function (item) {
+      if (item && item.hiddenOnPages &&
+      item.hiddenOnPages.constructor === [].constructor &&
+      item.hiddenOnPages.length > 0) {
+        console.log(item)
+        if (item.hiddenOnPages.indexOf(this.routeName) > -1) {
+          return false
+        }
+      }
+      return true
     }
   }
 }

diff --git a/src/renderer/store/modules/config/actions.js b/src/renderer/store/modules/config/actions.js
@@ -1,5 +1,6 @@
 import { ipcRenderer } from 'electron'
 import { platform } from 'os'
+import appConfig from '@/app.config.js'
 
 const uniqid = require('uniqid')
 
@@ -60,13 +61,29 @@ export default {
     return new Promise((resolve, reject) => {
       const settings = context.getters.getSettings
       if (settings && settings.constructor === [].constructor) {
-        const index = settings.findIndex(
-          x => x.key === key
-        )
-        if (index > -1) {
-          console.log('setting value', settings[index].value)
-          resolve({
-            value: parseInt(settings[index].value)
+        if (settings.length > 0) {
+          const index = settings.findIndex(
+            x => x.key === key
+          )
+          if (index > -1) {
+            resolve({
+              value: parseInt(settings[index].value)
+            })
+          } else {
+            // Resolve default value
+            resolve({
+              value: appConfig.defaultThreadCount
+            })
+          }
+        } else {
+          // Settings not found in the database
+          // Create new settings from app.config.js
+          console.log('DEBUG:111')
+          const settings = Object.assign([], appConfig.defaultSettings)
+          settings.forEach((item) => {
+            if (item && item.constructor === {}.constructor) {
+              item.key && context.dispatch('updateSettings', item)
+            }
           })
         }
       }

diff --git a/src/renderer/store/modules/navigator/actions.js b/src/renderer/store/modules/navigator/actions.js
@@ -10,9 +10,11 @@ const base64 = require('file-base64')
 
 export default {
   initTransferActivity: function (context) {
+    console.log('initTransferActivity')
     context.dispatch('getSetting', {
       key: 'thread-count'
     }).then(({ value }) => {
+      console.log(value)
       transferActivity = new TransferActivity({
         threadCount: value
       })