From eb836357b850be8a72fe1c6ad5f0397ff4a94f8a Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 15 Aug 2019 11:57:55 +0800
Subject: [PATCH] Refactor plugin system (part 10)

---
 resources/assets/src/views/admin/Market.vue      | 14 +++++++-------
 resources/assets/src/views/admin/Plugins.vue     |  6 +++---
 .../assets/tests/views/admin/Market.test.ts      | 16 ++++++++--------
 .../assets/tests/views/admin/Plugins.test.ts     |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/resources/assets/src/views/admin/Market.vue b/resources/assets/src/views/admin/Market.vue
index 7a720e0d..e92d4611 100644
--- a/resources/assets/src/views/admin/Market.vue
+++ b/resources/assets/src/views/admin/Market.vue
@@ -13,17 +13,17 @@
           <div>{{ props.row.name }}</div>
         </span>
         <span v-else-if="props.column.field === 'dependencies'">
-          <span
-            v-if="props.row.dependencies.requirements.length === 0"
-          ><i v-t="'admin.noDependencies'" /></span>
+          <span v-if="Object.keys(props.row.dependencies.all).length === 0">
+            <i v-t="'admin.noDependencies'" />
+          </span>
           <div v-else>
             <span
-              v-for="(semver, dep) in props.row.dependencies.requirements"
-              :key="dep"
+              v-for="(constraint, name) in props.row.dependencies.all"
+              :key="name"
               class="label"
-              :class="`bg-${dep in props.row.dependencies.unsatisfiedRequirements ? 'red' : 'green'}`"
+              :class="`bg-${name in props.row.dependencies.unsatisfied ? 'red' : 'green'}`"
             >
-              {{ dep }}: {{ semver }}
+              {{ name }}: {{ constraint }}
               <br>
             </span>
           </div>
diff --git a/resources/assets/src/views/admin/Plugins.vue b/resources/assets/src/views/admin/Plugins.vue
index 8acfc9f1..fd58afe3 100644
--- a/resources/assets/src/views/admin/Plugins.vue
+++ b/resources/assets/src/views/admin/Plugins.vue
@@ -53,9 +53,9 @@
           </div>
         </span>
         <span v-else-if="props.column.field === 'dependencies'">
-          <span
-            v-if="Object.keys(props.row.dependencies.all).length === 0"
-          ><i v-t="'admin.noDependencies'" /></span>
+          <span v-if="Object.keys(props.row.dependencies.all).length === 0">
+            <i v-t="'admin.noDependencies'" />
+          </span>
           <div v-else>
             <span
               v-for="(constraint, name) in props.row.dependencies.all"
diff --git a/resources/assets/tests/views/admin/Market.test.ts b/resources/assets/tests/views/admin/Market.test.ts
index 8f708849..10d8f86f 100644
--- a/resources/assets/tests/views/admin/Market.test.ts
+++ b/resources/assets/tests/views/admin/Market.test.ts
@@ -5,11 +5,11 @@ import { flushPromises } from '../../utils'
 
 test('render dependencies', async () => {
   Vue.prototype.$http.get.mockResolvedValue([
-    { name: 'a', dependencies: { requirements: [] } },
+    { name: 'a', dependencies: { all: {}, unsatisfied: {} } },
     {
       name: 'b',
       dependencies: {
-        requirements: { a: '^1.0.0', c: '^2.0.0' }, unsatisfiedRequirements: { c: {} },
+        all: { a: '^1.0.0', c: '^2.0.0' }, unsatisfied: { c: {} },
       },
     },
   ])
@@ -24,16 +24,16 @@ test('render dependencies', async () => {
 test('render operation buttons', async () => {
   Vue.prototype.$http.get.mockResolvedValue([
     {
-      name: 'a', dependencies: { requirements: [] }, installed: true, update_available: true,
+      name: 'a', dependencies: { all: {}, unsatisfied: {} }, installed: true, update_available: true,
     },
     {
-      name: 'b', dependencies: { requirements: [] }, installed: true, enabled: true,
+      name: 'b', dependencies: { all: {}, unsatisfied: {} }, installed: true, enabled: true,
     },
     {
-      name: 'c', dependencies: { requirements: [] }, installed: true,
+      name: 'c', dependencies: { all: {}, unsatisfied: {} }, installed: true,
     },
     {
-      name: 'd', dependencies: { requirements: [] }, installed: false,
+      name: 'd', dependencies: { all: {}, unsatisfied: {} }, installed: false,
     },
   ])
   const wrapper = mount(Market)
@@ -49,7 +49,7 @@ test('render operation buttons', async () => {
 test('install plugin', async () => {
   Vue.prototype.$http.get.mockResolvedValue([
     {
-      name: 'd', dependencies: { requirements: [] }, installed: false,
+      name: 'd', dependencies: { all: {}, unsatisfied: {} }, installed: false,
     },
   ])
   Vue.prototype.$http.post
@@ -75,7 +75,7 @@ test('update plugin', async () => {
     {
       name: 'a',
       version: '2.0.0',
-      dependencies: { requirements: [] },
+      dependencies: { all: {}, unsatisfied: {} },
       installed: '1.0.0',
       update_available: true,
     },
diff --git a/resources/assets/tests/views/admin/Plugins.test.ts b/resources/assets/tests/views/admin/Plugins.test.ts
index 8f29b86c..2c0ff846 100644
--- a/resources/assets/tests/views/admin/Plugins.test.ts
+++ b/resources/assets/tests/views/admin/Plugins.test.ts
@@ -52,7 +52,7 @@ test('enable plugin', async () => {
       name: 'a', dependencies: { all: {}, unsatisfied: {} }, enabled: false,
     },
     {
-      name: 'b', dependencies: { all: {}, unsatisfied: {} }, enabled: false,
+      name: 'b', dependencies: { all: { c: '' }, unsatisfied: {} }, enabled: false,
     },
   ])
   Vue.prototype.$http.post