Skip to content

Commit 629cec2

Browse files
author
Vivek Vishal
authored
Merge branch 'master' into fix-academy
2 parents 28e2f09 + 45ddb67 commit 629cec2

File tree

149 files changed

+8386
-13373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+8386
-13373
lines changed

.github/workflows/bump-meshery-version.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
token: ${{ secrets.RELEASEDRAFTER_PAT }}
3535
- uses: actions/setup-node@v4
3636
with:
37-
node-version: 18
37+
node-version: '20.x'
3838
cache: "npm"
3939
cache-dependency-path: '**/package-lock.json'
4040
- name: Make changes to pull request
@@ -57,7 +57,7 @@ jobs:
5757
ui/package-lock.json
5858
body: |
5959
Update to Sistent v${{ needs.versions-check.outputs.current }}
60-
60+
6161
_This pull request has been auto-generated by [l5io](http://github.com/l5io)_
6262
assignees: l5io
6363
draft: false
@@ -73,7 +73,7 @@ jobs:
7373
token: ${{ secrets.RELEASEDRAFTER_PAT }}
7474
- uses: actions/setup-node@v4
7575
with:
76-
node-version: 18
76+
node-version: '20.x'
7777
cache: "npm"
7878
cache-dependency-path: '**/package-lock.json'
7979
- name: Make changes to pull request
@@ -96,7 +96,7 @@ jobs:
9696
meshmap/package-lock.json
9797
body: |
9898
Update to Sistent v${{ needs.versions-check.outputs.current }}
99-
99+
100100
_This pull request has been auto-generated by [l5io](http://github.com/l5io)_
101101
assignees: l5io
102102
draft: false
@@ -112,7 +112,7 @@ jobs:
112112
token: ${{ secrets.RELEASEDRAFTER_PAT }}
113113
- uses: actions/setup-node@v4
114114
with:
115-
node-version: 18
115+
node-version: '20.x'
116116
cache: "npm"
117117
cache-dependency-path: '**/package-lock.json'
118118
- name: Make changes to pull request
@@ -134,7 +134,7 @@ jobs:
134134
package-lock.json
135135
body: |
136136
Update to Sistent v${{ needs.versions-check.outputs.current }}
137-
137+
138138
_This pull request has been auto-generated by [l5io](http://github.com/l5io)_
139139
assignees: l5io
140140
draft: false
@@ -150,7 +150,7 @@ jobs:
150150
token: ${{ secrets.RELEASEDRAFTER_PAT }}
151151
- uses: actions/setup-node@v4
152152
with:
153-
node-version: 18
153+
node-version: '20.x'
154154
cache: "npm"
155155
cache-dependency-path: '**/package-lock.json'
156156
- name: Make changes to pull request
@@ -173,7 +173,7 @@ jobs:
173173
ui/package-lock.json
174174
body: |
175175
Update to Sistent v${{ needs.versions-check.outputs.current }}
176-
176+
177177
_This pull request has been auto-generated by [l5io](http://github.com/l5io)_
178178
assignees: l5io
179179
draft: false

.github/workflows/node-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
node-version: [16, 18, 20]
18+
node-version: [18, 20]
1919
steps:
2020
- name: Checkout Repository
2121
uses: actions/checkout@v4

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
types: [published]
99
env:
1010
HUSKY: 0
11-
11+
1212
jobs:
1313
build:
1414
runs-on: ubuntu-latest
@@ -17,7 +17,7 @@ jobs:
1717

1818
- uses: actions/setup-node@v3
1919
with:
20-
node-version: 18
20+
node-version: '20.x'
2121

2222
publish-gpr:
2323
needs: build
@@ -35,15 +35,15 @@ jobs:
3535

3636
- uses: actions/setup-node@v3
3737
with:
38-
node-version: 18
38+
node-version: '20.x'
3939
registry-url: "https://registry.npmjs.org"
4040
scope: "@layer5"
4141
- run: |
4242
npm install
4343
npm run build
4444
npm publish --verbose
4545
env:
46-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
46+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
4747
versions-check:
4848
needs: publish-gpr
4949
runs-on: ubuntu-latest

CONTRIBUTING-gitflow.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ While this isn't an absolutely necessary step, if you plan on doing anything mor
1414
## Add 'upstream' repo to list of remotes
1515

1616
```
17-
git remote add upstream https://github.com/layer5io/meshery.git
17+
git remote add upstream https://github.com/layer5io/sistent.git
1818
```
1919

20-
("meshery" is used as the example repo. Be sure to reference the _actual_ repo you're contributing to e.g. "meshery-linkerd").
20+
Note: Replace "sistent" with the actual repository name if contributing to a different project under Layer5, such as "docs"
2121

2222
## Verify the new remote named 'upstream'
2323

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ build:
6767

6868
```
6969
attach sistent to your project:
70-
npm install [path to sistent repo ]
70+
npm install <path-to-sistent-on-local-machine>
7171
```
7272

7373
> [!NOTE]

examples/next-12/components/ResponsiveDataTable/ResponsiveDataTable.jsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export function ResponsiveDataTable({ data, columns, options = {}, ...props }) {
1313
year: 'numeric'
1414
};
1515

16-
return new Intl.DateTimeFormat('un-US', dateOptions).format(date);
16+
return new Intl.DateTimeFormat('en-US', dateOptions).format(date);
1717
};
1818

1919
const updatedOptions = {
@@ -37,14 +37,21 @@ export function ResponsiveDataTable({ data, columns, options = {}, ...props }) {
3737
break;
3838
}
3939
}
40-
}
40+
},
41+
filter: true,
42+
sort: true,
43+
responsive: 'standard',
44+
serverSide: false,
4145
};
4246

4347
useEffect(() => {
4448
columns?.forEach((col) => {
4549
if (!col.options) {
4650
col.options = {};
4751
}
52+
53+
col.options.sort = true;
54+
col.options.filter = true;
4855
col.options.display = columnVisibility[col.name];
4956

5057
if (

0 commit comments

Comments
 (0)