Skip to content

Commit 9ac26ad

Browse files
author
eniko.pusztai
authored
Merge branch 'develop' into feature/webhook_logs
2 parents 0ac8c77 + e0a0fdc commit 9ac26ad

File tree

37 files changed

+2968
-3191
lines changed

37 files changed

+2968
-3191
lines changed

‎apps/sensenet/package.json‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@app/sensenet",
3-
"version": "1.21.0",
3+
"version": "1.22.0",
44
"main": "dist/index.js",
55
"files": [
66
"dist",
@@ -38,41 +38,41 @@
3838
]
3939
},
4040
"devDependencies": {
41-
"@cypress/code-coverage": "^3.9.6",
41+
"@cypress/code-coverage": "^3.9.10",
4242
"@relative-ci/agent": "^2.0.0",
4343
"@types/autosuggest-highlight": "^3.1.1",
44-
"@types/react": "^17.0.11",
45-
"@types/react-autosuggest": "^10.1.4",
46-
"@types/react-dom": "^17.0.7",
47-
"@types/react-responsive": "^8.0.2",
48-
"@types/react-router": "^5.1.15",
49-
"@types/react-router-dom": "^5.1.7",
50-
"@types/react-virtualized": "^9.21.11",
51-
"@types/uuid": "^8.0.1",
44+
"@types/react": "^17.0.15",
45+
"@types/react-autosuggest": "^10.1.5",
46+
"@types/react-dom": "^17.0.9",
47+
"@types/react-responsive": "^8.0.3",
48+
"@types/react-router": "^5.1.16",
49+
"@types/react-router-dom": "^5.1.8",
50+
"@types/react-virtualized": "^9.21.12",
51+
"@types/uuid": "^8.3.1",
5252
"clean-webpack-plugin": "^4.0.0-alpha.0",
53-
"compression-webpack-plugin": "8.0.0",
54-
"copy-webpack-plugin": "^9.0.0",
55-
"css-loader": "^5.2.6",
56-
"css-minimizer-webpack-plugin": "^3.0.1",
57-
"cypress": "^7.5.0",
58-
"cypress-file-upload": "^5.0.6",
53+
"compression-webpack-plugin": "8.0.1",
54+
"copy-webpack-plugin": "^9.0.1",
55+
"css-loader": "^6.2.0",
56+
"css-minimizer-webpack-plugin": "^3.0.2",
57+
"cypress": "7.5.0",
58+
"cypress-file-upload": "^5.0.8",
5959
"cypress-xpath": "^1.6.2",
6060
"file-loader": "^6.1.1",
61-
"fork-ts-checker-webpack-plugin": "^6.2.10",
62-
"html-webpack-plugin": "^5.3.1",
63-
"mini-css-extract-plugin": "^1.5.0",
64-
"monaco-editor-webpack-plugin": "^4.0.0",
61+
"fork-ts-checker-webpack-plugin": "^6.3.1",
62+
"html-webpack-plugin": "^5.3.2",
63+
"mini-css-extract-plugin": "^2.1.0",
64+
"monaco-editor-webpack-plugin": "^4.1.1",
6565
"nyc": "^15.1.0",
6666
"nyc-config-tsx": "^0.1.0",
6767
"react-router": "^5.2.0",
6868
"react-router-dom": "^5.2.0",
6969
"source-map-support": "^0.5.19",
70-
"style-loader": "^2.0.0",
71-
"terser-webpack-plugin": "^5.1.3",
72-
"ts-loader": "^9.2.3",
73-
"ts-node": "^10.0.0",
70+
"style-loader": "^3.2.1",
71+
"terser-webpack-plugin": "^5.1.4",
72+
"ts-loader": "^9.2.4",
73+
"ts-node": "^10.1.0",
7474
"url-loader": "^4.1.1",
75-
"webpack": "^5.38.1",
75+
"webpack": "^5.47.1",
7676
"webpack-bundle-analyzer": "^4.4.1",
7777
"webpack-cli": "^4.7.2",
7878
"webpack-dev-server": "^3.11.2",
@@ -81,30 +81,30 @@
8181
"dependencies": {
8282
"@iconify-icons/logos": "^1.1.10",
8383
"@iconify/react": "^1.1.4",
84-
"@material-ui/core": "^4.11.4",
84+
"@material-ui/core": "~4.11.4",
8585
"@material-ui/icons": "^4.11.2",
86-
"@material-ui/lab": "^4.0.0-alpha.58",
86+
"@material-ui/lab": "4.0.0-alpha.58",
8787
"@sensenet/authentication-oidc-react": "^2.3.1",
88-
"@sensenet/client-core": "^4.0.0",
89-
"@sensenet/client-utils": "^2.1.1",
90-
"@sensenet/controls-react": "^8.0.0",
88+
"@sensenet/client-core": "^4.0.1",
89+
"@sensenet/client-utils": "^2.1.2",
90+
"@sensenet/controls-react": "^8.0.1",
9191
"@sensenet/default-content-types": "^5.0.0",
92-
"@sensenet/document-viewer-react": "^4.2.0",
93-
"@sensenet/hooks-react": "^1.6.1",
92+
"@sensenet/document-viewer-react": "^4.2.1",
93+
"@sensenet/hooks-react": "^1.6.2",
9494
"@sensenet/list-controls-react": "^2.1.1",
95-
"@sensenet/pickers-react": "^2.1.1",
96-
"@sensenet/query": "^2.1.1",
97-
"@sensenet/repository-events": "^2.1.1",
95+
"@sensenet/pickers-react": "^2.1.2",
96+
"@sensenet/query": "^2.1.2",
97+
"@sensenet/repository-events": "^2.1.2",
9898
"autosuggest-highlight": "^3.1.1",
9999
"clsx": "^1.1.1",
100-
"date-fns": "^2.22.1",
101-
"filesize": "^6.3.0",
100+
"date-fns": "^2.23.0",
101+
"filesize": "^7.0.0",
102102
"react": "^16.13.0",
103103
"react-autosuggest": "^10.1.0",
104104
"react-day-picker": "^7.4.10",
105105
"react-dom": "^16.13.0",
106-
"react-markdown": "^6.0.2",
107-
"react-monaco-editor": "0.43.0",
106+
"react-markdown": "^6.0.3",
107+
"react-monaco-editor": "0.44.0",
108108
"react-responsive": "^8.2.0",
109109
"react-virtualized": "^9.22.3",
110110
"semaphore-async-await": "^1.5.1",

‎apps/sensenet/src/components/dialogs/copy-move.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ export const CopyMoveDialog: React.FunctionComponent<CopyMoveDialogProps> = (pro
3535
const selectionRoots = useMemo(() => [snRoute.path], [snRoute.path])
3636
const itemsODataOptions = useMemo(() => ({ filter: '' }), [])
3737

38+
const blackList =
39+
props.operation === 'copy'
40+
? [props.content[0].Path]
41+
: [props.content[0].Path, `/${PathHelper.getParentPath(props.content[0].Path)}`]
42+
3843
useEffect(() => {
3944
setLocalization(localizations[props.operation])
4045
}, [localizations, props.operation])
@@ -148,7 +153,7 @@ export const CopyMoveDialog: React.FunctionComponent<CopyMoveDialogProps> = (pro
148153
actionsContainer={DialogActions}
149154
handleCancel={closeLastDialog}
150155
handleSubmit={handleSubmit}
151-
selectionBlacklist={[props.content[0].Path, `/${PathHelper.getParentPath(props.content[0].Path)}`]}
156+
selectionBlacklist={blackList}
152157
isExecInProgress={isExecInProgress}
153158
required={1}
154159
classes={{ cancelButton: globalClasses.cancelButton }}

‎examples/sn-dms-demo/package.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sn-dms-demo",
3-
"version": "3.7.2",
3+
"version": "3.7.3",
44
"description": "Document Management Demo upon sensenet",
55
"private": true,
66
"repository": {
@@ -29,23 +29,23 @@
2929
"fix:prettier": "prettier \"{,!(dist|temp|bundle)/**/}*.{ts,tsx}\" --write"
3030
},
3131
"dependencies": {
32-
"@material-ui/core": "^4.11.4",
32+
"@material-ui/core": "~4.11.4",
3333
"@material-ui/icons": "^4.11.2",
3434
"@sensenet/authentication-oidc-react": "^2.3.1",
35-
"@sensenet/client-core": "^4.0.0",
36-
"@sensenet/client-utils": "^2.1.1",
37-
"@sensenet/controls-react": "^8.0.0",
35+
"@sensenet/client-core": "^4.0.1",
36+
"@sensenet/client-utils": "^2.1.2",
37+
"@sensenet/controls-react": "^8.0.1",
3838
"@sensenet/default-content-types": "^5.0.0",
39-
"@sensenet/document-viewer-react": "^4.2.0",
40-
"@sensenet/hooks-react": "^1.6.1",
39+
"@sensenet/document-viewer-react": "^4.2.1",
40+
"@sensenet/hooks-react": "^1.6.2",
4141
"@sensenet/icons-react": "^2.1.1",
4242
"@sensenet/list-controls-react": "^2.1.1",
43-
"@sensenet/pickers-react": "^2.1.1",
44-
"@sensenet/query": "^2.1.1",
45-
"@sensenet/redux": "^5.7.1",
46-
"@sensenet/repository-events": "^2.1.1",
47-
"@sensenet/search-react": "^2.1.2",
48-
"date-fns": "^2.22.1",
43+
"@sensenet/pickers-react": "^2.1.2",
44+
"@sensenet/query": "^2.1.2",
45+
"@sensenet/redux": "^5.7.2",
46+
"@sensenet/repository-events": "^2.1.2",
47+
"@sensenet/search-react": "^2.1.3",
48+
"date-fns": "^2.23.0",
4949
"history": "^5.0.0",
5050
"lodash.groupby": "^4.6.0",
5151
"object-assign": "4.1.1",
@@ -66,22 +66,22 @@
6666
"uuid": "^8.3.2"
6767
},
6868
"devDependencies": {
69-
"@cypress/webpack-preprocessor": "^5.7.0",
70-
"@types/chance": "^1.1.2",
71-
"@types/jest": "^26.0.21",
69+
"@cypress/webpack-preprocessor": "^5.9.1",
70+
"@types/chance": "^1.1.3",
71+
"@types/jest": "^26.0.24",
7272
"@types/lodash.groupby": "^4.6.6",
73-
"@types/node": "^15.12.2",
74-
"@types/react": "^17.0.11",
75-
"@types/react-custom-scrollbars": "^4.0.6",
76-
"@types/react-dom": "^17.0.7",
77-
"@types/react-loadable": "^5.5.2",
78-
"@types/react-redux": "^7.1.16",
79-
"@types/react-responsive": "^8.0.2",
80-
"@types/react-router-dom": "^5.1.7",
81-
"@types/uuid": "^8.0.1",
73+
"@types/node": "^16.4.10",
74+
"@types/react": "^17.0.15",
75+
"@types/react-custom-scrollbars": "^4.0.8",
76+
"@types/react-dom": "^17.0.9",
77+
"@types/react-loadable": "^5.5.6",
78+
"@types/react-redux": "^7.1.18",
79+
"@types/react-responsive": "^8.0.3",
80+
"@types/react-router-dom": "^5.1.8",
81+
"@types/uuid": "^8.3.1",
8282
"chance": "^1.1.6",
8383
"cross-env": "^7.0.3",
84-
"cypress": "^7.5.0",
84+
"cypress": "^8.1.0",
8585
"path-to-regexp": "^6.2.0",
8686
"prop-types": "^15.7.2",
8787
"react-scripts": "4.0.3"

‎examples/sn-react-browser/package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@example/react-browser",
3-
"version": "2.4.0",
3+
"version": "2.4.1",
44
"private": true,
55
"author": "Sense/Net <snteam@sensenet.com> (http://sensenet.com/)",
66
"contributors": [
@@ -21,29 +21,29 @@
2121
"eject": "react-scripts eject"
2222
},
2323
"devDependencies": {
24-
"@types/jest": "^26.0.21",
25-
"@types/node": "^15.12.2",
26-
"@types/react": "^17.0.11",
27-
"@types/react-dom": "^17.0.7",
28-
"@types/react-router": "^5.1.15",
29-
"@types/react-router-dom": "^5.1.7",
24+
"@types/jest": "^26.0.24",
25+
"@types/node": "^16.4.10",
26+
"@types/react": "^17.0.15",
27+
"@types/react-dom": "^17.0.9",
28+
"@types/react-router": "^5.1.16",
29+
"@types/react-router-dom": "^5.1.8",
3030
"react": "^16.13.0",
3131
"react-dom": "^16.13.0",
3232
"react-scripts": "4.0.3",
33-
"typescript": "^4.3.3"
33+
"typescript": "^4.3.5"
3434
},
3535
"dependencies": {
36-
"@material-ui/core": "^4.11.4",
36+
"@material-ui/core": "~4.11.4",
3737
"@material-ui/icons": "^4.11.2",
3838
"@sensenet/authentication-oidc-react": "^2.3.1",
39-
"@sensenet/client-core": "^4.0.0",
39+
"@sensenet/client-core": "^4.0.1",
4040
"@sensenet/default-content-types": "^5.0.0",
41-
"@sensenet/document-viewer-react": "^4.2.0",
42-
"@sensenet/hooks-react": "^1.6.1",
41+
"@sensenet/document-viewer-react": "^4.2.1",
42+
"@sensenet/hooks-react": "^1.6.2",
4343
"@sensenet/list-controls-react": "^2.1.1",
4444
"@sensenet/universal-header-react": "^0.2.0",
4545
"clsx": "^1.1.1",
46-
"date-fns": "^2.22.1",
46+
"date-fns": "^2.23.0",
4747
"react-router": "^5.2.0",
4848
"react-router-dom": "^5.2.0"
4949
},

‎examples/sn-react-calendar/package.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@example/react-calendar",
3-
"version": "2.3.0",
3+
"version": "2.3.1",
44
"private": true,
55
"author": "Sense/Net <snteam@sensenet.com> (http://sensenet.com/)",
66
"contributors": [
@@ -21,36 +21,36 @@
2121
"eject": "react-scripts eject"
2222
},
2323
"devDependencies": {
24-
"@types/jest": "^26.0.21",
24+
"@types/jest": "^26.0.24",
2525
"@types/lodash.orderby": "^4.6.6",
26-
"@types/node": "^15.12.2",
27-
"@types/react": "^17.0.11",
28-
"@types/react-dom": "^17.0.7",
29-
"@types/react-router": "^5.1.15",
30-
"@types/react-router-dom": "^5.1.7",
31-
"@types/uuid": "^8.0.1",
26+
"@types/node": "^16.4.10",
27+
"@types/react": "^17.0.15",
28+
"@types/react-dom": "^17.0.9",
29+
"@types/react-router": "^5.1.16",
30+
"@types/react-router-dom": "^5.1.8",
31+
"@types/uuid": "^8.3.1",
3232
"react": "^16.13.0",
3333
"react-dom": "^16.13.0",
3434
"react-router": "^5.2.0",
3535
"react-router-dom": "^5.2.0",
3636
"react-scripts": "4.0.3",
37-
"typescript": "^4.3.3"
37+
"typescript": "^4.3.5"
3838
},
3939
"dependencies": {
40-
"@material-ui/core": "^4.11.4",
40+
"@material-ui/core": "~4.11.4",
4141
"@material-ui/icons": "^4.11.2",
4242
"@sensenet/authentication-oidc-react": "^2.3.1",
43-
"@sensenet/client-core": "^4.0.0",
44-
"@sensenet/controls-react": "^8.0.0",
43+
"@sensenet/client-core": "^4.0.1",
44+
"@sensenet/controls-react": "^8.0.1",
4545
"@sensenet/default-content-types": "^5.0.0",
46-
"@sensenet/hooks-react": "^1.6.1",
47-
"@sensenet/query": "^2.1.1",
48-
"@sensenet/repository-events": "^2.1.1",
46+
"@sensenet/hooks-react": "^1.6.2",
47+
"@sensenet/query": "^2.1.2",
48+
"@sensenet/repository-events": "^2.1.2",
4949
"@sensenet/universal-header-react": "^0.2.0",
5050
"clsx": "^1.1.1",
51-
"date-fns": "^2.22.1",
51+
"date-fns": "^2.23.0",
5252
"lodash.orderby": "^4.6.0",
53-
"striptags": "^3.1.1",
53+
"striptags": "^3.2.0",
5454
"uuid": "^8.3.2"
5555
},
5656
"browserslist": {

0 commit comments

Comments
 (0)