fix: fix contact list description display & UI column names (#4891)

monicahq · Feb 20, 2021 · aa090f8 · aa090f8
1 parent e6dd42b
commit aa090f8
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 26 deletions.
diff --git a/app/Http/Resources/Contact/ContactSearch.php b/app/Http/Resources/Contact/ContactSearch.php
@@ -24,6 +24,7 @@ public function toArray($request)
  'object' => 'contact',
  'route' => route('people.show', $this),
  'complete_name' => $this->name,
+ 'description' => $this->description,
  'initials' => $this->getInitials(),
  'is_me' => $this->isMe(),
  'is_starred' => $this->is_starred,

diff --git a/app/Models/Contact/Contact.php b/app/Models/Contact/Contact.php
@@ -77,6 +77,7 @@ class Contact extends Model
  'middle_name',
  'last_name',
  'nickname',
+ 'description',
  'gender_id',
  'account_id',
  'created_at',
@@ -156,16 +157,6 @@ class Contact extends Model
  */
  protected $nameOrder = 'firstname_lastname';
 
- /**
- * Get Searchable Fields.
- *
- * @return array
- */
- public function getSearchableFields()
- {
- return $this->searchable_columns;
- }
-
  /**
  * Get the user associated with the contact.
  *

diff --git a/public/css/app-ltr.css b/public/css/app-ltr.css
diff --git a/public/css/app-rtl.css b/public/css/app-rtl.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/langs/en.json b/public/js/langs/en.json
diff --git a/public/js/vendor.js b/public/js/vendor.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,9 +1,9 @@
 {
  "/js/manifest.js": "/js/manifest.js?id=7db827d654313dce4250",
- "/js/vendor.js": "/js/vendor.js?id=f1d25cdb9c04fd1afc64",
- "/js/app.js": "/js/app.js?id=0e910f3348e95fc19b61",
- "/css/app-ltr.css": "/css/app-ltr.css?id=e170464599d6491d6c24",
- "/css/app-rtl.css": "/css/app-rtl.css?id=0047b4f2dbce9192f46a",
+ "/js/vendor.js": "/js/vendor.js?id=328ace3a6e77123c320b",
+ "/js/app.js": "/js/app.js?id=a02d90e137bce90b34a5",
+ "/css/app-ltr.css": "/css/app-ltr.css?id=247eac24f03a2c03e7b9",
+ "/css/app-rtl.css": "/css/app-rtl.css?id=98bc5014524646c66b73",
  "/css/stripe.css": "/css/stripe.css?id=04066fb482310d18299c",
  "/js/stripe.js": "/js/stripe.js?id=31bf2d83f6ef3685ff0b"
 }
diff --git a/resources/js/components/people/ContactList.vue b/resources/js/components/people/ContactList.vue
@@ -32,7 +32,7 @@
  style-class="vgt-table"
  :rtl="!dirltr"
  :sort-options="{
- enabled: true
+ enabled: false,
  }"
  :pagination-options="{
  enabled: true,
@@ -57,8 +57,6 @@
  @on-search="onSearch"
  @on-row-click="onRowClick"
  >
- <template slot="table-column">
- </template>
  <div slot="emptystate" class="tc">
  {{ $t('people.people_search_no_results') }}
  </div>
@@ -147,13 +145,17 @@ export default {
 
  columns: [
  {
+ label: this.$t('app.contact_list_avatar'),
  field: 'avatar',
  width: '70px',
+ sortable: false,
  },
  {
+ label: this.$t('app.contact_list_name'),
  field: 'name',
  },
  {
+ label: this.$t('app.contact_list_description'),
  field: 'description',
  }
  ],

diff --git a/resources/lang/en/app.php b/resources/lang/en/app.php
@@ -462,4 +462,10 @@
  'dav_birthdays_description' => ':name’s contact’s birthdays',
  'dav_tasks' => 'Tasks',
  'dav_tasks_description' => ':name’s tasks',
+
+ // contact list
+ 'contact_list_avatar' => 'Avatar',
+ 'contact_list_name' => 'Contact',
+ 'contact_list_description' => 'Description',
+
 ];
diff --git a/resources/lang/en/people.php b/resources/lang/en/people.php
@@ -32,7 +32,7 @@
  'people_search_no_results' => 'No results found',
  'people_search_next' => 'Next',
  'people_search_prev' => 'Prev',
- 'people_search_rows_per_page' => 'Rows per page:',
+ 'people_search_rows_per_page' => 'Rows per page',
  'people_search_of' => 'of',
  'people_search_page' => 'Page',
  'people_search_all' => 'All',

diff --git a/webpack.mix.js b/webpack.mix.js
@@ -26,7 +26,7 @@ mix.webpackConfig({
 
 let purgeCssOptions = {
  enabled: true,
- whitelistPatterns: [/^autosuggest/, /^fa-/, /^vdp-datepicker/, /^StripeElement/, /^vgt/, /^vue-tooltip/, /^pretty/, /^sweet-/, /^vuejs-clipper-basic/, /^vs__/],
+ whitelistPatterns: [/^autosuggest/, /^fa-/, /^vdp-datepicker/, /^StripeElement/, /^vgt/, /^vue-tooltip/, /^pretty/, /^sweet-/, /^vuejs-clipper-basic/, /^vs__/, /^sr-only/],
  whitelistPatternsChildren: [/^vdp-datepicker/, /^vgt/, /^vue-tooltip/, /^pretty/, /^sweet-/, /^vs-/]
 };