Merge pull request #292 from multinet-app/waxlamp/reorder-table-graph

Rename "graphs" to "networks" in UI, and make network list primary
multinet-app · Feb 4, 2020 · 378f992 · 378f992
2 parents 9aa7feb + 8d8f0c0
commit 378f992
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/client/src/components/DeleteGraphDialog.vue b/client/src/components/DeleteGraphDialog.vue
@@ -29,11 +29,11 @@
         class="headline pb-0 pt-3 px-5"
         primary-title
         >
-        Delete Graphs
+        Delete Networks
       </v-card-title>
 
       <v-card-text class="px-5 py-4">
-        You are about to delete {{ selection.length }} graph{{plural}}. <strong>Are you sure?</strong>
+        You are about to delete {{ selection.length }} network{{plural}}. <strong>Are you sure?</strong>
       </v-card-text>
 
       <v-divider />

diff --git a/client/src/components/DeleteTableDialog.vue b/client/src/components/DeleteTableDialog.vue
@@ -62,7 +62,7 @@
       </v-card-title>
 
       <v-card-text class="px-5 py-4">
-        The following graphs are using these tables:
+        The following networks are using these tables:
         <ul>
           <li v-for="graph in using">
             {{ graph.graph }} ({{ graph.tables.join(', ') }})
@@ -71,7 +71,7 @@
       </v-card-text>
 
       <v-card-text class="px-5 py-4">
-        You must delete these graphs before you can delete the tables.
+        You must delete these networks before you can delete the tables.
       </v-card-text>
 
       <v-divider />

diff --git a/client/src/components/GraphDialog.vue b/client/src/components/GraphDialog.vue
@@ -22,7 +22,7 @@
           class="headline pb-0 pt-3"
           primary-title
         >
-          Create Graph
+          Create Network
         </v-card-title>
 
         <v-card-text class="px-4 pt-4 pb-1">
@@ -31,7 +31,7 @@
               <v-text-field
                 autofocus
                 filled
-                label="Graph name"
+                label="Network name"
                 v-model="newGraph"
                 :error-messages="graphCreationErrors"
               />
@@ -58,7 +58,7 @@
             depressed
             :disabled="graphCreateDisabled"
             @click="createGraph"
-          >create graph</v-btn>
+          >create network</v-btn>
         </v-card-actions>
       </v-card>
     </v-card>
@@ -103,7 +103,7 @@ export default Vue.extend({
       });
 
       if (!response) {
-        const message = `Graph "${this.newGraph}" already exists.`;
+        const message = `Network "${this.newGraph}" already exists.`;
 
         this.graphCreationErrors = [message];
         throw new Error(message);

diff --git a/client/src/views/WorkspaceDetail.vue b/client/src/views/WorkspaceDetail.vue
@@ -80,19 +80,21 @@
             text
           >
             <item-panel
-              ref="tablePanel"
-              title="Tables"
-              :items="tables"
+              ref="graphPanel"
+              title="Networks"
+              :items="graphs"
               :workspace="workspace"
-              route-type="table"
-              icon="table_chart"
+              route-type="graph"
+              icon="timeline"
               >
-                <table-dialog
+                <graph-dialog
+                  :node-tables="nodeTables"
+                  :edge-tables="edgeTables"
                   :workspace="workspace"
                   @success="update"
                   />
                 <template v-slot:deleter="deleter">
-                  <delete-table-dialog
+                  <delete-graph-dialog
                     :selection="deleter.selection"
                     :workspace="deleter.workspace"
                     @deleted="update"
@@ -113,21 +115,19 @@
             text
           >
             <item-panel
-              ref="graphPanel"
-              title="Graphs"
-              :items="graphs"
+              ref="tablePanel"
+              title="Tables"
+              :items="tables"
               :workspace="workspace"
-              route-type="graph"
-              icon="timeline"
+              route-type="table"
+              icon="table_chart"
               >
-                <graph-dialog
-                  :node-tables="nodeTables"
-                  :edge-tables="edgeTables"
+                <table-dialog
                   :workspace="workspace"
                   @success="update"
                   />
                 <template v-slot:deleter="deleter">
-                  <delete-graph-dialog
+                  <delete-table-dialog
                     :selection="deleter.selection"
                     :workspace="deleter.workspace"
                     @deleted="update"

diff --git a/client/test/e2e.test.js b/client/test/e2e.test.js
@@ -104,8 +104,8 @@ test('e2e - Check that actions that should work, do work', async (t) => {
 
   t.ok(exists, 'The new workspace has no tables.');
 
-  exists = await elements_empty('Graphs', p, undefined);
-  t.ok(exists, 'The new workspace has no graphs.');
+  exists = await elements_empty('Networks', p, undefined);
+  t.ok(exists, 'The new workspace has no networks.');
 
   // Cleanup
   await b.close();