Merge pull request #275 from traPtitech/develop

Develop
traPtitech · Feb 22, 2021 · 7173bae · 7173bae
2 parents 15ca280 + a1a93d4
commit 7173bae
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "room-web",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

diff --git a/src/components/group/GroupFormSummary.vue b/src/components/group/GroupFormSummary.vue
@@ -71,9 +71,9 @@ export default class GroupFormSummary extends Vue {
       : '自由参加できないグループです'
   }
 
-  get memberNames(): (string | undefined)[] {
+  get memberNames(): string[] {
     const nameById = this.$store.direct.getters.usersCache.nameById
-    return this.members.map(nameById)
+    return this.members.flatMap(userId => nameById(userId) ?? [])
   }
 
   get openIcon() {

diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
@@ -17,7 +17,7 @@
       </v-col>
       <v-col md="6" cols="12">
         <DashboardItem>
-          <DashboardItemTitle>あなたの管理者のグループ</DashboardItemTitle>
+          <DashboardItemTitle>あなたが管理者のグループ</DashboardItemTitle>
           <YourGroups />
         </DashboardItem>
       </v-col>

diff --git a/src/pages/GroupDetail.vue b/src/pages/GroupDetail.vue
@@ -33,7 +33,7 @@
           <v-col class="flex-grow-0">
             <ActionMenu>
               <v-list-item v-if="isMyGroup" :to="`/groups/edit/${groupId}`">
-                <v-list-item-title>Edit this event</v-list-item-title>
+                <v-list-item-title>Edit this group</v-list-item-title>
               </v-list-item>
             </ActionMenu>
           </v-col>