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.

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

[GH-23058] UI Enhancement: use icons in Settings > Import submenu #23461

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion webapp/boards/i18n/en.json
Expand Up @@ -253,7 +253,8 @@
"Sidebar.duplicate-board": "Duplicate board",
"Sidebar.export-archive": "Export archive",
"Sidebar.import": "Import",
"Sidebar.import-archive": "Import archive",
"Sidebar.import-archive": "Import archive file",
"Sidebar.external-import-docs": "External import docs",
"Sidebar.new-category.badge": "New",
"Sidebar.new-category.drag-boards-cta": "Drag boards here...",
"Sidebar.no-boards-in-category": "No boards inside",
Expand Down
3 changes: 2 additions & 1 deletion webapp/boards/i18n/en_AU.json
Expand Up @@ -256,7 +256,8 @@
"Sidebar.duplicate-board": "Duplicate board",
"Sidebar.export-archive": "Export archive",
"Sidebar.import": "Import",
"Sidebar.import-archive": "Import archive",
"Sidebar.import-archive": "Import archive file",
"Sidebar.external-import-docs": "External import docs",
"Sidebar.invite-users": "Invite users",
"Sidebar.logout": "Log out",
"Sidebar.new-category.badge": "New",
Expand Down
3 changes: 2 additions & 1 deletion webapp/boards/i18n/fr.json
Expand Up @@ -253,7 +253,8 @@
"Sidebar.duplicate-board": "Dupliquer une carte",
"Sidebar.export-archive": "Exporter une archive",
"Sidebar.import": "Importer",
"Sidebar.import-archive": "Importer une archive",
"Sidebar.import-archive": "Importer un fichier d'archive",
"Sidebar.external-import-docs": "Docs d'importation externe",
"Sidebar.invite-users": "Inviter des utilisateurs",
"Sidebar.logout": "Se déconnecter",
"Sidebar.new-category.badge": "Nouveau",
Expand Down
3 changes: 2 additions & 1 deletion webapp/boards/i18n/it.json
Expand Up @@ -218,7 +218,8 @@
"Sidebar.duplicate-board": "Duplica bacheca",
"Sidebar.export-archive": "Esporta archivio",
"Sidebar.import": "Importa",
"Sidebar.import-archive": "Importa archivio",
"Sidebar.import-archive": "Importa file di archivio",
"Sidebar.external-import-docs": "Docs di importazione esterni",
"Sidebar.invite-users": "Invita utenti",
"Sidebar.logout": "Logout",
"Sidebar.no-boards-in-category": "Nessuna bacheca all'interno",
Expand Down
3 changes: 2 additions & 1 deletion webapp/boards/i18n/ja.json
Expand Up @@ -256,7 +256,8 @@
"Sidebar.duplicate-board": "Boardを複製する",
"Sidebar.export-archive": "エクスポート",
"Sidebar.import": "インポート",
"Sidebar.import-archive": "インポート",
"Sidebar.import-archive": "アーカイブファイルをインポートする",
"Sidebar.external-import-docs": "外部インポートドキュメント",
"Sidebar.invite-users": "ユーザーを招待する",
"Sidebar.logout": "ログアウト",
"Sidebar.new-category.badge": "新規",
Expand Down
2 changes: 1 addition & 1 deletion webapp/boards/i18n/kk.json
Expand Up @@ -134,7 +134,7 @@
"Sidebar.changePassword": "Кілтсөзді өзгерту",
"Sidebar.delete-board": "Тақтаны жою",
"Sidebar.export-archive": "Мұрағатты экспорттау",
"Sidebar.import-archive": "Мұрағатты импорттау",
"Sidebar.import-archive": "Архив файлын импорттау",
"Sidebar.invite-users": "Қолданушыларды шақыру",
"Sidebar.logout": "Шығу",
"Sidebar.random-icons": "Рандом икондар",
Expand Down
3 changes: 2 additions & 1 deletion webapp/boards/i18n/lt.json
Expand Up @@ -253,7 +253,8 @@
"Sidebar.duplicate-board": "Pasikartojanti lenta",
"Sidebar.export-archive": "Eksportuoti archyvą",
"Sidebar.import": "Importuoti",
"Sidebar.import-archive": "Importuoti archyvą",
"Sidebar.import-archive": "Importuoti archyvo failą",
"Sidebar.external-import-docs": "Išoriniai importo doks",
"Sidebar.new-category.badge": "Naujas",
"Sidebar.new-category.drag-boards-cta": "Vilkite lentas čia...",
"Sidebar.no-boards-in-category": "Viduje nėra lentų",
Expand Down
2 changes: 1 addition & 1 deletion webapp/boards/i18n/ml.json
Expand Up @@ -200,7 +200,7 @@
"Sidebar.duplicate-board": "ഡ്യൂപ്ലിക്കേറ്റ് ബോർഡ്",
"Sidebar.export-archive": "ആർക്കൈവ് എക്സ്പോർട്ട് ചെയ്യുക",
"Sidebar.import": "ഇറക്കുമതി ചെയ്യുക",
"Sidebar.import-archive": "ആർക്കൈവ് ഇമ്പോർട്ട് ചെയ്യുക",
"Sidebar.import-archive": "ആർക്കൈവ് ഫയൽ ഇറക്കുമതി ചെയ്യുക",
"Sidebar.invite-users": "ഉപയോക്താക്കളെ ക്ഷണിക്കുക",
"Sidebar.logout": "ലോഗ്ഔട്ട്",
"Sidebar.no-boards-in-category": "അകത്ത് ബോർഡുകളില്ല",
Expand Down
3 changes: 2 additions & 1 deletion webapp/boards/i18n/nl.json
Expand Up @@ -256,7 +256,8 @@
"Sidebar.duplicate-board": "Board dupliceren",
"Sidebar.export-archive": "Archief exporteren",
"Sidebar.import": "Importeren",
"Sidebar.import-archive": "Archief importeren",
"Sidebar.import-archive": "Importeer archiefbestand",
"Sidebar.external-import-docs": "Externe importdocumenten",
"Sidebar.invite-users": "Gebruikers uitnodigen",
"Sidebar.logout": "Afmelden",
"Sidebar.new-category.badge": "Nieuw",
Expand Down
3 changes: 2 additions & 1 deletion webapp/boards/i18n/pl.json
Expand Up @@ -256,7 +256,8 @@
"Sidebar.duplicate-board": "Duplikuj tablicę",
"Sidebar.export-archive": "Eksportuj archiwum",
"Sidebar.import": "Importuj",
"Sidebar.import-archive": "Importuj archiwum",
"Sidebar.import-archive": "Importuj plik archiwum",
"Sidebar.external-import-docs": "Zewnętrzne dokumenty importowe",
"Sidebar.invite-users": "Zaproś użytkowników",
"Sidebar.logout": "Wyloguj się",
"Sidebar.new-category.badge": "Nowy",
Expand Down
3 changes: 2 additions & 1 deletion webapp/boards/i18n/ru.json
Expand Up @@ -256,7 +256,8 @@
"Sidebar.duplicate-board": "Дублировать доску",
"Sidebar.export-archive": "Экспорт архива",
"Sidebar.import": "Импорт",
"Sidebar.import-archive": "Импорт архива",
"Sidebar.import-archive": "Импортировать архивный файл",
"Sidebar.external-import-docs": "Внешние документы импорта",
"Sidebar.invite-users": "Пригласить пользователей",
"Sidebar.logout": "Выйти",
"Sidebar.new-category.badge": "Новый",
Expand Down
3 changes: 2 additions & 1 deletion webapp/boards/i18n/sk.json
Expand Up @@ -213,7 +213,8 @@
"Sidebar.changePassword": "Zmeniť heslo",
"Sidebar.delete-board": "Odstrániť nástenku",
"Sidebar.export-archive": "Export archívu",
"Sidebar.import-archive": "Import archívu",
"Sidebar.import-archive": "Importovať archívny súbor",
"Sidebar.external-import-docs": "Externé importné doks",
"Sidebar.invite-users": "Pozvať užívateľa",
"Sidebar.logout": "Odhlásiť sa",
"Sidebar.random-icons": "Náhodné ikony",
Expand Down
3 changes: 2 additions & 1 deletion webapp/boards/i18n/sv.json
Expand Up @@ -256,7 +256,8 @@
"Sidebar.duplicate-board": "Duplicera Board",
"Sidebar.export-archive": "Exportera arkiv",
"Sidebar.import": "Importera",
"Sidebar.import-archive": "Importera arkiv",
"Sidebar.import-archive": "Importera arkivfil",
"Sidebar.external-import-docs": "Externa importdokument",
"Sidebar.invite-users": "Bjud in användare",
"Sidebar.logout": "Logga ut",
"Sidebar.new-category.badge": "Ny",
Expand Down
3 changes: 2 additions & 1 deletion webapp/boards/i18n/tr.json
Expand Up @@ -256,7 +256,8 @@
"Sidebar.duplicate-board": "Panoyu kopyala",
"Sidebar.export-archive": "Arşivi dışa aktar",
"Sidebar.import": "İçe aktar",
"Sidebar.import-archive": "Arşivi içe aktar",
"Sidebar.import-archive": "Arşiv dosyası import et",
"Sidebar.external-import-docs": "Harici ithalat belgeleri",
"Sidebar.invite-users": "Kullanıcıları çağır",
"Sidebar.logout": "Oturumu kapat",
"Sidebar.new-category.badge": "Yeni",
Expand Down
Expand Up @@ -52,30 +52,42 @@ exports[`components/sidebar/GlobalHeaderSettingsMenu imports menu open should ma
class="menu-options"
>
<div
aria-label="Import archive"
aria-label="Import archive file"
class="MenuOption TextOption menu-option"
role="button"
>
<div
class="d-flex"
>
<div
class="noicon"
/>
class="menu-option__icon"
>
<i
class="CompassIcon icon-import"
/>
</div>
</div>
<div
class="menu-option__content"
>
<div
class="menu-name"
>
Import archive
Import archive file
</div>
</div>
<div
class="noicon"
/>
</div>
<div
class="MenuOption MenuSeparator menu-separator"
/>
<span
class="settings-menu-title__text"
>
External import docs
</span>
<div
aria-label="Trello"
class="MenuOption TextOption menu-option"
Expand Down
@@ -0,0 +1,10 @@
.settings-menu-title__text {
color: rgba(63, 67, 80, 0.56);
font-weight: 600;
font-size: 12px;
text-transform: uppercase;
display: flex;
align-items: center;
line-height: 16px;
padding: 6px 20px;
}
Expand Up @@ -14,6 +14,7 @@ import {IUser, UserConfigPatch} from 'src/user'
import octoClient from 'src/octoClient'
import {UserSettings} from 'src/userSettings'
import SettingsIcon from 'src/widgets/icons/settings'
import CompassIcon from 'src/widgets/icons/compassIcon'

import {Constants} from 'src/constants'
import TelemetryClient, {TelemetryActions, TelemetryCategory} from 'src/telemetry/telemetryClient'
Expand Down Expand Up @@ -50,12 +51,21 @@ const GlobalHeaderSettingsMenu = (props: Props) => {
>
<Menu.Text
id='import_archive'
name={intl.formatMessage({id: 'Sidebar.import-archive', defaultMessage: 'Import archive'})}
icon={
<CompassIcon
icon='import'
/>
}
name={intl.formatMessage({id: 'Sidebar.import-archive', defaultMessage: 'Import archive file'})}
onClick={async () => {
TelemetryClient.trackEvent(TelemetryCategory, TelemetryActions.ImportArchive)
Archiver.importFullArchive()
}}
/>
<Menu.Separator/>
<span className='settings-menu-title__text'>
{intl.formatMessage({id: 'Sidebar.external-import-docs', defaultMessage: 'External import docs'})}
</span>
{
Constants.imports.map((i) => (
<Menu.Text
Expand Down
Expand Up @@ -50,7 +50,7 @@ exports[`components/sidebar/SidebarSettingsMenu imports menu open should match s
class="menu-options"
>
<div
aria-label="Import archive"
aria-label="Import archive file"
class="MenuOption TextOption menu-option"
role="button"
>
Expand All @@ -67,7 +67,7 @@ exports[`components/sidebar/SidebarSettingsMenu imports menu open should match s
<div
class="menu-name"
>
Import archive
Import archive file
</div>
</div>
<div
Expand Down