Update MyTeams.tsx

Fix for URLs: office.com and more generic domain.
This commit is contained in:
Christophe Humbert 2021-08-01 11:48:33 -07:00 committed by GitHub
parent ed0ef70803
commit fa334a511d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions

View File

@ -30,7 +30,9 @@ export interface IMyTeamsState {
TenantURL: String; TenantURL: String;
} }
export default class MyTeams extends React.Component<IMyTeamsProps, IMyTeamsState> { export default class MyTeams extends React.Component<IMyTeamsProps, IMyTeamsState> {
public Tenant = this.props.context.pageContext.web.absoluteUrl.split('.')[0].split('//')[1]; public webAbsoluteURL: string = this.props.context.pageContext.web.absoluteUrl;
public TenantPathname: string = this.webAbsoluteURL.split('//')[1].split('/')[0];
public TenantEmail: string = this.props.context.pageContext.user.loginName.split('@')[1];
private graphClient: MSGraphClient = null; private graphClient: MSGraphClient = null;
constructor(props) { constructor(props) {
super(props); super(props);
@ -67,7 +69,7 @@ export default class MyTeams extends React.Component<IMyTeamsProps, IMyTeamsStat
var ID; results.value.map(Items => { var ID; results.value.map(Items => {
ID = Items.id; ID = Items.id;
}); });
var URL = `https://tasks.office.com/${this.Tenant}.com/EN-US/Home/Planner#/plantaskboard?groupId=${GroupId.Id}&planId=${ID}`; var URL = `https://tasks.office.com/${this.TenantEmail}/EN-US/Home/Planner#/plantaskboard?groupId=${GroupId.Id}&planId=${ID}`;
var Planner = { Planner: URL }; var Planner = { Planner: URL };
var Results = Object.assign(GroupId, Planner); var Results = Object.assign(GroupId, Planner);
GroupId = Results; GroupId = Results;
@ -176,12 +178,12 @@ export default class MyTeams extends React.Component<IMyTeamsProps, IMyTeamsStat
return ( return (
<div className={styles.rowStyle}> <div className={styles.rowStyle}>
<div className={styles.ToolTipName}>{Team.Name}<span className={styles.ToolTip}>{Team.Description}</span></div> <div className={styles.ToolTipName}>{Team.Name}<span className={styles.ToolTip}>{Team.Description}</span></div>
<a className={styles.Center} href={`https://outlook.office365.com/mail/group/${this.Tenant}.com/${Mail.toLowerCase()}/email`}> <a className={styles.Center} href={`https://outlook.office.com/mail/group/${this.TenantEmail}/${Mail.toLowerCase()}/email`}>
<Icon className={iconClass} style={{ color: '#087CD7' }} iconName="OutlookLogo"></Icon></a> <Icon className={iconClass} style={{ color: '#087CD7' }} iconName="OutlookLogo"></Icon></a>
<a className={styles.Center} href={`https://${this.Tenant}.sharepoint.com/sites/${Mail}`}> <a className={styles.Center} href={`https://${this.TenantPathname}/sites/${Mail}`}>
<Icon className={iconClass} style={{ color: '#068B90' }} iconName="SharePointLogo"></Icon> <Icon className={iconClass} style={{ color: '#068B90' }} iconName="SharePointLogo"></Icon>
</a> </a>
<a className={styles.Center} href={`https://outlook.office365.com/calendar/group/${this.Tenant}.com/${Team.Name.replace(Replaceregex, '')}/view/week`}> <a className={styles.Center} href={`https://outlook.office.com/calendar/group/${this.TenantEmail}/${Team.Name.replace(Replaceregex, '')}/view/week`}>
<Icon className={iconClass} style={{ color: '#119AE2' }} iconName="Calendar"></Icon> <Icon className={iconClass} style={{ color: '#119AE2' }} iconName="Calendar"></Icon>
</a> </a>
<div className={styles.Center}> <div className={styles.Center}>