Merge pull request #2997 from bcameron1231/v4-dataRemoval

Removing Data from Add/Updates

docs/concepts/batching.md

@@ -251,7 +251,7 @@ let newItems: IItem[] = [];
 
 for(let i=0; i<res.length; i++){
     //This line will correctly resolve
-    const newItem = await res[i].item.select("Title")<{Title: string}>();
+    const newItem = await res[i].select("Title")<{Title: string}>();
     newItems.push(newItem);
 }
 ```

docs/graph/calendars.md

@@ -5,7 +5,7 @@ More information can be found in the official Graph documentation:
 - [Calendar Resource Type](https://docs.microsoft.com/en-us/graph/api/resources/calendar?view=graph-rest-1.0)
 - [Event Resource Type](https://docs.microsoft.com/en-us/graph/api/resources/event?view=graph-rest-1.0)
 
-## ICalendar, ICalendars, ICalendarGroup, ICalendarGroups, ICalendarPermission, ICalendarPermissions, ICalendarView, IEvent, IEvents, IEventAddResult, IForwardEvent, IGetScheduleRequest
+## ICalendar, ICalendars, ICalendarGroup, ICalendarGroups, ICalendarPermission, ICalendarPermissions, ICalendarView, IEvent, IEvents, IForwardEvent, IGetScheduleRequest
 
 [![Invokable Banner](https://img.shields.io/badge/Invokable-informational.svg)](../concepts/invokable.md) [![Selective Imports Banner](https://img.shields.io/badge/Selective%20Imports-informational.svg)](../concepts/selective-imports.md)  
 

docs/graph/items.md

@@ -4,7 +4,7 @@ More information can be found in the official Graph documentation:
 
 - [List Item Resource Type](https://docs.microsoft.com/en-us/graph/api/resources/listitem?view=graph-rest-1.0)
 
-## IListItems, IListItem, IListItemAddResult, IDocumentSetVersion, IDocumentSetVersions IDocumentSetVersionAddResult,
+## IListItems, IListItem, IDocumentSetVersion, IDocumentSetVersions IDocumentSetVersionAddResult,
 [![Selective Imports Banner](https://img.shields.io/badge/Selective%20Imports-informational.svg)](../concepts/selective-imports.md)  
 
 ### Get list items

docs/sp/clientside-pages.md

@@ -927,7 +927,7 @@ const far = await sp.web.getFolderByServerRelativePath("/sites/dev/Shared Docume
 const page = await sp.web.addClientsidePage("MyPage", "Page Title");
 
 // set the banner image
-page.setBannerImage(far.data.ServerRelativeUrl);
+page.setBannerImage(far.ServerRelativeUrl);
 
 // publish the page
 await page.save();

docs/sp/folders.md

@@ -476,7 +476,7 @@ import "@pnp/sp/lists";
 const sp = spfi(...);
 
 const newFolderResult = await sp.web.rootFolder.folders.getByUrl("Shared Documents").folders.addUsingPath("My New Folder");
-const item = await newFolderResult.folder.listItemAllFields();
+const item = await sp.web.rootFolder.folders.getByUrl("Shared Documents").folders.getByUrl(newFolderResult.Name).listItemAllFields();
 
 await sp.web.lists.getByTitle("Documents").items.getById(item.ID).update({
     ContentTypeId: "0x0120001E76ED75A3E3F3408811F0BF56C4CDDD",

docs/sp/items.md

@@ -480,7 +480,7 @@ const newItem = await sp.web.lists.getByTitle("TestList").items.add({
 const updateVal = {};
 updateVal[fields[0].InternalName] = "-1;#New Term|bb046161-49cc-41bd-a459-5667175920d4;#-1;#New 2|0069972e-67f1-4c5e-99b6-24ac5c90b7c9";
 // execute the update call
-await newItem.item.update(updateVal);
+await sp.web.lists.getByTitle("TestList").items.getById(newItem.Id).update(updateVal);
 ```
 
 ### Update BCS Field

docs/sp/lists.md

@@ -63,7 +63,7 @@ const sp = spfi(...);
 const listAddResult = await sp.web.lists.add("My new list");
 
 // we can work with the list created using the IListAddResult.list property:
-const r = await listAddResult.list.select("Title")();
+const r = await sp.web.lists.getByTitle(listAddResult.list.select("Title")();
 
 // log newly created list title to console
 console.log(r.Title);
@@ -457,7 +457,7 @@ import "@pnp/sp/lists";
 
 const sp = spfi(...);
 const fld = await sp.site.rootWeb.fields.addText("MyField");
-await sp.web.lists.getByTitle("MyList").fields.createFieldAsXml(fld.data.SchemaXml);
+await sp.web.lists.getByTitle("MyList").fields.createFieldAsXml(fld.SchemaXml);
 ```
 
 ### folders

docs/sp/navigation.md

@@ -98,10 +98,6 @@ import "@pnp/sp/navigation";
 
 const result = await nav.add("Node Title", "/sites/dev/pages/mypage.aspx", true);
 
-const nodeDataRaw = result.data;
-
-// request the data from the created node
-const nodeData = result.node();
 ```
 
 ### moveAfter
@@ -113,10 +109,8 @@ import "@pnp/sp/navigation";
 
 const node1result = await nav.add(`Testing - ${getRandomString(4)} (1)`, url, true);
 const node2result = await nav.add(`Testing - ${getRandomString(4)} (2)`, url, true);
-const node1 = await node1result.node();
-const node2 = await node2result.node();
 
-await nav.moveAfter(node1.Id, node2.Id);
+await nav.moveAfter(node1result.Id, node2result.Id);
 ```
 
 ### Delete
@@ -129,14 +123,14 @@ import "@pnp/sp/navigation";
 const node1result = await nav.add(`Testing - ${getRandomString(4)}`, url, true);
 let nodes = await nav();
 // check we added a node
-let index = nodes.findIndex(n => n.Id === node1result.data.Id)
+let index = nodes.findIndex(n => n.Id === node1result.Id)
 // index >= 0
 
 // delete a node
-await nav.getById(node1result.data.Id).delete();
+await nav.getById(node1result.Id).delete();
 
 nodes = await nav();
-index = nodes.findIndex(n => n.Id === node1result.data.Id)
+index = nodes.findIndex(n => n.Id === node1result.Id)
 // index = -1
 ```
 

docs/sp/site-users.md

@@ -90,7 +90,7 @@ const sp = spfi(...);
 const user = await sp.web.ensureUser("userLoginname")
 const users = await sp.web.siteUsers;
 
-await users.add(user.data.LoginName);
+await users.add(user.LoginName);
 ```
 
 ### Get user by Id, Email, or LoginName

packages/graph/calendars/index.ts

@@ -20,7 +20,6 @@ export {
     ICalendarView,
     IEvent,
     IEvents,
-    IEventAddResult,
     IForwardEvent,
     IGetScheduleRequest,
 } from "./types.js";

packages/graph/calendars/types.ts

@@ -167,14 +167,6 @@ export class _CalendarPermissions extends _GraphCollection<ICalendarPermissionTy
 export interface ICalendarPermissions extends _CalendarPermissions, IGetById<ICalendarPermission>, IAddable<ICalendarPermissionType, ICalendarPermissionType> { }
 export const CalendarPermissions = graphInvokableFactory<ICalendarPermissions>(_CalendarPermissions);
 
-/**
- * EventAddResult
- */
-export interface IEventAddResult {
-    data: IEventType;
-    event: IEvent;
-}
-
 export interface IForwardEvent {
     Comment?: string;
     ToRecipients: Recipient[];

packages/graph/columns/addColumns.ts

@@ -1,4 +1,3 @@
-import { IColumn } from "./types.js";
 import { graphPost } from "../graphqueryable.js";
 import { body } from "@pnp/queryable";
 import {
@@ -10,19 +9,6 @@ import {
  *
  * @param column  a JSON representation of a Column object.
  */
-export const addColumn = async function(column: IColumnDefinition): Promise<IColumnAddResult> {
-    const data = await graphPost(this, body(column));
-
-    return {
-        data,
-        column: (<any>this).getById(data.id),
-    };
+export const addColumn = async function(column: IColumnDefinition): Promise<IColumnDefinition> {
+    return graphPost(this, body(column));
 };
-
-/**
-* IColumnAddResult
-*/
-export interface IColumnAddResult {
-    column: IColumn;
-    data: IColumnDefinition;
-}

packages/graph/columns/content-types.ts

@@ -2,15 +2,17 @@ import { addProp, body } from "@pnp/queryable";
 import { graphPost } from "../graphqueryable.js";
 import { _ContentType } from "../content-types/types.js";
 import { Columns, IColumns,IColumn, _Columns } from "./types.js";
-import { IColumnAddResult } from "./addColumns.js";
+import {
+    ColumnDefinition as IColumnDefinition,
+} from "@microsoft/microsoft-graph-types";
 
 declare module "./types" {
     interface _Columns {
-        addRef(siteColumn: IColumn): Promise<IColumnAddResult>;
+        addRef(siteColumn: IColumn): Promise<IColumnDefinition>;
     }
 
     interface IColumns {
-        addRef(siteColumn: IColumn): Promise<IColumnAddResult>;
+        addRef(siteColumn: IColumn): Promise<IColumnDefinition>;
     }
 }
 
@@ -20,14 +22,9 @@ declare module "./types" {
  *
  * @param siteColumn the site column to add.
  */
-_Columns.prototype.addRef = async function(siteColumn: IColumn): Promise<IColumnAddResult> {
+_Columns.prototype.addRef = async function(siteColumn: IColumn): Promise<IColumnDefinition> {
     const postBody = { "[email protected]": `https://graph.microsoft.com/v1.0/${siteColumn.toUrl()}`};
-    const data = await graphPost(this, body(postBody));
-
-    return {
-        data,
-        column: (<any>this).getById(data.id),
-    };
+    return graphPost(this, body(postBody));
 };
 
 declare module "../content-types/types" {

packages/graph/columns/index.ts

@@ -2,10 +2,6 @@ import "./lists.js";
 import "./sites.js";
 import "./content-types.js";
 
-export {
-    IColumnAddResult,
-} from "./addColumns.js";
-
 export {
     Columns,
     IColumns,

packages/graph/columns/lists.ts

@@ -1,6 +1,6 @@
 import { addProp } from "@pnp/queryable";
 import { _List } from "../lists/types.js";
-import { addColumn, IColumnAddResult } from "./addColumns.js";
+import { addColumn } from "./addColumns.js";
 import { Columns, IColumns, _Columns } from "./types.js";
 import {
     ColumnDefinition as IColumnDefinition,
@@ -9,11 +9,11 @@ import {
 
 declare module "./types" {
     interface _Columns {
-        add(column: IColumnDefinition): Promise<IColumnAddResult>;
+        add(column: IColumnDefinition): Promise<IColumnDefinition>;
     }
 
     interface IColumns {
-        add(column: IColumnDefinition): Promise<IColumnAddResult>;
+        add(column: IColumnDefinition): Promise<IColumnDefinition>;
     }
 }
 

packages/graph/columns/sites.ts

@@ -1,5 +1,5 @@
 import { addProp } from "@pnp/queryable";
-import { addColumn, IColumnAddResult } from "./addColumns.js";
+import { addColumn } from "./addColumns.js";
 import { Columns, IColumns, _Columns } from "./types.js";
 import {
     ColumnDefinition as IColumnDefinition,
@@ -8,11 +8,11 @@ import { _Site } from "../sites/types.js";
 
 declare module "./types" {
     interface _Columns {
-        add(column: IColumnDefinition): Promise<IColumnAddResult>;
+        add(column: IColumnDefinition): Promise<IColumnDefinition>;
     }
 
     interface IColumns {
-        add(column: IColumnDefinition): Promise<IColumnAddResult>;
+        add(column: IColumnDefinition): Promise<IColumnDefinition>;
     }
 }
 

packages/graph/contacts/index.ts

@@ -2,9 +2,7 @@ import "./users.js";
 
 export {
     Contact,
-    IContactAddResult,
     ContactFolder,
-    IContactFolderAddResult,
     ContactFolders,
     Contacts,
     IContact,

packages/graph/contacts/types.ts

@@ -33,7 +33,7 @@ export class _Contacts extends _GraphCollection<IContactType[]> {
         surName: string,
         emailAddresses: IEmailAddressType[],
         businessPhones: string[],
-        additionalProperties: Record<string, any> = {}): Promise<IContactAddResult> {
+        additionalProperties: Record<string, any> = {}): Promise<IContactType> {
 
         const postBody = {
             businessPhones,
@@ -43,12 +43,7 @@ export class _Contacts extends _GraphCollection<IContactType[]> {
             ...additionalProperties,
         };
 
-        const data = await graphPost(this, body(postBody));
-
-        return {
-            contact: (<any>this).getById(data.id),
-            data,
-        };
+        return graphPost(this, body(postBody));
     }
 }
 export interface IContacts extends _Contacts, IGetById<IContact> { }
@@ -90,36 +85,15 @@ export class _ContactFolders extends _GraphCollection<IContactFolderType[]> {
      * @param displayName The folder's display name.
      * @param parentFolderId The ID of the folder's parent folder.
      */
-    public async add(displayName: string, parentFolderId?: string): Promise<IContactFolderAddResult> {
+    public async add(displayName: string, parentFolderId?: string): Promise<IContactFolderType> {
 
         const postBody = {
             displayName: displayName,
             parentFolderId: parentFolderId,
         };
 
-        const data = await graphPost(this, body(postBody));
-
-        return {
-            contactFolder: (<any>this).getById(data.id),
-            data,
-        };
+        return graphPost(this, body(postBody));
     }
 }
 export interface IContactFolders extends _ContactFolders, IGetById<IContactFolder> { }
 export const ContactFolders = graphInvokableFactory<IContactFolders>(_ContactFolders);
-
-/**
- * IContactFolderAddResult
- */
-export interface IContactFolderAddResult {
-    data: IContactFolderType;
-    contactFolder: IContactFolder;
-}
-
-/**
- * IContactAddResult
- */
-export interface IContactAddResult {
-    data: IContactType;
-    contact: IContact;
-}

packages/graph/groups/index.ts

@@ -6,7 +6,6 @@ export {
     GroupType,
     Groups,
     IGroup,
-    IGroupAddResult,
     IGroups,
 } from "./types.js";
 

packages/graph/groups/types.ts

@@ -90,7 +90,7 @@ export class _Groups extends _DirectoryObjects<IGroupType[]> {
      * @param groupType Type of group being created
      * @param additionalProperties A plain object collection of additional properties you want to set on the new group
      */
-    public async add(name: string, mailNickname: string, groupType: GroupType, additionalProperties: Record<string, any> = {}): Promise<IGroupAddResult> {
+    public async add(name: string, mailNickname: string, groupType: GroupType, additionalProperties: Record<string, any> = {}): Promise<IGroupType> {
 
         let postBody = {
             displayName: name,
@@ -109,21 +109,9 @@ export class _Groups extends _DirectoryObjects<IGroupType[]> {
             };
         }
 
-        const data = await graphPost(this, body(postBody));
+        return graphPost(this, body(postBody));
 
-        return {
-            data,
-            group: (<any>this).getById(data.id),
-        };
     }
 }
 export interface IGroups extends _Groups, IGetById<IGroup> { }
 export const Groups = graphInvokableFactory<IGroups>(_Groups);
-
-/**
- * IGroupAddResult
- */
-export interface IGroupAddResult {
-    group: IGroup;
-    data: any;
-}

packages/graph/list-item/index.ts

@@ -6,10 +6,8 @@ export {
     IListItems,
     ListItem,
     IListItem,
-    IListItemAddResult,
     IDocumentSetVersion,
     DocumentSetVersion,
     DocumentSetVersions,
     IDocumentSetVersions,
-    IDocumentSetVersionAddResult,
 } from "./types.js";