From 381389cb2367b543374fcf3be58f8451246c1c2b Mon Sep 17 00:00:00 2001 From: Vlada Gazizova <94864088+gazizova-vlada@users.noreply.github.com> Date: Wed, 31 Jul 2024 10:19:33 +0300 Subject: [PATCH 1/4] Fixed Bug 69436 - Security:LoginHistory/AuditTrail. The hint for downloading data for the selected period has not been removed. --- packages/client/public/locales/ar-SA/Settings.json | 1 - packages/client/public/locales/az/Settings.json | 1 - packages/client/public/locales/bg/Settings.json | 1 - packages/client/public/locales/cs/Settings.json | 1 - packages/client/public/locales/de/Settings.json | 1 - packages/client/public/locales/el-GR/Settings.json | 1 - packages/client/public/locales/en/Settings.json | 1 - packages/client/public/locales/es/Settings.json | 1 - packages/client/public/locales/fi/Settings.json | 1 - packages/client/public/locales/fr/Settings.json | 1 - packages/client/public/locales/hy-AM/Settings.json | 1 - packages/client/public/locales/it/Settings.json | 1 - packages/client/public/locales/ja-JP/Settings.json | 1 - packages/client/public/locales/ko-KR/Settings.json | 1 - packages/client/public/locales/lo-LA/Settings.json | 1 - packages/client/public/locales/lv/Settings.json | 1 - packages/client/public/locales/nl/Settings.json | 1 - packages/client/public/locales/pl/Settings.json | 1 - packages/client/public/locales/pt-BR/Settings.json | 1 - packages/client/public/locales/pt/Settings.json | 1 - packages/client/public/locales/ro/Settings.json | 1 - packages/client/public/locales/ru/Settings.json | 1 - packages/client/public/locales/si/Settings.json | 1 - packages/client/public/locales/sk/Settings.json | 1 - packages/client/public/locales/sl/Settings.json | 1 - .../client/public/locales/sr-Cyrl-RS/Settings.json | 1 - .../client/public/locales/sr-Latn-RS/Settings.json | 1 - packages/client/public/locales/tr/Settings.json | 1 - packages/client/public/locales/uk-UA/Settings.json | 1 - packages/client/public/locales/vi/Settings.json | 1 - packages/client/public/locales/zh-CN/Settings.json | 1 - .../categories/security/audit-trail/index.js | 1 - .../categories/security/login-history/index.js | 1 - .../security/sub-components/HistoryMainContent.js | 10 +--------- 34 files changed, 1 insertion(+), 42 deletions(-) diff --git a/packages/client/public/locales/ar-SA/Settings.json b/packages/client/public/locales/ar-SA/Settings.json index 6f34b1cb29..d8c8250621 100644 --- a/packages/client/public/locales/ar-SA/Settings.json +++ b/packages/client/public/locales/ar-SA/Settings.json @@ -111,7 +111,6 @@ "DownloadLog": "سجل التنزيل", "DownloadReportBtnText": "تنزيل التقرير", "DownloadReportDescription": "سيتم حفظ التقرير في المستندات", - "DownloadStatisticsText": "يمكنك تنزيل التقرير الخاص بالبيانات المتاحة خلال فترة التخزين المحددة لعرض الإحصائيات التفصيلية.", "DuplicateNoun": "متكرر", "EditColorScheme": "تحرير نظام الألوان", "Employees": "المستخدمين", diff --git a/packages/client/public/locales/az/Settings.json b/packages/client/public/locales/az/Settings.json index b7c27d52be..fc3b043ea9 100644 --- a/packages/client/public/locales/az/Settings.json +++ b/packages/client/public/locales/az/Settings.json @@ -111,7 +111,6 @@ "DownloadLog": "Gündəliyi endirin", "DownloadReportBtnText": "Hesabatı yükləyin", "DownloadReportDescription": "Hesabat Sənədlərdə saxlanacaq", - "DownloadStatisticsText": "Ətraflı statistikaya baxmaq üçün seçilmiş saxlama müddəti ərzində mövcud olan məlumat üçün hesabatı yükləyə bilərsiniz.", "DuplicateNoun": "Dublikat edin", "EditColorScheme": "Rəng sxemini redaktə edin", "Employees": "istifadəçilər", diff --git a/packages/client/public/locales/bg/Settings.json b/packages/client/public/locales/bg/Settings.json index 3dcf2dbf5b..670a0588b2 100644 --- a/packages/client/public/locales/bg/Settings.json +++ b/packages/client/public/locales/bg/Settings.json @@ -112,7 +112,6 @@ "DownloadLog": "Дневник на изтеглянията", "DownloadReportBtnText": "Изтегляне на доклад", "DownloadReportDescription": "Отчетът ще бъде записан в Документи", - "DownloadStatisticsText": "Можете да изтеглите отчета за наличните данни през избрания период на съхранение, за да видите подробната статистика.", "DuplicateNoun": "Дублирай", "EditColorScheme": "Редактиране на цветовата схема", "Employees": "потребители", diff --git a/packages/client/public/locales/cs/Settings.json b/packages/client/public/locales/cs/Settings.json index f213a34a80..01bdd3f7a5 100644 --- a/packages/client/public/locales/cs/Settings.json +++ b/packages/client/public/locales/cs/Settings.json @@ -112,7 +112,6 @@ "DownloadLog": "Stáhnout protokol", "DownloadReportBtnText": "Stáhnout zprávu", "DownloadReportDescription": "Zpráva se uloží do složky Dokumenty", - "DownloadStatisticsText": "Můžete si stáhnout zprávu pro data dostupná během vybraného období ukládání a zobrazit podrobné statistiky.", "DuplicateNoun": "Duplikát", "EditColorScheme": "Úprava barevného schématu", "Employees": "uživatelé", diff --git a/packages/client/public/locales/de/Settings.json b/packages/client/public/locales/de/Settings.json index e6d3655a6e..799c3d0fd5 100644 --- a/packages/client/public/locales/de/Settings.json +++ b/packages/client/public/locales/de/Settings.json @@ -110,7 +110,6 @@ "DownloadLog": "Log herunterladen", "DownloadReportBtnText": "Bericht herunterladen", "DownloadReportDescription": "Der Bericht wird unter Dateien gespeichert", - "DownloadStatisticsText": "Sie können den Bericht für die verfügbaren Daten während des ausgewählten Speicherzeitraums herunterladen, um die detaillierten Statistiken anzuzeigen.", "DuplicateNoun": "Duplizieren", "EditColorScheme": "Farbschema bearbeiten", "Employees": "Benutzer", diff --git a/packages/client/public/locales/el-GR/Settings.json b/packages/client/public/locales/el-GR/Settings.json index 3bfaf59b77..cd20465625 100644 --- a/packages/client/public/locales/el-GR/Settings.json +++ b/packages/client/public/locales/el-GR/Settings.json @@ -110,7 +110,6 @@ "DownloadLog": "Λήψη αρχείου καταγραφής", "DownloadReportBtnText": "Λήψη αναφοράς", "DownloadReportDescription": "Η έκθεση θα αποθηκευτεί στα Έγγραφά", - "DownloadStatisticsText": "Μπορείτε να κατεβάσετε την αναφορά για τα δεδομένα που ήταν διαθέσιμα κατά την επιλεγμένη περίοδο αποθήκευσης για να δείτε τα λεπτομερή στατιστικά στοιχεία.", "DuplicateNoun": "Διπλότυπο", "EditColorScheme": "Επεξεργασία χρωμάτων", "Employees": "χρήστες", diff --git a/packages/client/public/locales/en/Settings.json b/packages/client/public/locales/en/Settings.json index d9e4733da5..4ff8002ccb 100644 --- a/packages/client/public/locales/en/Settings.json +++ b/packages/client/public/locales/en/Settings.json @@ -114,7 +114,6 @@ "DownloadLog": "Download log", "DownloadReportBtnText": "Download report", "DownloadReportDescription": "The report will be saved to Documents", - "DownloadStatisticsText": "You can download the report for the data available during the selected storage period to view the detailed statistics.", "DuplicateNoun": "Duplicate", "EditColorScheme": "Edit color scheme", "Employees": "users", diff --git a/packages/client/public/locales/es/Settings.json b/packages/client/public/locales/es/Settings.json index 5f35b6bb71..ef2839df78 100644 --- a/packages/client/public/locales/es/Settings.json +++ b/packages/client/public/locales/es/Settings.json @@ -112,7 +112,6 @@ "DownloadLog": "Descargar registro", "DownloadReportBtnText": "Descargar informe", "DownloadReportDescription": "El informe se guardará en Documentos", - "DownloadStatisticsText": "Usted puede descargar el informe para los datos disponibles durante el período de almacenamiento seleccionado para ver estadísticas detalladas.", "DuplicateNoun": "Duplicar", "EditColorScheme": "Editar combinación de colores", "Employees": "usuarios", diff --git a/packages/client/public/locales/fi/Settings.json b/packages/client/public/locales/fi/Settings.json index d87c286100..4dffc8508d 100644 --- a/packages/client/public/locales/fi/Settings.json +++ b/packages/client/public/locales/fi/Settings.json @@ -108,7 +108,6 @@ "DownloadLog": "Lataa loki", "DownloadReportBtnText": "Lataa raportti", "DownloadReportDescription": "Raportti tallennetaan Dokumentteihin", - "DownloadStatisticsText": "Voit ladata raportin valitun tallennusjakson aikana saatavilla olevista tiedoista nähdäksesi yksityiskohtaiset tilastot.", "DuplicateNoun": "Kopioi", "EditColorScheme": "Muokkaa värijärjestelmää", "Employees": "Käyttäjät", diff --git a/packages/client/public/locales/fr/Settings.json b/packages/client/public/locales/fr/Settings.json index 25584eedb8..51c8ddc3ca 100644 --- a/packages/client/public/locales/fr/Settings.json +++ b/packages/client/public/locales/fr/Settings.json @@ -112,7 +112,6 @@ "DownloadLog": "Télécharger le journal", "DownloadReportBtnText": "Télécharger le rapport", "DownloadReportDescription": "Le rapport sera enregistré dans Documents", - "DownloadStatisticsText": "Vous pouvez télécharger un rapport des données accessibles pour la période de stockage sélectionnée pour voir les statistiques détaillées. ", "DuplicateNoun": "Dupliquer", "EditColorScheme": "Modifier le jeu de couleurs", "Employees": "Utilisateurs", diff --git a/packages/client/public/locales/hy-AM/Settings.json b/packages/client/public/locales/hy-AM/Settings.json index f1be8aec3e..7649b6bedc 100644 --- a/packages/client/public/locales/hy-AM/Settings.json +++ b/packages/client/public/locales/hy-AM/Settings.json @@ -111,7 +111,6 @@ "DownloadLog": "Ներբեռնման մատյան", "DownloadReportBtnText": "Ներբեռնել զեկույցը", "DownloadReportDescription": "Զեկույցը կպահվի Փաստաթղթերում", - "DownloadStatisticsText": "Դուք կարող եք ներբեռնել զեկույցը ընտրված պահպանման ժամանակահատվածում առկա տվյալների համար՝ մանրամասն վիճակագրությունը դիտելու համար:", "DuplicateNoun": "Դուբլիկատ", "EditColorScheme": "Խմբագրել գունավորումը", "Employees": "Օգտվողներ", diff --git a/packages/client/public/locales/it/Settings.json b/packages/client/public/locales/it/Settings.json index f30d37ba8a..106f268cdb 100644 --- a/packages/client/public/locales/it/Settings.json +++ b/packages/client/public/locales/it/Settings.json @@ -112,7 +112,6 @@ "DownloadLog": "Scarica registro", "DownloadReportBtnText": "Scarica il report", "DownloadReportDescription": "Il report verrà salvato in Documenti", - "DownloadStatisticsText": "È possibile scaricare il report per i dati disponibili durante il periodo di archiviazione selezionato per visualizzare le statistiche dettagliate.", "DuplicateNoun": "Duplica", "EditColorScheme": "Modifica la combinazione di colori", "Employees": "utenti", diff --git a/packages/client/public/locales/ja-JP/Settings.json b/packages/client/public/locales/ja-JP/Settings.json index 5c8ecd6bca..f0edd3c924 100644 --- a/packages/client/public/locales/ja-JP/Settings.json +++ b/packages/client/public/locales/ja-JP/Settings.json @@ -110,7 +110,6 @@ "DownloadLog": "ダウンロードログ", "DownloadReportBtnText": "ダウンロードのレポート", "DownloadReportDescription": "レポートは「文書」に保存されます", - "DownloadStatisticsText": "選択した保存期間中に利用可能なデータのレポートをダウンロードして、詳細な統計情報を確認することができます。", "DuplicateNoun": "複製", "EditColorScheme": "カラースキームを編集する", "Employees": "ユーザー", diff --git a/packages/client/public/locales/ko-KR/Settings.json b/packages/client/public/locales/ko-KR/Settings.json index d61953edfa..98ee544494 100644 --- a/packages/client/public/locales/ko-KR/Settings.json +++ b/packages/client/public/locales/ko-KR/Settings.json @@ -112,7 +112,6 @@ "DownloadLog": "로그 다운로드", "DownloadReportBtnText": "보고서 다운로드", "DownloadReportDescription": "보고서가 문서에 저장됩니다", - "DownloadStatisticsText": "선택한 저장 기간 동안 이용 가능한 데이터에 대한 보고서를 다운로드하여 자세한 통계를 볼 수 있습니다.", "DuplicateNoun": "복제", "EditColorScheme": "색 구성표 편집", "Employees": "사용자", diff --git a/packages/client/public/locales/lo-LA/Settings.json b/packages/client/public/locales/lo-LA/Settings.json index a344055bd3..d365a10b69 100644 --- a/packages/client/public/locales/lo-LA/Settings.json +++ b/packages/client/public/locales/lo-LA/Settings.json @@ -71,7 +71,6 @@ "DownloadCopy": "ດາວໂຫລດ ໄດ້ ສຳເນົາ", "DownloadReportBtnText": "ດາວໂຫລດບົດລາຍງານ", "DownloadReportDescription": "ບົດລາຍງານຈະຖືກບັນທຶກໄວ້ໃນເອກະສານຂອງຂ້ອຍ", - "DownloadStatisticsText": "ທ່ານສາມາດດາວໂຫລດບົດລາຍງານສໍາລັບຂໍ້ມູນທີ່ມີ ຢູ່ໃນໄລຍະເວລາການເກັບຮັກສາທີ່ເລືອກເພື່ອເບິ່ງສະຖິຕິລາຍລະອຽດ.", "EditColorScheme": "ແກ້ໄຂຮູບແບບສີ", "Employees": "ຜຸ້ໃຊ້", "EmptyBackupList": "ຍັງ​ບໍ່​ມີ​ການ​ສ້າງ​ການ​ສໍາ​ຮອງ​ຂໍ້​ມູນ​ໃດໆ​ເທື່ອ. ສ້າງ​ຫນຶ່ງ​ຫຼື​ຫຼາຍ​ສໍາ​ຮອງ​ຂໍ້​ມູນ​ສໍາ​ລັບ​ການ​ໃຫ້​ເຂົາ​ເຈົ້າ​ປາ​ກົດ​ຢູ່​ໃນ​ບັນ​ຊີ​ລາຍ​ການ​ນີ້​.", diff --git a/packages/client/public/locales/lv/Settings.json b/packages/client/public/locales/lv/Settings.json index d780ee9022..5ecd0f1de0 100644 --- a/packages/client/public/locales/lv/Settings.json +++ b/packages/client/public/locales/lv/Settings.json @@ -111,7 +111,6 @@ "DownloadLog": "Lejupielādēt žurnālu", "DownloadReportBtnText": "Lejupielādēt pārskatu", "DownloadReportDescription": "Atskaite tiks saglabāta mapē Dokumenti", - "DownloadStatisticsText": "Varat lejupielādēt pārskatu par datiem, kas pieejami atlasītajā uzglabāšanas periodā, lai skatītu detalizētu statistiku.", "DuplicateNoun": "Dublicēt", "EditColorScheme": "Rediģēt krāsu shēmu", "Employees": "lietotāji", diff --git a/packages/client/public/locales/nl/Settings.json b/packages/client/public/locales/nl/Settings.json index 1f0415327d..c2773ceec5 100644 --- a/packages/client/public/locales/nl/Settings.json +++ b/packages/client/public/locales/nl/Settings.json @@ -112,7 +112,6 @@ "DownloadLog": "Download log", "DownloadReportBtnText": "Download verslag", "DownloadReportDescription": "Het verslag wordt opgeslagen in Documenten", - "DownloadStatisticsText": "U kunt het verslag downloaden voor de gegevens die beschikbaar zijn tijdens de geselecteerde opslagperiode om de gedetailleerde statistieken te bekijken.", "DuplicateNoun": "Dupliceren", "EditColorScheme": "Kleurenschema bewerken", "Employees": "gebruikers", diff --git a/packages/client/public/locales/pl/Settings.json b/packages/client/public/locales/pl/Settings.json index f48ba39f41..379a04fd97 100644 --- a/packages/client/public/locales/pl/Settings.json +++ b/packages/client/public/locales/pl/Settings.json @@ -113,7 +113,6 @@ "DownloadLog": "Rejestr pobranych plików", "DownloadReportBtnText": "Pobierz raport", "DownloadReportDescription": "Raport zostanie zapisany w Dokumentach", - "DownloadStatisticsText": "Możesz pobrać raport dla danych dostępnych w wybranym okresie przechowywania, aby zobaczyć szczegółowe statystyki.", "DuplicateNoun": "Duplikat", "EditColorScheme": "Edytuj schemat kolorów", "Employees": "użytkownicy", diff --git a/packages/client/public/locales/pt-BR/Settings.json b/packages/client/public/locales/pt-BR/Settings.json index 36add3e247..903837c65d 100644 --- a/packages/client/public/locales/pt-BR/Settings.json +++ b/packages/client/public/locales/pt-BR/Settings.json @@ -113,7 +113,6 @@ "DownloadLog": "Baixar registro", "DownloadReportBtnText": "Baixar relatório", "DownloadReportDescription": "O relatório será salvo em Documentos", - "DownloadStatisticsText": "Você pode baixar o relatório dos dados disponíveis durante o período de armazenamento selecionado para visualizar as estatísticas detalhadas.", "DuplicateNoun": "Duplicado", "EditColorScheme": "Editar esquema de cores", "Employees": "Usuários", diff --git a/packages/client/public/locales/pt/Settings.json b/packages/client/public/locales/pt/Settings.json index 70c6098641..0297a99cf1 100644 --- a/packages/client/public/locales/pt/Settings.json +++ b/packages/client/public/locales/pt/Settings.json @@ -113,7 +113,6 @@ "DownloadLog": "Baixar registro", "DownloadReportBtnText": "Transferir o relatório", "DownloadReportDescription": "O relatório será guardado nos Documentos", - "DownloadStatisticsText": "Pode descarregar o relatório com os dados disponíveis durante o período de armazenamento selecionado para ver estatísticas detalhadas.", "DuplicateNoun": "Duplicado", "EditColorScheme": "Editar Esquema de Cores", "Employees": "utilizadores", diff --git a/packages/client/public/locales/ro/Settings.json b/packages/client/public/locales/ro/Settings.json index a63aca1526..0c4baedc40 100644 --- a/packages/client/public/locales/ro/Settings.json +++ b/packages/client/public/locales/ro/Settings.json @@ -113,7 +113,6 @@ "DownloadLog": "Descărcare jurnal", "DownloadReportBtnText": "Descărcare raport", "DownloadReportDescription": "Raportul va fi salvat în Documentele", - "DownloadStatisticsText": "Puteţi descărca raportul pentru datele disponibile în perioada de stocare selectată pentru a vizualiza statisticile detaliate.", "DuplicateNoun": "Dublare", "EditColorScheme": "Editare schemă culori", "Employees": "utilizatori", diff --git a/packages/client/public/locales/ru/Settings.json b/packages/client/public/locales/ru/Settings.json index c671d638fa..382562789b 100644 --- a/packages/client/public/locales/ru/Settings.json +++ b/packages/client/public/locales/ru/Settings.json @@ -113,7 +113,6 @@ "DownloadLog": "Скачать журнал", "DownloadReportBtnText": "Скачать отчет", "DownloadReportDescription": "Отчет будет сохранен в \"Документы\"", - "DownloadStatisticsText": "Для просмотра подробной статистики вы можете скачать отчет по данным, доступным в течение выбранного периода хранения.", "DuplicateNoun": "Дубликат", "EditColorScheme": "Редактирование цветовой схемы", "Employees": "Пользователи", diff --git a/packages/client/public/locales/si/Settings.json b/packages/client/public/locales/si/Settings.json index 5a1d94aadf..a497ba358e 100644 --- a/packages/client/public/locales/si/Settings.json +++ b/packages/client/public/locales/si/Settings.json @@ -106,7 +106,6 @@ "DownloadLog": "සටහන බාගන්න", "DownloadReportBtnText": "වාර්තාව බාගන්න", "DownloadReportDescription": "ලේඛන වෙත වාර්තාව සුරැකෙනු ඇත", - "DownloadStatisticsText": "තෝරාගත් ආචයන පරාසයක පවතින දත්ත බාගැනීමෙන් සවිස්තරාත්මක සංඛ්‍යාලේඛන වාර්තාවක් බැලීමට හැකිය.", "DuplicateNoun": "අනුපිටපතක්", "EditColorScheme": "වත්මන් තේමාව සංස්කරණය", "Employees": "පරිශ්‍රීලකයින්", diff --git a/packages/client/public/locales/sk/Settings.json b/packages/client/public/locales/sk/Settings.json index 29220f9a63..ea25b9e54c 100644 --- a/packages/client/public/locales/sk/Settings.json +++ b/packages/client/public/locales/sk/Settings.json @@ -112,7 +112,6 @@ "DownloadLog": "Stiahnuť log", "DownloadReportBtnText": "Stiahnuť správu", "DownloadReportDescription": "Správa sa uloží do priečinka Dokumenty", - "DownloadStatisticsText": "Ak chcete zobraziť podrobné štatistiky, môžete si stiahnuť správu o dátach dostupných pre zvolené obdobie uchovávania.", "DuplicateNoun": "Duplikovať", "EditColorScheme": "Upraviť farebnú schému", "Employees": "užívatelia", diff --git a/packages/client/public/locales/sl/Settings.json b/packages/client/public/locales/sl/Settings.json index 9d2bd658d4..13660ff95e 100644 --- a/packages/client/public/locales/sl/Settings.json +++ b/packages/client/public/locales/sl/Settings.json @@ -112,7 +112,6 @@ "DownloadLog": "Dnevnik prenosa", "DownloadReportBtnText": "Prenesi poročilo", "DownloadReportDescription": "Poročilo bo shranjeno v Dokumenti", - "DownloadStatisticsText": "Za ogled podrobne statistike lahko prenesete poročilo za podatke, ki so na voljo v izbranem obdobju shranjevanja.", "DuplicateNoun": "Podvoji", "EditColorScheme": "Uredi barvno shemo", "Employees": "uporabniki", diff --git a/packages/client/public/locales/sr-Cyrl-RS/Settings.json b/packages/client/public/locales/sr-Cyrl-RS/Settings.json index 5a834f83e9..f3daab5595 100644 --- a/packages/client/public/locales/sr-Cyrl-RS/Settings.json +++ b/packages/client/public/locales/sr-Cyrl-RS/Settings.json @@ -113,7 +113,6 @@ "DownloadLog": "Преузми лог", "DownloadReportBtnText": "Преузми извештај", "DownloadReportDescription": "Извештај ће бити сачуван у Документи", - "DownloadStatisticsText": "Можете преузети извештај за доступне податке током изабраног периода складиштења како бисте прегледали детаљну статистику.", "DuplicateNoun": "Дуплицирај", "EditColorScheme": "Уреди шему боја", "Employees": "корисници", diff --git a/packages/client/public/locales/sr-Latn-RS/Settings.json b/packages/client/public/locales/sr-Latn-RS/Settings.json index 179b891536..678f29d4cf 100644 --- a/packages/client/public/locales/sr-Latn-RS/Settings.json +++ b/packages/client/public/locales/sr-Latn-RS/Settings.json @@ -113,7 +113,6 @@ "DownloadLog": "Preuzmi log", "DownloadReportBtnText": "Preuzmi izveštaj", "DownloadReportDescription": "Izveštaj će biti sačuvan u Dokumenti", - "DownloadStatisticsText": "Možete preuzeti izveštaj za dostupne podatke tokom izabranog perioda skladištenja kako biste pregledali detaljnu statistiku.", "DuplicateNoun": "Dupliciraj", "EditColorScheme": "Uredi šemu boja", "Employees": "korisnici", diff --git a/packages/client/public/locales/tr/Settings.json b/packages/client/public/locales/tr/Settings.json index fce0f0e24c..6d3871428c 100644 --- a/packages/client/public/locales/tr/Settings.json +++ b/packages/client/public/locales/tr/Settings.json @@ -112,7 +112,6 @@ "DownloadLog": "İndirme günlüğü", "DownloadReportBtnText": "Raporu indir", "DownloadReportDescription": "Rapor Belgeler'e kaydedilecek", - "DownloadStatisticsText": "Ayrıntılı istatistikleri görüntülemek için seçilen depolama süresi boyunca mevcut olan veriler için raporu indirebilirsiniz.", "DuplicateNoun": "Yinelenen", "EditColorScheme": "Renk düzenini düzenle", "Employees": "kullanıcılar", diff --git a/packages/client/public/locales/uk-UA/Settings.json b/packages/client/public/locales/uk-UA/Settings.json index 88e06b2879..e8630bcf60 100644 --- a/packages/client/public/locales/uk-UA/Settings.json +++ b/packages/client/public/locales/uk-UA/Settings.json @@ -113,7 +113,6 @@ "DownloadLog": "Завантажити журнал", "DownloadReportBtnText": "Завантажити звіт", "DownloadReportDescription": "Звіт буде збережено в розділі «Документи»", - "DownloadStatisticsText": "Ви можете завантажити звіт із даними, доступними для вибраного періоду зберігання, щоб переглянути детальну статистику.", "DuplicateNoun": "Дублікат", "EditColorScheme": "Редагувати колірну схему", "Employees": "користувачі", diff --git a/packages/client/public/locales/vi/Settings.json b/packages/client/public/locales/vi/Settings.json index a3169358b7..3b79eba90e 100644 --- a/packages/client/public/locales/vi/Settings.json +++ b/packages/client/public/locales/vi/Settings.json @@ -111,7 +111,6 @@ "DownloadLog": "Tải log", "DownloadReportBtnText": "Tải báo cáo xuống", "DownloadReportDescription": "Báo cáo sẽ được lưu vào Tài liệu", - "DownloadStatisticsText": "Bạn có thể tải xuống báo cáo cho dữ liệu hữu dụng trong thời gian lưu trữ đã chọn để xem số liệu thống kê chi tiết.", "DuplicateNoun": "Trùng lặp", "EditColorScheme": "Chỉnh sửa bảng màu", "Employees": "người dùng", diff --git a/packages/client/public/locales/zh-CN/Settings.json b/packages/client/public/locales/zh-CN/Settings.json index db2ef8f7d2..5b6f3ec354 100644 --- a/packages/client/public/locales/zh-CN/Settings.json +++ b/packages/client/public/locales/zh-CN/Settings.json @@ -114,7 +114,6 @@ "DownloadLog": "下载日志", "DownloadReportBtnText": "下载报告", "DownloadReportDescription": "报告将被保存至“文档”", - "DownloadStatisticsText": "您可以下载所选存储期间可用数据的报告，以查看详细统计信息。", "DuplicateNoun": "复制", "EditColorScheme": "编辑配色方案", "Employees": "用户", diff --git a/packages/client/src/pages/PortalSettings/categories/security/audit-trail/index.js b/packages/client/src/pages/PortalSettings/categories/security/audit-trail/index.js index 0e97740125..11d355c5c9 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/audit-trail/index.js +++ b/packages/client/src/pages/PortalSettings/categories/security/audit-trail/index.js @@ -95,7 +95,6 @@ const AuditTrail = (props) => { storagePeriod={t("StoragePeriod")} saveButtonLabel={t("Common:SaveButton")} cancelButtonLabel={t("Common:CancelButton")} - downloadText={t("DownloadStatisticsText")} securityLifetime={securityLifetime} lifetime={securityLifetime.auditTrailLifeTime} setLifetimeAuditSettings={setLifetimeAuditSettings} diff --git a/packages/client/src/pages/PortalSettings/categories/security/login-history/index.js b/packages/client/src/pages/PortalSettings/categories/security/login-history/index.js index f603458b72..88a2fb92c1 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/login-history/index.js +++ b/packages/client/src/pages/PortalSettings/categories/security/login-history/index.js @@ -93,7 +93,6 @@ const LoginHistory = (props) => { storagePeriod={t("StoragePeriod")} saveButtonLabel={t("Common:SaveButton")} cancelButtonLabel={t("Common:CancelButton")} - downloadText={t("DownloadStatisticsText")} lifetime={securityLifetime.loginHistoryLifeTime} securityLifetime={securityLifetime} setLifetimeAuditSettings={setLifetimeAuditSettings} diff --git a/packages/client/src/pages/PortalSettings/categories/security/sub-components/HistoryMainContent.js b/packages/client/src/pages/PortalSettings/categories/security/sub-components/HistoryMainContent.js index 46e5b7b927..a6a6b43903 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/sub-components/HistoryMainContent.js +++ b/packages/client/src/pages/PortalSettings/categories/security/sub-components/HistoryMainContent.js @@ -61,6 +61,7 @@ const MainContainer = styled.div` .login-history-description { color: ${(props) => props.theme.client.settings.common.descriptionColor}; + padding-bottom: 24px; } .save-cancel { @@ -82,11 +83,6 @@ const MainContainer = styled.div` padding: 20px 0 16px; } - .download-text { - font-size: 13px; - padding: 16px 0 24px 0; - } - .storage-label { font-weight: 600; } @@ -173,7 +169,6 @@ const HistoryMainContent = (props) => { lifetime, saveButtonLabel, cancelButtonLabel, - downloadText, setLifetimeAuditSettings, securityLifetime, content, @@ -384,9 +379,6 @@ const HistoryMainContent = (props) => { /> )} */} - - {downloadText} - {content} From 3d410921b2900ab67074d9f0e53146d65724435b Mon Sep 17 00:00:00 2001 From: Akmal Isomadinov Date: Wed, 31 Jul 2024 12:58:25 +0500 Subject: [PATCH 2/4] Client:FillPDFDialog Fixed margin --- .../src/components/dialogs/FillPDFDialog/FillPDFDialog.styled.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/client/src/components/dialogs/FillPDFDialog/FillPDFDialog.styled.ts b/packages/client/src/components/dialogs/FillPDFDialog/FillPDFDialog.styled.ts index a590889f90..7cc3a8a157 100644 --- a/packages/client/src/components/dialogs/FillPDFDialog/FillPDFDialog.styled.ts +++ b/packages/client/src/components/dialogs/FillPDFDialog/FillPDFDialog.styled.ts @@ -30,4 +30,5 @@ export const Container = styled.div` flex-direction: column; gap: 16px; + margin-top: 16px; `; From 2d11176958abb5e8662d2be87c8f6b660ffd08c8 Mon Sep 17 00:00:00 2001 From: Akmal Isomadinov Date: Wed, 31 Jul 2024 13:01:54 +0500 Subject: [PATCH 3/4] Client:Store: Added a check for the fill option --- packages/client/src/store/ContextOptionsStore.js | 2 +- packages/client/src/store/FilesStore.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/client/src/store/ContextOptionsStore.js b/packages/client/src/store/ContextOptionsStore.js index e22ae4dbfc..f3ccfed5c7 100644 --- a/packages/client/src/store/ContextOptionsStore.js +++ b/packages/client/src/store/ContextOptionsStore.js @@ -188,7 +188,7 @@ class ContextOptionsStore { }; onClickLinkFillForm = (item) => { - if (!item.startFilling) + if (!item.startFilling && item.isPDFForm) return this.dialogsStore.setFillPDFDialogData(true, item); return this.gotoDocEditor(false, item); diff --git a/packages/client/src/store/FilesStore.js b/packages/client/src/store/FilesStore.js index 969c227316..f57239b4d2 100644 --- a/packages/client/src/store/FilesStore.js +++ b/packages/client/src/store/FilesStore.js @@ -3498,6 +3498,7 @@ class FilesStore { type, hasDraft, isForm, + isPDFForm: item.isForm, requestToken, lastOpened, quotaLimit, From cbd298b62fc09eba7cc8e9fd167b48b1abea19a7 Mon Sep 17 00:00:00 2001 From: Akmal Isomadinov Date: Wed, 31 Jul 2024 17:08:42 +0500 Subject: [PATCH 4/4] Client: Fixed bug 69471 --- .../src/components/FilesPanels/index.js | 62 +--------------- .../src/components/GlobalEvents/index.js | 74 ++++++++++++++++++- packages/client/src/store/FilesStore.js | 3 +- 3 files changed, 76 insertions(+), 63 deletions(-) diff --git a/packages/client/src/components/FilesPanels/index.js b/packages/client/src/components/FilesPanels/index.js index 572d366eef..776209ee9e 100644 --- a/packages/client/src/components/FilesPanels/index.js +++ b/packages/client/src/components/FilesPanels/index.js @@ -26,10 +26,9 @@ import React, { useMemo, useState, useCallback, useEffect } from "react"; -import { useTranslation, Trans } from "react-i18next"; +import { useTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; -import { toastr } from "@docspace/shared/components/toast"; import { Events, FilesSelectorFilterTypes, @@ -78,7 +77,6 @@ import FilesSelector from "../FilesSelector"; import LeaveRoomDialog from "../dialogs/LeaveRoomDialog"; import ChangeRoomOwnerPanel from "../panels/ChangeRoomOwnerPanel"; -import { CreatedPDFFormDialog } from "../dialogs/CreatedPDFFormDialog"; import { PDFFormEditingDialog } from "../dialogs/PDFFormEditingDialog"; import { SharePDFFormDialog } from "../dialogs/SharePDFFormDialog"; import { FillPDFDialog } from "../dialogs/FillPDFDialog"; @@ -141,13 +139,6 @@ const Panels = (props) => { shareCollectSelector, } = props; - const [createPDFFormFile, setCreatePDFFormFile] = useState({ - visible: false, - file: null, - localKey: "", - onClose: null, - }); - const [sharePDFForm, setSharePDFForm] = useState({ visible: false, data: null, @@ -175,41 +166,6 @@ const Panels = (props) => { return text[selectFileFormRoomFilterParam]; }, [selectFileFormRoomFilterParam, t]); - const handleCreatePDFFormFile = useCallback( - /** - * @param {CustomEvent} event - */ - (event) => { - const { file, show, localKey } = event.detail; - - if (!show) { - return toastr.success( - }} - values={{ filename: file.title }} - />, - ); - } - - setCreatePDFFormFile({ - visible: true, - file, - localKey, - onClose: () => { - setCreatePDFFormFile({ - visible: false, - onClose: null, - file: null, - localKey: "", - }); - }, - }); - }, - [], - ); - const handleSharePDFForm = useCallback( /** * @param {CustomEvent} event @@ -229,20 +185,12 @@ const Panels = (props) => { ); useEffect(() => { - window.addEventListener( - Events.CREATE_PDF_FORM_FILE, - handleCreatePDFFormFile, - ); window.addEventListener(Events.Share_PDF_Form, handleSharePDFForm); return () => { - window.removeEventListener( - Events.CREATE_PDF_FORM_FILE, - handleCreatePDFFormFile, - ); window.removeEventListener(Events.Share_PDF_Form, handleSharePDFForm); }; - }, [handleCreatePDFFormFile, handleSharePDFForm]); + }, [handleSharePDFForm]); return [ settingsPluginDialogVisible && ( @@ -357,12 +305,6 @@ const Panels = (props) => { ), shareFolderDialogVisible && , - createPDFFormFile.visible && ( - - ), pdfFormEditVisible && , sharePDFForm.visible && ( diff --git a/packages/client/src/components/GlobalEvents/index.js b/packages/client/src/components/GlobalEvents/index.js index 8fc4942699..f139c2a0f8 100644 --- a/packages/client/src/components/GlobalEvents/index.js +++ b/packages/client/src/components/GlobalEvents/index.js @@ -24,12 +24,13 @@ // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode -import { useState, useEffect, useCallback, useRef, memo } from "react"; - +import { useState, useEffect, useCallback, useRef } from "react"; +import { Trans } from "react-i18next"; import { inject, observer } from "mobx-react"; import { FileAction } from "@docspace/shared/enums"; import { Events } from "@docspace/shared/enums"; +import { toastr } from "@docspace/shared/components/toast"; import CreateEvent from "./CreateEvent"; import RenameEvent from "./RenameEvent"; @@ -40,6 +41,8 @@ import EditGroupEvent from "./GroupEvents/EditGroupEvent"; import ChangeUserTypeEvent from "./ChangeUserTypeEvent"; import CreatePluginFile from "./CreatePluginFileEvent"; import ChangeQuotaEvent from "./ChangeQuotaEvent"; +import { CreatedPDFFormDialog } from "../dialogs/CreatedPDFFormDialog"; + const GlobalEvents = ({ enablePlugins, eventListenerItemsList }) => { const [createDialogProps, setCreateDialogProps] = useState({ visible: false, @@ -98,6 +101,13 @@ const GlobalEvents = ({ enablePlugins, eventListenerItemsList }) => { onClose: null, }); + const [createPDFFormFile, setCreatePDFFormFile] = useState({ + visible: false, + file: null, + localKey: "", + onClose: null, + }); + const eventHandlersList = useRef([]); const onCreate = useCallback((e) => { @@ -236,6 +246,45 @@ const GlobalEvents = ({ enablePlugins, eventListenerItemsList }) => { [enablePlugins], ); + const handleCreatePDFFormFile = useCallback( + /** + * @typedef {Object} DetailType + * @property {import("@docspace/shared/api/files/types").TFile} file + * @property {boolean} show + * @property {string} localKey + * @param {CustomEvent} event + */ + (event) => { + const { file, show, localKey } = event.detail; + + if (!show) { + return toastr.success( + }} + values={{ filename: file.title }} + />, + ); + } + + setCreatePDFFormFile({ + visible: true, + file, + localKey, + onClose: () => { + setCreatePDFFormFile({ + visible: false, + onClose: null, + file: null, + localKey: "", + }); + }, + }); + }, + [], + ); + const onChangeQuota = useCallback((e) => { const { payload } = e; @@ -261,6 +310,21 @@ const GlobalEvents = ({ enablePlugins, eventListenerItemsList }) => { }, }); }, []); + + useEffect(() => { + window.addEventListener( + Events.CREATE_PDF_FORM_FILE, + handleCreatePDFFormFile, + ); + + return () => { + window.removeEventListener( + Events.CREATE_PDF_FORM_FILE, + handleCreatePDFFormFile, + ); + }; + }, [handleCreatePDFFormFile]); + useEffect(() => { window.addEventListener(Events.CREATE, onCreate); window.addEventListener(Events.RENAME, onRename); @@ -360,6 +424,12 @@ const GlobalEvents = ({ enablePlugins, eventListenerItemsList }) => { changeQuotaDialog.visible && ( ), + createPDFFormFile.visible && !createDialogProps.visible && ( + + ), ]; }; diff --git a/packages/client/src/store/FilesStore.js b/packages/client/src/store/FilesStore.js index f57239b4d2..d8ae67b489 100644 --- a/packages/client/src/store/FilesStore.js +++ b/packages/client/src/store/FilesStore.js @@ -53,6 +53,7 @@ import config from "PACKAGE_FILE"; import { thumbnailStatuses } from "@docspace/client/src/helpers/filesConstants"; import { getDaysRemaining } from "@docspace/shared/utils/common"; import { + LOADER_TIMEOUT, MEDIA_VIEW_URL, PDF_FORM_DIALOG_KEY, ROOMS_PROVIDER_TYPE_NAME, @@ -380,7 +381,7 @@ class FilesStore { socketHelper.on("s:modify-room", (option) => { switch (option.cmd) { case "create-form": - this.wsCreatedPDFForm(option); + setTimeout(() => this.wsCreatedPDFForm(option), LOADER_TIMEOUT * 2); break; default: