Add meaningful names to tabs (close #214)

It will follow the this pattern: [db: <database_name>][tb: <table_name>] #<query_id>
sqlectron · Sep 5, 2016 · d37f279 · d37f279
1 parent 9e66458
commit d37f279
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/src/renderer/actions/queries.js b/src/renderer/actions/queries.js
@@ -58,10 +58,10 @@ export function executeDefaultSelectQueryIfNeeded (database, table) {
     }
 
     if (needNewQuery(currentState, database, queryDefaultSelect)) {
-      dispatch({ type: NEW_QUERY, database });
+      dispatch({ type: NEW_QUERY, database, table });
     }
 
-    dispatch({ type: UPDATE_QUERY, query: queryDefaultSelect });
+    dispatch({ type: UPDATE_QUERY, query: queryDefaultSelect, table });
     dispatch(executeQuery(queryDefaultSelect, true, dbConn));
   };
 }

diff --git a/src/renderer/reducers/queries.js b/src/renderer/reducers/queries.js
@@ -83,7 +83,7 @@ export default function (state = INITIAL_STATE, action) {
         query: action.query,
         selectedQuery: action.selectedQuery,
         copied: false,
-      });
+      }, { table: action.table });
     }
     case types.COPY_QUERY_RESULT_TO_CLIPBOARD_REQUEST: {
       return changeStateByCurrentQuery(state, {
@@ -145,7 +145,7 @@ function addNewQuery(state, action) {
   const newQuery = {
     id: newId,
     database: action.database,
-    name: `SQL File ${newId}`,
+    name: createQueryName(newId, action.database, action.table),
     filename: null,
     isExecuting: false,
     isDefaultSelect: false,
@@ -175,15 +175,34 @@ function addNewQuery(state, action) {
 }
 
 
-function changeStateByCurrentQuery(oldFullState, newCurrentQueryState) {
+function changeStateByCurrentQuery(oldFullState, newCurrentQueryState, options = {}) {
+  const oldQueryState = oldFullState.queriesById[oldFullState.currentQueryId];
+
+  oldQueryState.name = newCurrentQueryState.name || oldQueryState.name;
+  if (options.table) {
+    oldQueryState.name = createQueryName(
+      oldFullState.currentQueryId,
+      oldQueryState.database,
+      options.table
+    );
+  }
+
   return {
     ...oldFullState,
     queriesById: {
       ...oldFullState.queriesById,
       [oldFullState.currentQueryId]: {
-        ...oldFullState.queriesById[oldFullState.currentQueryId],
+        ...oldQueryState,
         ...newCurrentQueryState,
       },
     },
   };
 }
+
+function createQueryName (id, database, table) {
+  return (
+    table
+    ? `[db: ${database}][tb: ${table}] #${id}`
+    : `[db: ${database}] #${id}`
+  );
+}