pnpjs v2

Author: AJIXuMuK

package-lock.json

@@ -26,10 +26,7 @@
     "@microsoft/sp-lodash-subset": "1.11.0",
     "@microsoft/sp-office-ui-fabric-core": "1.11.0",
     "@microsoft/sp-webpart-base": "1.11.0",
-    "@pnp/common": "1.0.1",
-    "@pnp/logging": "1.0.1",
-    "@pnp/odata": "1.0.1",
-    "@pnp/sp": "1.0.1",
+    "@pnp/sp": "2.0.6",
     "@pnp/telemetry-js": "2.0.0",
     "chart.js": "2.7.3",
     "color": "^3.1.2",

package.json

@@ -5,10 +5,18 @@ import * as Constants from '../Constants';
 import { ListItemAccessor } from '@microsoft/sp-listview-extensibility';
 import { SPField } from '@microsoft/sp-page-context';
 import { sp } from '@pnp/sp';
+import '@pnp/sp/fields';
 import { SPHttpClient } from '@microsoft/sp-http';
+import { IFieldInfo } from '@pnp/sp/fields';
+import '@pnp/sp/site-users/web';
 
 declare var window: any;
 
+interface IFieldLookupInfo extends IFieldInfo {
+  LookupWebId: string;
+  LookupList: string;
+}
+
 /**
  * Helper class to work with SharePoint objects and entities
  */
@@ -231,7 +239,7 @@ export class SPHelper {
             sp.setup({
                 spfxContext: context
             });
-            sp.web.lists.getByTitle(context.pageContext.list.title).fields.getById(fieldId).select('LookupWebId', 'LookupList').get().then(f => {
+            sp.web.lists.getByTitle(context.pageContext.list.title).fields.getById(fieldId).select('LookupWebId', 'LookupList').get().then((f: IFieldLookupInfo) => {
                 sp.site.openWebById(f.LookupWebId).then(openedWeb => {
                     openedWeb.web.select('Url').get().then(w => {
                         field.LookupDisplayUrl = `${w.Url}/_layouts/15/listform.aspx?PageType=4&ListId=${f.LookupList}`;
@@ -389,4 +397,4 @@ export class SPHelper {
 
         return null;
     }
-}
+}

src/common/utilities/SPHelper.ts

@@ -2,7 +2,11 @@ import { ServiceKey, ServiceScope } from "@microsoft/sp-core-library";
 import { PageContext } from "@microsoft/sp-page-context";
 import { IFolderExplorerService } from "./IFolderExplorerService";
 import { IFolder } from "./IFolderExplorerService";
-import { sp, Web, List, FolderAddResult } from "@pnp/sp";
+import { sp } from "@pnp/sp";
+import "@pnp/sp/webs";
+import { Web } from "@pnp/sp/webs";
+import "@pnp/sp/folders";
+import { IFolderAddResult } from "@pnp/sp/folders";
 
 export class FolderExplorerService implements IFolderExplorerService {
 
@@ -36,7 +40,7 @@ export class FolderExplorerService implements IFolderExplorerService {
   private _getDocumentLibraries = async (webAbsoluteUrl: string): Promise<IFolder[]> => {
     let results: IFolder[] = [];
     try {
-      const web = new Web(webAbsoluteUrl);
+      const web = Web(webAbsoluteUrl);
       const libraries: any[] = await web.lists.filter('BaseTemplate eq 101 and Hidden eq false').expand('RootFolder').select('Title', 'RootFolder/ServerRelativeUrl').orderBy('Title').get();
 
       results = libraries.map((library): IFolder => {
@@ -66,7 +70,7 @@ export class FolderExplorerService implements IFolderExplorerService {
   private _getFolders = async (webAbsoluteUrl: string, folderRelativeUrl: string): Promise<IFolder[]> => {
     let results: IFolder[] = [];
     try {
-      const web = new Web(webAbsoluteUrl);
+      const web = Web(webAbsoluteUrl);
       let foldersResult: IFolder[] = await web.getFolderByServerRelativeUrl(folderRelativeUrl).folders.select('Name', 'ServerRelativeUrl').orderBy('Name').get();
       results = foldersResult.filter(f => f.Name != "Forms");
     } catch (error) {
@@ -94,8 +98,8 @@ export class FolderExplorerService implements IFolderExplorerService {
   private _addFolder = async (webAbsoluteUrl: string, folderRelativeUrl: string, name: string): Promise<IFolder> => {
     let folder: IFolder = null;
     try {
-      const web = new Web(webAbsoluteUrl);
-      let folderAddResult: FolderAddResult = await web.getFolderByServerRelativeUrl(folderRelativeUrl).folders.add(name);
+      const web = Web(webAbsoluteUrl);
+      let folderAddResult: IFolderAddResult = await web.getFolderByServerRelativeUrl(folderRelativeUrl).folders.add(name);
       if (folderAddResult && folderAddResult.data) {
         folder = {
           Name: folderAddResult.data.Name,

src/services/FolderExplorerService.ts

@@ -3,7 +3,6 @@ import { ISPLists } from "../common/SPEntities";
 import { WebPartContext } from "@microsoft/sp-webpart-base";
 import { ExtensionContext } from "@microsoft/sp-extension-base";
 import { SPHttpClient, SPHttpClientResponse, ISPHttpClientOptions } from "@microsoft/sp-http";
-import { sp, Web } from '@pnp/sp';
 
 export default class SPService implements ISPService {
 
@@ -50,7 +49,7 @@ export default class SPService implements ISPService {
   public async getListItems(filterText: string, listId: string, internalColumnName: string, keyInternalColumnName?: string, webUrl?: string, filter?: string, substringSearch: boolean = false ): Promise<any[]> {
     let returnItems: any[];
     const filterStr = substringSearch ? // JJ - 20200613 - find by substring as an option
-                        `substringof('${encodeURIComponent(filterText.replace("'","''"))}',${internalColumnName})${filter ? ' and ' + filter : ''}` 
+                        `substringof('${encodeURIComponent(filterText.replace("'","''"))}',${internalColumnName})${filter ? ' and ' + filter : ''}`
                         : `startswith(${internalColumnName},'${encodeURIComponent(filterText.replace("'","''"))}')${filter ? ' and ' + filter : ''}`; //string = filterList  ? `and ${filterList}` : '';
     try {
       const webAbsoluteUrl = !webUrl ? this._context.pageContext.web.absoluteUrl : webUrl;