From efa5d25cae9e36059ae3477b6d8e338ade167868 Mon Sep 17 00:00:00 2001
From: merelendor <merelendor@gmail.com>
Date: Thu, 8 Sep 2022 10:05:13 +0300
Subject: [PATCH 1/2] hotfixes for support appeals list

---
 .../change/components/VariantsList/index.js       |  4 +++-
 pages/settings/components/InnerMenu/index.js      |  4 ++--
 pages/support/appeals.js                          | 15 ++++++++++-----
 pages/support/components/RequestFile/index.js     |  4 ++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pages/contract/change/components/VariantsList/index.js b/pages/contract/change/components/VariantsList/index.js
index 0c56299..9d2b544 100644
--- a/pages/contract/change/components/VariantsList/index.js
+++ b/pages/contract/change/components/VariantsList/index.js
@@ -126,7 +126,9 @@ export default class VariantsList extends React.Component
 								</div>
 							)
 						}) }
-						<button className="button button-blue" disabled={ blocked || loading ? true : selected.length > 0 ? false : true } onClick={ this._handle_onOptions }>Далее</button>
+						{ selected !== undefined && selected !== null && (
+							<button className="button button-blue" disabled={ blocked || loading ? true : selected.length > 0 ? false : true } onClick={ this._handle_onOptions }>Далее</button>
+						)}
 					</form>
 				</div>
 				{ loading && (
diff --git a/pages/settings/components/InnerMenu/index.js b/pages/settings/components/InnerMenu/index.js
index f747b8d..1df05f6 100644
--- a/pages/settings/components/InnerMenu/index.js
+++ b/pages/settings/components/InnerMenu/index.js
@@ -64,7 +64,7 @@ export default class InnerMenu extends React.Component
 	render()
 	{
 		const { user, observer } = this.props;
-		const { menuOpened, } = this.state;
+		const { menu, menuOpened, } = this.state;
 
 		return (
 			<aside>
@@ -72,7 +72,7 @@ export default class InnerMenu extends React.Component
 					{ this.props.router && this._getActiveLink(this.props.router.asPath) }
 				</button>
 				<ul className={ menuOpened ? "aside_nav open" : "aside_nav" } ref={ this.menuRef }>
-					{ menu.map(item => 
+					{ user !== undefined && user !== null && menu.map(item => 
 					{
 						if(item.type === "admin" && !observer && !user.is_admin) { return null; }
 
diff --git a/pages/support/appeals.js b/pages/support/appeals.js
index 16b9e59..e65a5fe 100644
--- a/pages/support/appeals.js
+++ b/pages/support/appeals.js
@@ -137,7 +137,6 @@ class SupportAppealsPage extends React.Component
 													<>
 														{ appeals.list.map((appeal, index) => 
 														{
-															console.log("appeal >>>>>>>", appeal);
 															if(active) { if(appeal.status !== "active") { return null; } }
 
 															return (
@@ -154,11 +153,17 @@ class SupportAppealsPage extends React.Component
 																		<div className="item_text">
 																			<p><b>Тема запроса</b></p>
 																			<p>{ appeal.subject }</p>
+																			{ appeal.client_request !== null && appeal.client_request !== "" && (
+																				<>
+																					<p><b>Вопрос</b></p>
+																					<p>{ appeal.client_request }</p>
+																				</>
+																			) }
 																			{ appeal.documents.length > 0 && (
 																				<div className="dosc_list medium-icon">
 																					{ appeal.documents.map((file, index) => {
-																						if(file.doc_direction !== "outgoing") { return null; }
-																						return (<RequestFile key={ `template_${ index }` } id={ file.doc_url } filename={ file.doc_name } extension={ file.doc_extension }/>)
+																						if(file.doc_direction !== "incoming") { return null; }
+																						return (<RequestFile key={ `template_${ index }` } id={ file.doc_url } filename={ `${ file.doc_name }.${ file.doc_extension }` } extension={ file.doc_extension } title="Скачать документ"/>)
 																					}) }
 																				</div>
 																			) }
@@ -169,8 +174,8 @@ class SupportAppealsPage extends React.Component
 																			{ appeal.documents.length > 0 && (
 																				<div className="dosc_list medium-icon">
 																					{ appeal.documents.map((file, index) => {
-																						if(file.doc_direction !== "incoming") { return null; }
-																						(<RequestFile key={ `template_${ index }` } id={ file.doc_url } filename={ file.doc_name } extension={ file.doc_extension }/>)
+																						if(file.doc_direction !== "outgoing") { return null; }
+																						return (<RequestFile key={ `template_${ index }` } id={ file.doc_url } filename={ `${ file.doc_name }.${ file.doc_extension }` } extension={ file.doc_extension } title="Скачать документ"/>)
 																					}) }
 																				</div>
 																			) }
diff --git a/pages/support/components/RequestFile/index.js b/pages/support/components/RequestFile/index.js
index c120fd3..c856bfc 100644
--- a/pages/support/components/RequestFile/index.js
+++ b/pages/support/components/RequestFile/index.js
@@ -31,7 +31,7 @@ export default class RequestFile extends React.Component
 
 	render()
 	{
-		const { filename, extension } = this.props;
+		const { filename, extension, title } = this.props;
 		const { downloading } = this.state;
 
 		return (
@@ -39,7 +39,7 @@ export default class RequestFile extends React.Component
 				<p className="doc_name i-pdf extension" data-format={ extension } style={{ flexDirection: "column", display: "flex", alignItems: "flex-start", }}>
 					{ filename }
 					<span style={{ position: "relative", color: downloading ? "#8e94a780" : "#8e94a7", }}>
-						Скачать шаблон{ downloading ? (<SpinnerCircular size={ 20 } thickness={ 100 } speed={ 100 } color="rgba(236, 239, 244, 1)" secondaryColor="rgba(28, 1, 169, 1)" style={{ position: "absolute", right: 0, marginRight: "-26px", top: 0, }} />) : null }
+						{ title ? title : "Скачать шаблон" } { downloading ? (<SpinnerCircular size={ 20 } thickness={ 100 } speed={ 100 } color="rgba(236, 239, 244, 1)" secondaryColor="rgba(28, 1, 169, 1)" style={{ position: "absolute", right: 0, marginRight: "-26px", top: 0, }} />) : null }
 					</span>
 				</p>
 			</div>

From 556d1b355cc7721edc45d0cff964b7af14bf432b Mon Sep 17 00:00:00 2001
From: merelendor <merelendor@gmail.com>
Date: Thu, 8 Sep 2022 10:06:30 +0300
Subject: [PATCH 2/2] appeals hotfix 2

---
 pages/support/appeals.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/support/appeals.js b/pages/support/appeals.js
index e65a5fe..bc261ef 100644
--- a/pages/support/appeals.js
+++ b/pages/support/appeals.js
@@ -155,7 +155,7 @@ class SupportAppealsPage extends React.Component
 																			<p>{ appeal.subject }</p>
 																			{ appeal.client_request !== null && appeal.client_request !== "" && (
 																				<>
-																					<p><b>Вопрос</b></p>
+																					<p><b>Текст запроса</b></p>
 																					<p>{ appeal.client_request }</p>
 																				</>
 																			) }