Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Jul 13, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9005ff0
Merge channels and private groups
gerzonc Jul 12, 2021
50d7adc
Merge branch 'develop' into chore.remove-public-private-difference
gerzonc Jul 12, 2021
ad67230
Remove i18n
gerzonc Jul 13, 2021
51e1827
Merge branch 'develop' into chore.remove-public-private-difference
gerzonc Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/i18n/locales/ar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,6 @@
"Preferences_saved": "تم حفظ التفضيلات",
"Privacy_Policy": "سياسة الخصوصية",
"Private_Channel": "قناة خاصة",
"Private_Groups": "مجموعات خاصة",
"Private": "خاص",
"Processing": "جار معالجة...",
"Profile_saved_successfully": "تم حفظ الملف الشخصي بنجاح!",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@
"Preferences_saved": "Einstellungen gespeichert!",
"Privacy_Policy": " Datenschutzbestimmungen",
"Private_Channel": "Privater Kanal",
"Private_Groups": "Private Gruppen",
"Private": "Privat",
"Processing": "Bearbeite …",
"Profile_saved_successfully": "Profil erfolgreich gespeichert!",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@
"Preferences_saved": "Preferences saved!",
"Privacy_Policy": " Privacy Policy",
"Private_Channel": "Private Channel",
"Private_Groups": "Private Groups",
"Private": "Private",
"Processing": "Processing...",
"Profile_saved_successfully": "Profile saved successfully!",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/es-ES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@
"Preferences_saved": "¡Preferencias guardadas!",
"Privacy_Policy": "Política de privacidad",
"Private_Channel": "Canal privado",
"Private_Groups": "Grupos privados",
"Private": "Privado",
"Processing": "Procesando...",
"Profile_saved_successfully": "¡Perfil guardado correctamente!",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@
"Preferences_saved": "Préférences sauvegardées !",
"Privacy_Policy": " Politique de confidentialité",
"Private_Channel": "Canal privé",
"Private_Groups": "Groupes privés",
"Private": "Privé",
"Processing": "Traitement...",
"Profile_saved_successfully": "Profil enregistré avec succès !",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,6 @@
"Preferences_saved": "Impostazioni salvate!",
"Privacy_Policy": " Privacy Policy",
"Private_Channel": "Canale privato",
"Private_Groups": "Gruppi privati",
"Private": "Privato",
"Processing": "Elaborazione...",
"Profile_saved_successfully": "Profilo salvato correttamente!",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@
"Preferences_saved": "設定が保存されました。",
"Privacy_Policy": " プライバシーポリシー",
"Private_Channel": "プライベートチャンネル",
"Private_Groups": "プライベートグループ",
"Private": "プライベート",
"Processing": "処理中...",
"Profile_saved_successfully": "プロフィールが保存されました！",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@
"Preferences_saved": "Voorkeuren opgeslagen!",
"Privacy_Policy": " Privacybeleid",
"Private_Channel": "Privékanaal",
"Private_Groups": "Privé groepen",
"Private": "Privé",
"Processing": "Verwerking...",
"Profile_saved_successfully": "Profiel succesvol opgeslagen!",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/pt-BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,6 @@
"Preferences_saved": "Preferências salvas!",
"Privacy_Policy": " Política de Privacidade",
"Private_Channel": "Canal Privado",
"Private_Groups": "Grupo Privado",
"Private": "Privado",
"Processing": "Processando...",
"Profile_saved_successfully": "Perfil salvo com sucesso!",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/pt-PT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,6 @@
"Preferences_saved": "Preferências guardadas!",
"Privacy_Policy": " Política de Privacidade",
"Private_Channel": "Canal Privado",
"Private_Groups": "Grupos Privados",
"Private": "Privado",
"Processing": "A processar...",
"Profile_saved_successfully": "Perfil actualizado com sucesso!",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@
"Preferences_saved": "Настройки сохранены!",
"Privacy_Policy": " Политика конфиденциальности",
"Private_Channel": "Приватный канал",
"Private_Groups": "Приватные группы",
"Private": "Приватный",
"Processing": "Обработка...",
"Profile_saved_successfully": "Профиль успешно сохранен!",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/tr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@
"Preferences_saved": "Tercihler kaydedildi!",
"Privacy_Policy": " Privacy Policy",
"Private_Channel": "Özel Kanal",
"Private_Groups": "Özel Gruplar",
"Private": "Özel",
"Processing": "İşleniyor...",
"Profile_saved_successfully": "Profil başarıyla kaydedildi!",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@
"Preferences_saved": "偏好已保存!",
"Privacy_Policy": "隐私政策",
"Private_Channel": "私人频道",
"Private_Groups": "私人群组",
"Private": "私有的",
"Processing": "处理中",
"Profile_saved_successfully": "个人资料保存成功!",
Expand Down
1 change: 0 additions & 1 deletion app/i18n/locales/zh-TW.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,6 @@
"Preferences_saved": "偏好設定已被儲存!",
"Privacy_Policy": "隱私政策",
"Private_Channel": "私人頻道",
"Private_Groups": "私人群組",
"Private": "私有的",
"Processing": "處理中",
"Profile_saved_successfully": "個人資料儲存成功!",
Expand Down
5 changes: 1 addition & 4 deletions app/views/RoomsListView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ const DISCUSSIONS_HEADER = 'Discussions';
const TEAMS_HEADER = 'Teams';
const CHANNELS_HEADER = 'Channels';
const DM_HEADER = 'Direct_Messages';
const GROUPS_HEADER = 'Private_Groups';
gerzonc marked this conversation as resolved.
Show resolved Hide resolved
const OMNICHANNEL_HEADER = 'Open_Livechats';
const QUERY_SIZE = 20;

Expand Down Expand Up @@ -480,13 +479,11 @@ class RoomsListView extends React.Component {
if (groupByType) {
const teams = chats.filter(s => filterIsTeam(s));
const discussions = chats.filter(s => filterIsDiscussion(s));
const channels = chats.filter(s => s.t === 'c' && !filterIsDiscussion(s) && !filterIsTeam(s));
const privateGroup = chats.filter(s => s.t === 'p' && !filterIsDiscussion(s) && !filterIsTeam(s));
const channels = chats.filter(s => (s.t === 'c' || s.t === 'p') && !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(discussions, DISCUSSIONS_HEADER, tempChats);
tempChats = this.addRoomsGroup(channels, CHANNELS_HEADER, tempChats);
tempChats = this.addRoomsGroup(privateGroup, GROUPS_HEADER, tempChats);
tempChats = this.addRoomsGroup(direct, DM_HEADER, tempChats);
} else if (showUnread || showFavorites || isOmnichannelAgent) {
tempChats = this.addRoomsGroup(chats, CHATS_HEADER, tempChats);
Expand Down