Skip to content

Commit c7e4bdc

Browse files
authored
Merge pull request #1593 from pnp/pnp-js-v3
Pnp js v3
2 parents 7d19de9 + cb7d653 commit c7e4bdc

File tree

18 files changed

+940
-709
lines changed

18 files changed

+940
-709
lines changed

package-lock.json

Lines changed: 64 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@microsoft/sp-property-pane": "1.17.3",
4242
"@microsoft/sp-webpart-base": "1.17.3",
4343
"@monaco-editor/loader": "^1.3.1",
44-
"@pnp/sp": "2.5.0",
44+
"@pnp/sp": "^3.16.0",
4545
"@pnp/telemetry-js": "2.0.0",
4646
"@popperjs/core": "2.5.4",
4747
"@uifabric/icons": "7.9.5",

src/common/Interfaces.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { SPHttpClient } from '@microsoft/sp-http';
2+
import { BaseComponentContext } from '@microsoft/sp-component-base';
23
import { PageContext, SPField } from '@microsoft/sp-page-context';
34
import { ListViewAccessor } from "@microsoft/sp-listview-extensibility";
45
import { ISPField } from './SPEntities';
@@ -26,7 +27,7 @@ export interface IFields {
2627
* Parent of all props interfaces that needs context
2728
*/
2829
export interface IProps {
29-
context: IContext;
30+
context: BaseComponentContext;
3031
}
3132

3233
export interface IHubSiteData {

src/common/telemetry/version.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const version: string = "4.0.0";
1+
export const version: string = "4.0.0";

src/common/utilities/FieldRendererHelper.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ import * as React from 'react';
22
import { ISPFieldLookupValue, ITerm, IPrincipal } from '../SPEntities';
33
import { FieldTextRenderer } from '../../controls/fields/fieldTextRenderer/FieldTextRenderer';
44
import { FieldDateRenderer } from '../../controls/fields/fieldDateRenderer/FieldDateRenderer';
5-
import { ListItemAccessor } from '@microsoft/sp-listview-extensibility';
5+
import { FieldCustomizerContext, ListItemAccessor } from '@microsoft/sp-listview-extensibility';
66
import { SPHelper } from './SPHelper';
77
import { FieldTitleRenderer } from '../../controls/fields/fieldTitleRenderer/FieldTitleRenderer';
88
import { SPField } from '@microsoft/sp-page-context';
9-
import { IContext } from '../Interfaces';
109
import { GeneralHelper } from './GeneralHelper';
1110
import { FieldLookupRenderer } from '../../controls/fields/fieldLookupRenderer/FieldLookupRenderer';
1211
import { FieldUrlRenderer } from '../../controls/fields/fieldUrlRenderer/FieldUrlRenderer';
@@ -29,7 +28,7 @@ export class FieldRendererHelper {
2928
* @param listItem Current list item
3029
* @param context Customizer context
3130
*/
32-
public static getFieldRenderer(fieldValue: any, props: IFieldRendererProps, listItem: ListItemAccessor, context: IContext): Promise<JSX.Element> { // eslint-disable-line @typescript-eslint/no-explicit-any
31+
public static getFieldRenderer(fieldValue: any, props: IFieldRendererProps, listItem: ListItemAccessor, context: FieldCustomizerContext): Promise<JSX.Element> { // eslint-disable-line @typescript-eslint/no-explicit-any
3332
return new Promise<JSX.Element>(resolve => {
3433
const field: SPField = context.field;
3534
const listId: string = context.pageContext.list.id.toString();

src/common/utilities/PnPJSConfig.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { BaseComponentContext } from "@microsoft/sp-component-base";
2+
3+
// import pnp
4+
import { ISPFXContext, spfi, SPFI, SPFx } from "@pnp/sp";
5+
import "@pnp/sp/webs";
6+
import "@pnp/sp/lists";
7+
import "@pnp/sp/items";
8+
import "@pnp/sp/batching";
9+
10+
// eslint-disable-next-line no-var
11+
let _sp: SPFI = null;
12+
13+
export const getSP = (context?: BaseComponentContext | ISPFXContext, webAbsoluteUrl?: string): SPFI => {
14+
if (!!context) {
15+
_sp = spfi(webAbsoluteUrl).using(SPFx(context));
16+
}
17+
return _sp;
18+
};

0 commit comments

Comments
 (0)