Skip to content

Commit abe1cc6

Browse files
caybrocaybro
committed
WIP feat(PrimaryNavSidebar): integrate into AppMain and other flows
- remove now unused/obsolete components and SB pages - StatusSmartIdenticon: fix missing import - simplify ProfileButton by porting it to the StatusIconTabButton baseclass and fix the context menu opening/closing - fixup e2e locator types Fixes #19606
1 parent c62972c commit abe1cc6

37 files changed

+213
-959
lines changed

‎storybook/pages/PrimaryNavSidebarPage.qml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,11 @@ SplitView {
219219
showCreateCommunityBadge: ctrlShowCreateCommunityBadge.checked
220220
profileSectionHasNotification: ctrlSettingsHasNotification.checked
221221

222-
onItemActivated: function (sectionType, id) {
222+
onItemActivated: function (sectionType, sectionId) {
223223
logs.logEvent("onItemActivated", ["sectionType", "sectionId"], arguments)
224-
sectionsModel.setActiveSection(id)
224+
sectionsModel.setActiveSection(sectionId)
225225
d.activeSectionType = sectionType
226-
d.activeSectionId = id
226+
d.activeSectionId = sectionId
227227
}
228228
onActivityCenterRequested: function (shouldShow) {
229229
logs.logEvent("onActivityCenterRequested", ["shouldShow"], arguments)

‎storybook/pages/StatusAppNavBarPage.qml‎

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎storybook/pages/StatusNavBarTabButtonPage.qml‎

Lines changed: 0 additions & 141 deletions
This file was deleted.

‎storybook/pages/StatusSectionLayoutPage.qml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ Page {
137137
centerPanel: centerPanelCheckBox.checked ? centerPanel : null
138138
rightPanel: rightPanel
139139
showRightPanel: rightPanelCheckBox.checked
140-
navBar: navBarItem
141140
footer: footerItem
142141
headerContent: headerContent
143142
headerBackground: Control {
@@ -155,4 +154,4 @@ Page {
155154
}
156155
}
157156
}
158-
}
157+
}

‎test/e2e/gui/objects_map/messaging_names.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
statusToolBar_Confirm_StatusButton = {"checkable": False, "container": mainWindow_statusToolBar_StatusToolBar, "objectName": "inlineSelectorConfirmButton", "type": "StatusButton", "visible": True}
1919
statusToolBar_Cancel_StatusButton = {"checkable": False, "container": mainWindow_statusToolBar_StatusToolBar, "type": "StatusButton", "unnamed": 1, "visible": True}
2020
statusToolBar_StatusTagItem = {"container": mainWindow_statusToolBar_StatusToolBar, "type": "StatusTagItem", "visible": True}
21-
statusToolBar_notificationButton_StatusActivityCenterButton = {"container": statusDesktop_mainWindow, "objectName": "activityCenterNotificationsButton", "type": "StatusActivityCenterButton", "visible": True}
2221

2322
# Chat View
2423
mainWindow_ChatColumnView = {"container": mainWindow_chatView_ChatView, "type": "ChatColumnView", "unnamed": 1, "visible": True}

‎test/e2e/gui/objects_map/names.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,34 @@
4141

4242
# First half of left main panel: home button, chat button, wallet button, market button
4343

44-
homeButton = {"checkable": True, "container": mainWindow_LeftPanelNavBar, "objectName": "Home Page-navbar", "type": "StatusNavBarTabButton", "visible": True}
44+
homeButton = {"checkable": True, "container": mainWindow_LeftPanelNavBar, "objectName": "Home Page-navbar", "type": "PrimaryNavSidebarButton", "visible": True}
4545
walletChatSwapNavBarList = {"container": mainWindow_LeftPanelNavBar, "objectName": "statusChatNavBarListView",
4646
"type": "ListView", "visible": True}
4747
mainWalletButton = {"container": walletChatSwapNavBarList, "objectName": "Wallet-navbar",
48-
"type": "StatusNavBarTabButton", "visible": True}
49-
chatButton = {"container": walletChatSwapNavBarList, "objectName": "Messages-navbar", "type": "StatusNavBarTabButton",
48+
"type": "PrimaryNavSidebarButton", "visible": True}
49+
chatButton = {"container": walletChatSwapNavBarList, "objectName": "Messages-navbar", "type": "PrimaryNavSidebarButton",
5050
"visible": True}
5151

5252
# Second half of left main panel: communities button, settings button
5353
communitiesSettingsNavBarList = {"container": statusDesktop_mainWindow, "objectName": "statusMainNavBarListView",
5454
"type": "ListView", "visible": True}
5555
communitiesPortalButton = {"container": communitiesSettingsNavBarList, "objectName": "Communities Portal-navbar",
56-
"type": "StatusNavBarTabButton", "visible": True}
56+
"type": "PrimaryNavSidebarButton", "visible": True}
5757
settingsGearButton = {"container": communitiesSettingsNavBarList, "objectName": "Settings-navbar",
58-
"type": "StatusNavBarTabButton", "visible": True}
59-
activityCenterButton = {"container": communitiesSettingsNavBarList, "objectName": "Activity Center-navbar", "type": "StatusNavBarTabButton", "visible": True}
58+
"type": "PrimaryNavSidebarButton", "visible": True}
59+
activityCenterButton = {"container": communitiesSettingsNavBarList, "objectName": "Activity Center-navbar", "type": "PrimaryNavSidebarButton", "visible": True}
6060

6161
# Online identifier
6262
onlineIdentifierButton = {"container": mainWindow_LeftPanelNavBar, "objectName": "statusProfileNavBarTabButton",
63-
"type": "StatusNavBarTabButton", "visible": True}
63+
"type": "PrimaryNavSidebarButton", "visible": True}
6464

6565
mainWindow_statusCommunityMainNavBarListView_ListView = {"container": statusDesktop_mainWindow,
6666
"objectName": "statusCommunityMainNavBarListView",
6767
"type": "ListView", "visible": True}
6868
statusCommunityMainNavBarListView_CommunityNavBarButton = {"checkable": True,
6969
"container": mainWindow_statusCommunityMainNavBarListView_ListView,
7070
"objectName": "CommunityNavBarButton",
71-
"type": "StatusNavBarTabButton", "visible": True}
71+
"type": "PrimaryNavSidebarButton", "visible": True}
7272
scrollView_Add_members_StatusButton = {"container": mainWindow_scrollView_StatusScrollView,
7373
"objectName": "CommunityWelcomeBannerPanel_AddMembersButton",
7474
"type": "StatusButton", "visible": True}

‎test/ui-test/src/screens/StatusMainScreen.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ class MainScreenComponents(Enum):
2626
PROFILE_NAVBAR_BUTTON = 'mainWindow_ProfileNavBarButton'
2727
MAIN_WINDOW = "statusDesktop_mainWindow"
2828
POPUP_OVERLAY = "statusDesktop_mainWindow_overlay"
29-
CHAT_NAVBAR_ICON = "navBarListView_Chat_navbar_StatusNavBarTabButton"
30-
COMMUNITY_PORTAL_BUTTON = "navBarListView_Communities_Portal_navbar_StatusNavBarTabButton"
31-
SETTINGS_BUTTON = "navBarListView_Settings_navbar_StatusNavBarTabButton"
29+
CHAT_NAVBAR_ICON = "navBarListView_Chat_navbar_PrimaryNavSidebarButton"
30+
COMMUNITY_PORTAL_BUTTON = "navBarListView_Communities_Portal_navbar_PrimaryNavSidebarButton"
31+
SETTINGS_BUTTON = "navBarListView_Settings_navbar_PrimaryNavSidebarButton"
3232
WALLET_BUTTON = "wallet_navbar_wallet_icon_StatusIcon"
3333
START_CHAT_BTN = "mainWindow_startChat"
3434
CHAT_LIST = "chatList"

‎test/ui-test/testSuites/global_shared/scripts/global_names.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
statusDesktop_mainWindow_AppMain_EmojiPopup_SearchTextInput = {"container": statusDesktop_mainWindow_overlay, "objectName": "StatusEmojiPopup_searchBox", "type": "TextEdit", "visible": True}
1212
mainWindow_ScrollView = {"container": statusDesktop_mainWindow, "type": "StatusScrollView", "unnamed": 1, "visible": True}
1313
mainWindow_ScrollView_2 = {"container": statusDesktop_mainWindow, "occurrence": 2, "type": "StatusScrollView", "unnamed": 1, "visible": True}
14-
mainWindow_ProfileNavBarButton = {"container": statusDesktop_mainWindow, "objectName": "statusProfileNavBarTabButton", "type": "StatusNavBarTabButton", "visible": True}
14+
mainWindow_ProfileNavBarButton = {"container": statusDesktop_mainWindow, "objectName": "statusProfileNavBarTabButton", "type": "PrimaryNavSidebarButton", "visible": True}
1515
mainWindow_ProfileSettingsView = {"container": statusDesktop_mainWindow, "objectName": "myProfileSettingsView", "type": "ColumnLayout", "visible": True}
1616
settings_navbar_settings_icon_StatusIcon = {"container": mainWindow_navBarListView_ListView, "objectName": "settings-icon", "type": "StatusIcon", "visible": True}
1717
splashScreen = {"container": statusDesktop_mainWindow, "objectName": "splashScreen", "type": "DidYouKnowSplashScreen"}
@@ -41,7 +41,7 @@
4141

4242
# Main Window - chat related:
4343
mainWindow_statusChatNavBarListView_ListView = {"container": statusDesktop_mainWindow, "objectName": "statusChatNavBarListView", "type": "ListView", "visible": True}
44-
navBarListView_Chat_navbar_StatusNavBarTabButton = {"checkable": True, "container": mainWindow_statusChatNavBarListView_ListView, "objectName": "Messages-navbar", "type": "StatusNavBarTabButton", "visible": True}
44+
navBarListView_Chat_navbar_PrimaryNavSidebarButton = {"checkable": True, "container": mainWindow_statusChatNavBarListView_ListView, "objectName": "Messages-navbar", "type": "PrimaryNavSidebarButton", "visible": True}
4545
chatList_ListView = {"container": statusDesktop_mainWindow, "objectName": "chatListItems", "type": "StatusListView", "visible": True}
4646
chatList = {"container": statusDesktop_mainWindow, "objectName": "ContactsColumnView_chatList", "type": "StatusChatList"}
4747
mainWindow_startChat = {"checkable": True, "container": statusDesktop_mainWindow, "objectName": "startChatButton", "type": "StatusIconTabButton"}

‎test/ui-test/testSuites/global_shared/scripts/settings_names.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class SettingsSubsection(Enum):
3030
BACKUP_SEED: str = "18" + _MAIN_MENU_ITEM_OBJ_NAME
3131

3232
# Main:
33-
navBarListView_Settings_navbar_StatusNavBarTabButton = {"checkable": True, "container": mainWindow_navBarListView_ListView, "objectName": "Settings-navbar", "type": "StatusNavBarTabButton", "visible": True}
33+
navBarListView_Settings_navbar_PrimaryNavSidebarButton = {"checkable": True, "container": mainWindow_navBarListView_ListView, "objectName": "Settings-navbar", "type": "PrimaryNavSidebarButton", "visible": True}
3434
settingsSave_StatusButton = {"container": statusDesktop_mainWindow, "objectName": "settingsDirtyToastMessageSaveButton", "type": "StatusButton", "visible": True}
3535
settings_Sidebar_ENS_Item = {"container": mainWindow_ScrollView, "objectName": SettingsSubsection.ENS_USERNAMES.value, "type": "StatusNavigationListItem"}
3636
settingsContentBase_ScrollView = {"container": statusDesktop_mainWindow, "objectName": "settingsContentBaseScrollView", "type": "StatusScrollView", "visible": True}

‎test/ui-test/testSuites/global_shared/scripts/wallet_names.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
addAccountPopup_GeneratedAddressesListPageIndicatior_StatusPageIndicator = {"container": statusDesktop_mainWindow_overlay_popup2, "objectName": "AddAccountPopup-GeneratedAddressesListPageIndicatior", "type": "StatusPageIndicator", "visible": True}
4444
page_StatusBaseButton = {"checkable": False, "container": addAccountPopup_GeneratedAddressesListPageIndicatior_StatusPageIndicator, "objectName": RegularExpression("Page-*"), "type": "StatusBaseButton", "visible": True}
4545

46-
navBarListView_Wallet_navbar_StatusNavBarTabButton = {"checkable": True, "container": mainWindow_navBarListView_ListView, "objectName": "Wallet-navbar", "type": "StatusNavBarTabButton", "visible": True}
47-
wallet_navbar_wallet_icon_StatusIcon = {"container": navBarListView_Wallet_navbar_StatusNavBarTabButton, "objectName": "wallet-icon", "type": "StatusIcon", "visible": True}
46+
navBarListView_Wallet_navbar_PrimaryNavSidebarButton = {"checkable": True, "container": mainWindow_navBarListView_ListView, "objectName": "Wallet-navbar", "type": "PrimaryNavSidebarButton", "visible": True}
47+
wallet_navbar_wallet_icon_StatusIcon = {"container": navBarListView_Wallet_navbar_PrimaryNavSidebarButton, "objectName": "wallet-icon", "type": "StatusIcon", "visible": True}
4848

4949
mainWallet_Address_Panel = {"container": statusDesktop_mainWindow, "objectName": "addressPanel", "type": "StatusAddressPanel", "visible": True}
5050
mainWallet_Add_Account_Button = {"container": statusDesktop_mainWindow, "objectName": "addAccountButton", "type": "StatusRoundButton", "visible": True}

0 commit comments

Comments
 (0)