Added sorting by aliases in favorites

src/const/common.ts

@@ -85,6 +85,7 @@ export const RETURN_NAVIGATION_COLUMNS = [
 
 export const RETURN_FAVORITES_COLUMNS = [
     'favorites.alias',
+    'favorites.display_alias',
     'entries.entryId',
     'entries.scope',
     'entries.type',

src/db/models/favorite/index.ts

@@ -1,3 +1,4 @@
+import {raw} from 'objection';
 import {Model} from '../..';
 import Entry from '../entry';
 import {Entry as EntryModel} from '../new/entry';
@@ -110,7 +111,7 @@ class Favorite extends Model {
             .where((builder) => {
                 if (filters && filters.name) {
                     builder.where(
-                        'name',
+                        raw('coalesce(favorites.alias, entries.name)'),
                         'like',
                         `%${Utils.escapeStringForLike(filters.name.toLowerCase())}%`,
                     );
@@ -388,8 +389,11 @@ class Favorite extends Model {
 
         const {login} = requestedBy;
 
+        const displayAlias = name ? name : null;
+        const alias = displayAlias ? displayAlias.toLowerCase() : null;
+
         const result = await Favorite.query(this.primary)
-            .update({alias: name})
+            .update({alias, displayAlias})
             .where({entryId, tenantId, login})
             .returning('*')
             .first()

src/db/scripts/update-alias-favorites.ts

@@ -0,0 +1,33 @@
+/* eslint-disable camelcase */
+/* This script facilitates migration of aliases for favorites and can be deleted after release */
+require('dotenv').config();
+require('../../index');
+import {db} from '../index';
+
+(async function () {
+    try {
+        await db.ready();
+
+        const favorites = await db.primary.raw(
+            `SELECT entry_id, tenant_id, login, alias, display_alias 
+             FROM favorites 
+             WHERE alias IS NOT NULL AND alias != ''`,
+        );
+
+        for (const entry of favorites.rows) {
+            const {entry_id, tenant_id, login, alias, display_alias} = entry;
+
+            if (display_alias === null || alias.toLowerCase() !== display_alias.toLowerCase()) {
+                await db.primary
+                    .table('favorites')
+                    .update({alias: alias.toLowerCase(), display_alias: alias})
+                    .where({entry_id, tenant_id, login});
+            }
+        }
+
+        process.exit(0);
+    } catch (err) {
+        console.error(err);
+        process.exit(1);
+    }
+})();

src/types/models/favorite.ts

@@ -26,7 +26,7 @@ export interface DeleteFavoriteConfig extends BasicRequestParams {
 }
 export interface RenameFavoriteConfig extends BasicRequestParams {
     entryId: string;
-    name: string;
+    name: string | null;
     ctx: CTX;
     dlContext?: string;
 }

src/types/models/tables-columns.ts

@@ -89,5 +89,6 @@ export interface FavoriteColumns {
     tenantId: string;
     login: string;
     alias: string | null;
+    displayAlias: string | null;
     createdAt: string;
 }

src/types/services.types.ts

@@ -101,7 +101,7 @@ export interface AddFavorite extends StdServiceParams {
 }
 export interface RenameFavorite extends StdServiceParams {
     entryId: string;
-    name: string;
+    name: string | null;
 }
 export interface DeleteFavorite extends StdServiceParams {
     entryId: string;