Skip to content

Extract meetingOptionsUrl, add Meeting Options button #5

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

Open
Josverl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Extract meetingOptionsUrl, add Meeting Options button #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 20 additions & 7 deletions src/CopyMeetingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,26 @@ function CopyMeetingPageComponent(props: CopyMeetingPageProps) {
id="copy"
dangerouslySetInnerHTML={{ __html: props.meeting?.preview ?? '' }}
/>
<PrimaryButton
className="teamsButton copyButton"
onClick={() => props.onCopyToClipboard(props.meeting)}
ariaLabel={translate('copyMeetingPage.copy.ariaLabel')}
>
<FormattedMessage id="copyMeetingPage.copy" />
</PrimaryButton>

<Stack horizontal horizontalAlign="space-around" >

<PrimaryButton
className="teamsButton copyButton"
onClick={() => props.onCopyToClipboard(props.meeting)}
ariaLabel={translate('copyMeetingPage.copy.ariaLabel')}
>
<FormattedMessage id="copyMeetingPage.copy" />
</PrimaryButton>

<PrimaryButton
className="teamsButton optionsButton"
onClick={() => window.open(props.meeting?.meetingOptionsUrl, '_blank')}
ariaLabel={translate('copyMeetingPage.options.ariaLabel')}
>
<FormattedMessage id="copyMeetingPage.options" />
</PrimaryButton>

</Stack>
</Stack.Item>
</Stack>
</>
Expand Down
3 changes: 2 additions & 1 deletion src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ div[class*="ms-ComboBox"]::after {
margin-bottom: 1rem;
}

.copyButton {
.copyButton
.optionsButton {
align-self: flex-end;
margin-top: 1.6rem;
}
Expand Down
6 changes: 5 additions & 1 deletion src/localization/edu/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@
"_copyMeetingPage.copy.comment": "VERB - button text that tells user they can copy the meeting link",
"copyMeetingPage.copy.ariaLabel": "Copy the meeting link",
"_copyMeetingPage.copy.ariaLabel.comment": "Accessibility label for copy button",
"header.signout.title": "Sign out",
"copyMeetingPage.options": "Meeting options",
"_copyMeetingPage.options.comment": "VERB - button text that tells user they can change the meeting options",
"copyMeetingPage.options.ariaLabel": "Change the meeting options",
"_copyMeetingPage.options.ariaLabel.comment": "Accessibility label for 'meeting options' button",
"header.signout.title": "Sign out",
"_header.signout.title.comment": "VERB - Title for sign out icon",
"header.signout.ariaLabel": "Sign out",
"_header.signout.ariaLabel.comment": "Accessibility label that tells user this button will sign them out",
Expand Down
4 changes: 4 additions & 0 deletions src/localization/health/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
"_copyMeetingPage.copy.comment": "VERB - button text that tells user they can copy the meeting link",
"copyMeetingPage.copy.ariaLabel": "Copy the meeting link",
"_copyMeetingPage.copy.ariaLabel.comment": "Accessibility label for copy button",
"copyMeetingPage.options": "Meeting options",
"_copyMeetingPage.options.comment": "VERB - button text that tells user they can change the meeting options",
"copyMeetingPage.options.ariaLabel": "Change the meeting options",
"_copyMeetingPage.options.ariaLabel.comment": "Accessibility label for 'meeting options' button",
"header.signout.title": "Sign out",
"_header.signout.title.comment": "VERB - Title for sign out icon",
"header.signout.ariaLabel": "Sign out",
Expand Down
1 change: 1 addition & 0 deletions src/meeting-creator/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export interface OnlineMeeting {
conferenceId: string;
tollNumber: string;
tollFreeNumber: string;
meetingOptionsUrl:string;
preview: string;
}

Expand Down
10 changes: 10 additions & 0 deletions src/meeting-creator/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ export function createMeetingService() {
'%20'
)
);

// Extract MeetingOptions URL using regex
var meetingOptionsUrl = '';
if (preview){
const re =preview.match("(https://teams.microsoft.com/meetingOptions/?.*)(?:\".+rel)");
if (re && re.length>1){
meetingOptionsUrl = re[1];
}
}

const createdMeeting = {
id: response.data.id,
Expand All @@ -54,6 +63,7 @@ export function createMeetingService() {
tollFreeNumber: response.data.audioConferencing?.tollFreeNumber || '',
dialinUrl: response.data.audioConferencing?.dialinUrl || '',
videoTeleconferenceId: response.data.videoTeleconferenceId,
meetingOptionsUrl: meetingOptionsUrl || '',
preview
} as OnlineMeeting;

Expand Down
4 changes: 4 additions & 0 deletions src/translations/edu/en-US/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
"_copyMeetingPage.copy.comment": "VERB - button text that tells user they can copy the meeting link",
"copyMeetingPage.copy.ariaLabel": "Copy the meeting link",
"_copyMeetingPage.copy.ariaLabel.comment": "Accessibility label for copy button",
"copyMeetingPage.options": "Meeting options",
"_copyMeetingPage.options.comment": "VERB - button text that tells user they can change the meeting options",
"copyMeetingPage.options.ariaLabel": "Change the meeting options",
"_copyMeetingPage.options.ariaLabel.comment": "Accessibility label for 'meeting options' button",
"header.signout.title": "Sign out",
"_header.signout.title.comment": "VERB - Title for sign out icon",
"header.signout.ariaLabel": "Sign out",
Expand Down