more granular imports in FilePicker

AJIXuMuK · AJIXuMuK · commit 6f4c60eb2220 · 2020-11-20T18:37:15.000-08:00
diff --git a/src/controls/filePicker/FilePicker.tsx b/src/controls/filePicker/FilePicker.tsx
@@ -6,7 +6,7 @@ import { PrimaryButton, ActionButton } from 'office-ui-fabric-react/lib/componen
 import { Panel, PanelType } from 'office-ui-fabric-react/lib/components/Panel';
 import { Label } from 'office-ui-fabric-react/lib/components/Label';
 import { Nav, INavLink, INavLinkGroup } from 'office-ui-fabric-react/lib/Nav';
-import { css } from "@uifabric/utilities/lib/css";
+import { css } from "office-ui-fabric-react/lib/Utilities";
 
 // Localization
 import * as strings from 'ControlStrings';
@@ -19,7 +19,7 @@ import RecentFilesTab from './RecentFilesTab/RecentFilesTab';
 
 import styles from './FilePicker.module.scss';
 import { FileBrowserService } from '../../services/FileBrowserService';
-import { OneDriveFilesTab } from './OneDriveFilesTab';
+import { OneDriveFilesTab } from './OneDriveFilesTab/OneDriveFilesTab';
 import { OneDriveService } from '../../services/OneDriveService';
 import { OrgAssetsService } from '../../services/OrgAssetsService';
 import { IFilePickerResult } from './FilePicker.types';
diff --git a/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx b/src/controls/filePicker/LinkFilePickerTab/LinkFilePickerTab.tsx
@@ -1,11 +1,12 @@
 import * as React from 'react';
 
-import { ILinkFilePickerTabProps, ILinkFilePickerTabState } from '.';
-import { GeneralHelper } from '../../../Utilities';
+import { ILinkFilePickerTabProps } from './ILinkFilePickerTabProps';
+import { ILinkFilePickerTabState } from './ILinkFilePickerTabState';
+import { GeneralHelper } from '../../../common/utilities/GeneralHelper';
 import { IFilePickerResult } from '../FilePicker.types';
 import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/components/Button';
 import { TextField } from 'office-ui-fabric-react/lib/TextField';
-import { css } from '@uifabric/utilities/lib/css';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
 
 import * as strings from 'ControlStrings';
 import styles from './LinkFilePickerTab.module.scss';
diff --git a/src/controls/filePicker/OneDriveFilesTab/OneDriveFilesTab.tsx b/src/controls/filePicker/OneDriveFilesTab/OneDriveFilesTab.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { IOneDriveFilesTabProps, IOneDriveFilesTabState } from '.';
+import { IOneDriveFilesTabProps } from './IOneDriveFilesTabProps';
+import { IOneDriveFilesTabState } from './IOneDriveFilesTabState';
 import { IFile } from '../../../services/FileBrowserService.types';
 import { OneDriveFilesBreadcrumbItem } from './OneDriveFilesTab.types';
 import { findIndex } from '@microsoft/sp-lodash-subset';
diff --git a/src/controls/filePicker/RecentFilesTab/IRecentFilesTabProps.ts b/src/controls/filePicker/RecentFilesTab/IRecentFilesTabProps.ts
@@ -1,4 +1,4 @@
-import { IFilePickerTab } from "..";
+import { IFilePickerTab } from "../FilePicker.types";
 import { FilesSearchService } from "../../../services/FilesSearchService";
 
 export interface IRecentFilesTabProps extends IFilePickerTab {
diff --git a/src/controls/filePicker/RecentFilesTab/RecentFilesTab.tsx b/src/controls/filePicker/RecentFilesTab/RecentFilesTab.tsx
@@ -5,15 +5,16 @@ import { Spinner } from 'office-ui-fabric-react/lib/Spinner';
 import { FocusZone } from 'office-ui-fabric-react/lib/FocusZone';
 import { List } from 'office-ui-fabric-react/lib/List';
 import { IRectangle } from 'office-ui-fabric-react/lib/Utilities';
-import { css } from '@uifabric/utilities/lib/css';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
 import { Selection, SelectionMode, SelectionZone } from 'office-ui-fabric-react/lib/Selection';
 import { Image, ImageFit } from 'office-ui-fabric-react/lib/Image';
 import { Check } from 'office-ui-fabric-react/lib/Check';
 import { Placeholder } from '../../../Placeholder';
 import { IRecentFile } from '../../../services/FilesSearchService.types';
 import { IFilePickerResult } from '../FilePicker.types';
-import { GeneralHelper } from '../../../Utilities';
-import { IRecentFilesTabProps, IRecentFilesTabState } from '.';
+import { GeneralHelper } from '../../../common/utilities/GeneralHelper';
+import { IRecentFilesTabProps } from './IRecentFilesTabProps';
+import { IRecentFilesTabState } from './IRecentFilesTabState';
 
 import * as strings from 'ControlStrings';
 import styles from './RecentFilesTab.module.scss';
diff --git a/src/controls/filePicker/SiteFilePickerTab/ISiteFilePickerTabProps.ts b/src/controls/filePicker/SiteFilePickerTab/ISiteFilePickerTabProps.ts
@@ -1,4 +1,4 @@
-import { IFilePickerTab } from "..";
+import { IFilePickerTab } from "../FilePicker.types";
 import { FileBrowserService } from "../../../services/FileBrowserService";
 import { IBreadcrumbItem } from "office-ui-fabric-react/lib/Breadcrumb";
 
diff --git a/src/controls/filePicker/SiteFilePickerTab/SiteFilePickerTab.tsx b/src/controls/filePicker/SiteFilePickerTab/SiteFilePickerTab.tsx
@@ -1,7 +1,9 @@
 import * as React from 'react';
-import { findIndex } from '@microsoft/sp-lodash-subset';
-import { ISiteFilePickerTabProps, ISiteFilePickerTabState } from '.';
-import { DocumentLibraryBrowser, FileBrowser } from '../controls';
+import findIndex from 'lodash/findIndex';
+import { ISiteFilePickerTabProps } from './ISiteFilePickerTabProps';
+import {ISiteFilePickerTabState } from './ISiteFilePickerTabState';
+import { DocumentLibraryBrowser } from '../controls/DocumentLibraryBrowser/DocumentLibraryBrowser';
+import { FileBrowser } from '../controls/FileBrowser/FileBrowser';
 import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/components/Button';
 import { Breadcrumb, IBreadcrumbItem } from 'office-ui-fabric-react/lib/Breadcrumb';
 import { IFile, ILibrary } from '../../../services/FileBrowserService.types';
diff --git a/src/controls/filePicker/StockImagesTab/IStockImagesProps.ts b/src/controls/filePicker/StockImagesTab/IStockImagesProps.ts
@@ -1,7 +1,7 @@
-import { IFilePickerTab } from "..";
+import { IFilePickerTab } from "../FilePicker.types";
 import { FilesSearchService } from "../../../services/FilesSearchService";
 
 export interface IStockImagesProps extends IFilePickerTab {
   language: string;
   fileSearchService: FilesSearchService;
-}
+}
diff --git a/src/controls/filePicker/StockImagesTab/StockImages.tsx b/src/controls/filePicker/StockImagesTab/StockImages.tsx
@@ -1,8 +1,9 @@
 import * as React from 'react';
 import styles from './StockImages.module.scss';
-import { StockImagesEvent, SubmitValue, IStockImagesProps } from '.';
+import { IStockImagesProps } from './IStockImagesProps';
+import { StockImagesEvent, SubmitValue } from './StockImagesModel';
 import { GeneralHelper } from '../../../Utilities';
-import { IFilePickerResult } from '..';
+import { IFilePickerResult } from '../FilePicker.types';
 
 export class StockImages extends React.Component<IStockImagesProps> {
   public componentDidMount() {
@@ -42,7 +43,7 @@ export class StockImages extends React.Component<IStockImagesProps> {
       this._handleSave(eventData);
     } else if (eventData.MessageId === "CancelDialog") {
       this._handleClose();
-    } 
+    }
   }
 
   /**
@@ -59,7 +60,7 @@ export class StockImages extends React.Component<IStockImagesProps> {
         fileNameWithoutExtension: GeneralHelper.getFileNameWithoutExtension(cdnFileInfo.sourceUrl)
       };
     }
-    
+
     this.props.onSave(filePickerResult);
   }
 
@@ -77,8 +78,8 @@ export class StockImages extends React.Component<IStockImagesProps> {
 
     const primaryColor = window["__themeState__"].theme["themePrimary"];
     const textColor = window["__themeState__"].theme["primaryText"];
-    const primaryBackground = window["__themeState__"].theme["bodyBackground"]; 
-    const neutralLighter = window["__themeState__"].theme["neutralLighter"]; 
+    const primaryBackground = window["__themeState__"].theme["bodyBackground"];
+    const neutralLighter = window["__themeState__"].theme["neutralLighter"];
 
     const theme = `{"primaryColor":"${primaryColor}","textColor":"${textColor}","backgroundColor":"${primaryBackground}","neutralLighterColor":"${neutralLighter}"}`;
     return theme;
diff --git a/src/controls/filePicker/UploadFilePickerTab/IUploadFilePickerTabProps.ts b/src/controls/filePicker/UploadFilePickerTab/IUploadFilePickerTabProps.ts
@@ -1,3 +1,3 @@
-import { IFilePickerTab } from "..";
+import { IFilePickerTab } from "../FilePicker.types";
 
 export interface IUploadFilePickerTabProps extends IFilePickerTab { }
diff --git a/src/controls/filePicker/UploadFilePickerTab/UploadFilePickerTab.tsx b/src/controls/filePicker/UploadFilePickerTab/UploadFilePickerTab.tsx
@@ -1,10 +1,11 @@
 import * as React from 'react';
 
-import { IUploadFilePickerTabProps, IUploadFilePickerTabState } from '.';
+import { IUploadFilePickerTabProps } from './IUploadFilePickerTabProps';
+import { IUploadFilePickerTabState } from './IUploadFilePickerTabState';
 import { IFilePickerResult } from '../FilePicker.types';
-import { GeneralHelper } from '../../../common/utilities';
+import { GeneralHelper } from '../../../common/utilities/GeneralHelper';
 import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/components/Button';
-import { css } from '@uifabric/utilities/lib/css';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
 
 import * as strings from 'ControlStrings';
 import styles from './UploadFilePickerTab.module.scss';
diff --git a/src/controls/filePicker/WebSearchTab/IWebSearchTabProps.ts b/src/controls/filePicker/WebSearchTab/IWebSearchTabProps.ts
@@ -1,5 +1,5 @@
-import { IFilePickerTab } from "..";
-import { ISearchSuggestion } from ".";
+import { IFilePickerTab } from "../FilePicker.types";
+import { ISearchSuggestion } from "./WebSearchTab.types";
 import { FilesSearchService } from "../../../services/FilesSearchService";
 
 export interface IWebSearchTabProps extends IFilePickerTab {
diff --git a/src/controls/filePicker/WebSearchTab/IWebSearchTabState.ts b/src/controls/filePicker/WebSearchTab/IWebSearchTabState.ts
@@ -1,4 +1,4 @@
-import { ImageSize, ImageAspect, ImageLicense } from ".";
+import { ImageSize, ImageAspect, ImageLicense } from "./WebSearchTab.types";
 import { IFilePickerResult } from "../FilePicker.types";
 import { ISearchResult } from "../../../services/FilesSearchService.types";
 
diff --git a/src/controls/filePicker/WebSearchTab/WebSearchTab.tsx b/src/controls/filePicker/WebSearchTab/WebSearchTab.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
 
-import { IWebSearchTabProps, IWebSearchTabState, ISearchSuggestion, ImageSize, ImageAspect, ImageLicense, DEFAULT_SUGGESTIONS, MAX_ROW_HEIGHT, ROWS_PER_PAGE } from '.';
+import { IWebSearchTabProps } from './IWebSearchTabProps';
+import { IWebSearchTabState } from './IWebSearchTabState';
+import { ISearchSuggestion, ImageSize, ImageAspect, ImageLicense, DEFAULT_SUGGESTIONS, MAX_ROW_HEIGHT, ROWS_PER_PAGE } from './WebSearchTab.types';
 import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/components/Button';
 import { Label } from 'office-ui-fabric-react/lib/Label';
 import { SearchBox } from 'office-ui-fabric-react/lib/SearchBox';
@@ -13,9 +15,9 @@ import { List } from 'office-ui-fabric-react/lib/List';
 import { IRectangle } from 'office-ui-fabric-react/lib/Utilities';
 import { Selection, SelectionMode, SelectionZone } from 'office-ui-fabric-react/lib/Selection';
 import { MessageBar } from 'office-ui-fabric-react/lib/MessageBar';
-import { css } from '@uifabric/utilities/lib/css';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
 import { IFilePickerResult } from '../FilePicker.types';
-import { GeneralHelper } from '../../../common/utilities';
+import { GeneralHelper } from '../../../common/utilities/GeneralHelper';
 import { ISearchResult, BingQuerySearchParams } from '../../../services/FilesSearchService.types';
 
 import styles from './WebSearchTab.module.scss';
diff --git a/src/controls/filePicker/controls/DocumentLibraryBrowser/DocumentLibraryBrowser.tsx b/src/controls/filePicker/controls/DocumentLibraryBrowser/DocumentLibraryBrowser.tsx
@@ -3,7 +3,8 @@ import { FocusZone } from 'office-ui-fabric-react/lib/FocusZone';
 import { List } from 'office-ui-fabric-react/lib/List';
 import { Spinner } from 'office-ui-fabric-react/lib/Spinner';
 import { Image, ImageFit } from 'office-ui-fabric-react/lib/Image';
-import { IDocumentLibraryBrowserProps, IDocumentLibraryBrowserState } from '.';
+import { IDocumentLibraryBrowserProps } from './IDocumentLibraryBrowserProps';
+import { IDocumentLibraryBrowserState } from './IDocumentLibraryBrowserState';
 import { ILibrary } from '../../../../services/FileBrowserService.types';
 
 import { IRectangle } from 'office-ui-fabric-react/lib/Utilities';
diff --git a/src/controls/filePicker/controls/FileBrowser/FileBrowser.tsx b/src/controls/filePicker/controls/FileBrowser/FileBrowser.tsx
@@ -1,12 +1,14 @@
 import * as React from 'react';
 import { IFile, FilesQueryResult } from '../../../../services/FileBrowserService.types';
-import { GeneralHelper } from '../../../../Utilities';
+import { GeneralHelper } from '../../../../common/utilities/GeneralHelper';
 import { LoadingState } from './IFileBrowserState';
 import { TilesList } from '../TilesList/TilesList';
 import { IFilePickerResult } from '../../FilePicker.types';
-import { IFileBrowserProps, IFileBrowserState, ViewType } from '.';
+import { IFileBrowserProps } from './IFileBrowserProps';
+import { IFileBrowserState } from './IFileBrowserState';
+import { ViewType } from './FileBrowser.types';
 import { Spinner } from 'office-ui-fabric-react/lib/Spinner';
-import { DetailsList, DetailsListLayoutMode, Selection, SelectionMode, IColumn, IDetailsRowProps, DetailsRow, SelectionZone } from 'office-ui-fabric-react/lib/DetailsList';
+import { DetailsList, DetailsListLayoutMode, Selection, SelectionMode, IColumn, IDetailsRowProps, DetailsRow } from 'office-ui-fabric-react/lib/DetailsList';
 import { CommandBar, ICommandBarItemProps } from 'office-ui-fabric-react/lib/CommandBar';
 import { IContextualMenuItem } from 'office-ui-fabric-react/lib/ContextualMenu';
 import { ScrollablePane } from 'office-ui-fabric-react/lib/ScrollablePane';
diff --git a/src/controls/filePicker/controls/FileBrowser/IFileBrowserState.ts b/src/controls/filePicker/controls/FileBrowser/IFileBrowserState.ts
@@ -1,4 +1,4 @@
-import { ViewType } from ".";
+import { ViewType } from "./FileBrowser.types";
 import { IFile } from "../../../../services/FileBrowserService.types";
 import { IColumn } from 'office-ui-fabric-react/lib/DetailsList';
 import { IFilePickerResult } from "../../FilePicker.types";
diff --git a/src/services/FileBrowserService.ts b/src/services/FileBrowserService.ts
@@ -1,7 +1,7 @@
 import { WebPartContext } from "@microsoft/sp-webpart-base";
 import { IFile, FilesQueryResult, ILibrary } from "./FileBrowserService.types";
 import { SPHttpClient } from "@microsoft/sp-http";
-import { GeneralHelper } from "..";
+import { GeneralHelper } from "../common/utilities/GeneralHelper";
 import { ExtensionContext } from "@microsoft/sp-extension-base";
 
 export class FileBrowserService {
diff --git a/src/services/FilesSearchService.ts b/src/services/FilesSearchService.ts
@@ -3,7 +3,7 @@ import { SPHttpClient } from "@microsoft/sp-http";
 import { ISearchResult, BingQuerySearchParams, IRecentFile } from "./FilesSearchService.types";
 import { find } from "office-ui-fabric-react/lib/Utilities";
 import { ExtensionContext } from "@microsoft/sp-extension-base";
-import { GeneralHelper } from "../common/utilities";
+import { GeneralHelper } from "../common/utilities/GeneralHelper";
 
 /**
  * Maximum file size when searching
@@ -145,8 +145,8 @@ export class FilesSearchService {
 
       // Submit the request
       const apiUrl: string = `https://www.bingapis.com/api/v7/images/search?appid=${this.bingAPIKey}&traffictype=Internal_monitor&q=${encodeURIComponent(query)}&count=${maxResults}&aspect=${aspect}&maxFileSize=${maxFileSize}&size=${size}&mkt=en-US&license=${license}`;
-      
-      const searchDataResponse: any = await this.context.httpClient.get(apiUrl, SPHttpClient.configurations.v1, {        
+
+      const searchDataResponse: any = await this.context.httpClient.get(apiUrl, SPHttpClient.configurations.v1, {
         method: 'GET',
         mode: 'cors'
       });
diff --git a/src/services/OneDriveService.ts b/src/services/OneDriveService.ts
@@ -5,7 +5,7 @@ import { SPHttpClient } from '@microsoft/sp-http';
 import { FileBrowserService } from "./FileBrowserService";
 import { FilesQueryResult } from "./FileBrowserService.types";
 import { ExtensionContext } from "@microsoft/sp-extension-base";
-import { GeneralHelper } from "../Utilities";
+import { GeneralHelper } from "../common/utilities/GeneralHelper";
 
 export class OneDriveService extends FileBrowserService {
   protected oneDrivePersonalUrl: string;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { IFilePickerTab } from "..";`
	`1`	`+import { IFilePickerTab } from "../FilePicker.types";`
`2`	`2`	`import { FilesSearchService } from "../../../services/FilesSearchService";`
`3`	`3`
`4`	`4`	`export interface IRecentFilesTabProps extends IFilePickerTab {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-import { IFilePickerTab } from "..";`
	`1`	`+import { IFilePickerTab } from "../FilePicker.types";`
`2`	`2`
`3`	`3`	`export interface IUploadFilePickerTabProps extends IFilePickerTab { }`