Skip to content

Commit 1980184

Browse files
feature/dep272: More Sonar Cube fixes
1 parent deebb73 commit 1980184

3 files changed

Lines changed: 15 additions & 18 deletions

File tree

api/tests/utilities/factory_scenarios.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
fake = Faker()
3535

3636
CONFIG = get_named_config('testing')
37+
DATE_FORMAT = '%Y/%m/%d, %H:%M:%S'
3738

3839

3940
class TestUserInfo(dict, Enum):
@@ -185,8 +186,8 @@ class TestEngagementInfo(dict, Enum):
185186

186187
engagement1 = {
187188
'name': fake.name(),
188-
'start_date': (datetime.today() - timedelta(days=1)).strftime('%Y/%m/%d, %H:%M:%S'),
189-
'end_date': (datetime.today() + timedelta(days=1)).strftime('%Y/%m/%d, %H:%M:%S'),
189+
'start_date': (datetime.today() - timedelta(days=1)).strftime(DATE_FORMAT),
190+
'end_date': (datetime.today() + timedelta(days=1)).strftime(DATE_FORMAT),
190191
'banner_url': '',
191192
'created_by': '123',
192193
'updated_by': '123',
@@ -206,8 +207,8 @@ class TestEngagementInfo(dict, Enum):
206207

207208
engagement_draft = {
208209
'name': fake.name(),
209-
'start_date': (datetime.today() - timedelta(days=1)).strftime('%Y/%m/%d, %H:%M:%S'),
210-
'end_date': (datetime.today() + timedelta(days=1)).strftime('%Y/%m/%d, %H:%M:%S'),
210+
'start_date': (datetime.today() - timedelta(days=1)).strftime(DATE_FORMAT),
211+
'end_date': (datetime.today() + timedelta(days=1)).strftime(DATE_FORMAT),
211212
'banner_url': '',
212213
'created_by': '123',
213214
'updated_by': '123',
@@ -226,8 +227,8 @@ class TestEngagementInfo(dict, Enum):
226227

227228
engagement2 = {
228229
'name': fake.name(),
229-
'start_date': (datetime.today() - timedelta(days=1)).strftime('%Y/%m/%d, %H:%M:%S'),
230-
'end_date': (datetime.today() + timedelta(days=1)).strftime('%Y/%m/%d, %H:%M:%S'),
230+
'start_date': (datetime.today() - timedelta(days=1)).strftime(DATE_FORMAT),
231+
'end_date': (datetime.today() + timedelta(days=1)).strftime(DATE_FORMAT),
231232
'banner_url': '',
232233
'created_by': '123',
233234
'updated_by': '123',
@@ -258,8 +259,8 @@ class TestEngagementInfo(dict, Enum):
258259

259260
engagement3 = {
260261
'name': fake.name(),
261-
'start_date': (datetime.today() - timedelta(days=1)).strftime('%Y/%m/%d, %H:%M:%S'),
262-
'end_date': (datetime.today() + timedelta(days=1)).strftime('%Y/%m/%d, %H:%M:%S'),
262+
'start_date': (datetime.today() - timedelta(days=1)).strftime(DATE_FORMAT),
263+
'end_date': (datetime.today() + timedelta(days=1)).strftime(DATE_FORMAT),
263264
'banner_url': '',
264265
'tenant_id': 1,
265266
'created_by': '123',

web/src/components/common/Navigation/Breadcrumb.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export const AutoBreadcrumbs: React.FC<{ smallScreenOnly?: boolean }> = ({ small
9494
useEffect(() => {
9595
let cancelled = false;
9696

97-
const getNewCrumbs = (
97+
const setNewCrumbs = (
9898
resolvedCrumb: BreadcrumbProps,
9999
previousCrumbs: Record<string, BreadcrumbProps>,
100100
pathname: string,
@@ -112,17 +112,13 @@ export const AutoBreadcrumbs: React.FC<{ smallScreenOnly?: boolean }> = ({ small
112112
};
113113
};
114114

115-
crumbs.forEach((unresolvedCrumb, index) => {
115+
crumbs.forEach(async (unresolvedCrumb, index) => {
116116
const pathname = matches[index]?.pathname;
117-
118117
if (!pathname) return;
119118

120-
Promise.resolve(unresolvedCrumb)
121-
.then((resolvedCrumb) => {
122-
if (cancelled) return;
123-
setResolvedCrumbs((previousCrumbs) => getNewCrumbs(resolvedCrumb, previousCrumbs, pathname));
124-
})
125-
.catch(() => {});
119+
const resolvedCrumb = await unresolvedCrumb;
120+
if (cancelled) return;
121+
setResolvedCrumbs((previousCrumbs) => setNewCrumbs(resolvedCrumb, previousCrumbs, pathname));
126122
});
127123

128124
return () => {

web/src/components/engagement/admin/create/authoring/AuthoringBottomNav.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ const LanguageSelector = ({
421421

422422
useEffect(() => {
423423
languages.then((lngs) => {
424-
if (!lngs.find((l) => l.code === 'en')) {
424+
if (!lngs.some((l) => l.code === 'en')) {
425425
lngs.unshift({ id: 42, code: 'en', name: 'English', right_to_left: false });
426426
}
427427
setLanguageList(lngs);

0 commit comments

Comments
 (0)