Commitd97dd82

committed

Apply a few Michaels suggestions

1 parent341f550 commitd97dd82Copy full SHA for d97dd82

File tree

+24

-18

lines changed

+24

-18

lines changed

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export const updateUserNotificationPreferences = (`
`38`	`38`	`id,`
`39`	`39`	`disabled,`
`40`	`40`	`updated_at:newDate().toISOString(),`
`41`		`-})asNotificationPreference,`
	`41`	`+})satisfiesNotificationPreference,`
`42`	`42`	`),`
`43`	`43`	`);`
`44`	`44`	`},`
`@@ -65,7 +65,7 @@ export const systemNotificationTemplates = () => {`
`65`	`65`	`exportfunctionselectTemplatesByGroup(`
`66`	`66`	`data:NotificationTemplate[],`
`67`	`67`	`):Record<string,NotificationTemplate[]>{`
`68`		`-returndata.reduce(`
	`68`	`+constgrouped=data.reduce(`
`69`	`69`	`(acc,tpl)=>{`
`70`	`70`	`if(!acc[tpl.group]){`
`71`	`71`	`acc[tpl.group]=[];`
`@@ -75,6 +75,20 @@ export function selectTemplatesByGroup(`
`75`	`75`	`},`
`76`	`76`	`{}asRecord<string,NotificationTemplate[]>,`
`77`	`77`	`);`
	`78`	`+`
	`79`	`+// Sort templates within each group`
	`80`	`+for(constgroupingrouped){`
	`81`	`+grouped[group].sort((a,b)=>a.name.localeCompare(b.name));`
	`82`	`+}`
	`83`	`+`
	`84`	`+// Sort groups by name`
	`85`	`+constsortedGroups=Object.keys(grouped).sort((a,b)=>a.localeCompare(b));`
	`86`	`+constsortedGrouped:Record<string,NotificationTemplate[]>={};`
	`87`	`+for(constgroupofsortedGroups){`
	`88`	`+sortedGrouped[group]=grouped[group];`
	`89`	`+}`
	`90`	`+`
	`91`	`+returnsortedGrouped;`
`78`	`92`	`}`
`79`	`93`
`80`	`94`	`exportconstnotificationDispatchMethodsKey=[`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ const EventsView: FC<EventsViewProps> = ({`
`190`	`190`	`deploymentValues,`
`191`	`191`	`})=>{`
`192`	`192`	`return(`
`193`		`-<Stackspacing={3}>`
	`193`	`+<Stackspacing={4}>`
`194`	`194`	`{availableMethods.includes("smtp")&&`
`195`	`195`	`deploymentValues.notifications?.webhook.endpoint===""&&(`
`196`	`196`	`<Alertseverity="warning">`
`@@ -218,8 +218,9 @@ const EventsView: FC<EventsViewProps> = ({`
`218`	`218`	`<ListItemTextcss={styles.listItemText}primary={group}/>`
`219`	`219`	`</ListItem>`
`220`	`220`
`221`		`-{templates.map((tpl)=>{`
	`221`	`+{templates.map((tpl,i)=>{`
`222`	`222`	`constvalue=castNotificationMethod(tpl.method\|\|defaultMethod);`
	`223`	`+constisLastItem=i===templates.length-1;`
`223`	`224`
`224`	`225`	`return(`
`225`	`226`	`<Fragmentkey={tpl.id}>`
`@@ -234,7 +235,7 @@ const EventsView: FC<EventsViewProps> = ({`
`234`	`235`	`value={value}`
`235`	`236`	`/>`
`236`	`237`	`</ListItem>`
`237`		`-<Dividercss={styles.divider}/>`
	`238`	`+{!isLastItem&&<Divider/>}`
`238`	`239`	`</Fragment>`
`239`	`240`	`);`
`240`	`241`	`})}`
`@@ -281,9 +282,4 @@ const styles = {`
`281`	`282`	`fontSize:"inherit",`
`282`	`283`	`},`
`283`	`284`	`}),`
`284`		`-divider:{`
`285`		`-"&:last-child":{`
`286`		`-display:"none",`
`287`		`-},`
`288`		`-},`
`289`	`285`	`}asRecord<string,Interpolation<Theme>>;`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ export const NotificationsPage: FC = () => {`
`102`	`102`	`layout="fluid"`
`103`	`103`	`>`
`104`	`104`	`{ready ?(`
`105`		`-<Stackspacing={3}>`
	`105`	`+<Stackspacing={4}>`
`106`	`106`	`{Object.entries(templatesByGroup.data).map(([group,templates])=>{`
`107`	`107`	`constallDisabled=templates.some((tpl)=>{`
`108`	`108`	`returndisabledPreferences.data[tpl.id]===true;`
`@@ -138,12 +138,13 @@ export const NotificationsPage: FC = () => {`
`138`	`138`	`}}`
`139`	`139`	`/>`
`140`	`140`	`</ListItem>`
`141`		`-{templates.map((tmpl)=>{`
	`141`	`+{templates.map((tmpl,i)=>{`
`142`	`142`	`constmethod=castNotificationMethod(`
`143`	`143`	`tmpl.method\|\|dispatchMethods.data.default,`
`144`	`144`	`);`
`145`	`145`	`constIcon=methodIcons[method];`
`146`	`146`	`constlabel=methodLabels[method];`
	`147`	`+constisLastItem=i===templates.length-1;`
`147`	`148`
`148`	`149`	`return(`
`149`	`150`	`<Fragmentkey={tmpl.id}>`
`@@ -177,7 +178,7 @@ export const NotificationsPage: FC = () => {`
`177`	`178`	`</Tooltip>`
`178`	`179`	`</ListItemIcon>`
`179`	`180`	`</ListItem>`
`180`		`-<Dividercss={styles.divider}/>`
	`181`	`+{!isLastItem&&<Divider/>}`
`181`	`182`	`</Fragment>`
`182`	`183`	`);`
`183`	`184`	`})}`
`@@ -230,9 +231,4 @@ const styles = {`
`230`	`231`	`fontSize:"inherit",`
`231`	`232`	`},`
`232`	`233`	`}),`
`233`		`-divider:{`
`234`		`-"&:last-child":{`
`235`		`-display:"none",`
`236`		`-},`
`237`		`-},`
`238`	`234`	`}asRecord<string,Interpolation<Theme>>;`

Comments

(0)