[fix]

檀家一覧表の初期表示を修正
・かな検索機能のfilterの非同期処理を修正

src/app/pages/danka-list/danka-list.ts

@@ -8,18 +8,7 @@ import { AppSideMenu } from '../../share/side-menu/app-side-menu';
 import { Danka } from '../../models/danka';
 import { FormsModule } from '@angular/forms';
 
-type KanaRowValue =
-  | 'all'
-  | 'a'
-  | 'ka'
-  | 'sa'
-  | 'ta'
-  | 'na'
-  | 'ha'
-  | 'ma'
-  | 'ya'
-  | 'ra'
-  | 'wa';
+type KanaRowValue = 'all' | 'a' | 'ka' | 'sa' | 'ta' | 'na' | 'ha' | 'ma' | 'ya' | 'ra' | 'wa';
 
 @Component({
   selector: 'app-danka-list',
@@ -50,16 +39,110 @@ export class DankaList implements OnInit {
   ];
 
   private readonly kanaRowMap: Record<Exclude<KanaRowValue, 'all'>, string[]> = {
-    a: ['あ','い','う','え','お','ア','イ','ウ','エ','オ'],
-    ka: ['か','き','く','け','こ','が','ぎ','ぐ','げ','ご','カ','キ','ク','ケ','コ','ガ','ギ','グ','ゲ','ゴ'],
-    sa: ['さ','し','す','せ','そ','ざ','じ','ず','ぜ','ぞ','サ','シ','ス','セ','ソ','ザ','ジ','ズ','ゼ','ゾ'],
-    ta: ['た','ち','つ','て','と','だ','ぢ','づ','で','ど','タ','チ','ツ','テ','ト','ダ','ヂ','ヅ','デ','ド'],
-    na: ['な','に','ぬ','ね','の','ナ','ニ','ヌ','ネ','ノ'],
-    ha: ['は','ひ','ふ','へ','ほ','ば','び','ぶ','べ','ぼ','ぱ','ぴ','ぷ','ぺ','ぽ','ハ','ヒ','フ','ヘ','ホ','バ','ビ','ブ','ベ','ボ','パ','ピ','プ','ペ','ポ'],
-    ma: ['ま','み','む','め','も','マ','ミ','ム','メ','モ'],
-    ya: ['や','ゆ','よ','ヤ','ユ','ヨ'],
-    ra: ['ら','り','る','れ','ろ','ラ','リ','ル','レ','ロ'],
-    wa: ['わ','を','ん','ワ','ヲ','ン'],
+    a: ['あ', 'い', 'う', 'え', 'お', 'ア', 'イ', 'ウ', 'エ', 'オ'],
+    ka: [
+      'か',
+      'き',
+      'く',
+      'け',
+      'こ',
+      'が',
+      'ぎ',
+      'ぐ',
+      'げ',
+      'ご',
+      'カ',
+      'キ',
+      'ク',
+      'ケ',
+      'コ',
+      'ガ',
+      'ギ',
+      'グ',
+      'ゲ',
+      'ゴ',
+    ],
+    sa: [
+      'さ',
+      'し',
+      'す',
+      'せ',
+      'そ',
+      'ざ',
+      'じ',
+      'ず',
+      'ぜ',
+      'ぞ',
+      'サ',
+      'シ',
+      'ス',
+      'セ',
+      'ソ',
+      'ザ',
+      'ジ',
+      'ズ',
+      'ゼ',
+      'ゾ',
+    ],
+    ta: [
+      'た',
+      'ち',
+      'つ',
+      'て',
+      'と',
+      'だ',
+      'ぢ',
+      'づ',
+      'で',
+      'ど',
+      'タ',
+      'チ',
+      'ツ',
+      'テ',
+      'ト',
+      'ダ',
+      'ヂ',
+      'ヅ',
+      'デ',
+      'ド',
+    ],
+    na: ['な', 'に', 'にょ', 'ぬ', 'ね', 'の', 'ナ', 'ニ', 'ニョ', 'ヌ', 'ネ', 'ノ'],
+    ha: [
+      'は',
+      'ひ',
+      'ふ',
+      'へ',
+      'ほ',
+      'ば',
+      'び',
+      'ぶ',
+      'べ',
+      'ぼ',
+      'ぱ',
+      'ぴ',
+      'ぷ',
+      'ぺ',
+      'ぽ',
+      'ハ',
+      'ヒ',
+      'フ',
+      'ヘ',
+      'ホ',
+      'バ',
+      'ビ',
+      'ブ',
+      'ベ',
+      'ボ',
+      'パ',
+      'ピ',
+      'プ',
+      'ペ',
+      'ポ',
+    ],
+    ma: ['ま', 'み', 'む', 'め', 'も', 'マ', 'ミ', 'ム', 'メ', 'モ'],
+    ya: ['や', 'ゆ', 'よ', 'ヤ', 'ユ', 'ヨ'],
+    ra: ['ら', 'り', 'る', 'れ', 'ろ', 'ラ', 'リ', 'ル', 'レ', 'ロ'],
+    wa: ['わ', 'を', 'ん', 'ワ', 'ヲ', 'ン'],
   };
 
   constructor(
@@ -92,7 +175,7 @@ export class DankaList implements OnInit {
     this.selectedKanaRow = 'all';
 
     this.filterDankaList = this.dankaList.filter((danka) =>
-      danka.phones.some((phone) => phone.tel.trim() !== '')
+      danka.phones.some((phone) => phone.tel.trim() !== ''),
     );
 
     this.dankaDisplay = this.filterDankaList.length;
@@ -109,20 +192,21 @@ export class DankaList implements OnInit {
       return;
     }
 
-    this.filterDankaList = this.dankaList.filter((danka) =>
-      danka.householdName.includes(keyword) ||
-      danka.householdFurigana.includes(keyword) ||
-      danka.householder.includes(keyword) ||
-      danka.householderFurigana.includes(keyword) ||
-      danka.postalCode.includes(keyword) ||
-      danka.address.includes(keyword) ||
-      danka.phones.some((p) => p.tel.includes(keyword) || p.note.includes(keyword))
+    this.filterDankaList = this.dankaList.filter(
+      (danka) =>
+        danka.householdName.includes(keyword) ||
+        danka.householdFurigana.includes(keyword) ||
+        danka.householder.includes(keyword) ||
+        danka.householderFurigana.includes(keyword) ||
+        danka.postalCode.includes(keyword) ||
+        danka.address.includes(keyword) ||
+        danka.phones.some((p) => p.tel.includes(keyword) || p.note.includes(keyword)),
     );
 
     this.dankaDisplay = this.filterDankaList.length;
   }
 
-  filterByKanaRow(row: KanaRowValue): void {
+  async filterByKanaRow(row: KanaRowValue): Promise<void> {
     this.selectedFilter = 'kana';
     this.selectedKanaRow = row;
     this.searchKeyword = '';
@@ -132,12 +216,22 @@ export class DankaList implements OnInit {
       return;
     }
 
-    this.filterDankaList = this.dankaList.filter(async (danka) => {
-      const firstKana = (await this.getDankaSortText(danka)).charAt(0);
-      return this.kanaRowMap[row].includes(firstKana);
-    });
+    const filterResults = await Promise.all(
+      this.dankaList.map(async (danka) => {
+        const firstKana = (await this.getDankaSortText(danka)).charAt(0);
+        return {
+          danka,
+          isMatch: this.kanaRowMap[row].includes(firstKana),
+        };
+      }),
+    );
+
+    this.filterDankaList = filterResults
+      .filter((result) => result.isMatch)
+      .map((result) => result.danka);
 
     this.dankaDisplay = this.filterDankaList.length;
+    this.cdr.detectChanges();
   }
 
   clearDanka() {
@@ -150,11 +244,9 @@ export class DankaList implements OnInit {
 
   private async getDankaSortText(danka: Danka): Promise<string> {
     const householderName = this.normalizeName(danka.householder);
-
-    const householderFamily = (await this.familyService
-      .getFamiliesByDankaId(danka.id))
-      .find((f) => this.normalizeName(f.name) === householderName);
-
+    const householderFamily = (await this.familyService.getFamiliesByDankaId(danka.id)).find(
+      (f) => this.normalizeName(f.name) === householderName,
+    );
     return (householderFamily?.furigana || danka.householder).trim();
   }