Skip to content

Commit

Permalink
Merge branch 'release/2019-08-21'
Browse files Browse the repository at this point in the history
  • Loading branch information
herflis committed Aug 21, 2019
2 parents 532b6a2 + 0b6ff53 commit 499af30
Show file tree
Hide file tree
Showing 338 changed files with 18,843 additions and 14,240 deletions.
14 changes: 14 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ module.exports = {
'prefer-template': 'error',
'prefer-destructuring': ['error', { array: false, object: true }],
'default-case': 'error',
'sort-imports': ['error', { ignoreCase: true, ignoreDeclarationSort: true }],
'react/self-closing-comp': [
'error',
{
component: true,
html: true,
},
],
},
overrides: [
{
Expand All @@ -85,5 +93,11 @@ module.exports = {
'dot-notation': 'off',
},
},
{
files: ['examples/sn-react-component-docs/**/*.{ts,tsx}'],
rules: {
'require-jsdoc': 'off',
},
},
],
}
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

# sensenet client

[![Build Status](https://travis-ci.org/SenseNet/sn-client.svg?branch=master)](https://travis-ci.org/SenseNet/sn-client)
[![Coverage](https://img.shields.io/codecov/c/github/SenseNet/sn-client.svg?style=flat)](https://codecov.io/gh/SenseNet/sn-client)
[![Gitter chat](https://img.shields.io/gitter/room/SenseNet/sensenet.svg?style=flat)](https://gitter.im/SenseNet/sensenet)

This repository is a monorepo that we manage using [Lerna](https://github.com/lerna/lerna). That means that we actually publish [several packages](/packages) to npm from the same codebase, including:

| Package | Version |
Expand All @@ -20,6 +24,7 @@ This repository is a monorepo that we manage using [Lerna](https://github.com/le
| [@sensenet/document-viewer-react](/packages/sn-document-viewer-react) | [![npm](https://img.shields.io/npm/v/@sensenet/document-viewer-react.svg?maxAge=3600)](https://www.npmjs.com/package/@sensenet/document-viewer-react) |
| [@sensenet/icons-react](/packages/sn-icons-react) | [![npm](https://img.shields.io/npm/v/@sensenet/icons-react.svg?maxAge=3600)](https://www.npmjs.com/package/@sensenet/icons-react) |
| [@sensenet/list-controls-react](/packages/sn-list-controls-react) | [![npm](https://img.shields.io/npm/v/@sensenet/list-controls-react.svg?maxAge=3600)](https://www.npmjs.com/package/@sensenet/list-controls-react) |
| [@sensenet/pickers-react](/packages/sn-pickers-react) | [![npm](https://img.shields.io/npm/v/@sensenet/pickers-react.svg?style=flat)](https://www.npmjs.com/package/@sensenet/pickers-react) |
| [@sensenet/query](/packages/sn-query) | [![npm](https://img.shields.io/npm/v/@sensenet/query.svg?maxAge=3600)](https://www.npmjs.com/package/@sensenet/query) |
| [@sensenet/redux-promise-middleware](/packages/sn-redux-promise-middleware) | [![npm](https://img.shields.io/npm/v/@sensenet/redux-promise-middleware.svg?maxAge=3600)](https://www.npmjs.com/package/@sensenet/redux-promise-middleware) |
| [@sensenet/redux](/packages/sn-redux) | [![npm](https://img.shields.io/npm/v/@sensenet/redux.svg?maxAge=3600)](https://www.npmjs.com/package/@sensenet/redux) |
Expand Down
64 changes: 34 additions & 30 deletions apps/sensenet/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sensenet/sn-app",
"version": "0.4.0",
"version": "1.0.0",
"main": "dist/index.js",
"files": [
"dist",
Expand All @@ -27,18 +27,18 @@
"homepage": "https://sensenet.com",
"devDependencies": {
"@types/autosuggest-highlight": "^3.1.0",
"@types/react": "^16.8.19",
"@types/react": "^16.8.23",
"@types/react-autosuggest": "^9.3.8",
"@types/react-dom": "^16.8.4",
"@types/react-redux": "^7.0.9",
"@types/react-dom": "^16.8.5",
"@types/react-redux": "^7.1.1",
"@types/react-responsive": "^3.0.3",
"@types/react-router": "^5.0.1",
"@types/react-router": "^5.0.3",
"@types/react-router-dom": "^4.3.3",
"@types/uuid": "^3.4.4",
"autoprefixer": "^9.5.1",
"@types/uuid": "^3.4.5",
"autoprefixer": "^9.6.1",
"awesome-typescript-loader": "^5.2.1",
"css-loader": "^2.1.0",
"file-loader": "^3.0.1",
"css-loader": "^3.1.0",
"file-loader": "^4.1.0",
"git-revision-webpack-plugin": "^3.0.3",
"html-webpack-plugin": "^3.2.0",
"monaco-editor-webpack-plugin": "^1.7.0",
Expand All @@ -48,38 +48,42 @@
"react-router-dom": "^5.0.0",
"source-map-loader": "^0.2.4",
"style-loader": "^0.23.1",
"ts-config-webpack-plugin": "^1.3.1",
"url-loader": "^1.1.2",
"webpack": "^4.32.2",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-cli": "^3.3.2",
"ts-config-webpack-plugin": "^1.4.0",
"url-loader": "^2.1.0",
"webpack": "^4.38.0",
"webpack-bundle-analyzer": "^3.4.1",
"webpack-cli": "^3.3.6",
"webpack-dev-server": "^3.4.1"
},
"dependencies": {
"@furystack/inject": "^3.0.7",
"@furystack/logging": "^1.1.6",
"@material-ui/core": "^4.0.1",
"@furystack/inject": "^4.0.2",
"@furystack/logging": "^2.0.2",
"@material-ui/core": "^4.3.1",
"@material-ui/icons": "^4.0.1",
"@sensenet/client-core": "^2.1.0",
"@sensenet/client-utils": "^1.6.2",
"@sensenet/controls-react": "^2.8.0",
"@sensenet/default-content-types": "^1.2.2",
"@sensenet/document-viewer-react": "^1.1.2",
"@sensenet/list-controls-react": "^1.3.8",
"@sensenet/pickers-react": "^1.2.1",
"@sensenet/query": "^1.1.7",
"@sensenet/redux": "^5.1.10",
"@sensenet/repository-events": "^1.4.2",
"@sensenet/authentication-google": "^2.0.11",
"@sensenet/authentication-jwt": "^1.0.15",
"@sensenet/client-core": "^2.2.0",
"@sensenet/client-utils": "^1.6.4",
"@sensenet/controls-react": "^3.1.0",
"@sensenet/default-content-types": "^2.0.0",
"@sensenet/document-viewer-react": "^1.2.0",
"@sensenet/icons-react": "^1.2.12",
"@sensenet/list-controls-react": "^1.3.10",
"@sensenet/pickers-react": "^1.2.3",
"@sensenet/query": "^1.1.8",
"@sensenet/redux": "^5.1.12",
"@sensenet/repository-events": "^1.4.4",
"autosuggest-highlight": "^3.1.1",
"moment": "^2.24.0",
"monaco-editor": "^0.17.0",
"react": "^16.8.2",
"react-autosuggest": "^9.4.3",
"react-dom": "^16.8.2",
"react-markdown": "^4.0.8",
"react-monaco-editor": "^0.26.1",
"react-monaco-editor": "^0.28.0",
"react-redux": "^7.0.3",
"react-responsive": "^6.1.2",
"redux": "^4.0.1",
"react-responsive": "^7.0.0",
"redux": "^4.0.4",
"redux-di-middleware": "^4.0.1",
"semaphore-async-await": "^1.5.1",
"uuid": "^3.3.2"
Expand Down
Binary file added apps/sensenet/src/assets/favicon.ico
Binary file not shown.
7 changes: 3 additions & 4 deletions apps/sensenet/src/components/Breadcrumbs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ const Breadcrumbs: React.FunctionComponent<BreadcrumbProps & RouteComponentProps

return (
<>
<Typography variant="h5" style={{ paddingLeft: '.5em' }}>
<Typography variant="h5" style={{ padding: '.5em' }}>
{props.content.map((item, key) => (
<DropFileArea key={key} parent={item.content} style={{ display: 'inline-block' }}>
<DropFileArea key={key} parentContent={item.content} style={{ display: 'inline-block' }}>
<Tooltip title={item.title}>
<Button
onClick={ev => props.onItemClick(ev, item)}
Expand All @@ -49,8 +49,7 @@ const Breadcrumbs: React.FunctionComponent<BreadcrumbProps & RouteComponentProps
<KeyboardArrowRight style={{ verticalAlign: 'middle', height: '16px' }} />
</DropFileArea>
))}
{/* TODO: Make a component of this */}
<DropFileArea parent={props.currentContent.content} style={{ display: 'inline-block' }}>
<DropFileArea parentContent={props.currentContent.content} style={{ display: 'inline-block' }}>
<Tooltip title={props.currentContent.content.Path || '/'}>
<Button
onClick={ev => props.onItemClick(ev, props.currentContent)}
Expand Down
66 changes: 46 additions & 20 deletions apps/sensenet/src/components/ContentContextMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ import Delete from '@material-ui/icons/Delete'
import FileMove from '@material-ui/icons/FileCopy'
import FileCopy from '@material-ui/icons/FileCopyOutlined'
import Info from '@material-ui/icons/Info'
import React, { useContext, useState, useCallback } from 'react'
import React, { useCallback, useContext, useState } from 'react'
import { RouteComponentProps, withRouter } from 'react-router'
import { CurrentContentContext, ResponsiveContext } from '../context'
import { useContentRouting, useLocalization, useRepository, useDownload, useWopi } from '../hooks'
import { ConstantContent } from '@sensenet/client-core'
import { CurrentContentContext, CurrentContentProvider, ResponsiveContext } from '../context'
import { useContentRouting, useDownload, useLocalization, useRepository, useWopi } from '../hooks'
import { ContentInfoDialog, CopyMoveDialog, DeleteContentDialog, EditPropertiesDialog } from './dialogs'
import { Icon } from './Icon'

Expand Down Expand Up @@ -49,26 +50,51 @@ export const ContentContextMenuComponent: React.FunctionComponent<

return (
<div onKeyDown={ev => ev.stopPropagation()} onKeyPress={ev => ev.stopPropagation()}>
<DeleteContentDialog
dialogProps={{ open: isDeleteOpened, disablePortal: true, onClose: () => setIsDeleteOpened(false) }}
content={[content]}
/>
<EditPropertiesDialog
content={content}
dialogProps={{ open: isEditPropertiesOpened, onClose: () => setIsEditPropertiesOpened(false) }}
/>
<ContentInfoDialog
content={content}
dialogProps={{ open: isInfoDialogOpened, onClose: () => setIsInfoDialogOpened(false) }}
/>
{isCopyDialogOpened ? (
<CopyMoveDialog
{isDeleteOpened ? (
<DeleteContentDialog
dialogProps={{
open: isDeleteOpened,
disablePortal: true,
onClose: () => setIsDeleteOpened(false),
keepMounted: false,
}}
content={[content]}
currentParent={content}
dialogProps={{ open: isCopyDialogOpened, onClose: () => setIsCopyDialogOpened(false) }}
operation={copyMoveOperation}
/>
) : null}
{isEditPropertiesOpened ? (
<EditPropertiesDialog
content={content}
dialogProps={{
open: isEditPropertiesOpened,
onClose: () => setIsEditPropertiesOpened(false),
keepMounted: false,
}}
/>
) : null}
{isInfoDialogOpened ? (
<ContentInfoDialog
content={content}
dialogProps={{ open: isInfoDialogOpened, onClose: () => setIsInfoDialogOpened(false), keepMounted: false }}
/>
) : null}
{isCopyDialogOpened ? (
<CurrentContentProvider idOrPath={content.ParentId || ConstantContent.PORTAL_ROOT.Path}>
<CurrentContentContext.Consumer>
{parent => (
<CopyMoveDialog
content={[content]}
currentParent={parent}
dialogProps={{
open: isCopyDialogOpened,
onClose: () => setIsCopyDialogOpened(false),
keepMounted: false,
}}
operation={copyMoveOperation}
/>
)}
</CurrentContentContext.Consumer>
</CurrentContentProvider>
) : null}
{device === 'mobile' ? (
<Drawer
anchor="bottom"
Expand Down
Loading

0 comments on commit 499af30

Please sign in to comment.