fix(search): match figma styles and remove outdated test

Satellite-im · Apr 11, 2022 · 09934d8 · 09934d8
1 parent 1980153
commit 09934d8
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 51 deletions.
diff --git a/components/views/chat/search/SearchUtil.test.ts b/components/views/chat/search/SearchUtil.test.ts
@@ -29,13 +29,6 @@ describe('SearchUtil.default.getSearchResultGroupList', () => {
   })
 })
 
-describe('SearchUtil.default.getSearchOrderTypeList', () => {
-  test('0', () => {
-    const result: any = SearchUtil.default.getSearchOrderTypeList()
-    expect(result).toMatchSnapshot()
-  })
-})
-
 describe('SearchUtil.default.getCommandMeta', () => {
   test('0', () => {
     const result: any = SearchUtil.default.getCommandMeta(

diff --git a/components/views/chat/search/SearchUtil.ts b/components/views/chat/search/SearchUtil.ts
@@ -4,7 +4,6 @@ import {
   SearchCommandType,
   SearchCommandTypeParam,
   SearchOption,
-  SearchOrderType,
   SearchQueryItem,
   SearchRecommend,
   SearchRecommendResultItem,
@@ -98,22 +97,6 @@ export const searchCommandMetaList = [
   },
 ] as SearchCommandMeta[]
 
-const searchOrderTypeList = [
-  {
-    type: SearchOrderType.New,
-    title: 'New',
-  },
-
-  {
-    type: SearchOrderType.Old,
-    title: 'Old',
-  },
-  {
-    type: SearchOrderType.Relevant,
-    title: 'Relevant',
-  },
-]
-
 const searchResultGroupList = [
   {
     type: SearchResultGroupType.Messages,
@@ -142,7 +125,6 @@ const SearchUtil = {
   getCommandTypeParams: () => searchCommandTypeParams,
   getCommandMetaList: () => searchCommandMetaList,
   getSearchResultGroupList: () => searchResultGroupList,
-  getSearchOrderTypeList: () => searchOrderTypeList,
   /**
    * @method getCommandMeta DocsTODO
    * @description

diff --git a/components/views/chat/search/__snapshots__/SearchUtil.test.ts.snap b/components/views/chat/search/__snapshots__/SearchUtil.test.ts.snap
@@ -169,23 +169,6 @@ Object {
 }
 `;
 
-exports[`SearchUtil.default.getSearchOrderTypeList 0 1`] = `
-Array [
-  Object {
-    "title": "New",
-    "type": undefined,
-  },
-  Object {
-    "title": "Old",
-    "type": undefined,
-  },
-  Object {
-    "title": "Relevant",
-    "type": undefined,
-  },
-]
-`;
-
 exports[`SearchUtil.default.getSearchResultGroupList 0 1`] = `
 Array [
   Object {

diff --git a/components/views/chat/search/result/Result.vue b/components/views/chat/search/result/Result.vue
@@ -31,7 +31,7 @@ export default Vue.extend({
       groupList: SearchUtil.getSearchResultGroupList(),
       query: '' as string,
       groupBy: SearchResultGroupType.Messages as SearchResultGroupType,
-      orderBy: SearchOrderType.NEW as SearchOrderType,
+      orderBy: SearchOrderType.New as SearchOrderType,
       channels: [],
       date: null,
       result: [] as UISearchResult[],

diff --git a/components/views/chat/search/result/meta/Meta.less b/components/views/chat/search/result/meta/Meta.less
@@ -8,11 +8,12 @@
   }
   .result-orderby {
     display: flex;
+    gap: @normal-spacing;
     .orderby-item {
+      &:extend(.font-muted);
       cursor: pointer;
-      padding: 2px 8px;
       &.active {
-        font-weight: bold;
+        &:extend(.font-secondary);
       }
     }
   }

diff --git a/store/textile/actions.ts b/store/textile/actions.ts
@@ -960,13 +960,13 @@ export default {
       ...match,
       user: accounts.find((acct) => acct?.textilePubkey === match.from),
     }))
-    if (orderBy === SearchOrderType.NEW) {
+    if (orderBy === SearchOrderType.New) {
       data.sort((a: UISearchResultData, b: UISearchResultData) => b.at - a.at)
     }
-    if (orderBy === SearchOrderType.OLD) {
+    if (orderBy === SearchOrderType.Old) {
       data.sort((a: UISearchResultData, b: UISearchResultData) => a.at - b.at)
     }
-    if (orderBy === SearchOrderType.RELEVANT) {
+    if (orderBy === SearchOrderType.Relevant) {
       data.sort(
         (a: UISearchResultData, b: UISearchResultData) => b.score - a.score,
       )

diff --git a/types/search/search.ts b/types/search/search.ts
@@ -121,9 +121,9 @@ export type SearchFilter = {
 }
 
 export enum SearchOrderType {
-  NEW = 'new',
-  OLD = 'old',
-  RELEVANT = 'relevant',
+  New = 'new',
+  Old = 'old',
+  Relevant = 'relevant',
 }
 
 export type SearchParam = {