Skip to content

Commit c220ab1

Browse files
musalemusale
committed
Merge branch 'main' into next/fluentui
2 parents 87e6c2f + cea0986 commit c220ab1

File tree

14 files changed

+204
-125
lines changed

14 files changed

+204
-125
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @microsoftgraph/microsoft-graph-toolkit-write

‎CODE_OF_CONDUCT.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Microsoft Open Source Code of Conduct
2+
3+
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
4+
5+
Resources:
6+
7+
- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
8+
- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
9+
- Contact [[email protected]](mailto:[email protected]) with questions or concerns

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"bootstrap": "lerna bootstrap --useWorkspaces",
4141
"clean": "lerna run --parallel --stream --scope @microsoft/* clean",
4242
"link": "lerna link --force-local",
43-
"lint": "eslint -c .eslintrc.js 'packages/*/src/**/*.ts'",
43+
"lint": "eslint -c .eslintrc.js --quiet 'packages/*/src/**/*.ts'",
4444
"pack": "shx rm -rf artifacts/*.tgz && lerna exec --stream --scope @microsoft/* -- npm pack",
4545
"prepare": "lerna bootstrap --force-local",
4646
"sass": "lerna run sass --scope @microsoft/*",

‎packages/mgt-components/src/components/mgt-people-picker/mgt-people-picker.ts‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -926,27 +926,31 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
926926
*/
927927
protected renderSearchResults(people: IDynamicPerson[]) {
928928
const filteredPeople = people.filter(person => person.id);
929-
930929
return html`
931930
<ul
932931
id="suggestions-list"
933932
class="searched-people-list"
934933
role="listbox"
935-
aria-label="${this.strings.suggestedContacts}">
936-
${repeat(
937-
filteredPeople,
938-
person => person.id,
939-
person => html`
940-
<li
941-
role="option"
942-
id="${person.id}"
943-
aria-label=" ${this.strings.suggestedContact} ${person.displayName}"
944-
class="searched-people-list-result"
945-
@click="${() => this.handleSuggestionClick(person)}">
946-
${this.renderPersonResult(person)}
947-
</li>
948-
`
949-
)}
934+
aria-live="polite"
935+
>
936+
${repeat(
937+
filteredPeople,
938+
person => person.id,
939+
person => {
940+
const lineTwo = person.jobTitle || (person as User).mail;
941+
const ariaLabel = `${this.strings.suggestedContact} ${person.displayName} ${lineTwo ?? ''}`;
942+
return html`
943+
<li
944+
id="${person.id}"
945+
aria-label="${ariaLabel}"
946+
class="list-person"
947+
role="option"
948+
@click="${e => this.handleSuggestionClick(person)}">
949+
${this.renderPersonResult(person)}
950+
</li>
951+
`;
952+
}
953+
)}
950954
</ul>
951955
`;
952956
}
@@ -1753,7 +1757,8 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
17531757
if (this._arrowSelectionCount === -1) {
17541758
this._arrowSelectionCount = 0;
17551759
} else {
1756-
this._arrowSelectionCount = (this._arrowSelectionCount + 1) % peopleList.children.length;
1760+
this._arrowSelectionCount =
1761+
(this._arrowSelectionCount + 1 + peopleList.children.length) % peopleList.children.length;
17571762
}
17581763
}
17591764
}

‎packages/mgt-components/src/components/mgt-picker/mgt-picker.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ export class MgtPicker extends MgtTemplatedComponent {
195195
if (this.isLoadingState && !this.response) {
196196
return this.renderTemplate('loading', null);
197197
} else if (this.hasTemplate('error')) {
198-
return this.renderTemplate('error', this.error ? this.error : null, 'error');
198+
const error = this.error ? (this.error as Error) : null;
199+
return this.renderTemplate('error', { error }, 'error');
199200
} else if (this.hasTemplate('no-data')) {
200201
return this.renderTemplate('no-data', null);
201202
}

‎packages/mgt-components/src/components/mgt-search-box/mgt-search-box.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* -------------------------------------------------------------------------------------------
66
*/
77

8-
import { html, TemplateResult } from 'lit';
8+
import { CSSResult, html, TemplateResult } from 'lit';
99
import { property } from 'lit/decorators.js';
1010
import { customElement, MgtBaseComponent } from '@microsoft/mgt-element';
1111
import { fluentSearch } from '@fluentui/web-components';

‎packages/mgt-components/src/components/mgt-search-results/mgt-search-results.ts‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ export class MgtSearchResults extends MgtTemplatedComponent {
591591
this.response = null;
592592
}
593593
this.isRefreshing = false;
594-
this.fireCustomEvent('dataChange', { response: this.response, error: this.error });
594+
this.fireCustomEvent('dataChange', { response: this.response, error: this.error as Error });
595595
}
596596

597597
/**
@@ -635,9 +635,9 @@ export class MgtSearchResults extends MgtTemplatedComponent {
635635
<fluent-skeleton class="search-result-thumbnail__shimmer" shape="rect" shimmer></fluent-skeleton>
636636
</div>
637637
`
638-
}
639-
</div>
640-
<fluent-divider></fluent-divider>
638+
}
639+
</div>
640+
<fluent-divider></fluent-divider>
641641
</div>
642642
`;
643643
})}
@@ -694,7 +694,7 @@ export class MgtSearchResults extends MgtTemplatedComponent {
694694
<div class="search-results-pages">
695695
${this.renderPreviousPage()}
696696
${this.renderFirstPage(pages)}
697-
${this.renderAllPages(pages)}
697+
${this.renderAllPages(pages)}
698698
${this.renderNextPage()}
699699
</div>
700700
`;
@@ -758,10 +758,10 @@ export class MgtSearchResults extends MgtTemplatedComponent {
758758
${pages.map(
759759
page =>
760760
html`
761-
<fluent-button
761+
<fluent-button
762762
title="${strings.page} ${page}"
763-
appearance="stealth"
764-
class="${page === this.currentPage ? 'search-results-page-active' : 'search-results-page'}"
763+
appearance="stealth"
764+
class="${page === this.currentPage ? 'search-results-page-active' : 'search-results-page'}"
765765
@click="${() => this.onPageClick(page)}">
766766
${page}
767767
</fluent-button>`
@@ -779,19 +779,19 @@ export class MgtSearchResults extends MgtTemplatedComponent {
779779
pages.some(page => page === 1)
780780
? nothing
781781
: html`
782-
<fluent-button
782+
<fluent-button
783783
title="${strings.page} 1"
784784
appearance="stealth"
785785
class="search-results-page"
786786
@click="${this.onFirstPageClick}">
787787
1
788788
</fluent-button>`
789789
? html`
790-
<fluent-button
791-
id="page-back-dot"
792-
appearance="stealth"
793-
class="search-results-page"
794-
title="${this.getDotButtonTitle()}"
790+
<fluent-button
791+
id="page-back-dot"
792+
appearance="stealth"
793+
class="search-results-page"
794+
title="${this.getDotButtonTitle()}"
795795
@click="${() => this.onPageClick(this.currentPage - Math.ceil(this.pagingMax / 2))}"
796796
>
797797
...
@@ -813,10 +813,10 @@ export class MgtSearchResults extends MgtTemplatedComponent {
813813
private renderPreviousPage() {
814814
return this.currentPage > 1
815815
? html`
816-
<fluent-button
817-
appearance="stealth"
818-
class="search-results-page"
819-
title="${strings.back}"
816+
<fluent-button
817+
appearance="stealth"
818+
class="search-results-page"
819+
title="${strings.back}"
820820
@click="${this.onPageBackClick}">
821821
${getSvg(SvgIcon.ChevronLeft)}
822822
</fluent-button>`
@@ -829,11 +829,11 @@ export class MgtSearchResults extends MgtTemplatedComponent {
829829
private renderNextPage() {
830830
return !this.isLastPage()
831831
? html`
832-
<fluent-button
833-
appearance="stealth"
834-
class="search-results-page"
835-
title="${strings.next}"
836-
aria-label="${strings.next}"
832+
<fluent-button
833+
appearance="stealth"
834+
class="search-results-page"
835+
title="${strings.next}"
836+
aria-label="${strings.next}"
837837
@click="${this.onPageNextClick}">
838838
${getSvg(SvgIcon.ChevronRight)}
839839
</fluent-button>`
@@ -912,9 +912,9 @@ export class MgtSearchResults extends MgtTemplatedComponent {
912912
return mgtHtml`
913913
<div class="search-result-grid">
914914
<div class="search-result-icon">
915-
<mgt-file
916-
.fileDetails="${result.resource}"
917-
view="image"
915+
<mgt-file
916+
.fileDetails="${result.resource}"
917+
view="image"
918918
class="file-icon">
919919
</mgt-file>
920920
</div>
@@ -924,8 +924,8 @@ export class MgtSearchResults extends MgtTemplatedComponent {
924924
</div>
925925
<div class="search-result-info">
926926
<div class="search-result-author">
927-
<mgt-person
928-
person-query=${resource.lastModifiedBy.user.email}
927+
<mgt-person
928+
person-query=${resource.lastModifiedBy.user.email}
929929
view="oneLine"
930930
person-card="hover"
931931
show-presence="true">
@@ -936,16 +936,16 @@ export class MgtSearchResults extends MgtTemplatedComponent {
936936
</div>
937937
</div>
938938
<div class="search-result-summary" .innerHTML="${sanitizeSummary(result.summary)}"></div>
939-
</div>
939+
</div>
940940
${
941941
resource.thumbnail?.url &&
942942
html`
943943
<div class="search-result-thumbnail">
944944
<a href="${resource.webUrl}" target="_blank"><img alt="${resource.name}" src="${resource.thumbnail?.url}" /></a>
945945
</div>`
946946
}
947-
948-
</div>
947+
948+
</div>
949949
<fluent-divider></fluent-divider>
950950
`;
951951
}
@@ -973,8 +973,8 @@ export class MgtSearchResults extends MgtTemplatedComponent {
973973
</div>
974974
</div>
975975
<div class="search-result-summary" .innerHTML="${sanitizeSummary(result.summary)}"></div>
976-
</div>
977-
</div>
976+
</div>
977+
</div>
978978
<fluent-divider></fluent-divider>
979979
`;
980980
}
@@ -990,8 +990,8 @@ export class MgtSearchResults extends MgtTemplatedComponent {
990990
return mgtHtml`
991991
<div class="search-result-grid">
992992
<div class="search-result-icon">
993-
<mgt-file
994-
.fileDetails="${result.resource}"
993+
<mgt-file
994+
.fileDetails="${result.resource}"
995995
view="image">
996996
</mgt-file>
997997
</div>
@@ -1002,8 +1002,8 @@ export class MgtSearchResults extends MgtTemplatedComponent {
10021002
</a>
10031003
</div>
10041004
<div class="search-result-summary" .innerHTML="${sanitizeSummary(result.summary)}"></div>
1005-
</div>
1006-
</div>
1005+
</div>
1006+
</div>
10071007
<fluent-divider></fluent-divider>
10081008
`;
10091009
}
@@ -1029,8 +1029,8 @@ export class MgtSearchResults extends MgtTemplatedComponent {
10291029
</div>
10301030
<div class="search-result-info">
10311031
<div class="search-result-author">
1032-
<mgt-person
1033-
person-query=${resource.lastModifiedBy.user.email}
1032+
<mgt-person
1033+
person-query=${resource.lastModifiedBy.user.email}
10341034
view="oneLine"
10351035
person-card="hover"
10361036
show-presence="true">
@@ -1041,17 +1041,17 @@ export class MgtSearchResults extends MgtTemplatedComponent {
10411041
</div>
10421042
</div>
10431043
<div class="search-result-summary" .innerHTML="${sanitizeSummary(result.summary)}"></div>
1044-
</div>
1044+
</div>
10451045
${
10461046
resource.thumbnail?.url &&
1047-
html`
1047+
html`
10481048
<div class="search-result-thumbnail">
10491049
<a href="${resource.webUrl}" target="_blank"><img alt="${trimFileExtension(
10501050
resource.name || getNameFromUrl(resource.webUrl)
10511051
)}" src="${resource.thumbnail?.url || nothing}" /></a>
10521052
</div>`
10531053
}
1054-
</div>
1054+
</div>
10551055
<fluent-divider></fluent-divider>
10561056
`;
10571057
}
@@ -1066,13 +1066,13 @@ export class MgtSearchResults extends MgtTemplatedComponent {
10661066
const resource = result.resource as SearchResource;
10671067
return mgtHtml`
10681068
<div class="search-result">
1069-
<mgt-person
1070-
view="fourLines"
1071-
person-query=${resource.userPrincipalName}
1069+
<mgt-person
1070+
view="fourLines"
1071+
person-query=${resource.userPrincipalName}
10721072
person-card="hover"
10731073
show-presence="true">
1074-
</mgt-person>
1075-
</div>
1074+
</mgt-person>
1075+
</div>
10761076
<fluent-divider></fluent-divider>
10771077
`;
10781078
}
@@ -1121,8 +1121,8 @@ export class MgtSearchResults extends MgtTemplatedComponent {
11211121
<a href="${this.getResourceUrl(resource)}?Web=1" target="_blank">${resource.displayName}</a>
11221122
</div>
11231123
<div class="search-result-summary">${resource.description}</div>
1124-
</div>
1125-
</div>
1124+
</div>
1125+
</div>
11261126
<fluent-divider></fluent-divider>
11271127
`;
11281128
}
@@ -1150,11 +1150,11 @@ export class MgtSearchResults extends MgtTemplatedComponent {
11501150
: html`
11511151
${this.getResourceName(resource)}
11521152
`
1153-
}
1153+
}
11541154
</div>
11551155
<div class="search-result-summary" .innerHTML="${this.getResultSummary(result)}"></div>
1156-
</div>
1157-
</div>
1156+
</div>
1157+
</div>
11581158
<fluent-divider></fluent-divider>
11591159
`;
11601160
}
@@ -1246,7 +1246,7 @@ export class MgtSearchResults extends MgtTemplatedComponent {
12461246
}
12471247

12481248
if (this.version === 'beta') {
1249-
(requestOptions as BetaSearchRequest).query.queryTemplate = this.queryTemplate ? this.queryTemplate : undefined;
1249+
requestOptions.query.queryString = this.queryTemplate ? this.queryTemplate : undefined;
12501250
}
12511251

12521252
return requestOptions;

0 commit comments

Comments
 (0)