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

[SDESK-6744] Improve displaying of coverage icons & avatars #1800

Merged
merged 26 commits into from
May 24, 2023
Merged

[SDESK-6744] Improve displaying of coverage icons & avatars #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
eb423f5
use new avatar instead of CoverageIcon componet
dzonidoo May 4, 2023
d685a9b
finished improvements on popup
dzonidoo May 5, 2023
f768a39
rename PlanningDateTime.scss to coverage-icons.scss
tomaskikutis May 7, 2023
b7bce8c
remove unused code
tomaskikutis May 7, 2023
f1115fd
remove CoverageIcon
tomaskikutis May 7, 2023
adf77d2
use single avatars inside popover row
tomaskikutis May 7, 2023
783dcf6
use spacer for layout
tomaskikutis May 8, 2023
50783c6
review and correct displayed data to match existing code
tomaskikutis May 8, 2023
3b54dac
update peer dependency
tomaskikutis May 8, 2023
44d78de
forgotten icon in avatar placeholder ; zindex; spacer usage update
tomaskikutis May 9, 2023
c6abd93
fix lint
tomaskikutis May 9, 2023
6a09a8d
show type icon also for unassigned coverages; include workflow state …
tomaskikutis May 10, 2023
124195c
add overflow
tomaskikutis May 10, 2023
6873d57
fix lint
tomaskikutis May 10, 2023
089de76
update ui-framework; fix tests
tomaskikutis May 11, 2023
111497c
status/state should only be displayed if there's a desk
tomaskikutis May 11, 2023
9c39ae0
fix lint
tomaskikutis May 11, 2023
ad51055
update usage of switch component
tomaskikutis May 11, 2023
1015474
Merge branch 'develop' into planning-avatar
tomaskikutis May 12, 2023
bfa961a
cancelled coverage icons
tomaskikutis May 23, 2023
9629969
Merge branch 'develop' into planning-avatar
tomaskikutis May 23, 2023
06cce2e
use gettext from superdeskApi
tomaskikutis May 23, 2023
b30682d
address review comments
tomaskikutis May 23, 2023
134c1e5
use rem for line height
tomaskikutis May 23, 2023
fbe2c1d
update icon colors
tomaskikutis May 24, 2023
89ce40e
update ui-framework and usages of avatar group
tomaskikutis May 24, 2023
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
6 changes: 3 additions & 3 deletions client/components/Coverages/CoverageHistory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {stringUtils, historyUtils, getDateTimeString, getItemInArrayById, gettex
import {Item, Column, Row, Border} from '../UI/List';
import {ContentBlock} from '../UI/SidePanel';
import {CollapseBox} from '../UI';
import {CoverageIcon} from './index';
import {CoverageIcons} from './CoverageIcons';

export class CoverageHistory extends React.Component {
getHistoryActionElement(historyItem) {
Expand Down Expand Up @@ -143,8 +143,8 @@ export class CoverageHistory extends React.Component {
<Border />
<Column grow={true} border={false}>
<Row paddingBottom>
<CoverageIcon
coverage={historyData}
<CoverageIcons
coverages={[historyData]}
users={users}
desks={desks}
contentTypes={contentTypes}
Expand Down
161 changes: 0 additions & 161 deletions client/components/Coverages/CoverageIcon.tsx
View file
Open in desktop

This file was deleted.

Loading