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

feat: view mode dashboards-bar design changes [DHIS2-18441] #3155

Merged
Changes from 1 commit
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
a9ec00d
feat: add new dashboards header and display it alongside the old one
HendrikThePendric Nov 21, 2024
f7dcdea
refactor: destructure all props
HendrikThePendric Nov 21, 2024
0916e9d
chore: address eslint warning about missing dependenies in useEffect
HendrikThePendric Nov 21, 2024
bbf1cc0
chore: remove hook that scrolls container to top because the componen…
HendrikThePendric Nov 21, 2024
1041dd3
chore: fix eslint warning about missing effect hook dependencies
HendrikThePendric Nov 21, 2024
5447d97
refactor: cleanup ViewDashboard component implementation
HendrikThePendric Nov 21, 2024
ed451fa
chore: move title-bar into new dashboardsbar
HendrikThePendric Nov 21, 2024
5df8634
chore: move navigation menu components into dedicated directory
HendrikThePendric Nov 21, 2024
6f4748e
chore: move information block components into dedicated directory
HendrikThePendric Nov 21, 2024
c338f46
chore: remove old titlebar component from view dashboard content
HendrikThePendric Nov 21, 2024
65f1e8b
chore: add information block to new header bar
HendrikThePendric Nov 21, 2024
d76024d
chore: apply new design to star-dashboard-button
HendrikThePendric Nov 21, 2024
8d07b6c
chore: organise imports in actions-bar
HendrikThePendric Nov 21, 2024
7b85123
chore: remove star-dashboard-button from action menu and add it to th…
HendrikThePendric Nov 21, 2024
4956554
chore: adjust actions-bar to new design
HendrikThePendric Nov 21, 2024
1e41162
chore: cleanup mockup code from dashboards bar
HendrikThePendric Nov 21, 2024
ef9ce46
fix: remove margin around header
HendrikThePendric Nov 21, 2024
67606f2
fix: address issue when scrolling to active menu item
HendrikThePendric Nov 25, 2024
1a443ba
fix: address prop-types error when passing node to Notice component
HendrikThePendric Nov 25, 2024
f0a19b5
fix: prevent prop-types error in DropdownButton due to empty children…
HendrikThePendric Nov 25, 2024
43da2cc
fix: avoid invalidDomNesting error by removing link and navigating vi…
HendrikThePendric Nov 25, 2024
a8e6a82
fix: ensure bar is 45px in height
HendrikThePendric Nov 25, 2024
78684dd
fix: smooth scrolling on item focus
HendrikThePendric Nov 25, 2024
a44314c
chore: update pot file
HendrikThePendric Nov 25, 2024
f202f38
fix: ensure star button does not give focus to inner element when tab…
HendrikThePendric Nov 25, 2024
f2e60b3
refactor: split up actions-bar and more-menu
HendrikThePendric Nov 26, 2024
1eebfb2
chore: update pot files
HendrikThePendric Nov 26, 2024
9dea744
fix: upgrade UI lib for better minu item styles
HendrikThePendric Nov 26, 2024
ea05897
chore: clean up dashboards-bar code
HendrikThePendric Nov 26, 2024
19ab7b5
fix: adjust no-dashboards styles to specs
HendrikThePendric Nov 26, 2024
56eb0ac
Revert "refactor: split up actions-bar and more-menu"
HendrikThePendric Nov 26, 2024
eb0b15f
chore: align component name with filename
HendrikThePendric Nov 26, 2024
653d086
fix: dynamically set offline icon on nav menu items
HendrikThePendric Nov 26, 2024
444dc15
chore: add dataStatistics logic to navigation menu items
HendrikThePendric Nov 26, 2024
b6740b6
fix: restore selected menu item styles
HendrikThePendric Nov 26, 2024
676dfa7
chore: re-add the description to the dashboards container
HendrikThePendric Nov 26, 2024
a642c09
chore: update pot file
HendrikThePendric Nov 26, 2024
4144041
chore: upgrade @dhis2/ui
HendrikThePendric Nov 26, 2024
3afeb87
chore: remove the old dashboard bar from the view and adjust menu height
HendrikThePendric Nov 26, 2024
ac3de4f
chore: make nav menu dense
HendrikThePendric Nov 28, 2024
03f0859
fix: ensure star icon in nav menu has color grey500
HendrikThePendric Nov 28, 2024
644d7bd
chore: implement filter badge redesign
HendrikThePendric Nov 28, 2024
c5daa3e
chore: apply small screen styles
HendrikThePendric Nov 28, 2024
cba12bf
chore: upgrade @dhis2/ui to get button alignment fixes
HendrikThePendric Nov 28, 2024
9bc6a0a
fix: clear selected dashboard when not found
HendrikThePendric Nov 28, 2024
56988a2
chore: clear information-block when no dashboard found
HendrikThePendric Nov 28, 2024
1496864
chore: show new headerbar on the landing page
HendrikThePendric Nov 28, 2024
c0c8145
chore: remove re-export of redundant component
HendrikThePendric Nov 28, 2024
26da1ca
chore: remove redundant code related to the controlBar
HendrikThePendric Nov 28, 2024
eeb06fb
chore: remove tests related to redundant functionailty
HendrikThePendric Nov 28, 2024
0f8bc97
chore: move tests to new dashboards-bar dir amd outdated snapshots
HendrikThePendric Nov 28, 2024
2275d72
chore: remove old dashboards-bar implementation
HendrikThePendric Nov 28, 2024
0100e31
chore: move offline-saved icon to the root of component folder becaus…
HendrikThePendric Nov 28, 2024
b891605
chore: remove New suffix from new dashboards-bar dir
HendrikThePendric Nov 28, 2024
2045f5b
fix: import local useCacheableSection
HendrikThePendric Nov 28, 2024
f1fbd62
fix: address vertical alignment issues and screen real-estate issues …
HendrikThePendric Dec 2, 2024
3ea5201
chore: remove redundant classNames
HendrikThePendric Dec 2, 2024
aa1b5f9
chore: configure testing-library/react to work with data-test attribute
HendrikThePendric Dec 3, 2024
d25c054
chore: relax eslint rules for spec files so component mocking is easier
HendrikThePendric Dec 3, 2024
027a68d
chore: update pot file
HendrikThePendric Dec 3, 2024
7786f2f
test: align unit tests to new implementation
HendrikThePendric Dec 3, 2024
d527a7d
test: add test cases for posting data statistics
HendrikThePendric Dec 4, 2024
75017e7
chore: add jest-dom module from testing-library for more ergonomic as…
HendrikThePendric Dec 4, 2024
d57a139
fix: adjust filter-badge so that it is only enabled when online and a…
HendrikThePendric Dec 4, 2024
93a7533
chore: align tests to new implementation
HendrikThePendric Dec 4, 2024
0ce3286
chore: adjust preexiting tests to new implementation
HendrikThePendric Dec 5, 2024
bf8e9d9
chore: fix accessibility warnings and invalid dom nesting errors to u…
HendrikThePendric Dec 5, 2024
8ecda67
chore: address lint errors
HendrikThePendric Dec 5, 2024
4c1ffb6
chore: address css lint errors
HendrikThePendric Dec 5, 2024
fa6b460
chore: update pot file
HendrikThePendric Dec 5, 2024
42ebefc
fix: adjust filter e2e tests
HendrikThePendric Dec 5, 2024
ae268de
fix: improve itemGrid empty state
cooper-joe Dec 6, 2024
20513e0
fix: use UI colors for background
cooper-joe Dec 6, 2024
0cfdb75
fix: adjust dashboard item style
cooper-joe Dec 6, 2024
14405e5
fix: adjust item hover in edit mode
cooper-joe Dec 6, 2024
309d1bb
fix: adjust spacer style in edit mode
cooper-joe Dec 6, 2024
7181c47
fix: edit mode style adjustments
cooper-joe Dec 6, 2024
c80f08b
fix: change dashboard item menu button icon
cooper-joe Dec 6, 2024
af4b75d
fix: layout modal style fixes
cooper-joe Dec 6, 2024
094cd55
fix: description display style
cooper-joe Dec 6, 2024
86cc0ff
fix: start screen style adjustments
cooper-joe Dec 6, 2024
a90104e
chore: update jest snapshots after design changes by Joe
HendrikThePendric Dec 9, 2024
a3abbc5
chore: allow omitting network requests from the Cypress log
HendrikThePendric Dec 9, 2024
c5f39f7
fix: hide create button on small screen
HendrikThePendric Dec 10, 2024
50877e4
fix: disable filters on small screen
HendrikThePendric Dec 10, 2024
6655f2f
fix: add gap between filter badges
HendrikThePendric Dec 10, 2024
aa96541
fix: close nav menu when selecting current item and repair keyboard n…
HendrikThePendric Dec 10, 2024
82d5090
chore: fix cypress tests
HendrikThePendric Dec 10, 2024
082a871
chore: update pot file
HendrikThePendric Dec 10, 2024
d8d21d6
chore: remove unused imports
HendrikThePendric Dec 10, 2024
2a17a15
chore: fix tests
HendrikThePendric Dec 10, 2024
0a0aeef
chore: removed unused cypress helpers
HendrikThePendric Dec 10, 2024
ab04a65
chore: remove redundant e2e test file
HendrikThePendric Dec 10, 2024
609dd28
fix: restore e2e helpers that are still used
HendrikThePendric Dec 10, 2024
8b99f54
chore: add test for closing menu when clicking selected dashboard men…
HendrikThePendric Dec 10, 2024
d501076
chore: add test for disabling buttons on small screen
HendrikThePendric Dec 10, 2024
0c250e2
chore: add test for dahboard details failing to load
HendrikThePendric Dec 11, 2024
1cae83d
chore: use analytics version from d2-ci
HendrikThePendric Dec 16, 2024
347a598
chore: rename variable name for clarity
HendrikThePendric Dec 16, 2024
e600569
chore: remove redundant TODO comment
HendrikThePendric Dec 16, 2024
bcaf10c
chore: remove redundant CSS variables
HendrikThePendric Dec 16, 2024
43d0d92
fix: space description, filter and item-grid 8px apart instead of 16
HendrikThePendric Dec 16, 2024
af974e9
fix: update filter-badge implementation so filters can be removed on …
HendrikThePendric Dec 16, 2024
01e1b9b
chore: remove console.log
HendrikThePendric Dec 16, 2024
85aace1
chore: do not pass redundant covered prop to DashboardContainer
HendrikThePendric Dec 16, 2024
cc0382b
chore: use plural i18n
HendrikThePendric Dec 16, 2024
213024b
chore: use cy.containsExact helper to select filter button
HendrikThePendric Dec 18, 2024
d297fa4
chore: remove redundant component and css module
HendrikThePendric Dec 18, 2024
f5160d4
fix: add whitespace above and below the dashboard title in case it ov…
HendrikThePendric Dec 18, 2024
93cd47c
fix: ensure border-block-end fills entire height
HendrikThePendric Dec 18, 2024
21e9f95
chore: update pot files
HendrikThePendric Dec 18, 2024
2e748ce
chore: use block-size instead of height
HendrikThePendric Dec 18, 2024
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
Prev Previous commit
Next Next commit
chore: apply small screen styles
  • Loading branch information
HendrikThePendric committed Dec 4, 2024
commit c5daa3e86c444901004b09c9da2217097f11dc91
5 changes: 4 additions & 1 deletion src/components/DashboardsBarNew/DashboardsBar.js
Original file line number Diff line number Diff line change
@@ -16,14 +16,17 @@ export const DashboardsBar = () => {
secondary
small
icon={<IconAdd16 />}
className={styles.createDashboardButton}
/>
<DropdownButton
icon={<IconNavigation />}
secondary
small
component={<NavigationMenu />}
>
{i18n.t('Dashboards')}
<span className={styles.navMenuButtonText}>
{i18n.t('Dashboards')}
</span>
</DropdownButton>
</div>
<InformationBlock />
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
}

@media only screen and (max-width: 480px) {
.editButton,
.shareButton {
.actions .editButton,
.actions .shareButton {
display: none;
}
}
Original file line number Diff line number Diff line change
@@ -39,3 +39,9 @@
align-items: center;
justify-content: center;
}

@media only screen and (max-width: 480px) {
button.star {
display: none;
}
}
Original file line number Diff line number Diff line change
@@ -40,3 +40,16 @@
font-size: 14px;
color: var(--colors-grey700);
}

@media only screen and (max-width: 480px) {
.container {
min-inline-size: 320px;
max-inline-size: 460px;
}
.scrollbox {
/* 176px instead of 152px is needed because the online-status
* indicator is is showing below the main header and this has
* a height of 24px. */
max-block-size: calc(100vh - 176px);
}
}
Original file line number Diff line number Diff line change
@@ -14,3 +14,10 @@
var(--spacers-dp8);
border-inline-end: 1px solid var(--colors-grey400);
}

@media only screen and (max-width: 480px) {
.createDashboardButton,
.navMenuButtonText {
display: none;
}
}