Merge branch 'main' of https://github.com/shesha-io/Shesha-framework

shesha-io · May 3, 2023 · a2c0d86 · a2c0d86
2 parents 53609af + a92271e
commit a2c0d86
Show file tree

Hide file tree

Showing 30 changed files with 335 additions and 422 deletions.
diff --git a/shesha-core/src/Shesha.Application/_Test/ComplexTestAppService.cs b/shesha-core/src/Shesha.Application/_Test/ComplexTestAppService.cs
@@ -1,4 +1,5 @@
-using Abp.Dependency;
+using Abp.Authorization;
+using Abp.Dependency;
 using Abp.Domain.Repositories;
 using Castle.DynamicProxy;
 using Microsoft.AspNetCore.Mvc;
@@ -83,9 +84,9 @@ public Task<JObject> CheckJObject()
         }
 
         [HttpGet]
+        [AbpAuthorize("Test")]
         public Task CheckData()
         {
-            var obj = Repository.GetAll().ToList();
             return Task.CompletedTask;
         }
 

diff --git a/shesha-reactjs/src/components/collapsiblePanel/index.en-US.stories.mdx b/shesha-reactjs/src/components/collapsiblePanel/index.en-US.stories.mdx
diff --git a/shesha-reactjs/src/components/collapsiblePanel/index.stories.tsx b/shesha-reactjs/src/components/collapsiblePanel/index.stories.tsx
diff --git a/shesha-reactjs/src/components/collapsiblePanel/index.tsx b/shesha-reactjs/src/components/collapsiblePanel/index.tsx
diff --git a/shesha-reactjs/src/components/collapsiblePanel/styles/index.less b/shesha-reactjs/src/components/collapsiblePanel/styles/index.less
diff --git a/shesha-reactjs/src/components/collapsibleSidebarContainer/index.stories.tsx b/shesha-reactjs/src/components/collapsibleSidebarContainer/index.stories.tsx
@@ -2,12 +2,12 @@ import React, { useState } from 'react';
 import { Story, Meta } from '@storybook/react';
 import CollapsibleSidebarContainer, { ICollapsibleSidebarContainerProps } from './';
 import { Alert, Col, Row } from 'antd';
-import CollapsiblePanel from '../collapsiblePanel';
+import CollapsiblePanel from '../panel';
 // import './styles/index.less';
 
 export default {
   title: 'Components/CollapsibleSidebarContainer',
-  component: CollapsibleSidebarContainer
+  component: CollapsibleSidebarContainer
 } as Meta;
 
 const LoremIpsum = () => (

diff --git a/shesha-reactjs/src/components/configurableForm/index.tsx b/shesha-reactjs/src/components/configurableForm/index.tsx
@@ -54,7 +54,7 @@ export const ConfigurableForm: FC<IConfigurableFormProps> = props => {
     const showFormInfo = Boolean(persistedFormProps) && formInfoBlockVisible && formStatusInfo;
 
     return (
-      <FormMarkupConverter markup={providedMarkup}>
+      <FormMarkupConverter markup={providedMarkup} formSettings={formSettings}>
         {flatComponents => (
           <FormProvider
             name="Form"

diff --git a/...-reactjs/src/components/formDesigner/components/collapsiblePanel/__tests__/index.test.tsx b/...-reactjs/src/components/formDesigner/components/collapsiblePanel/__tests__/index.test.tsx
diff --git a/...tjs/src/components/formDesigner/components/collapsiblePanel/collapsiblePanelComponent.tsx b/...tjs/src/components/formDesigner/components/collapsiblePanel/collapsiblePanelComponent.tsx
diff --git a/shesha-reactjs/src/components/formDesigner/components/collapsiblePanel/interfaces.ts b/shesha-reactjs/src/components/formDesigner/components/collapsiblePanel/interfaces.ts