Skip to content

Commit 9e9bf7b

Browse files
azaslonovazaslonov
committed
Resolved conflicts.
2 parents 3e1c85a + 1399677 commit 9e9bf7b

File tree

42 files changed

+222
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+222
-222
lines changed

‎src/admin/custom-widgets/customWidgetDetailsModal.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ const technology: IChoiceGroupOption[] = [
4242

4343
export class CustomWidgetDetailsModal extends React.Component<CustomWidgetDetailsModalProps, CustomWidgetDetailsModalState> {
4444
@Resolve('widgetService')
45-
public widgetService: IWidgetService;
45+
public declare widgetService: IWidgetService;
4646

4747
@Resolve('blobStorage')
48-
public blobStorage: MapiBlobStorage;
48+
public declare blobStorage: MapiBlobStorage;
4949

5050
@Resolve('eventManager')
51-
public eventManager: EventManager;
51+
public declare eventManager: EventManager;
5252

5353
constructor(props: CustomWidgetDetailsModalProps) {
5454
super(props);
@@ -200,7 +200,7 @@ export class CustomWidgetDetailsModal extends React.Component<CustomWidgetDetail
200200
}
201201
<Stack className={`collapsible-section${!this.state.showInstructions ? ' hidden' : ''}`}>
202202
<Text block styles={{ root: { paddingTop: 20 } }}>
203-
Follow the steps below to create, implement, and deploy a custom widget.
203+
Follow the steps below to create, implement, and deploy a custom widget.
204204
<Link href="https://aka.ms/apimdocs/portal/customwidgets" target="_blank">Learn more</Link>.
205205
</Text>
206206
<ol>

‎src/admin/custom-widgets/customWidgets.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ const iconStyles = { width: '16px', color: lightTheme.palette.themePrimary };
2727

2828
export class CustomWidgets extends React.Component<CustomWidgetsProps, CustomWidgetsState> {
2929
@Resolve('viewManager')
30-
public viewManager: ViewManager;
30+
public declare viewManager: ViewManager;
3131

3232
@Resolve('blobStorage')
33-
public blobStorage: MapiBlobStorage;
33+
public declare blobStorage: MapiBlobStorage;
3434

3535
constructor(props: CustomWidgetsProps) {
3636
super(props);
@@ -63,7 +63,7 @@ export class CustomWidgets extends React.Component<CustomWidgetsProps, CustomWid
6363
configsAll.forEach(config => {
6464
if (config.override) configs[config.name] = config;
6565
});
66-
66+
6767
this.setState({ customWidgets: Object.values(configs)});
6868
}).finally(() => this.setState({ isLoading: false }));
6969
}
@@ -109,7 +109,7 @@ export class CustomWidgets extends React.Component<CustomWidgetsProps, CustomWid
109109
<BackButton onClick={this.props.onBackButtonClick} />
110110
<Stack className="nav-item-description-container">
111111
<Text className="description-text">
112-
Custom widgets let you extend the developer portal's functionality in a modular way. For example, you can implement an integration
112+
Custom widgets let you extend the developer portal's functionality in a modular way. For example, you can implement an integration
113113
with a support system, reuse it on several pages, and source-control the code in a git repository.
114114
</Text>
115115
</Stack>

‎src/admin/help/helpModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const headerStyles = { root: { paddingTop: 15, margin: 0 } };
1616

1717
export class HelpModal extends React.Component<HelpModalProps, HelpModalState> {
1818
@Resolve('policyService')
19-
public policyService: PolicyService;
19+
public declare policyService: PolicyService;
2020

2121
constructor(props: HelpModalProps) {
2222
super(props);
@@ -64,7 +64,7 @@ export class HelpModal extends React.Component<HelpModalProps, HelpModalState> {
6464
<li><Text block><Link href="https://aka.ms/apimdocs/portal" target="_blank">Overview</Link> of the developer portal.</Text></li>
6565
<li><Text block><Link href="https://aka.ms/apimdocs/customizeportal" target="_blank">Access and customize the developer portal</Link> with a step-by-step tutorial.</Text></li>
6666
</ul>
67-
67+
6868
<Text as="h3" block variant="large" styles={headerStyles}>How-to</Text>
6969
<ul>
7070
<li><Text block><Link href="https://aka.ms/apimdocs/portal/cors" target="_blank">Enable CORS</Link></Text></li>

‎src/admin/leftPanel.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,19 @@ const iconStyles = { root: { color: lightTheme.palette.themePrimary, fontSize: 2
5959

6060
export class LeftPanel extends React.Component<{}, LeftPanelState> {
6161
@Resolve('siteService')
62-
public siteService: ISiteService;
62+
public declare siteService: ISiteService;
6363

6464
@Resolve('eventManager')
65-
public eventManager: EventManager;
66-
65+
public declare eventManager: EventManager;
66+
6767
@Resolve('viewManager')
68-
public viewManager: ViewManager;
68+
public declare viewManager: ViewManager;
6969

7070
@Resolve('router')
71-
public router: Router;
71+
public declare router: Router;
7272

7373
@Resolve('logger')
74-
public logger: Logger;
74+
public declare logger: Logger;
7575

7676
constructor(props: any) {
7777
super(props);
@@ -128,7 +128,7 @@ export class LeftPanel extends React.Component<{}, LeftPanelState> {
128128
this.setState({ selectedNavItem: NavItem.Main });
129129
this.viewManager.setHost({ name: 'page-host' });
130130
}
131-
131+
132132
handleOnboardingModalClose = (): void => {
133133
this.setState({ showOnboardingModal: false });
134134
localStorage.setItem('isOnboardingSeen', 'true');
@@ -210,7 +210,7 @@ export class LeftPanel extends React.Component<{}, LeftPanelState> {
210210
/>
211211
<CommandBarButton
212212
iconProps={feedbackIcon}
213-
onRenderText={() =>
213+
onRenderText={() =>
214214
<Text block styles={{ root: { flexGrow: 1, margin: '0 4px' } }}>
215215
Give feedback
216216
<Icon iconName="OpenInNewWindow" styles={{ root: { paddingLeft: 5 } }} />
@@ -268,7 +268,7 @@ export class LeftPanel extends React.Component<{}, LeftPanelState> {
268268
this.logger.trackEvent(`${checked ? 'Checked' : 'Unchecked'}: Preview new UI design`);
269269
this.eventManager.dispatchEvent('onSaveChanges');
270270
this.eventManager.dispatchEvent('onDataPush'); // Needed to reload the runtime part
271-
}}
271+
}}
272272
/>
273273
}
274274
</div>

‎src/admin/media/imageDetailsModal.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ const flipHorizontallyStyles = { root: { color: '#000', transform: 'rotate(45deg
3434

3535
export class ImageDetailsModal extends React.Component<ImageDetailsModalProps, ImageDetailsModalState> {
3636
@Resolve('mediaService')
37-
public mediaService: IMediaService;
37+
public declare mediaService: IMediaService;
3838

3939
@Resolve('eventManager')
40-
public eventManager: EventManager;
40+
public declare eventManager: EventManager;
4141

4242
cropper: Cropper;
4343

@@ -132,11 +132,11 @@ export class ImageDetailsModal extends React.Component<ImageDetailsModalProps, I
132132

133133
render(): JSX.Element {
134134
return <>
135-
{this.state.showDeleteConfirmation &&
135+
{this.state.showDeleteConfirmation &&
136136
<DeleteConfirmationOverlay
137137
deleteItemTitle={this.state.mediaItem.fileName}
138138
onConfirm={this.deleteMedia.bind(this)}
139-
onDismiss={this.closeDeleteConfirmation.bind(this)}
139+
onDismiss={this.closeDeleteConfirmation.bind(this)}
140140
/>
141141
}
142142
<Modal

‎src/admin/media/mediaModal.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ const deleteIcon: IIconProps = { iconName: 'Delete' };
3737

3838
export class MediaModal extends React.Component<MediaModalProps, MediaModalState> {
3939
@Resolve('mediaService')
40-
public mediaService: IMediaService;
40+
public declare mediaService: IMediaService;
4141

4242
@Resolve('eventManager')
43-
public eventManager: EventManager;
44-
43+
public declare eventManager: EventManager;
44+
4545
@Resolve('viewManager')
46-
public viewManager: ViewManager;
46+
public declare viewManager: ViewManager;
4747

4848
constructor(props: MediaModalProps) {
4949
super(props);
@@ -104,7 +104,7 @@ export class MediaModal extends React.Component<MediaModalProps, MediaModalState
104104
for (const file of this.state.selectedFiles) {
105105
await this.mediaService.deleteMedia(file);
106106
}
107-
107+
108108
this.setState({ selectedFiles: [], showDeleteConfirmation: false });
109109
this.eventManager.dispatchEvent('onSaveChanges');
110110
this.searchMedia();
@@ -129,7 +129,7 @@ export class MediaModal extends React.Component<MediaModalProps, MediaModalState
129129
{item.name}
130130
</Link>
131131
);
132-
132+
133133
onRenderOverflowButton = (overflowItems: any[] | undefined): JSX.Element => {
134134
return (
135135
<IconButton
@@ -152,7 +152,7 @@ export class MediaModal extends React.Component<MediaModalProps, MediaModalState
152152

153153
renderMediaItem = (mediaItem: MediaContract): JSX.Element => {
154154
const thumbnailUrl: string = getThumbnailUrl(mediaItem);
155-
155+
156156
return (
157157
<div className="media-box" key={mediaItem.key}>
158158
<Stack horizontal horizontalAlign="space-between" verticalAlign="center">
@@ -249,7 +249,7 @@ export class MediaModal extends React.Component<MediaModalProps, MediaModalState
249249
<DeleteConfirmationOverlay
250250
deleteItemTitle={this.state.selectedFiles.length === 1 ? this.state.selectedFiles[0].fileName : 'selected files'}
251251
onConfirm={this.deleteMedia.bind(this)}
252-
onDismiss={this.closeDeleteConfirmation.bind(this)}
252+
onDismiss={this.closeDeleteConfirmation.bind(this)}
253253
/>
254254
}
255255
<Modal
@@ -288,7 +288,7 @@ export class MediaModal extends React.Component<MediaModalProps, MediaModalState
288288
onClick={() => this.linkMedia()}
289289
/>
290290
</Stack.Item>
291-
{this.state.selectedFiles.length > 0 &&
291+
{this.state.selectedFiles.length > 0 &&
292292
<Stack.Item>
293293
<DefaultButton
294294
iconProps={deleteIcon}

‎src/admin/media/mediaSelectionItemModal.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ const linkIcon: IIconProps = { iconName: 'Link' };
2727

2828
export class MediaSelectionItemModal extends React.Component<MediaSelectionItemModalProps, MediaSelectionItemModalState> {
2929
@Resolve('mediaService')
30-
public mediaService: IMediaService;
30+
public declare mediaService: IMediaService;
3131

3232
@Resolve('eventManager')
33-
public eventManager: EventManager;
33+
public declare eventManager: EventManager;
3434

3535
@Resolve('viewManager')
36-
public viewManager: ViewManager;
36+
public declare viewManager: ViewManager;
3737

3838
constructor(props: MediaSelectionItemModalProps) {
3939
super(props);

‎src/admin/media/nonImageDetailsModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ const textFieldStyles = { root: { paddingBottom: 15 } };
2626

2727
export class NonImageDetailsModal extends React.Component<NonImageDetailsModalProps, NonImageDetailsModalState> {
2828
@Resolve('mediaService')
29-
public mediaService: IMediaService;
29+
public declare mediaService: IMediaService;
3030

3131
@Resolve('eventManager')
32-
public eventManager: EventManager;
32+
public declare eventManager: EventManager;
3333

3434
constructor(props: NonImageDetailsModalProps) {
3535
super(props);

‎src/admin/navigation/navigation.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ const iconStyles = { width: '16px' };
3434

3535
export class Navigation extends React.Component<PagesProps, NavigationState> {
3636
@Resolve('navigationService')
37-
public navigationService: INavigationService;
37+
public declare navigationService: INavigationService;
3838

3939
@Resolve('eventManager')
40-
public eventManager: EventManager;
40+
public declare eventManager: EventManager;
4141

4242
constructor(props: PagesProps) {
4343
super(props);
@@ -73,7 +73,7 @@ export class Navigation extends React.Component<PagesProps, NavigationState> {
7373
targetKey: navItem.targetKey || '',
7474
isExpanded: true
7575
};
76-
76+
7777
if (navItem.navigationItems) newNode.links = this.structureNavItems(navItem.navigationItems);
7878

7979
return newNode;
@@ -96,7 +96,7 @@ export class Navigation extends React.Component<PagesProps, NavigationState> {
9696
removeNavItem = (navItems: NavigationItemContract[], removableNavItemKey: string): NavigationItemContract[] => (
9797
navItems.filter(navItem => {
9898
const keep = navItem.key !== removableNavItemKey;
99-
99+
100100
if (keep && navItem.navigationItems) {
101101
navItem.navigationItems = this.removeNavItem(navItem.navigationItems, removableNavItemKey);
102102
}
@@ -280,11 +280,11 @@ export class Navigation extends React.Component<PagesProps, NavigationState> {
280280

281281
render(): JSX.Element {
282282
return <>
283-
{this.state.showDeleteConfirmation &&
283+
{this.state.showDeleteConfirmation &&
284284
<DeleteConfirmationOverlay
285285
deleteItemTitle={this.state.currentNavItem.label}
286286
onConfirm={this.deleteNavItem.bind(this)}
287-
onDismiss={this.closePopUps.bind(this)}
287+
onDismiss={this.closePopUps.bind(this)}
288288
/>
289289
}
290290
{this.state.showNavigationItemModal &&
@@ -310,7 +310,7 @@ export class Navigation extends React.Component<PagesProps, NavigationState> {
310310
{this.state.isLoading && <Spinner />}
311311
{this.state.navigationItemsToRender.length === 0 && !this.state.isLoading
312312
? <Text block className="nav-item-description-container">It seems that you don't have site menu items yet. Would you like to create one?</Text>
313-
:
313+
:
314314
<Nav
315315
ariaLabel="Site menu"
316316
groups={this.state.navigationItemsToRender}

0 commit comments

Comments
 (0)