feat(OData): add $select and $expand query options

ghiscoding · Nov 20, 2022 · 631434c · 631434c
1 parent c7beced
commit 631434c
Show file tree

Hide file tree

Showing 9 changed files with 1,394 additions and 717 deletions.
diff --git a/package.json b/package.json
@@ -88,12 +88,11 @@
     "@babel/preset-env": "^7.16.5",
     "@babel/preset-react": "^7.16.5",
     "@babel/preset-typescript": "^7.16.5",
-    "@slickgrid-universal/common": "^1.1.0",
-    "@slickgrid-universal/custom-footer-component": "^1.1.1",
-    "@slickgrid-universal/empty-warning-component": "^1.1.1",
-    "@slickgrid-universal/event-pub-sub": "^1.1.1",
-    "@slickgrid-universal/pagination-component": "^1.1.1",
-    "@slickgrid-universal/rxjs-observable": "^1.1.1",
+    "@slickgrid-universal/common": "^1.2.6",
+    "@slickgrid-universal/custom-footer-component": "^1.2.6",
+    "@slickgrid-universal/empty-warning-component": "^1.2.6",
+    "@slickgrid-universal/event-pub-sub": "^1.2.6",
+    "@slickgrid-universal/pagination-component": "^1.2.6",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^11.2.7",
     "@testing-library/user-event": "^13.5.0",
@@ -115,12 +114,12 @@
   },
   "devDependencies": {
     "@popperjs/core": "^2.11.0",
-    "@slickgrid-universal/composite-editor-component": "^1.1.1",
-    "@slickgrid-universal/excel-export": "^1.1.1",
-    "@slickgrid-universal/graphql": "^1.1.1",
-    "@slickgrid-universal/odata": "^1.1.1",
-    "@slickgrid-universal/rxjs-observable": "^1.1.1",
-    "@slickgrid-universal/text-export": "^1.1.1",
+    "@slickgrid-universal/composite-editor-component": "^1.2.6",
+    "@slickgrid-universal/excel-export": "^1.2.6",
+    "@slickgrid-universal/graphql": "^1.2.6",
+    "@slickgrid-universal/odata": "^1.2.6",
+    "@slickgrid-universal/rxjs-observable": "^1.2.6",
+    "@slickgrid-universal/text-export": "^1.2.6",
     "@types/bluebird": "^3.5.36",
     "@types/dompurify": "^2.3.2",
     "@types/flatpickr": "^3.1.2",
@@ -141,7 +140,7 @@
     "clean-webpack-plugin": "^4.0.0",
     "codecov": "^3.8.3",
     "codelyzer": "^6.0.2",
-    "concurrently": "^6.5.1",
+    "concurrently": "^7.0.0",
     "conventional-changelog": "^3.1.24",
     "conventional-changelog-cli": "^2.1.1",
     "copy-webpack-plugin": "^10.2.0",
@@ -153,7 +152,7 @@
     "del-cli": "^4.0.1",
     "duplicate-package-checker-webpack-plugin": "^3.0.0",
     "eslint": "^8.5.0",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "file-loader": "6.2.0",
     "font-awesome": "^4.7.0",
@@ -163,13 +162,13 @@
     "i18next-xhr-backend": "^3.2.2",
     "isomorphic-fetch": "^3.0.0",
     "istanbul-instrumenter-loader": "^3.0.1",
-    "jest": "^27.1.1",
-    "jest-cli": "^27.1.1",
-    "jest-environment-jsdom": "^27.1.1",
+    "jest": "^27.4.7",
+    "jest-cli": "^27.4.7",
+    "jest-environment-jsdom": "^27.4.6",
     "jest-extended": "^0.11.5",
     "jest-junit": "^12.2.0",
     "jsdom-global": "^3.0.2",
-    "mini-css-extract-plugin": "^2.4.5",
+    "mini-css-extract-plugin": "^2.4.6",
     "minimatch": "^3.0.4",
     "moment-mini": "^2.24.0",
     "npm-check": "^4.1.4",
@@ -181,7 +180,8 @@
     "require-dir": "^1.2.0",
     "rimraf": "^3.0.2",
     "run-sequence": "^2.2.1",
-    "sass": "^1.45.1",
+    "rxjs": "^7.5.7",
+    "sass": "^1.46.0",
     "sass-loader": "^12.4.0",
     "standard-version": "^9.3.1",
     "stream-browserify": "^3.0.0",

diff --git a/src/NavBar.tsx b/src/NavBar.tsx
@@ -11,9 +11,9 @@ export class NavBar extends React.Component {
     return (
       <div>
         <nav className="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
-          <a className="navbar-brand ms-2" href="https://github.com/ghiscoding/aurelia-slickgrid">
+          <a className="navbar-brand ms-2" href="https://github.com/ghiscoding/slickgrid-react">
             <i className="fa fa-github"></i>
-            <span>{this.router.title}</span>
+            <span className="ms-2">Slickgrid-React</span>
           </a>
           <button className="navbar-toggler" type="button" data-bs-toggle="collapse" data-target="#navbarContent"
             aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
@@ -23,19 +23,19 @@ export class NavBar extends React.Component {
           <div className="navbar-collapse collapse" id="navbarContent">
             <ul className="navbar-nav mr-auto">
               <li>
-                <div className="github-button-container"></div>
+                <div className="github-button-container" style={{ height: '40px' }}>
+                  <a href="https://github.com/ghiscoding/slickgrid-react">
+                    <img src="https://img.shields.io/github/stars/ghiscoding/slickgrid-react?style=social" />
+                  </a>
+                </div>
               </li>
               {
-                this.router.navigation.map(row =>
+                this.router.navigation.map((row: any) =>
                   <li className={`nav-item ${row.isActive ? 'active' : ''}`}>
                     <a className="nav-link" href="row.href">{row.title}</a>
                   </li>
                 )
-              }
-              <li className="nav-item">
-                <a className="nav-link" href="https://ghiscoding.github.io/Aurelia-Bootstrap-Plugins/"
-                  target="_blank">Aurelia-Bootstrap-Plugins</a>
-              </li>
+              }              
             </ul>
             <ul className="nav navbar-nav navbar-right">
               {