Merge pull request #7 from ryoldash/u-yasirCodeRefactoring

Exception page  bug fixed and Delete confirm added

Author: ryoldash

reactjs/src/scenes/Exception/index.tsx

@@ -7,30 +7,17 @@ import './index.css';
 import * as React from 'react';
 import { Row, Col, Avatar, Button } from 'antd';
 
-const exception = [
-  {
-    errorCode: '404',
-    errorImg: error404,
-    errorDescription: 'Sorry, the page you visited does not exist',
-  },
-  {
-    errorCode: '401',
-    errorImg: error401,
-    errorDescription: 'Kardeş, Nere gidiyon',
-  },
-  {
-    errorCode: '500',
-    errorImg: error500,
-    errorDescription: 'Kardeş yavas , Sunucu Gitti',
-  },
-];
+
 
 class Exception extends React.Component<any, any> {
   constructor(props: any) {
     super(props);
   }
 
   public render() {
+    const exception = [{ errorCode: '404', errorImg: error404, errorDescription: 'Sorry, the page you visited does not exist' }, {
+      errorCode: '401', errorImg: error401, errorDescription: 'Sorry, you dont have access to this page' }, 
+      { errorCode: '500', errorImg: error500, errorDescription: 'Sorry, the server is reporting an error' }];
     let params = new URLSearchParams(this.props.location.search);
     const test = params.get('type');
 
@@ -46,9 +33,9 @@ class Exception extends React.Component<any, any> {
           xs={{ span: 7, offset: 1 }}
           sm={{ span: 7, offset: 1 }}
           md={{ span: 7, offset: 1 }}
-          lg={{ span: 5, offset: 8 }}
-          xl={{ span: 5, offset: 8 }}
-          xxl={{ span: 5, offset: 8 }}
+          lg={{ span: 10, offset: 4 }}
+          xl={{ span: 10, offset: 4 }}
+          xxl={{ span: 10, offset: 4 }}
         >
           <Avatar shape="square" className={'errorAvatar'} src={error!.errorImg} />
         </Col>

reactjs/src/scenes/Roles/components/createOrUpdateRoles.tsx

@@ -19,9 +19,9 @@ class CreateOrUpdateRoles extends React.Component<any> {
   };
 
   render() {
-    debugger;
+    
     const { permission } = this.props;
-    debugger;
+    
     const options = permission.map((x: GetAllPermissionsOutput) => {
       var test = { label: x.displayName, value: x.name };
       return test;

reactjs/src/scenes/Roles/index.tsx

@@ -1,4 +1,4 @@
-import { Card, Col, Row, Button, Table, Dropdown, Menu } from 'antd';
+import { Card, Col, Row, Button, Table, Dropdown, Menu, Modal } from 'antd';
 import 'antd/dist/antd.css';
 import * as React from 'react';
 import { EntityDto } from 'src/services/dto/entityDto';
@@ -18,7 +18,7 @@ export interface IRoleState {
   maxResultCount: number;
   skipCount: number;
 }
-
+const confirm = Modal.confirm;
 @inject(Stores.RoleStore)
 @observer
 class Role extends AppComponentBase<any> {
@@ -39,7 +39,7 @@ class Role extends AppComponentBase<any> {
   }
 
   async getAll() {
-    debugger;
+    
     await this.props.roleStore.getAll({ maxResultCount: this.state.maxResultCount, skipCount: this.state.skipCount });
   }
 
@@ -68,20 +68,30 @@ class Role extends AppComponentBase<any> {
     this.setState({ roleId: entityDto.id })
     this.Modal();
 
-    debugger;
+    
     this.formRef.props.form.setFieldsValue({
       ...this.props.roleStore.roleForEdit.role,
       permissions: this.props.roleStore.roleForEdit.grantedPermissionNames,
     });
   }
 
   delete(input: EntityDto) {
-    this.props.roleStore.delete(input);
+    const self = this;
+    confirm({
+      title: 'Do you Want to delete these items?',
+      onOk() {
+        self.props.roleStore.delete(input);
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+    
   }
   handleCreate = () => {
     const form = this.formRef.props.form;
     form.validateFields(async (err: any, values: any) => {
-      debugger;
+      
       if (err) {
         return;
       }

reactjs/src/scenes/Tenants/components/createOrUpdateTenant.tsx

@@ -55,14 +55,14 @@ class CreateOrUpdateTenant extends React.Component<any> {
       return <Modal visible={visible} onCancel={onCancel} onOk={onCreate} title={'User'} width={550}>
           <Form>
           <FormItem label={L('TenancyName')} {...formItemLayout}>
-              {this.props.form.getFieldDecorator('tenancyName', { rules: [{ required: true, message: 'Please input your name!' }] })(<Input />)}
+            {this.props.form.getFieldDecorator('tenancyName', { rules: [{ required: true, message: 'Please input TenancyName!' }] })(<Input />)}
             </FormItem>
           <FormItem label={L('Name')} {...formItemLayout}>
-              {getFieldDecorator('name', { rules: [{ required: true, message: 'Please input your surname!' }] })(<Input />)}
+            {getFieldDecorator('name', { rules: [{ required: true, message: 'Please input your name!' }] })(<Input />)}
             </FormItem>
           {this.props.modalType == 'edit' ? <FormItem label={L('AdminEmailAddress')} {...formItemLayout}>
                 {getFieldDecorator('adminEmailAddress', {
-                  rules: [{ type: 'email', required: true, message: 'Please input your username!' }],
+              rules: [{ type: 'email', required: true, message: 'Please input your email!' }],
                 })(<Input />)}
               </FormItem> : null}
             {this.props.modalType == 'edit' ? <FormItem label={L('DatabaseConnectionString')} {...formItemLayout}>

reactjs/src/scenes/Tenants/index.tsx

@@ -1,4 +1,4 @@
-import { Card, Col, Row,  Button, Table, Tag, Dropdown, Menu } from 'antd';
+import { Card, Col, Row,  Button, Table, Tag, Dropdown, Menu, Modal } from 'antd';
 import 'antd/dist/antd.css';
 import *as React from 'react';
 import { EntityDto } from 'src/services/dto/entityDto';
@@ -12,7 +12,7 @@ import { L } from 'src/lib/abpUtility';
 export interface ITenantProps {
   tenantStore: TenantStore;
 }
-
+const confirm = Modal.confirm;
 @inject(Stores.TenantStore)
 @observer
 class Tenant extends React.Component<any> {
@@ -61,8 +61,18 @@ class Tenant extends React.Component<any> {
     });
   }
 
-  delete(input: EntityDto) {
-    this.props.tenantStore.delete(input);
+  delete (input: EntityDto) {
+    const self=this;
+    confirm({
+      title: 'Do you Want to delete these items?',
+     onOk() {
+        self.props.tenantStore.delete(input);
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+    
   }
 
   handleCreate = () => {

reactjs/src/scenes/Users/components/createOrUpdateUser.tsx

@@ -32,7 +32,7 @@ class CreateOrUpdateUser extends React.Component<any> {
   };
   render() {
     const { roles}=this.props
-    debugger;
+    
     const formItemLayout = {
       labelCol: {
         xs: { span: 6 },

reactjs/src/scenes/Users/index.tsx

@@ -1,4 +1,4 @@
-import { Card, Col, Row, Button, Table, Tag, Dropdown, Menu } from 'antd';
+import { Card, Col, Row, Button, Table, Tag, Dropdown, Menu, Modal } from 'antd';
 import 'antd/dist/antd.css';
 import *as React from 'react';
 import CreateOrUpdateUser from './components/createOrUpdateUser';
@@ -12,7 +12,7 @@ import { L } from 'src/lib/abpUtility';
 export interface IUserProps {
   userStore: UserStore;
 }
-
+const confirm = Modal.confirm;
 @inject(Stores.UserStore)
 @observer
 class User extends React.Component<any> {
@@ -56,19 +56,29 @@ class User extends React.Component<any> {
     this.setState({ userId: entityDto.id });
     this.Modal();
 
-    debugger;
+    
     this.formRef.props.form.setFieldsValue({ ...this.props.userStore.editUser, roleNames: this.props.userStore.editUser.roleNames });
   }
 
   delete(input: EntityDto) {
-    this.props.userStore.delete(input);
+    const self = this;
+    confirm({
+      title: 'Do you Want to delete these items?',
+      onOk() {
+        self.props.userStore.delete(input);
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+   
   }
   handleCreate = () => {
-    debugger;
+    
     const form = this.formRef.props.form;
 
     form.validateFields(async (err: any, values: any) => {
-      debugger;
+      
       if (err) {
         return;
       } else {
@@ -88,7 +98,7 @@ class User extends React.Component<any> {
     this.formRef = formRef;
   };
   public render() {
-    debugger;
+    
     const { users } = this.props.userStore;
     const columns = [{ title: L('UserName'), dataIndex: 'userName', key: 'userName', width: 150, render: (text: string) => <div>
             {text}

reactjs/src/stores/roleStore.ts

@@ -18,7 +18,7 @@ class RoleStore {
   allPermissions: GetAllPermissionsOutput[]=[];
 
   @action async create(createRoleInput:CreateRoleInput){
-    debugger;
+    
 
     console.log(JSON.stringify(createRoleInput));
 var result=await roleService.create(createRoleInput);

reactjs/src/stores/userStore.ts

@@ -15,15 +15,15 @@ class UserStore {
 
   @action
   async create(createUserInput: CreateOrUpdateUserInput) {
-    debugger;
+    
     var result = await userService.create(createUserInput);
     console.log(result);
     this.users.items.push(result);
   }
 
   @action
   async update(updateUserInput: UpdateUserInput) {
-    debugger;
+    
     var result = await userService.update(updateUserInput);
     console.log(result);
     this.users.items = this.users.items.map((x: GetUserOutput) => {