Skip to content
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.

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

Add addAndConfigure overload with new parameters to enable Townhall App Filtering #2725

Open
wants to merge 29 commits into
base: main
Choose a base branch
from

Conversation

cmachart
Copy link

For more information about how to contribute to this repo, visit this page.

Description

In order to filter apps for Townhalls in the app install menu, the new calendar must pass two new properties to addAndConfigure(). These two properties indicate whether the install menu is being triggered by a Townhall and whether the app will be installed to the streaming thread.

Main changes in the PR:

  1. Add two new optional parameters: isTownhall and isStreamingThread.

Validation

Validation performed:

  1. Tested changes with local Teams

Unit Tests added:

Unit tests are required for all changes. If no unit tests were added as part of this change, please explain why they aren't necessary.

Yes

End-to-end tests added:

No

Additional Requirements

Change file added:

Ensure the change file meets the formatting requirements.

Yes

@cmachart cmachart requested a review from a team as a code owner February 18, 2025 22:15
Copy link
Contributor

github-actions bot commented Feb 18, 2025

size-limit report 📦

Path Size Loading time (3g) Running time (snapdragon) Total time
packages/teams-js/dist/esm/packages/teams-js/src/index.js 180.75 KB (+0.13% 🔺) 3.7 s (+0.13% 🔺) 1.6 s (-6.69% 🔽) 5.3 s

*
* Additional parameters associated with a meeting
*/
export interface TeamsExtraMeetingInputs {
Copy link
Contributor

@jekloudaMSFT jekloudaMSFT Feb 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Echoing comments on the host sdk side: it would be better to avoid naming this "Teams" since that is host-specific, "Extra" is implied by this being optional in the function interface, and "Inputs" describes how the interface is used more than what it is. Would something like "MeetingSettings", "MeetingProperties", or something along those lines be appropriate here?

@cmachart cmachart changed the title Add optional parameters to addAndConfigure to enable Townhall App Filtering Add addAndConfigure overload with new parameters to enable Townhall App Filtering Feb 25, 2025
@cmachart
Copy link
Author

@cmachart please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"

Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”), and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your contributions to Microsoft open source projects. This Agreement is effective as of the latest signature date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

@microsoft-github-policy-service agree company="Microsoft"

[new SerializableHostEntityId(hostEntityIds), appTypes],
[
new SerializableHostEntityId(hostEntityIds),
(Array.isArray(appTypesOrMeetingParams) || appTypesOrMeetingParams == undefined
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change will break with older versions of host SDK. Hosts will try to read the second argument as appTypes when meetingParams is passes. Is there any problem with leaving the original argument order here and adding meetingParams as a third argument?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It shouldn't break anything because the method still accepts appTypes as the second argument. The reason the new parameter precedes appTypes in the argument list is because appTypes is optional and meetingParams isn't (as Shakeel suggested).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But if an app picks up this change, then runs in a host that does not have the corresponding host sdk change, then it will send a [hostEntityIds, meetingParams] message to the host, and the host will try to read that meetingParams argument as appTypes and will fail the call or continue with unexpected behavior. If the app were to instead send a [hostEntityIds, null, meetingParams] message then the older host sdk versions would just ignore the third parameter and continue to work.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, ok let me try to rearrange the args

@@ -96,7 +96,26 @@ describe('hostEntity', () => {
const promise = hostEntity.tab.addAndConfigure(mockHostEntity);
const message = utils.findMessageByFunc('hostEntity.tab.addAndConfigure');
expect(message).not.toBeNull();
expect(message?.args).toEqual([mockHostEntity, null]);
expect(message?.args).toEqual([mockHostEntity, null, null]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you pass appTypes here to make sure that these arguments are in the right order?

Copy link
Contributor

@jekloudaMSFT jekloudaMSFT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add doc comments for the overloaded functions and see the question on argument ordering. Thanks!

@cmachart cmachart requested a review from jekloudaMSFT March 3, 2025 23:18
[
new SerializableHostEntityId(hostEntityIds),
appTypes ? appTypes : Array.isArray(appTypesOrMeetingParams) ? appTypesOrMeetingParams : undefined,
!Array.isArray(appTypesOrMeetingParams) && appTypesOrMeetingParams != undefined
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
!Array.isArray(appTypesOrMeetingParams) && appTypesOrMeetingParams != undefined
!Array.isArray(appTypesOrMeetingParams) && appTypesOrMeetingParams !== undefined

@cmachart cmachart requested a review from jekloudaMSFT March 4, 2025 17:39
jekloudaMSFT
jekloudaMSFT previously approved these changes Mar 4, 2025
Comment on lines +188 to +202
if (
(Array.isArray(appTypesOrMeetingParams) && appTypesOrMeetingParams.length === 0) ||
(Array.isArray(appTypes) && appTypes?.length === 0)
) {
throw new Error(`Error code: ${ErrorCode.INVALID_ARGUMENTS}, message: App types cannot be an empty array`);
}

return callFunctionInHostAndHandleResponse<HostEntityTabInstance, HostEntityTabInstance>(
'hostEntity.tab.addAndConfigure',
[new SerializableHostEntityId(hostEntityIds), appTypes],
[
new SerializableHostEntityId(hostEntityIds),
appTypes ? appTypes : Array.isArray(appTypesOrMeetingParams) ? appTypesOrMeetingParams : undefined,
!Array.isArray(appTypesOrMeetingParams) && appTypesOrMeetingParams !== undefined
? new SerializableMeetingParams(appTypesOrMeetingParams)
: undefined,
],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find it a bit hard to parse through exactly which one is the meeting params and which one is supposed to be the app types... For readability's sake, I think it would help to do a pre-processing step and assign the correct values in some variables before doing anything, so it is easier to understand and parse the order of the arguments. Something like:

const meetingParams = !Array.isArray(appTypesOrMeetingParams) ? appTypesOrMeetingParams : undefined;
const appTypesArg = !meetingParams ? appTypesOrMeetingParams : appTypes;

This could simplify a bit all the branching logic in the if statement for the list and in the calling function in host arguments.

Comment on lines 13 to 27
{
"title": "addAndConfigure API Call - Success",
"title": "addAndConfigure API Call - Success with meetingParams and appTypes",
"type": "callResponse",
"boxSelector": "#box_addAndConfigure",
"inputValue": {
"hostEntityIds": {
"threadId": "threadId"
},
"appTypes": ["web"],
"meetingParams": {
"isTownhall": true,
"isStreamingThread": true
}
},
"expectedAlertValue": "addAndConfigure called with {\"threadId\":\"threadId\"}",
"expectedAlertValue": "addAndConfigure called with {\"threadId\":\"threadId\"} and {\"appTypes\":[\"web\"]} and {\"meetingParams\":{\"isTownhall\":true,\"isStreamingThread\":true}}",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please consider if it's best to instead of replacing this E2E test, just keep the previous one and add this as a new one. I think it would be beneficial as the old test should still be supported thanks to the overloading of this function and could prevent us to add any bug to how this works. Still, is up to you if you find it redundant.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants