Merge pull request #222 from multinet-app/item-panel-slot

Use a slot to simplify item-panel dialog logic
multinet-app · Dec 31, 2019 · 2a34a10 · 2a34a10
2 parents 819d93a + 5b5519a
commit 2a34a10
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 30 deletions.
diff --git a/client/src/components/ItemPanel.vue b/client/src/components/ItemPanel.vue
@@ -25,18 +25,7 @@
         <span>Delete selected</span>
       </v-tooltip>
 
-      <table-dialog
-        v-if="isTable"
-        :workspace="workspace"
-        @success="$emit('new-table')"
-      />
-      <graph-dialog
-        v-else
-        :node-tables="nodeTables"
-        :edge-tables="edgeTables"
-        :workspace="workspace"
-        @success="$emit('new-graph')"
-      />
+      <slot></slot>
 
     </v-subheader>
 
@@ -105,14 +94,6 @@ export default Vue.extend({
       type: String,
       required: true,
     },
-    nodeTables: {
-      type: Array,
-      required: false,
-    },
-    edgeTables: {
-      type: Array,
-      required: false,
-    },
     routeType: {
       type: String,
       required: true,
@@ -128,10 +109,6 @@ export default Vue.extend({
     };
   },
   computed: {
-    isTable(): boolean {
-      return this.title === 'Tables';
-    },
-
     anySelected(): boolean {
       return Object.values(this.checkbox)
         .some((d) => !!d);

diff --git a/client/src/views/WorkspaceDetail.vue b/client/src/views/WorkspaceDetail.vue
@@ -86,8 +86,12 @@
               :workspace="workspace"
               route-type="table"
               icon="table_chart"
-              @new-table="update"
-            />
+              >
+                <table-dialog
+                  :workspace="workspace"
+                  @success="update"
+                  />
+            </item-panel>
 
           </v-card>
         </v-flex>
@@ -105,12 +109,16 @@
               title="Graphs"
               :items="graphs"
               :workspace="workspace"
-              :node-tables="nodeTables"
-              :edge-tables="edgeTables"
               route-type="graph"
               icon="timeline"
-              @new-graph="update"
-            />
+              >
+                <graph-dialog
+                  :node-tables="nodeTables"
+                  :edge-tables="edgeTables"
+                  :workspace="workspace"
+                  @success="update"
+                  />
+            </item-panel>
 
           </v-card>
         </v-flex>