Skip to content

Commit f13669b

Browse files
blaskodanielblaskodaniel
committed
Merge branch 'release/2021-09'
2 parents 40e739c + 1d1ed4e commit f13669b

File tree

46 files changed

+1816
-1826
lines changed

Some content is hidden

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

46 files changed

+1816
-1826
lines changed

‎apps/sensenet/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@app/sensenet",
3-
"version": "1.23.0",
3+
"version": "1.24.0",
44
"main": "dist/index.js",
55
"files": [
66
"dist",
@@ -87,7 +87,7 @@
8787
"@sensenet/authentication-oidc-react": "^2.3.1",
8888
"@sensenet/client-core": "^4.0.1",
8989
"@sensenet/client-utils": "^2.1.2",
90-
"@sensenet/controls-react": "^8.0.2",
90+
"@sensenet/controls-react": "^8.0.3",
9191
"@sensenet/default-content-types": "^5.0.0",
9292
"@sensenet/document-viewer-react": "^4.2.1",
9393
"@sensenet/hooks-react": "^1.6.2",
@@ -98,12 +98,12 @@
9898
"autosuggest-highlight": "^3.1.1",
9999
"clsx": "^1.1.1",
100100
"date-fns": "^2.23.0",
101-
"filesize": "^7.0.0",
101+
"filesize": "^8.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.3",
106+
"react-markdown": "6.0.3",
107107
"react-monaco-editor": "0.44.0",
108108
"react-responsive": "^8.2.0",
109109
"react-virtualized": "^9.22.3",

‎apps/sensenet/src/components/app-providers.tsx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
ResponsiveContextProvider,
1010
ThemeProvider,
1111
} from '../context'
12+
import { ShareProvider } from '../context/ShareProvider'
1213
import {
1314
CommandProviderManager,
1415
CustomActionCommandProvider,
@@ -40,11 +41,13 @@ export default function AppProviders({ children }: AppProvidersProps) {
4041
<BrowserRouter>
4142
<ThemeProvider>
4243
<RepositoryProvider>
43-
<CurrentUserProvider>
44-
<ResponsiveContextProvider>
45-
<DialogProvider>{children}</DialogProvider>
46-
</ResponsiveContextProvider>
47-
</CurrentUserProvider>
44+
<ShareProvider>
45+
<CurrentUserProvider>
46+
<ResponsiveContextProvider>
47+
<DialogProvider>{children}</DialogProvider>
48+
</ResponsiveContextProvider>
49+
</CurrentUserProvider>
50+
</ShareProvider>
4851
</RepositoryProvider>
4952
</ThemeProvider>
5053
</BrowserRouter>

‎apps/sensenet/src/components/dashboard/index.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,13 @@ const Dashboard = () => {
9898
{localization.descriptionSecondLine}
9999
</div>
100100
<LearnMoreWidget />
101-
<SubscriptionWidget subscription={data.subscription} version={data.version} isAdmin={isAdmin} />
101+
{data.subscription && (
102+
<SubscriptionWidget subscription={data.subscription} version={data.version} isAdmin={isAdmin} />
103+
)}
102104
{data?.usage?.user === 1 && <YourProjectWidget />}
103-
<UsageWidget limitations={data.subscription.plan.limitations} used={data.usage} />
105+
{data.subscription?.plan?.limitations && (
106+
<UsageWidget limitations={data.subscription?.plan?.limitations} used={data.usage} />
107+
)}
104108
</Container>
105109
</div>
106110
)

‎apps/sensenet/src/components/drawer/PermanentDrawer.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const PermanentDrawer = () => {
7474
const localization = useLocalization().drawer
7575
const location = useLocation()
7676

77-
const settingsItem = items.find((item) => item.primaryText === 'Settings')
77+
const settingsItem = items.find((item) => item.itemType === 'Settings')
7878

7979
if (!settings.drawer.enabled) {
8080
return null
@@ -114,7 +114,7 @@ export const PermanentDrawer = () => {
114114
<AddButton aria-label={localization.add} isOpened={opened} />
115115
) : null}
116116
{items.map((item, index) => {
117-
return item.primaryText !== 'Settings' && <PermanentDrawerItem item={item} opened={opened} key={index} />
117+
return item.itemType !== 'Settings' && <PermanentDrawerItem item={item} opened={opened} key={index} />
118118
})}
119119
</li>
120120
<li>{settingsItem && <PermanentDrawerItem item={settingsItem} opened={opened} />}</li>

‎apps/sensenet/src/components/login/login-page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ export default function LoginPage({ handleSubmit, isLoginInProgress }: LoginPage
8585
</Typography>
8686
</Grid>
8787
<Grid container direction="column" justify="center" alignItems="center" style={{ flexBasis: 150 }}>
88-
<Grid item alignContent="center" alignItems="center">
88+
<Grid item>
8989
<Typography align="center" variant="subtitle1" component="p">
9090
{localization.demoTitle}
9191
</Typography>
9292
</Grid>
93-
<Grid item alignContent="center" alignItems="center">
93+
<Grid item>
9494
<Button
9595
onClick={handleDemoSubmit}
9696
size="medium"

‎apps/sensenet/src/components/settings/api-keys-secrets.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ export const ApiSecretsWidget: React.FunctionComponent = () => {
8383
method: 'GET',
8484
})
8585

86-
setExternalClients(response.clients.filter((client) => client.type === ApiKeyType.ExternalClient))
87-
setExternalSpas(response.clients.filter((client) => client.type === ApiKeyType.ExternalSpa))
86+
setExternalClients(response.clients.filter((client: any) => client.type === ApiKeyType.ExternalClient))
87+
setExternalSpas(response.clients.filter((client: any) => client.type === ApiKeyType.ExternalSpa))
8888
})()
8989
}, [repo])
9090

‎apps/sensenet/src/components/settings/stats-storage-widget.tsx‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@ export const StorageWidget: React.FunctionComponent<StorageWidgetProps> = (props
3131
const numberFormatter = new Intl.NumberFormat('en-US')
3232

3333
const allUsage =
34-
props.data.usage.storage.files +
35-
props.data.usage.storage.content +
36-
props.data.usage.storage.oldVersions +
37-
props.data.usage.storage.log +
38-
props.data.usage.storage.system
34+
props.data?.usage?.storage.files +
35+
props.data?.usage?.storage.content +
36+
props.data?.usage?.storage.oldVersions +
37+
props.data?.usage?.storage.log +
38+
props.data?.usage?.storage.system
39+
40+
if (!allUsage) {
41+
return null
42+
}
3943

4044
return (
4145
<div className={widgetClasses.root}>

‎apps/sensenet/src/components/settings/stats.tsx‎

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,45 +16,59 @@ export const Stats: React.FunctionComponent = () => {
1616
const repository = useRepository()
1717
const [versionInfo, setVersionInfo] = useState<VersionInfo>()
1818
const [dashboardData, setDashboardData] = useState<DashboardData>()
19+
const [versionInfoError, setVersionInfoError] = useState<boolean>(false)
20+
const [dashboardDataError, setDashboardDataError] = useState<boolean>(false)
1921

2022
useEffect(() => {
2123
;(async () => {
22-
const response = await repository.executeAction<any, VersionInfo>({
23-
idOrPath: '/Root',
24-
name: 'GetVersionInfo',
25-
method: 'GET',
26-
})
24+
try {
25+
const response = await repository.executeAction<any, VersionInfo>({
26+
idOrPath: '/Root',
27+
name: 'GetVersionInfo',
28+
method: 'GET',
29+
})
2730

28-
setVersionInfo(response)
31+
setVersionInfo(response)
32+
} catch {
33+
setVersionInfoError(true)
34+
}
2935
})()
3036
}, [repository])
3137

3238
useEffect(() => {
3339
;(async () => {
34-
const response = await repository.executeAction<any, DashboardData>({
35-
idOrPath: '/Root',
36-
name: 'GetDashboardData',
37-
method: 'GET',
38-
oDataOptions: {
39-
select: ['Plan'],
40-
},
41-
})
42-
43-
setDashboardData(response)
40+
try {
41+
const response = await repository.executeAction<any, DashboardData>({
42+
idOrPath: '/Root',
43+
name: 'GetDashboardData',
44+
method: 'GET',
45+
oDataOptions: {
46+
select: ['Plan'],
47+
},
48+
})
49+
50+
setDashboardData(response)
51+
} catch {
52+
setDashboardDataError(true)
53+
}
4454
})()
4555
}, [repository])
4656

47-
if (!versionInfo || !dashboardData) return <FullScreenLoader />
57+
if ((!versionInfo && !versionInfoError) || (!dashboardData && !dashboardDataError)) return <FullScreenLoader />
4858

4959
return (
5060
<div style={{ overflow: 'auto' }}>
5161
<div className={clsx(globalClasses.contentTitle, globalClasses.centeredVertical)} style={{ display: 'grid' }}>
5262
<span style={{ fontSize: '20px' }}>{localization.settings.stats}</span>
5363
</div>
5464
<Container fixed>
55-
<StorageWidget data={dashboardData} />
56-
<ComponentsWidget data={versionInfo} />
57-
<InstalledPackagesWidget data={versionInfo} />
65+
{dashboardData && !dashboardDataError && <StorageWidget data={dashboardData} />}
66+
{versionInfo && !versionInfoError && (
67+
<>
68+
<ComponentsWidget data={versionInfo} />
69+
<InstalledPackagesWidget data={versionInfo} />
70+
</>
71+
)}
5872
</Container>
5973
</div>
6074
)

0 commit comments

Comments
 (0)