diff --git a/web-ui/src/context/AppContext.jsx b/web-ui/src/context/AppContext.jsx
index a8e8983d1c..be80771818 100644
--- a/web-ui/src/context/AppContext.jsx
+++ b/web-ui/src/context/AppContext.jsx
@@ -15,16 +15,16 @@ import {
UPDATE_TEAMS,
UPDATE_PEOPLE_LOADING,
UPDATE_TEAMS_LOADING,
- SET_MEMBER_ROLES,
+ SET_MEMBER_ROLES
} from './actions';
import {
getCurrentUser,
getAllMembers,
- getAllTerminatedMembers,
+ getAllTerminatedMembers
} from '../api/member';
import {
selectCanViewCheckinsPermission,
- selectCanViewTerminatedMembers,
+ selectCanViewTerminatedMembers
} from './selectors';
import { getAllRoles, getAllMemberRoles } from '../api/roles';
import { getMemberSkills } from '../api/memberskill';
@@ -32,7 +32,7 @@ import { BASE_API_URL } from '../api/api';
import { getAllGuilds } from '../api/guild';
import { getSkills } from '../api/skill';
import { getAllTeams } from '../api/team';
-import {getCertifications} from "../api/certification.js";
+import { getCertifications } from '../api/certification.js';
const AppContext = React.createContext();
@@ -239,13 +239,13 @@ const AppContextProvider = props => {
const getAllCertifications = async () => {
const res = await getCertifications(csrf);
const data =
- res &&
- res.payload &&
- res.payload.data &&
- res.payload.status === 200 &&
- !res.error
- ? res.payload.data
- : null;
+ res &&
+ res.payload &&
+ res.payload.data &&
+ res.payload.status === 200 &&
+ !res.error
+ ? res.payload.data
+ : null;
if (data && data.length > 0) {
dispatch({ type: UPDATE_CERTIFICATIONS, payload: data });
}
diff --git a/web-ui/src/context/actions.js b/web-ui/src/context/actions.js
index 554ebea917..a11a6be76b 100644
--- a/web-ui/src/context/actions.js
+++ b/web-ui/src/context/actions.js
@@ -28,7 +28,8 @@ export const UPDATE_TEAMS = '@@check-ins/update_teams';
export const UPDATE_TERMINATED_MEMBERS =
'@@check-ins/update_terminated_members';
export const UPDATE_TOAST = '@@check-ins/update_toast';
-export const UPDATE_CURRENT_USER_PROFILE = '@@check-ins/update_current_user_profile';
+export const UPDATE_CURRENT_USER_PROFILE =
+ '@@check-ins/update_current_user_profile';
export const UPDATE_USER_BIO = '@@check-ins/update_bio';
export const UPDATE_FEEEDBACK_SUGGESTIONS =
'@@check-ins/update_feedback_suggestions';
diff --git a/web-ui/src/context/reducer.js b/web-ui/src/context/reducer.js
index a70c9bbcec..e2df086237 100644
--- a/web-ui/src/context/reducer.js
+++ b/web-ui/src/context/reducer.js
@@ -81,17 +81,24 @@ const convertMemberDates = member => {
export const reducer = (state, action) => {
switch (action.type) {
case MY_PROFILE_UPDATE:
- state.userProfile = { id: action.payload.memberProfile.id, role: action.payload.role, permissions: action.payload.permissions };
+ state.userProfile = {
+ id: action.payload.memberProfile.id,
+ role: action.payload.role,
+ permissions: action.payload.permissions
+ };
break;
case UPDATE_CURRENT_USER_PROFILE:
convertMemberDates(action.payload);
const profileId = action.payload.id;
- const memberProfiles = state.memberProfiles.reduce((acc, current) => {
- if(current.id !== profileId) {
- acc.push({...current});
- }
- return acc;
- }, [{ ...action.payload }])
+ const memberProfiles = state.memberProfiles.reduce(
+ (acc, current) => {
+ if (current.id !== profileId) {
+ acc.push({ ...current });
+ }
+ return acc;
+ },
+ [{ ...action.payload }]
+ );
state.memberProfiles = memberProfiles;
break;
case ADD_CHECKIN:
@@ -165,7 +172,7 @@ export const reducer = (state, action) => {
state.teams.sort((a, b) => a.name.localeCompare(b.name));
break;
case UPDATE_TEAMS_LOADING:
- state.loading = { ...state.loading, teams: !state.loading.teams };
+ state.loading = { ...state.loading, teams: !state?.loading?.teams };
break;
case UPDATE_PEOPLE_LOADING:
state.loading = { ...state.loading, memberProfiles: action.payload };
@@ -173,12 +180,12 @@ export const reducer = (state, action) => {
case UPDATE_MEMBER_PROFILES:
action.payload.forEach(convertMemberDates);
const currentProfileId = state?.userProfile?.id;
- const currentProfile = action.payload.find((current) => {
- if(currentProfileId && current.id === currentProfileId) {
+ const currentProfile = action.payload.find(current => {
+ if (currentProfileId && current.id === currentProfileId) {
return current;
}
});
- if(currentProfile) {
+ if (currentProfile) {
state.userProfile.memberProfile = { ...currentProfile };
}
state.memberProfiles = action.payload;
diff --git a/web-ui/src/context/selectors.js b/web-ui/src/context/selectors.js
index 5a039bb3e2..bf9856718c 100644
--- a/web-ui/src/context/selectors.js
+++ b/web-ui/src/context/selectors.js
@@ -40,7 +40,7 @@ export const selectCurrentUser = createSelector(
selectUserProfile,
selectMemberProfiles,
(userProfile, memberProfiles) =>
- memberProfiles.find((current) => current?.id === userProfile?.id) || {}
+ memberProfiles.find(current => current?.id === userProfile?.id) || {}
);
export const selectIsAdmin = createSelector(
@@ -50,8 +50,8 @@ export const selectIsAdmin = createSelector(
);
export const selectCurrentUserRoles = createSelector(
- selectUserProfile,
- userProfile => userProfile.role || []
+ selectUserProfile,
+ userProfile => userProfile.role || []
);
export const selectHasPermissionAssignmentPermission = hasPermission(
@@ -144,9 +144,7 @@ export const selectHasMeritReportPermission = hasPermission(
'CAN_CREATE_MERIT_REPORT'
);
-export const selectHasUploadHoursPermission = hasPermission(
- 'CAN_UPLOAD_HOURS'
-);
+export const selectHasUploadHoursPermission = hasPermission('CAN_UPLOAD_HOURS');
export const selectHasEarnedCertificationsPermission = hasPermission(
'CAN_MANAGE_EARNED_CERTIFICATIONS'
@@ -176,9 +174,7 @@ export const selectHasAdministerKudosPermission = hasPermission(
'CAN_ADMINISTER_KUDOS'
);
-export const selectHasCreateKudosPermission = hasPermission(
- 'CAN_CREATE_KUDOS'
-);
+export const selectHasCreateKudosPermission = hasPermission('CAN_CREATE_KUDOS');
export const selectHasDeleteMembersPermission = hasPermission(
'CAN_DELETE_ORGANIZATION_MEMBERS'
@@ -192,21 +188,17 @@ export const selectHasImpersonateMembersPermission = hasPermission(
'CAN_IMPERSONATE_MEMBERS'
);
-export const selectHasViewSettingsPermission = hasPermission(
- 'CAN_VIEW_SETTINGS'
-);
+export const selectHasViewSettingsPermission =
+ hasPermission('CAN_VIEW_SETTINGS');
export const selectHasAdministerSettingsPermission = hasPermission(
'CAN_ADMINISTER_SETTINGS'
);
-export const selectHasSendEmailPermission = hasPermission(
- 'CAN_SEND_EMAIL'
-);
+export const selectHasSendEmailPermission = hasPermission('CAN_SEND_EMAIL');
-export const selectCanViewCheckinsPermission = hasPermission(
- 'CAN_VIEW_CHECKINS'
-);
+export const selectCanViewCheckinsPermission =
+ hasPermission('CAN_VIEW_CHECKINS');
export const selectCanUpdateCheckinsPermission = hasPermission(
'CAN_UPDATE_CHECKINS'
@@ -220,9 +212,7 @@ export const selectCanUpdateAllCheckinsPermission = hasPermission(
'CAN_UPDATE_ALL_CHECKINS'
);
-export const selectCanEditSkills = hasPermission(
- 'CAN_EDIT_SKILLS'
-);
+export const selectCanEditSkills = hasPermission('CAN_EDIT_SKILLS');
export const selectCanViewPrivateNotesPermission = hasPermission(
'CAN_VIEW_PRIVATE_NOTE'
@@ -245,15 +235,13 @@ export const selectCanAdministerFeedbackRequests = hasPermission(
);
export const selectCanEditAllOrganizationMembers = hasPermission(
- 'CAN_EDIT_ALL_ORGANIZATION_MEMBERS',
+ 'CAN_EDIT_ALL_ORGANIZATION_MEMBERS'
);
export const selectCanViewTerminatedMembers = createSelector(
- selectCanEditAllOrganizationMembers,
- hasPermission(
- 'CAN_VIEW_TERMINATED_MEMBERS'
- ),
- (canEdit, canView) => canEdit || canView
+ selectCanEditAllOrganizationMembers,
+ hasPermission('CAN_VIEW_TERMINATED_MEMBERS'),
+ (canEdit, canView) => canEdit || canView
);
export const selectIsPDL = createSelector(
@@ -345,7 +333,8 @@ export const selectActiveOrInactiveProfile = createSelector(
selectProfileMap,
selectProfileMapForTerminatedMembers,
(state, profileId) => profileId,
- (profileMap, termedProfileMap, profileId) => profileMap[profileId] || termedProfileMap[profileId]
+ (profileMap, termedProfileMap, profileId) =>
+ profileMap[profileId] || termedProfileMap[profileId]
);
export const selectSkill = createSelector(
@@ -397,7 +386,8 @@ export const selectTerminatedMembersWithPDLRole = createSelector(
);
/** @type {MemberProfile[]} */
const terminatedMembersWithPDLRole = terminatedPDLs?.map(
- memberRole => terminatedMembersProfileMap[memberRole?.memberRoleId?.memberId]
+ memberRole =>
+ terminatedMembersProfileMap[memberRole?.memberRoleId?.memberId]
);
return terminatedMembersWithPDLRole;
}
@@ -431,7 +421,9 @@ export const selectMappedMemberRoles = createSelector(
const mappedMemberRoles = {};
memberRoles.forEach(memberRole => {
const memberId = memberRole.memberRoleId.memberId;
- const role = roles.find(role => role.id === memberRole.memberRoleId.roleId);
+ const role = roles.find(
+ role => role.id === memberRole.memberRoleId.roleId
+ );
if (!(memberId in mappedMemberRoles)) {
mappedMemberRoles[memberId] = new Set();
}
@@ -461,7 +453,7 @@ export const selectMappedPdls = createSelector(
export const selectOrderedCurrentMemberProfiles = createSelector(
selectCurrentMembers,
- (mappedMemberProfiles) =>
+ mappedMemberProfiles =>
mappedMemberProfiles?.sort((a, b) => a.lastName.localeCompare(b.lastName))
);
@@ -773,8 +765,10 @@ export const selectMyGuilds = createSelector(
selectCurrentUserId,
selectGuilds,
(id, guilds) =>
- guilds?.filter(guild => guild.active &&
- guild.guildMembers?.some(member => member.memberId === id)
+ guilds?.filter(
+ guild =>
+ guild.active &&
+ guild.guildMembers?.some(member => member.memberId === id)
)
);
@@ -782,8 +776,9 @@ export const selectMyTeams = createSelector(
selectCurrentUserId,
selectTeams,
(id, teams) =>
- teams?.filter(team => team.active &&
- team.teamMembers?.some(member => member.memberId === id)
+ teams?.filter(
+ team =>
+ team.active && team.teamMembers?.some(member => member.memberId === id)
)
);
diff --git a/web-ui/src/context/selectors.test.js b/web-ui/src/context/selectors.test.js
index e7362f8f4d..f6ba387c7e 100644
--- a/web-ui/src/context/selectors.test.js
+++ b/web-ui/src/context/selectors.test.js
@@ -26,7 +26,9 @@ import {
selectCanViewTerminatedMembers,
selectHasAnniversaryReportPermission,
selectHasBirthdayReportPermission,
- selectHasCheckinsReportPermission, selectHasSkillsReportPermission, selectHasTeamSkillsReportPermission,
+ selectHasCheckinsReportPermission,
+ selectHasSkillsReportPermission,
+ selectHasTeamSkillsReportPermission
} from './selectors';
describe('Selectors', () => {
@@ -663,7 +665,10 @@ describe('Selectors', () => {
mockSelectMemberRoles.mockReturnValue(memberRoles);
mockSelectTerminatedMemberIds.mockReturnValue(memberIds);
- const result = selectTerminatedMemberRoles.resultFunc(memberRoles, memberIds);
+ const result = selectTerminatedMemberRoles.resultFunc(
+ memberRoles,
+ memberIds
+ );
expect(result).toEqual([
{
memberRoleId: {
@@ -1328,7 +1333,7 @@ describe('Selectors', () => {
const testState = {
userProfile: {
- id: testMemberProfiles[0].id,
+ id: testMemberProfiles[0].id
},
memberProfiles: testMemberProfiles
};
@@ -1408,7 +1413,7 @@ describe('Selectors', () => {
const testState = {
userProfile: {
- id: testMemberProfiles[0].id,
+ id: testMemberProfiles[0].id
},
memberProfiles: testMemberProfiles
};
@@ -1425,7 +1430,7 @@ describe('Selectors', () => {
lastName: 'Emmerich',
permissions: [
{ permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
- { permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
+ { permission: 'CAN_VIEW_FEEDBACK_ANSWER' }
]
}
};
@@ -1441,7 +1446,7 @@ describe('Selectors', () => {
permissions: [
{ permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
{ permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
- { permission: 'CAN_VIEW_ANNIVERSARY_REPORT' },
+ { permission: 'CAN_VIEW_ANNIVERSARY_REPORT' }
]
}
};
@@ -1522,9 +1527,7 @@ describe('Selectors', () => {
userProfile: {
firstName: 'Huey',
lastName: 'Emmerich',
- permissions: [
- { permission: 'CAN_VIEW_CHECKINS_REPORT' }
- ]
+ permissions: [{ permission: 'CAN_VIEW_CHECKINS_REPORT' }]
}
};
@@ -1551,9 +1554,7 @@ describe('Selectors', () => {
userProfile: {
firstName: 'Huey',
lastName: 'Emmerich',
- permissions: [
- { permission: 'CAN_VIEW_SKILLS_REPORT' }
- ]
+ permissions: [{ permission: 'CAN_VIEW_SKILLS_REPORT' }]
}
};
@@ -1580,9 +1581,7 @@ describe('Selectors', () => {
userProfile: {
firstName: 'Huey',
lastName: 'Emmerich',
- permissions: [
- { permission: 'CAN_VIEW_SKILLS_REPORT' }
- ]
+ permissions: [{ permission: 'CAN_VIEW_SKILLS_REPORT' }]
}
};
@@ -1596,7 +1595,7 @@ describe('Selectors', () => {
lastName: 'Emmerich',
permissions: [
{ permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
- { permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
+ { permission: 'CAN_VIEW_FEEDBACK_ANSWER' }
]
}
};
@@ -1612,7 +1611,7 @@ describe('Selectors', () => {
permissions: [
{ permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
{ permission: 'CAN_EDIT_ALL_ORGANIZATION_MEMBERS' },
- { permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
+ { permission: 'CAN_VIEW_FEEDBACK_ANSWER' }
]
}
};
@@ -1627,7 +1626,7 @@ describe('Selectors', () => {
lastName: 'Emmerich',
permissions: [
{ permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
- { permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
+ { permission: 'CAN_VIEW_FEEDBACK_ANSWER' }
]
}
};
@@ -1643,7 +1642,7 @@ describe('Selectors', () => {
permissions: [
{ permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
{ permission: 'CAN_EDIT_ALL_ORGANIZATION_MEMBERS' },
- { permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
+ { permission: 'CAN_VIEW_FEEDBACK_ANSWER' }
]
}
};
@@ -1654,7 +1653,7 @@ describe('Selectors', () => {
permissions: [
{ permission: 'CAN_VIEW_FEEDBACK_REQUEST' },
{ permission: 'CAN_VIEW_TERMINATED_MEMBERS' },
- { permission: 'CAN_VIEW_FEEDBACK_ANSWER' },
+ { permission: 'CAN_VIEW_FEEDBACK_ANSWER' }
]
}
};
@@ -1675,7 +1674,7 @@ describe('Selectors', () => {
title: 'engineer',
workEmail: 'employee@sample.com',
pdlId: 9,
- startDate: [2012, 9, 29],
+ startDate: [2012, 9, 29]
};
const inactiveTestMember = {
id: 2,
@@ -1689,7 +1688,7 @@ describe('Selectors', () => {
workEmail: 'employee@sample.com',
pdlId: 9,
startDate: [2012, 9, 29],
- terminationDate: [2013, 9, 29],
+ terminationDate: [2013, 9, 29]
};
/** @type MemberProfile[] */
const testActiveMemberProfiles = [
@@ -1705,7 +1704,7 @@ describe('Selectors', () => {
title: 'engineer',
workEmail: 'employee@sample.com',
pdlId: 9,
- startDate: [2012, 9, 29],
+ startDate: [2012, 9, 29]
}
];
/** @type MemberProfile[] */
@@ -1723,15 +1722,19 @@ describe('Selectors', () => {
workEmail: 'employee@sample.com',
pdlId: 9,
startDate: [2012, 9, 29],
- terminationDate: [2013, 9, 29],
+ terminationDate: [2013, 9, 29]
}
];
const testState = {
memberProfiles: testActiveMemberProfiles,
- terminatedMembers: testInactiveMemberProfiles,
+ terminatedMembers: testInactiveMemberProfiles
};
- expect(selectActiveOrInactiveProfile(testState, activeTestMember.id)).toEqual(activeTestMember);
- expect(selectActiveOrInactiveProfile(testState, inactiveTestMember.id)).toEqual(inactiveTestMember);
+ expect(
+ selectActiveOrInactiveProfile(testState, activeTestMember.id)
+ ).toEqual(activeTestMember);
+ expect(
+ selectActiveOrInactiveProfile(testState, inactiveTestMember.id)
+ ).toEqual(inactiveTestMember);
});
});
diff --git a/web-ui/src/context/util.js b/web-ui/src/context/util.js
index cff4e515a8..e9b0fc4a7e 100644
--- a/web-ui/src/context/util.js
+++ b/web-ui/src/context/util.js
@@ -19,14 +19,16 @@ export const sortAnniversaries = anniversaryData => {
return anniversaryData.sort((a, b) => b.yearsOfService - a.yearsOfService);
};
-export const sortKudos = (kudos, order = "ASC") => {
- if (order === "DESC") {
+export const sortKudos = (kudos, order = 'ASC') => {
+ if (order === 'DESC') {
return kudos?.sort(
- (a, b) => new Date(a.dateCreated.join("/")) - new Date(b.dateCreated.join("/"))
+ (a, b) =>
+ new Date(a.dateCreated.join('/')) - new Date(b.dateCreated.join('/'))
);
- } else if (order === "ASC") {
+ } else if (order === 'ASC') {
return kudos?.sort(
- (a, b) => new Date(b.dateCreated.join("/")) - new Date(a.dateCreated.join("/"))
+ (a, b) =>
+ new Date(b.dateCreated.join('/')) - new Date(a.dateCreated.join('/'))
);
}
};
diff --git a/web-ui/src/helpers/colors.js b/web-ui/src/helpers/colors.js
index e2bf178af3..82b75f943a 100644
--- a/web-ui/src/helpers/colors.js
+++ b/web-ui/src/helpers/colors.js
@@ -1,31 +1,102 @@
// pSBC - Shade Blend Convert - Version 4.1 - 01/7/2021
// https://github.com/PimpTrizkit/PJs/blob/master/pSBC.js
-export const pSBC=(p,c0,c1,l)=>{
- let r,g,b,P,f,t,h,m=Math.round,a=typeof(c1)=="string";
- if(typeof(p)!="number"||p<-1||p>1||typeof(c0)!="string"||(c0[0]!='r'&&c0[0]!='#')||(c1&&!a))return null;
- h=c0.length>9,h=a?c1.length>9?true:c1=="c"?!h:false:h,f=pSBC.pSBCr(c0),P=p<0,t=c1&&c1!="c"?pSBC.pSBCr(c1):P?{r:0,g:0,b:0,a:-1}:{r:255,g:255,b:255,a:-1},p=P?p*-1:p,P=1-p;
- if(!f||!t)return null;
- if(l)r=m(P*f.r+p*t.r),g=m(P*f.g+p*t.g),b=m(P*f.b+p*t.b);
- else r=m((P*f.r**2+p*t.r**2)**0.5),g=m((P*f.g**2+p*t.g**2)**0.5),b=m((P*f.b**2+p*t.b**2)**0.5);
- a=f.a,t=t.a,f=a>=0||t>=0,a=f?a<0?t:t<0?a:a*P+t*p:0;
- if(h)return"rgb"+(f?"a(":"(")+r+","+g+","+b+(f?","+m(a*1000)/1000:"")+")";
- else return"#"+(4294967296+r*16777216+g*65536+b*256+(f?m(a*255):0)).toString(16).slice(1,f?undefined:-2)
-}
+export const pSBC = (p, c0, c1, l) => {
+ let r,
+ g,
+ b,
+ P,
+ f,
+ t,
+ h,
+ m = Math.round,
+ a = typeof c1 == 'string';
+ if (
+ typeof p != 'number' ||
+ p < -1 ||
+ p > 1 ||
+ typeof c0 != 'string' ||
+ (c0[0] != 'r' && c0[0] != '#') ||
+ (c1 && !a)
+ )
+ return null;
+ (h = c0.length > 9),
+ (h = a ? (c1.length > 9 ? true : c1 == 'c' ? !h : false) : h),
+ (f = pSBC.pSBCr(c0)),
+ (P = p < 0),
+ (t =
+ c1 && c1 != 'c'
+ ? pSBC.pSBCr(c1)
+ : P
+ ? { r: 0, g: 0, b: 0, a: -1 }
+ : { r: 255, g: 255, b: 255, a: -1 }),
+ (p = P ? p * -1 : p),
+ (P = 1 - p);
+ if (!f || !t) return null;
+ if (l)
+ (r = m(P * f.r + p * t.r)),
+ (g = m(P * f.g + p * t.g)),
+ (b = m(P * f.b + p * t.b));
+ else
+ (r = m((P * f.r ** 2 + p * t.r ** 2) ** 0.5)),
+ (g = m((P * f.g ** 2 + p * t.g ** 2) ** 0.5)),
+ (b = m((P * f.b ** 2 + p * t.b ** 2) ** 0.5));
+ (a = f.a),
+ (t = t.a),
+ (f = a >= 0 || t >= 0),
+ (a = f ? (a < 0 ? t : t < 0 ? a : a * P + t * p) : 0);
+ if (h)
+ return (
+ 'rgb' +
+ (f ? 'a(' : '(') +
+ r +
+ ',' +
+ g +
+ ',' +
+ b +
+ (f ? ',' + m(a * 1000) / 1000 : '') +
+ ')'
+ );
+ else
+ return (
+ '#' +
+ (4294967296 + r * 16777216 + g * 65536 + b * 256 + (f ? m(a * 255) : 0))
+ .toString(16)
+ .slice(1, f ? undefined : -2)
+ );
+};
-pSBC.pSBCr=(d)=>{
- const i=parseInt;
- let n=d.length,x={};
- if(n>9){
- const [r, g, b, a] = (d = d.split(','));
- n = d.length;
- if(n<3||n>4)return null;
- x.r=i(r[3]=="a"?r.slice(5):r.slice(4)),x.g=i(g),x.b=i(b),x.a=a?parseFloat(a):-1
- }else{
- if(n==8||n==6||n<4)return null;
- if(n<6)d="#"+d[1]+d[1]+d[2]+d[2]+d[3]+d[3]+(n>4?d[4]+d[4]:"");
- d=i(d.slice(1),16);
- if(n==9||n==5)x.r=d>>24&255,x.g=d>>16&255,x.b=d>>8&255,x.a=Math.round((d&255)/0.255)/1000;
- else x.r=d>>16,x.g=d>>8&255,x.b=d&255,x.a=-1
- }return x
+pSBC.pSBCr = d => {
+ const i = parseInt;
+ let n = d.length,
+ x = {};
+ if (n > 9) {
+ const [r, g, b, a] = (d = d.split(','));
+ n = d.length;
+ if (n < 3 || n > 4) return null;
+ (x.r = i(r[3] == 'a' ? r.slice(5) : r.slice(4))),
+ (x.g = i(g)),
+ (x.b = i(b)),
+ (x.a = a ? parseFloat(a) : -1);
+ } else {
+ if (n == 8 || n == 6 || n < 4) return null;
+ if (n < 6)
+ d =
+ '#' +
+ d[1] +
+ d[1] +
+ d[2] +
+ d[2] +
+ d[3] +
+ d[3] +
+ (n > 4 ? d[4] + d[4] : '');
+ d = i(d.slice(1), 16);
+ if (n == 9 || n == 5)
+ (x.r = (d >> 24) & 255),
+ (x.g = (d >> 16) & 255),
+ (x.b = (d >> 8) & 255),
+ (x.a = Math.round((d & 255) / 0.255) / 1000);
+ else (x.r = d >> 16), (x.g = (d >> 8) & 255), (x.b = d & 255), (x.a = -1);
+ }
+ return x;
};
diff --git a/web-ui/src/helpers/toast.js b/web-ui/src/helpers/toast.js
index a9af77a9dd..fb853a876c 100644
--- a/web-ui/src/helpers/toast.js
+++ b/web-ui/src/helpers/toast.js
@@ -6,7 +6,7 @@ export const showToast = (severity, toast) => {
type: UPDATE_TOAST,
payload: {
severity,
- toast,
+ toast
}
});
}
diff --git a/web-ui/src/index.css b/web-ui/src/index.css
index ec2585e8c0..84640987c3 100644
--- a/web-ui/src/index.css
+++ b/web-ui/src/index.css
@@ -1,13 +1,13 @@
body {
margin: 0;
- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
- 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
- sans-serif;
+ font-family:
+ -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
+ 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
code {
- font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
- monospace;
+ font-family:
+ source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
}
diff --git a/web-ui/src/pages/AnniversaryReportPage.jsx b/web-ui/src/pages/AnniversaryReportPage.jsx
index 5f5977594b..ce312c2634 100644
--- a/web-ui/src/pages/AnniversaryReportPage.jsx
+++ b/web-ui/src/pages/AnniversaryReportPage.jsx
@@ -15,7 +15,7 @@ import { sortAnniversaries } from '../context/util';
import {
selectCsrfToken,
selectHasAnniversaryReportPermission,
- noPermission,
+ noPermission
} from '../context/selectors';
import { useQueryParameters } from '../helpers/query-parameters';
import SkeletonLoader from '../components/skeleton_loader/SkeletonLoader';
@@ -64,13 +64,13 @@ const AnniversaryReportPage = () => {
const anniversaryResults = await getAnniversaries(monthsToSearch, csrf);
setSearchAnniversaryResults(sortAnniversaries(anniversaryResults));
setHasSearched(true);
- } catch(e) {
+ } catch (e) {
console.error(e);
window.snackDispatch({
type: UPDATE_TOAST,
payload: {
severity: 'error',
- toast: e,
+ toast: e
}
});
}
@@ -125,11 +125,11 @@ const AnniversaryReportPage = () => {