Merge from develop

public_new/js/views/archive/archive.js

@@ -10,10 +10,9 @@ document.addEventListener("DOMContentLoaded", function () {
 
 
 ArchiveUI.refreshSearchScreen = function (keyword) {
 ArchiveUI.refreshSearchScreen = function (keyword) {
   const archiveList = NativeBridgeDataSource.getArchiveByName(keyword);
   const archiveList = NativeBridgeDataSource.getArchiveByName(keyword);
-  const typeImage = ArchiveUI.getArchiveTypeIconURL(archive.archiveType);
-
   ArchiveUI.getArchiveTemplate().then(function (archiveTemplate) {
   ArchiveUI.getArchiveTemplate().then(function (archiveTemplate) {
     archiveList.forEach(function (archive) {
     archiveList.forEach(function (archive) {
+      const typeImage = ArchiveUI.getArchiveTypeIconURL(archive.archiveType);
       let html = ArchiveUI.renderArchiveTemplate(
       let html = ArchiveUI.renderArchiveTemplate(
         archiveTemplate,
         archiveTemplate,
         archive.archiveId,
         archive.archiveId,

public_new/js/views/collaboration/fermi-web-socket-message-handler.js

@@ -111,6 +111,8 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
     case "API_WELCOME":
     case "API_WELCOME":
       if (globalUserInfo.joinType != COLLABORATION_JOIN_TYPE.INVITED) {
       if (globalUserInfo.joinType != COLLABORATION_JOIN_TYPE.INVITED) {
         FermiWebSocketMessageHandler.apiWelcome();
         FermiWebSocketMessageHandler.apiWelcome();
+      } else {
+        FermiWebSocketBridge.getCollaborationType()
       }
       }
       CollaborationFeature.updateHost();
       CollaborationFeature.updateHost();
       break;
       break;

public_new/js/views/contact/contact.js

@@ -83,7 +83,7 @@ Contact.appendGroupList = function (groupList) {
   const groupTemplate = getTemplate(TemplateURL.GROUP_LIST);
   const groupTemplate = getTemplate(TemplateURL.GROUP_LIST);
 
 
   groupList.forEach(function (group) {
   groupList.forEach(function (group) {
-    const html = renderGroupList(
+    const html = Contact.renderGroupList(
       groupTemplate,
       groupTemplate,
       group.groupName,
       group.groupName,
       group.groupId,
       group.groupId,

public_new/template/template_archive.html

 <li class="d-flex align-items-center">
 <li class="d-flex align-items-center">
-    <a href="archive_detail.html?archiveId={{archiveId}}" class="w-100">
-        <div class="archive_item d-flex flex-row align-items-center w-100">
-            <div class="arhive_img">
-                <div class="img_wrap bg_blue">
-                    <img src="{{typeImage}}" alt="動画" />
-                </div>
-            </div>
-            <div class="archive_desc">
-                <div class="archive_name">
-                    <span>{{fileName}}</span>
-                </div>
-                <div class="archive_date">
-                    <span>{{insertDate}}</span>
-                </div>
-            </div>
+  <a href="archive_detail.html?archiveId={{archiveId}}" class="w-100">
+    <div class="archive_item d-flex flex-row align-items-center w-100">
+      <div class="arhive_img">
+        <div class="img_wrap bg_blue">
+          <img src="{{typeImage}}" alt="動画" />
         </div>
         </div>
-    </a>
+      </div>
+      <div class="archive_desc">
+        <div class="archive_name">
+          <span>{{fileName}}</span>
+        </div>
+        <div class="archive_date">
+          <span>{{insertDate}}</span>
+        </div>
+      </div>
+    </div>
+  </a>
 </li>
 </li>
\ No newline at end of file

public_new/template/template_archive_list.html

 <li class="d-flex align-items-center">
 <li class="d-flex align-items-center">
-    <a href="archive_detail.html?archiveId={{archiveId}}" class="w-100">
-        <div class="archive_item d-flex flex-row align-items-center w-100">
-            <div class="arhive_img">
-              <div class="img_wrap bg_blue">
-                <img src="{{typeImage}}" alt="動画" />
-              </div>
-            </div>
-            <div class="archive_desc">
-              <div class="archive_name">
-                <span>{{fileName}}</span>
-              </div>
-              <div class="archive_date">
-                <span>{{insertDate}}</span>
-              </div>
-            </div>
+  <a href="archive_detail.html?archiveId={{archiveId}}" class="w-100">
+    <div class="archive_item d-flex flex-row align-items-center w-100">
+      <div class="arhive_img">
+        <div class="img_wrap bg_blue">
+          <img src="{{typeImage}}" alt="動画" />
         </div>
         </div>
-    </a>
+      </div>
+      <div class="archive_desc">
+        <div class="archive_name">
+          <span>{{fileName}}</span>
+        </div>
+        <div class="archive_date">
+          <span>{{insertDate}}</span>
+        </div>
+      </div>
+    </div>
+  </a>
 </li>
 </li>
\ No newline at end of file