Skip to content

Commit

Permalink
Merge branch 'release/2021-08'
Browse files Browse the repository at this point in the history
  • Loading branch information
pusztaienike committed Aug 30, 2021
2 parents 6231793 + c879a6a commit 40e739c
Show file tree
Hide file tree
Showing 36 changed files with 2,872 additions and 3,097 deletions.
64 changes: 32 additions & 32 deletions apps/sensenet/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@app/sensenet",
"version": "1.22.0",
"version": "1.23.0",
"main": "dist/index.js",
"files": [
"dist",
Expand Down Expand Up @@ -38,41 +38,41 @@
]
},
"devDependencies": {
"@cypress/code-coverage": "^3.9.6",
"@cypress/code-coverage": "^3.9.10",
"@relative-ci/agent": "^2.0.0",
"@types/autosuggest-highlight": "^3.1.1",
"@types/react": "^17.0.11",
"@types/react-autosuggest": "^10.1.4",
"@types/react-dom": "^17.0.7",
"@types/react-responsive": "^8.0.2",
"@types/react-router": "^5.1.15",
"@types/react-router-dom": "^5.1.7",
"@types/react-virtualized": "^9.21.11",
"@types/uuid": "^8.0.1",
"@types/react": "^17.0.15",
"@types/react-autosuggest": "^10.1.5",
"@types/react-dom": "^17.0.9",
"@types/react-responsive": "^8.0.3",
"@types/react-router": "^5.1.16",
"@types/react-router-dom": "^5.1.8",
"@types/react-virtualized": "^9.21.12",
"@types/uuid": "^8.3.1",
"clean-webpack-plugin": "^4.0.0-alpha.0",
"compression-webpack-plugin": "8.0.0",
"copy-webpack-plugin": "^9.0.0",
"css-loader": "^5.2.6",
"css-minimizer-webpack-plugin": "^3.0.1",
"cypress": "^7.5.0",
"cypress-file-upload": "^5.0.6",
"compression-webpack-plugin": "8.0.1",
"copy-webpack-plugin": "^9.0.1",
"css-loader": "^6.2.0",
"css-minimizer-webpack-plugin": "^3.0.2",
"cypress": "7.5.0",
"cypress-file-upload": "^5.0.8",
"cypress-xpath": "^1.6.2",
"file-loader": "^6.1.1",
"fork-ts-checker-webpack-plugin": "^6.2.10",
"html-webpack-plugin": "^5.3.1",
"mini-css-extract-plugin": "^1.5.0",
"monaco-editor-webpack-plugin": "^4.0.0",
"fork-ts-checker-webpack-plugin": "^6.3.1",
"html-webpack-plugin": "^5.3.2",
"mini-css-extract-plugin": "^2.1.0",
"monaco-editor-webpack-plugin": "^4.1.1",
"nyc": "^15.1.0",
"nyc-config-tsx": "^0.1.0",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"source-map-support": "^0.5.19",
"style-loader": "^2.0.0",
"terser-webpack-plugin": "^5.1.3",
"ts-loader": "^9.2.3",
"ts-node": "^10.0.0",
"style-loader": "^3.2.1",
"terser-webpack-plugin": "^5.1.4",
"ts-loader": "^9.2.4",
"ts-node": "^10.1.0",
"url-loader": "^4.1.1",
"webpack": "^5.38.1",
"webpack": "^5.47.1",
"webpack-bundle-analyzer": "^4.4.1",
"webpack-cli": "^4.7.2",
"webpack-dev-server": "^3.11.2",
Expand All @@ -81,13 +81,13 @@
"dependencies": {
"@iconify-icons/logos": "^1.1.10",
"@iconify/react": "^1.1.4",
"@material-ui/core": "^4.11.4",
"@material-ui/core": "~4.11.4",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.58",
"@material-ui/lab": "4.0.0-alpha.58",
"@sensenet/authentication-oidc-react": "^2.3.1",
"@sensenet/client-core": "^4.0.1",
"@sensenet/client-utils": "^2.1.2",
"@sensenet/controls-react": "^8.0.1",
"@sensenet/controls-react": "^8.0.2",
"@sensenet/default-content-types": "^5.0.0",
"@sensenet/document-viewer-react": "^4.2.1",
"@sensenet/hooks-react": "^1.6.2",
Expand All @@ -97,14 +97,14 @@
"@sensenet/repository-events": "^2.1.2",
"autosuggest-highlight": "^3.1.1",
"clsx": "^1.1.1",
"date-fns": "^2.22.1",
"filesize": "^6.3.0",
"date-fns": "^2.23.0",
"filesize": "^7.0.0",
"react": "^16.13.0",
"react-autosuggest": "^10.1.0",
"react-day-picker": "^7.4.10",
"react-dom": "^16.13.0",
"react-markdown": "^6.0.2",
"react-monaco-editor": "0.43.0",
"react-markdown": "^6.0.3",
"react-monaco-editor": "0.44.0",
"react-responsive": "^8.2.0",
"react-virtualized": "^9.22.3",
"semaphore-async-await": "^1.5.1",
Expand Down
7 changes: 6 additions & 1 deletion apps/sensenet/src/components/dialogs/copy-move.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ export const CopyMoveDialog: React.FunctionComponent<CopyMoveDialogProps> = (pro
const selectionRoots = useMemo(() => [snRoute.path], [snRoute.path])
const itemsODataOptions = useMemo(() => ({ filter: '' }), [])

const blackList =
props.operation === 'copy'
? [props.content[0].Path]
: [props.content[0].Path, `/${PathHelper.getParentPath(props.content[0].Path)}`]

useEffect(() => {
setLocalization(localizations[props.operation])
}, [localizations, props.operation])
Expand Down Expand Up @@ -148,7 +153,7 @@ export const CopyMoveDialog: React.FunctionComponent<CopyMoveDialogProps> = (pro
actionsContainer={DialogActions}
handleCancel={closeLastDialog}
handleSubmit={handleSubmit}
selectionBlacklist={[props.content[0].Path, `/${PathHelper.getParentPath(props.content[0].Path)}`]}
selectionBlacklist={blackList}
isExecInProgress={isExecInProgress}
required={1}
classes={{ cancelButton: globalClasses.cancelButton }}
Expand Down
34 changes: 17 additions & 17 deletions examples/sn-dms-demo/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sn-dms-demo",
"version": "3.7.3",
"version": "3.7.4",
"description": "Document Management Demo upon sensenet",
"private": true,
"repository": {
Expand Down Expand Up @@ -29,12 +29,12 @@
"fix:prettier": "prettier \"{,!(dist|temp|bundle)/**/}*.{ts,tsx}\" --write"
},
"dependencies": {
"@material-ui/core": "^4.11.4",
"@material-ui/core": "~4.11.4",
"@material-ui/icons": "^4.11.2",
"@sensenet/authentication-oidc-react": "^2.3.1",
"@sensenet/client-core": "^4.0.1",
"@sensenet/client-utils": "^2.1.2",
"@sensenet/controls-react": "^8.0.1",
"@sensenet/controls-react": "^8.0.2",
"@sensenet/default-content-types": "^5.0.0",
"@sensenet/document-viewer-react": "^4.2.1",
"@sensenet/hooks-react": "^1.6.2",
Expand All @@ -45,7 +45,7 @@
"@sensenet/redux": "^5.7.2",
"@sensenet/repository-events": "^2.1.2",
"@sensenet/search-react": "^2.1.3",
"date-fns": "^2.22.1",
"date-fns": "^2.23.0",
"history": "^5.0.0",
"lodash.groupby": "^4.6.0",
"object-assign": "4.1.1",
Expand All @@ -66,22 +66,22 @@
"uuid": "^8.3.2"
},
"devDependencies": {
"@cypress/webpack-preprocessor": "^5.7.0",
"@types/chance": "^1.1.2",
"@types/jest": "^26.0.21",
"@cypress/webpack-preprocessor": "^5.9.1",
"@types/chance": "^1.1.3",
"@types/jest": "^26.0.24",
"@types/lodash.groupby": "^4.6.6",
"@types/node": "^15.12.2",
"@types/react": "^17.0.11",
"@types/react-custom-scrollbars": "^4.0.6",
"@types/react-dom": "^17.0.7",
"@types/react-loadable": "^5.5.2",
"@types/react-redux": "^7.1.16",
"@types/react-responsive": "^8.0.2",
"@types/react-router-dom": "^5.1.7",
"@types/uuid": "^8.0.1",
"@types/node": "^16.4.10",
"@types/react": "^17.0.15",
"@types/react-custom-scrollbars": "^4.0.8",
"@types/react-dom": "^17.0.9",
"@types/react-loadable": "^5.5.6",
"@types/react-redux": "^7.1.18",
"@types/react-responsive": "^8.0.3",
"@types/react-router-dom": "^5.1.8",
"@types/uuid": "^8.3.1",
"chance": "^1.1.6",
"cross-env": "^7.0.3",
"cypress": "^7.5.0",
"cypress": "^8.1.0",
"path-to-regexp": "^6.2.0",
"prop-types": "^15.7.2",
"react-scripts": "4.0.3"
Expand Down
18 changes: 9 additions & 9 deletions examples/sn-react-browser/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@
"eject": "react-scripts eject"
},
"devDependencies": {
"@types/jest": "^26.0.21",
"@types/node": "^15.12.2",
"@types/react": "^17.0.11",
"@types/react-dom": "^17.0.7",
"@types/react-router": "^5.1.15",
"@types/react-router-dom": "^5.1.7",
"@types/jest": "^26.0.24",
"@types/node": "^16.4.10",
"@types/react": "^17.0.15",
"@types/react-dom": "^17.0.9",
"@types/react-router": "^5.1.16",
"@types/react-router-dom": "^5.1.8",
"react": "^16.13.0",
"react-dom": "^16.13.0",
"react-scripts": "4.0.3",
"typescript": "^4.3.3"
"typescript": "^4.3.5"
},
"dependencies": {
"@material-ui/core": "^4.11.4",
"@material-ui/core": "~4.11.4",
"@material-ui/icons": "^4.11.2",
"@sensenet/authentication-oidc-react": "^2.3.1",
"@sensenet/client-core": "^4.0.1",
Expand All @@ -43,7 +43,7 @@
"@sensenet/list-controls-react": "^2.1.1",
"@sensenet/universal-header-react": "^0.2.0",
"clsx": "^1.1.1",
"date-fns": "^2.22.1",
"date-fns": "^2.23.0",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0"
},
Expand Down
26 changes: 13 additions & 13 deletions examples/sn-react-calendar/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@example/react-calendar",
"version": "2.3.1",
"version": "2.3.2",
"private": true,
"author": "Sense/Net <snteam@sensenet.com> (http://sensenet.com/)",
"contributors": [
Expand All @@ -21,36 +21,36 @@
"eject": "react-scripts eject"
},
"devDependencies": {
"@types/jest": "^26.0.21",
"@types/jest": "^26.0.24",
"@types/lodash.orderby": "^4.6.6",
"@types/node": "^15.12.2",
"@types/react": "^17.0.11",
"@types/react-dom": "^17.0.7",
"@types/react-router": "^5.1.15",
"@types/react-router-dom": "^5.1.7",
"@types/uuid": "^8.0.1",
"@types/node": "^16.4.10",
"@types/react": "^17.0.15",
"@types/react-dom": "^17.0.9",
"@types/react-router": "^5.1.16",
"@types/react-router-dom": "^5.1.8",
"@types/uuid": "^8.3.1",
"react": "^16.13.0",
"react-dom": "^16.13.0",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"typescript": "^4.3.3"
"typescript": "^4.3.5"
},
"dependencies": {
"@material-ui/core": "^4.11.4",
"@material-ui/core": "~4.11.4",
"@material-ui/icons": "^4.11.2",
"@sensenet/authentication-oidc-react": "^2.3.1",
"@sensenet/client-core": "^4.0.1",
"@sensenet/controls-react": "^8.0.1",
"@sensenet/controls-react": "^8.0.2",
"@sensenet/default-content-types": "^5.0.0",
"@sensenet/hooks-react": "^1.6.2",
"@sensenet/query": "^2.1.2",
"@sensenet/repository-events": "^2.1.2",
"@sensenet/universal-header-react": "^0.2.0",
"clsx": "^1.1.1",
"date-fns": "^2.22.1",
"date-fns": "^2.23.0",
"lodash.orderby": "^4.6.0",
"striptags": "^3.1.1",
"striptags": "^3.2.0",
"uuid": "^8.3.2"
},
"browserslist": {
Expand Down
42 changes: 21 additions & 21 deletions examples/sn-react-component-docs/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "sn-react-component-docs",
"version": "3.1.3",
"version": "3.1.4",
"description": "UI components for building apps upon sensenet implemented in React",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -31,7 +31,7 @@
"@sensenet/client-core": "^4.0.1",
"@sensenet/client-utils": "^2.1.2",
"@sensenet/control-mapper": "^3.1.2",
"@sensenet/controls-react": "^8.0.1",
"@sensenet/controls-react": "^8.0.2",
"@sensenet/default-content-types": "^5.0.0",
"@sensenet/document-viewer-react": "^4.2.1",
"@sensenet/icons-react": "^2.1.1",
Expand All @@ -44,28 +44,28 @@
"react-dom": "^16.13.0"
},
"devDependencies": {
"@babel/core": "^7.14.5",
"@storybook/addon-a11y": "^6.2.8",
"@storybook/addon-actions": "^6.2.8",
"@storybook/addon-events": "^6.2.8",
"@storybook/addon-info": "^5.3.21",
"@storybook/addon-knobs": "^6.2.8",
"@storybook/addon-links": "^6.2.8",
"@storybook/addon-notes": "^5.3.21",
"@storybook/addon-options": "^5.3.21",
"@storybook/addon-storysource": "^6.2.8",
"@storybook/addon-viewport": "^6.2.8",
"@storybook/addons": "^6.2.8",
"@storybook/core": "^6.2.8",
"@storybook/react": "^6.2.8",
"@storybook/source-loader": "^6.2.8",
"@types/node": "^15.12.2",
"@types/react": "^17.0.11",
"@types/uuid": "^8.0.1",
"@babel/core": "^7.14.8",
"@storybook/addon-a11y": "6.2.8",
"@storybook/addon-actions": "6.2.8",
"@storybook/addon-events": "6.2.8",
"@storybook/addon-info": "5.3.21",
"@storybook/addon-knobs": "6.2.8",
"@storybook/addon-links": "6.2.8",
"@storybook/addon-notes": "5.3.21",
"@storybook/addon-options": "5.3.21",
"@storybook/addon-storysource": "6.2.8",
"@storybook/addon-viewport": "6.2.8",
"@storybook/addons": "6.2.8",
"@storybook/core": "6.2.8",
"@storybook/react": "6.2.8",
"@storybook/source-loader": "6.2.8",
"@types/node": "^16.4.10",
"@types/react": "^17.0.15",
"@types/uuid": "^8.3.1",
"babel-loader": "^8.2.2",
"prop-types": "^15.7.2",
"react-docgen-typescript-loader": "^3.7.1",
"regenerator-runtime": "^0.13.7",
"regenerator-runtime": "^0.13.9",
"ts-loader": "8.0.14",
"typescript": "4.2.3",
"uuid": "^8.3.2",
Expand Down
Loading

0 comments on commit 40e739c

Please sign in to comment.