From 3fa8cb194e09e17e405132257390c80a56194dca Mon Sep 17 00:00:00 2001
From: herteleo <leonard.hertel@gmail.com>
Date: Sat, 20 Apr 2019 01:27:37 +0200
Subject: [PATCH] feat(tabs): switched from 'ident' to 'id' as identifier

---
 src/components/TabHeader.vue       |  4 ++--
 src/components/TabMain.vue         |  4 ++--
 src/components/TabWebview.vue      |  6 +++---
 src/components/TabsList.vue        |  2 +-
 src/components/TabsNav.vue         |  2 +-
 src/components/TabsNavItem.vue     |  4 ++--
 src/router/index.js                |  4 ++--
 src/store/modules/Notifications.js |  4 ++--
 src/store/modules/Tabs.js          | 34 +++++++++++++++---------------
 src/views/Notifications.vue        |  2 +-
 src/views/TabSettings.vue          | 12 +++++------
 11 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/components/TabHeader.vue b/src/components/TabHeader.vue
index f664d2d..0157f6a 100644
--- a/src/components/TabHeader.vue
+++ b/src/components/TabHeader.vue
@@ -16,7 +16,7 @@
       @click="$emit('toggleDevTools')"
     />
     <title-bar-button
-      :to="{ name: 'tabs-settings', params: { ident: item.ident } }"
+      :to="{ name: 'tabs-settings', params: { id: item.id } }"
       icon="dots-vertical"
     />
   </title-bar>
@@ -42,7 +42,7 @@ export default {
       return this.$store.getters['Settings/isLayoutInvertedForOs'];
     },
     pageState() {
-      return this.$store.getters['Pages/state'](this.item.ident);
+      return this.$store.getters['Pages/state'](this.item.id);
     },
   },
 };
diff --git a/src/components/TabMain.vue b/src/components/TabMain.vue
index d0f6d20..03aa34d 100644
--- a/src/components/TabMain.vue
+++ b/src/components/TabMain.vue
@@ -35,7 +35,7 @@ export default {
   },
   computed: {
     isActive() {
-      return parseInt(this.$route.params.ident, 0) === this.item.ident;
+      return parseInt(this.$route.params.id, 0) === this.item.id;
     },
     webview() {
       return this.$refs.webview.$refs.webview;
@@ -44,7 +44,7 @@ export default {
   watch: {
     isActive(isActive) {
       if (isActive) {
-        this.$store.commit('Tabs/activateIdent', this.item.ident);
+        this.$store.commit('Tabs/activateId', this.item.id);
         this.webview.focus();
       }
     },
diff --git a/src/components/TabWebview.vue b/src/components/TabWebview.vue
index 16e4932..f9676f5 100644
--- a/src/components/TabWebview.vue
+++ b/src/components/TabWebview.vue
@@ -48,7 +48,7 @@ export default {
 
       this.$store.commit('Notifications/add', {
         notification,
-        tabIdent: this.item.ident,
+        tabId: this.item.id,
       });
 
       if (!this.notificationsPreventOnBlur || this.windowHasFocus) {
@@ -58,7 +58,7 @@ export default {
 
     this.$refs.webview.addEventListener('page-title-updated', ({ title }) => {
       this.$store.commit('Pages/setState', {
-        tabId: this.item.ident,
+        tabId: this.item.id,
         data: { title },
       });
     });
@@ -67,7 +67,7 @@ export default {
       const [favicon] = favicons;
 
       this.$store.commit('Pages/setState', {
-        tabId: this.item.ident,
+        tabId: this.item.id,
         data: { favicon },
       });
     });
diff --git a/src/components/TabsList.vue b/src/components/TabsList.vue
index 259d0a1..1e6c0af 100644
--- a/src/components/TabsList.vue
+++ b/src/components/TabsList.vue
@@ -5,7 +5,7 @@
   >
     <tab-main
       v-for="tab in $store.getters['Tabs/list']"
-      :key="tab.ident"
+      :key="tab.id"
       :item="tab"
     />
   </div>
diff --git a/src/components/TabsNav.vue b/src/components/TabsNav.vue
index 4a63e3d..d35e5d0 100644
--- a/src/components/TabsNav.vue
+++ b/src/components/TabsNav.vue
@@ -9,7 +9,7 @@
   >
     <tabs-nav-item
       v-for="tab in tabList"
-      :key="tab.ident"
+      :key="tab.id"
       :item="tab"
     />
   </vue-draggable>
diff --git a/src/components/TabsNavItem.vue b/src/components/TabsNavItem.vue
index 3302568..2b06240 100644
--- a/src/components/TabsNavItem.vue
+++ b/src/components/TabsNavItem.vue
@@ -1,6 +1,6 @@
 <template>
   <router-link
-    :to="{ name: 'tabs', params: { ident: item.ident } }"
+    :to="{ name: 'tabs', params: { id: item.id } }"
     :class="$style.item"
     :active-class="$style.active"
     tag="button"
@@ -38,7 +38,7 @@ export default {
   },
   computed: {
     pageState() {
-      return this.$store.getters['Pages/state'](this.item.ident);
+      return this.$store.getters['Pages/state'](this.item.id);
     },
   },
 };
diff --git a/src/router/index.js b/src/router/index.js
index 3280353..02cf638 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -16,12 +16,12 @@ export default new Router({
       component: () => import(/* webpackChunkName: "tabs" */ '@/views/TabSettings.vue'),
     },
     {
-      path: '/tabs/:ident/settings',
+      path: '/tabs/:id/settings',
       name: 'tabs-settings',
       component: () => import(/* webpackChunkName: "tabs" */ '@/views/TabSettings.vue'),
     },
     {
-      path: '/tabs/:ident?',
+      path: '/tabs/:id?',
       name: 'tabs',
     },
     {
diff --git a/src/store/modules/Notifications.js b/src/store/modules/Notifications.js
index 7216a44..1b1f9b4 100644
--- a/src/store/modules/Notifications.js
+++ b/src/store/modules/Notifications.js
@@ -48,11 +48,11 @@ export default {
     },
   },
   mutations: {
-    add(state, { tabIdent, notification }) {
+    add(state, { tabId, notification }) {
       db().get('notifications')
         .push({
           notification,
-          tabIdent,
+          tabId,
           timestamp: Date.now(),
         })
         .write();
diff --git a/src/store/modules/Tabs.js b/src/store/modules/Tabs.js
index f462f25..83b5b57 100644
--- a/src/store/modules/Tabs.js
+++ b/src/store/modules/Tabs.js
@@ -11,15 +11,15 @@ const db = new Connection({
 export default {
   namespaced: true,
   state: {
-    activeIdent: 0,
+    activeId: 0,
     dbUpdated: Date.now(),
   },
   getters: {
-    active({ activeIdent, dbUpdated }) {
-      return db(dbUpdated).get('tabs').find(item => item.ident === activeIdent).value() || {};
+    active({ activeId, dbUpdated }) {
+      return db(dbUpdated).get('tabs').find(item => item.id === activeId).value() || {};
     },
-    byIdent({ dbUpdated }) {
-      return ident => db(dbUpdated).get('tabs').find(item => item.ident === ident).value() || {};
+    byId({ dbUpdated }) {
+      return id => db(dbUpdated).get('tabs').find(item => item.id === id).value() || {};
     },
     list({ dbUpdated }) {
       return db(dbUpdated)
@@ -30,12 +30,12 @@ export default {
     listSorted({ dbUpdated }, { list }) {
       const sorting = db(dbUpdated).get('sorting').value();
 
-      return [...list].sort((a, b) => sorting.indexOf(a.ident) - sorting.indexOf(b.ident));
+      return [...list].sort((a, b) => sorting.indexOf(a.id) - sorting.indexOf(b.id));
     },
   },
   mutations: {
-    activateIdent(state, ident) {
-      state.activeIdent = ident;
+    activateId(state, id) {
+      state.activeId = id;
       state.dbUpdated = Date.now();
     },
     create(state, item) {
@@ -46,7 +46,7 @@ export default {
 
       db()
         .get('sorting')
-        .push(item.ident)
+        .push(item.id)
         .write();
 
       state.dbUpdated = Date.now();
@@ -54,25 +54,25 @@ export default {
     delete(state, item) {
       db()
         .get('tabs')
-        .remove(i => i.ident === item.ident)
+        .remove(i => i.id === item.id)
         .write();
 
       db()
         .get('sorting')
-        .remove(i => i === item.ident)
+        .remove(i => i === item.id)
         .write();
 
-      state.activateIdent = 0;
+      state.activateId = 0;
       state.dbUpdated = Date.now();
     },
     setSorting(state, items) {
-      db().set('sorting', items.map(item => item.ident)).write();
+      db().set('sorting', items.map(item => item.id)).write();
       state.dbUpdated = Date.now();
     },
-    update(state, { ident, data }) {
+    update(state, { id, data }) {
       db()
         .get('tabs')
-        .find(i => i.ident === ident).assign(data)
+        .find(i => i.id === id).assign(data)
         .write();
 
       state.dbUpdated = Date.now();
@@ -80,9 +80,9 @@ export default {
   },
   actions: {
     create({ commit }, payload = {}) {
-      const ident = Date.now();
+      const id = Date.now();
       const item = {
-        ident,
+        id,
         ...payload,
       };
       commit('create', item);
diff --git a/src/views/Notifications.vue b/src/views/Notifications.vue
index 783c1af..a7c9c62 100644
--- a/src/views/Notifications.vue
+++ b/src/views/Notifications.vue
@@ -18,7 +18,7 @@
         v-for="item in notifications"
         :key="item.timestamp"
         :class="$style.item"
-        @click="$router.push({ name: 'tabs', params: { ident: item.tabIdent }})"
+        @click="$router.push({ name: 'tabs', params: { id: item.tabId }})"
       >
         <div :class="$style.thumb">
           <img
diff --git a/src/views/TabSettings.vue b/src/views/TabSettings.vue
index 471de1a..9cb2d92 100644
--- a/src/views/TabSettings.vue
+++ b/src/views/TabSettings.vue
@@ -94,8 +94,8 @@ export default {
   created() {
     if (this.isCreateMode) return;
 
-    const { ident } = this.$route.params;
-    this.tab = this.$store.getters['Tabs/byIdent'](ident);
+    const { id } = this.$route.params;
+    this.tab = this.$store.getters['Tabs/byId'](id);
   },
   methods: {
     submitForm() {
@@ -111,17 +111,17 @@ export default {
       this.$router.push({
         name: 'tabs',
         params: {
-          ident: tab.ident,
+          id: tab.id,
         },
       });
     },
     updateTab() {
-      const { ident, ...data } = this.tab;
-      this.$store.commit('Tabs/update', { ident, data });
+      const { id, ...data } = this.tab;
+      this.$store.commit('Tabs/update', { id, data });
 
       this.$router.push({
         name: 'tabs',
-        params: { ident: this.tab.ident },
+        params: { id: this.tab.id },
       });
     },
     deleteTab() {