Merge pull request #446 from syncfusion-content/888907-conflict

888907: Resolved the conflict issues

Author: Mydeensn

ej2-react-toc.html

@@ -896,6 +896,7 @@
 <li><a href="/ej2-react/document-editor/dialog">Dialog</a></li>
 <li><a href="/ej2-react/document-editor/right-to-left">RTL</a></li>
 <li><a href="/ej2-react/document-editor/chart">Chart</a></li>
+<li><a href="/ej2-react/document-editor/content-control">Content Control</a></li>
 <li><a href="/ej2-react/document-editor/restrict-editing">Restrict Editing</a></li>
 <li><a href="/ej2-react/document-editor/spell-check">SpellCheck</a></li>
 <li><a href="/ej2-react/document-editor/global-local">Globalization</a></li>
@@ -2623,7 +2624,7 @@
     <li><a href="https://ej2.syncfusion.com/react/documentation/api/tooltip/">API Reference</a></li>
     </ul>
  </li><li>
-TreeGrid
+    <a href="/ej2-react/treegrid/overview">TreeGrid</a>
 <ul>
 <li>Getting Started
 <ul>
@@ -2897,8 +2898,7 @@
 </ul>
 </li> <li>Release Notes
                 <ul>
-				<li>2024 Volume 2 - 26.*<ul><li><a href="/ej2-react/release-notes/26.1.35">26.1.35 Main Release</a></li></ul></li>
-				<li>2024 Volume 1 - 25.*<ul><li>Weekly Release<ul><li><a href="/ej2-react/release-notes/25.2.7">25.2.7</a></li><li><a href="/ej2-react/release-notes/25.2.6">25.2.6</a></li><li><a href="/ej2-react/release-notes/25.2.5">25.2.5</a></li><li><a href="/ej2-react/release-notes/25.2.4">25.2.4</a></li><li><a href="/ej2-react/release-notes/25.1.42">25.1.42</a></li><li><a href="/ej2-react/release-notes/25.1.41">25.1.41</a></li><li><a href="/ej2-react/release-notes/25.1.40">25.1.40</a></li><li><a href="/ej2-react/release-notes/25.1.39">25.1.39</a></li><li><a href="/ej2-react/release-notes/25.1.38">25.1.38</a></li><li><a href="/ej2-react/release-notes/25.1.37">25.1.37</a></li></ul></li><li><a href="/ej2-react/release-notes/25.2.3">25.2.3 Service Pack Release</a></li><li><a href="/ej2-react/release-notes/25.1.35">25.1.35 Main Release</a></li></ul></li>
+				<li>2024 Volume 2 - 26.*<ul><li><a href="/ej2-react/release-notes/26.1.35">26.1.35 Main Release</a></li></ul></li><li>2024 Volume 1 - 25.*<ul><li>Weekly Release<ul><li><a href="/ej2-react/release-notes/25.2.7">25.2.7</a></li><li><a href="/ej2-react/release-notes/25.2.6">25.2.6</a></li><li><a href="/ej2-react/release-notes/25.2.5">25.2.5</a></li><li><a href="/ej2-react/release-notes/25.2.4">25.2.4</a></li><li><a href="/ej2-react/release-notes/25.1.42">25.1.42</a></li><li><a href="/ej2-react/release-notes/25.1.41">25.1.41</a></li><li><a href="/ej2-react/release-notes/25.1.40">25.1.40</a></li><li><a href="/ej2-react/release-notes/25.1.39">25.1.39</a></li><li><a href="/ej2-react/release-notes/25.1.38">25.1.38</a></li><li><a href="/ej2-react/release-notes/25.1.37">25.1.37</a></li></ul></li><li><a href="/ej2-react/release-notes/25.2.3">25.2.3 Service Pack Release</a></li><li><a href="/ej2-react/release-notes/25.1.35">25.1.35 Main Release</a></li></ul></li>
 				<li>2023 Volume 4 - 24.*<ul><li>Weekly Release<ul><li><a href="/ej2-react/release-notes/24.2.9">24.2.9</a></li><li><a href="/ej2-react/release-notes/24.2.8">24.2.8</a></li><li><a href="/ej2-react/release-notes/24.2.7">24.2.7</a></li><li><a href="/ej2-react/release-notes/24.2.6">24.2.6</a></li><li><a href="/ej2-react/release-notes/24.2.5">24.2.5</a></li><li><a href="/ej2-react/release-notes/24.2.4">24.2.4</a></li><li><a href="/ej2-react/release-notes/24.1.47">24.1.47</a></li><li><a href="/ej2-react/release-notes/24.1.46">24.1.46</a></li><li><a href="/ej2-react/release-notes/24.1.45">24.1.45</a></li><li><a href="/ej2-react/release-notes/24.1.44">24.1.44</a></li><li><a href="/ej2-react/release-notes/24.1.43">24.1.43</a></li></ul></li><li><a href="/ej2-react/release-notes/24.2.3">24.2.3 Service Pack Release</a></li><li><a href="/ej2-react/release-notes/24.1.41">24.1.41 Main Release</a></li></ul></li>
 				<li>2023 Volume 3 - 23.*<ul><li> Weekly Release<ul><li><a href="/ej2-react/release-notes/23.2.7">23.2.7</a></li><li><a href="/ej2-react/release-notes/23.2.6">23.2.6</a></li><li><a href="/ej2-react/release-notes/23.2.5">23.2.5</a></li><li><a href="/ej2-react/release-notes/23.1.44">23.1.44</a></li><li><a href="/ej2-react/release-notes/23.1.43">23.1.43</a></li><li><a href="/ej2-react/release-notes/23.1.42">23.1.42</a></li><li><a href="/ej2-react/release-notes/23.1.41">23.1.41</a></li><li><a href="/ej2-react/release-notes/23.1.40">23.1.40</a></li><li><a href="/ej2-react/release-notes/23.1.39">23.1.39</a></li><li><a href="/ej2-react/release-notes/23.1.38">23.1.38</a></li></ul></li><li><a href="/ej2-react/release-notes/23.2.4">23.2.4 Service Pack Release</a></li><li><a href="/ej2-react/release-notes/23.1.36">23.1.36 Main Release</a></li></ul></li>
 				<li>2023 Volume 2 - 22.*

ej2-react/code-snippet/pivot-table/getting-started-cs1/app/datasource.jsx

@@ -544,4 +544,83 @@ public IActionResult Delete(int key)
 }
 ```
 
-![ODataV4Adaptor-Delete-record](../images/odatav4-adaptor-delete-record.png)
+![ODataV4Adaptor-Delete-record](../images/odatav4-adaptor-delete-record.png)
+
+## Odata with custom url
+
+The Syncfusion ODataV4 adaptor extends support for calling customized URLs to accommodate data retrieval and CRUD actions as per your application's requirements. However, when utilizing a custom URL with the ODataV4 adaptor, it's essential to modify the routing configurations in your application's route configuration file to align with your custom URL. You can invoke the custom URL by the following methods in the Datamanager
+
+**Configuring Custom URLs**
+
+To work with custom URLs for CRUD operations in the Syncfusion Grid, you can use the following properties:
+
+* insertUrl: Specifies the custom URL for inserting new records.
+* removeUrl: Specifies the custom URL for deleting records.
+* updateUrl: Specifies the custom URL for updating records.
+* batchUrl: Specifies the custom URL for batch editing operations.
+
+> Ensure that the routing configurations on the server-side are properly updated to handle these custom URLs.
+
+The following code example describes the above behavior.
+
+{% tabs %}
+{% highlight ts tabtitle="App.tsx" %}
+import { ColumnDirective, ColumnsDirective, GridComponent, ToolbarItems, EditSettingsModel, Toolbar, Edit, Inject } from '@syncfusion/ej2-react-grids';
+import { DataManager, ODataV4Adaptor } from '@syncfusion/ej2-data';
+
+function App() {
+    const data = new DataManager({ 
+      url: 'https://localhost:xxxx/odata/Orders', // xxxx denotes port number
+      updateUrl: 'https://localhost:xxxx/odata/Orders/Update', // custom URL to update the record
+      insertUrl: 'https://localhost:xxxx/odata/Orders/Insert', // custom URL to insert new record
+      removeUrl: 'https://localhost:xxxx/odata/Orders/Delete', // custom URL to delete the record
+      adaptor: new ODataV4Adaptor()
+    });
+    const editSettings: EditSettingsModel = { allowEditing: true, allowAdding: true, allowDeleting: true, mode: 'Normal' };
+    const toolbar: ToolbarItems[] = ['Add', 'Edit', 'Delete', 'Update', 'Cancel', 'Search'];
+    const orderIDRules: object = {required: true};
+    const customerIDRules: object = {required: true, minLength: 3};
+    return <GridComponent dataSource={data} editSettings={editSettings} toolbar={toolbar} height={320}>
+        <ColumnsDirective>
+            <ColumnDirective field='OrderID' headerText='Order ID' isPrimaryKey={true} width='150' textAlign='Right' validationRules={orderIDRules}></ColumnDirective>
+            <ColumnDirective field='CustomerID' headerText='Customer ID' width='150' validationRules={customerIDRules}></ColumnDirective>
+            <ColumnDirective field='EmployeeID' headerText='Employee ID' width='150'/>
+            <ColumnDirective field='ShipCountry' headerText='Ship Country' width='150'/>
+        </ColumnsDirective>
+        <Inject services={[Toolbar,Edit]} />
+    </GridComponent>
+};
+export default App;
+{% endhighlight %}
+{% endtabs %}
+
+For batch editing, you can specify a custom batch URL as follows:
+
+{% tabs %}
+{% highlight ts tabtitle="App.tsx" %}
+import { ColumnDirective, ColumnsDirective, GridComponent, ToolbarItems, EditSettingsModel, Toolbar, Edit, Inject } from '@syncfusion/ej2-react-grids';
+import { DataManager, ODataV4Adaptor } from '@syncfusion/ej2-data';
+
+function App() {
+    const data = new DataManager({ 
+      url: 'https://localhost:xxxx/odata/Orders', // xxxx denotes port number
+      BatchUrl: 'https://localhost:xxxx/odata/Orders/BatchUpdate', // custom URL for batch update
+      adaptor: new ODataV4Adaptor()
+    });
+    const editSettings: EditSettingsModel = { allowEditing: true, allowAdding: true, allowDeleting: true, mode: 'Batch' };
+    const toolbar: ToolbarItems[] = ['Add', 'Edit', 'Delete', 'Update', 'Cancel', 'Search'];
+    const orderIDRules: object = {required: true};
+    const customerIDRules: object = {required: true, minLength: 3};
+    return <GridComponent dataSource={data} editSettings={editSettings} toolbar={toolbar} height={320}>
+        <ColumnsDirective>
+            <ColumnDirective field='OrderID' headerText='Order ID' isPrimaryKey={true} width='150' textAlign='Right' validationRules={orderIDRules}></ColumnDirective>
+            <ColumnDirective field='CustomerID' headerText='Customer ID' width='150' validationRules={customerIDRules}></ColumnDirective>
+            <ColumnDirective field='EmployeeID' headerText='Employee ID' width='150'/>
+            <ColumnDirective field='ShipCountry' headerText='Ship Country' width='150'/>
+        </ColumnsDirective>
+        <Inject services={[Toolbar,Edit]} />
+    </GridComponent>
+};
+export default App;
+{% endhighlight %}
+{% endtabs %}