Unverified Commit e040be0b authored by Gerzon Z's avatar Gerzon Z Committed by GitHub
Browse files

[IMPROVE] Remove difference between public/private on "Group by type" (#3271)

* Merge channels and private groups

* Remove i18n
parent 8a91d0d5
...@@ -387,7 +387,6 @@ ...@@ -387,7 +387,6 @@
"Preferences_saved": "تم حفظ التفضيلات", "Preferences_saved": "تم حفظ التفضيلات",
"Privacy_Policy": "سياسة الخصوصية", "Privacy_Policy": "سياسة الخصوصية",
"Private_Channel": "قناة خاصة", "Private_Channel": "قناة خاصة",
"Private_Groups": "مجموعات خاصة",
"Private": "خاص", "Private": "خاص",
"Processing": "جار معالجة...", "Processing": "جار معالجة...",
"Profile_saved_successfully": "تم حفظ الملف الشخصي بنجاح!", "Profile_saved_successfully": "تم حفظ الملف الشخصي بنجاح!",
......
...@@ -400,7 +400,6 @@ ...@@ -400,7 +400,6 @@
"Preferences_saved": "Einstellungen gespeichert!", "Preferences_saved": "Einstellungen gespeichert!",
"Privacy_Policy": " Datenschutzbestimmungen", "Privacy_Policy": " Datenschutzbestimmungen",
"Private_Channel": "Privater Kanal", "Private_Channel": "Privater Kanal",
"Private_Groups": "Private Gruppen",
"Private": "Privat", "Private": "Privat",
"Processing": "Bearbeite …", "Processing": "Bearbeite …",
"Profile_saved_successfully": "Profil erfolgreich gespeichert!", "Profile_saved_successfully": "Profil erfolgreich gespeichert!",
......
...@@ -400,7 +400,6 @@ ...@@ -400,7 +400,6 @@
"Preferences_saved": "Preferences saved!", "Preferences_saved": "Preferences saved!",
"Privacy_Policy": " Privacy Policy", "Privacy_Policy": " Privacy Policy",
"Private_Channel": "Private Channel", "Private_Channel": "Private Channel",
"Private_Groups": "Private Groups",
"Private": "Private", "Private": "Private",
"Processing": "Processing...", "Processing": "Processing...",
"Profile_saved_successfully": "Profile saved successfully!", "Profile_saved_successfully": "Profile saved successfully!",
......
...@@ -280,7 +280,6 @@ ...@@ -280,7 +280,6 @@
"Preferences_saved": "¡Preferencias guardadas!", "Preferences_saved": "¡Preferencias guardadas!",
"Privacy_Policy": "Política de privacidad", "Privacy_Policy": "Política de privacidad",
"Private_Channel": "Canal privado", "Private_Channel": "Canal privado",
"Private_Groups": "Grupos privados",
"Private": "Privado", "Private": "Privado",
"Processing": "Procesando...", "Processing": "Procesando...",
"Profile_saved_successfully": "¡Perfil guardado correctamente!", "Profile_saved_successfully": "¡Perfil guardado correctamente!",
......
...@@ -400,7 +400,6 @@ ...@@ -400,7 +400,6 @@
"Preferences_saved": "Préférences sauvegardées !", "Preferences_saved": "Préférences sauvegardées !",
"Privacy_Policy": " Politique de confidentialité", "Privacy_Policy": " Politique de confidentialité",
"Private_Channel": "Canal privé", "Private_Channel": "Canal privé",
"Private_Groups": "Groupes privés",
"Private": "Privé", "Private": "Privé",
"Processing": "Traitement...", "Processing": "Traitement...",
"Profile_saved_successfully": "Profil enregistré avec succès !", "Profile_saved_successfully": "Profil enregistré avec succès !",
......
...@@ -392,7 +392,6 @@ ...@@ -392,7 +392,6 @@
"Preferences_saved": "Impostazioni salvate!", "Preferences_saved": "Impostazioni salvate!",
"Privacy_Policy": " Privacy Policy", "Privacy_Policy": " Privacy Policy",
"Private_Channel": "Canale privato", "Private_Channel": "Canale privato",
"Private_Groups": "Gruppi privati",
"Private": "Privato", "Private": "Privato",
"Processing": "Elaborazione...", "Processing": "Elaborazione...",
"Profile_saved_successfully": "Profilo salvato correttamente!", "Profile_saved_successfully": "Profilo salvato correttamente!",
......
...@@ -296,7 +296,6 @@ ...@@ -296,7 +296,6 @@
"Preferences_saved": "設定が保存されました。", "Preferences_saved": "設定が保存されました。",
"Privacy_Policy": " プライバシーポリシー", "Privacy_Policy": " プライバシーポリシー",
"Private_Channel": "プライベートチャンネル", "Private_Channel": "プライベートチャンネル",
"Private_Groups": "プライベートグループ",
"Private": "プライベート", "Private": "プライベート",
"Processing": "処理中...", "Processing": "処理中...",
"Profile_saved_successfully": "プロフィールが保存されました!", "Profile_saved_successfully": "プロフィールが保存されました!",
......
...@@ -400,7 +400,6 @@ ...@@ -400,7 +400,6 @@
"Preferences_saved": "Voorkeuren opgeslagen!", "Preferences_saved": "Voorkeuren opgeslagen!",
"Privacy_Policy": " Privacybeleid", "Privacy_Policy": " Privacybeleid",
"Private_Channel": "Privékanaal", "Private_Channel": "Privékanaal",
"Private_Groups": "Privé groepen",
"Private": "Privé", "Private": "Privé",
"Processing": "Verwerking...", "Processing": "Verwerking...",
"Profile_saved_successfully": "Profiel succesvol opgeslagen!", "Profile_saved_successfully": "Profiel succesvol opgeslagen!",
......
...@@ -370,7 +370,6 @@ ...@@ -370,7 +370,6 @@
"Preferences_saved": "Preferências salvas!", "Preferences_saved": "Preferências salvas!",
"Privacy_Policy": " Política de Privacidade", "Privacy_Policy": " Política de Privacidade",
"Private_Channel": "Canal Privado", "Private_Channel": "Canal Privado",
"Private_Groups": "Grupo Privado",
"Private": "Privado", "Private": "Privado",
"Processing": "Processando...", "Processing": "Processando...",
"Profile_saved_successfully": "Perfil salvo com sucesso!", "Profile_saved_successfully": "Perfil salvo com sucesso!",
......
...@@ -399,7 +399,6 @@ ...@@ -399,7 +399,6 @@
"Preferences_saved": "Preferências guardadas!", "Preferences_saved": "Preferências guardadas!",
"Privacy_Policy": " Política de Privacidade", "Privacy_Policy": " Política de Privacidade",
"Private_Channel": "Canal Privado", "Private_Channel": "Canal Privado",
"Private_Groups": "Grupos Privados",
"Private": "Privado", "Private": "Privado",
"Processing": "A processar...", "Processing": "A processar...",
"Profile_saved_successfully": "Perfil actualizado com sucesso!", "Profile_saved_successfully": "Perfil actualizado com sucesso!",
......
...@@ -400,7 +400,6 @@ ...@@ -400,7 +400,6 @@
"Preferences_saved": "Настройки сохранены!", "Preferences_saved": "Настройки сохранены!",
"Privacy_Policy": " Политика конфиденциальности", "Privacy_Policy": " Политика конфиденциальности",
"Private_Channel": "Приватный канал", "Private_Channel": "Приватный канал",
"Private_Groups": "Приватные группы",
"Private": "Приватный", "Private": "Приватный",
"Processing": "Обработка...", "Processing": "Обработка...",
"Profile_saved_successfully": "Профиль успешно сохранен!", "Profile_saved_successfully": "Профиль успешно сохранен!",
......
...@@ -393,7 +393,6 @@ ...@@ -393,7 +393,6 @@
"Preferences_saved": "Tercihler kaydedildi!", "Preferences_saved": "Tercihler kaydedildi!",
"Privacy_Policy": " Privacy Policy", "Privacy_Policy": " Privacy Policy",
"Private_Channel": "Özel Kanal", "Private_Channel": "Özel Kanal",
"Private_Groups": "Özel Gruplar",
"Private": "Özel", "Private": "Özel",
"Processing": "İşleniyor...", "Processing": "İşleniyor...",
"Profile_saved_successfully": "Profil başarıyla kaydedildi!", "Profile_saved_successfully": "Profil başarıyla kaydedildi!",
......
...@@ -390,7 +390,6 @@ ...@@ -390,7 +390,6 @@
"Preferences_saved": "偏好已保存!", "Preferences_saved": "偏好已保存!",
"Privacy_Policy": "隐私政策", "Privacy_Policy": "隐私政策",
"Private_Channel": "私人频道", "Private_Channel": "私人频道",
"Private_Groups": "私人群组",
"Private": "私有的", "Private": "私有的",
"Processing": "处理中", "Processing": "处理中",
"Profile_saved_successfully": "个人资料保存成功!", "Profile_saved_successfully": "个人资料保存成功!",
......
...@@ -391,7 +391,6 @@ ...@@ -391,7 +391,6 @@
"Preferences_saved": "偏好設定已被儲存!", "Preferences_saved": "偏好設定已被儲存!",
"Privacy_Policy": "隱私政策", "Privacy_Policy": "隱私政策",
"Private_Channel": "私人頻道", "Private_Channel": "私人頻道",
"Private_Groups": "私人群組",
"Private": "私有的", "Private": "私有的",
"Processing": "處理中", "Processing": "處理中",
"Profile_saved_successfully": "個人資料儲存成功!", "Profile_saved_successfully": "個人資料儲存成功!",
......
...@@ -71,7 +71,6 @@ const DISCUSSIONS_HEADER = 'Discussions'; ...@@ -71,7 +71,6 @@ const DISCUSSIONS_HEADER = 'Discussions';
const TEAMS_HEADER = 'Teams'; const TEAMS_HEADER = 'Teams';
const CHANNELS_HEADER = 'Channels'; const CHANNELS_HEADER = 'Channels';
const DM_HEADER = 'Direct_Messages'; const DM_HEADER = 'Direct_Messages';
const GROUPS_HEADER = 'Private_Groups';
const OMNICHANNEL_HEADER = 'Open_Livechats'; const OMNICHANNEL_HEADER = 'Open_Livechats';
const QUERY_SIZE = 20; const QUERY_SIZE = 20;
...@@ -480,13 +479,11 @@ class RoomsListView extends React.Component { ...@@ -480,13 +479,11 @@ class RoomsListView extends React.Component {
if (groupByType) { if (groupByType) {
const teams = chats.filter(s => filterIsTeam(s)); const teams = chats.filter(s => filterIsTeam(s));
const discussions = chats.filter(s => filterIsDiscussion(s)); const discussions = chats.filter(s => filterIsDiscussion(s));
const channels = chats.filter(s => s.t === 'c' && !filterIsDiscussion(s) && !filterIsTeam(s)); const channels = chats.filter(s => (s.t === 'c' || s.t === 'p') && !filterIsDiscussion(s) && !filterIsTeam(s));
const privateGroup = chats.filter(s => s.t === 'p' && !filterIsDiscussion(s) && !filterIsTeam(s));
const direct = chats.filter(s => s.t === 'd' && !filterIsDiscussion(s) && !filterIsTeam(s)); const direct = chats.filter(s => s.t === 'd' && !filterIsDiscussion(s) && !filterIsTeam(s));
tempChats = this.addRoomsGroup(teams, TEAMS_HEADER, tempChats); tempChats = this.addRoomsGroup(teams, TEAMS_HEADER, tempChats);
tempChats = this.addRoomsGroup(discussions, DISCUSSIONS_HEADER, tempChats); tempChats = this.addRoomsGroup(discussions, DISCUSSIONS_HEADER, tempChats);
tempChats = this.addRoomsGroup(channels, CHANNELS_HEADER, tempChats); tempChats = this.addRoomsGroup(channels, CHANNELS_HEADER, tempChats);
tempChats = this.addRoomsGroup(privateGroup, GROUPS_HEADER, tempChats);
tempChats = this.addRoomsGroup(direct, DM_HEADER, tempChats); tempChats = this.addRoomsGroup(direct, DM_HEADER, tempChats);
} else if (showUnread || showFavorites || isOmnichannelAgent) { } else if (showUnread || showFavorites || isOmnichannelAgent) {
tempChats = this.addRoomsGroup(chats, CHATS_HEADER, tempChats); tempChats = this.addRoomsGroup(chats, CHATS_HEADER, tempChats);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment