RocketChat#755 [FIX] Правки | Добавлена иконка "плюс в круге"

app/discussion/client/views/creationDialog/CreateDiscussion.html

@@ -75,7 +75,7 @@
 				</div>
 			</form>
 			<div class="rc-input">
-				<button form="create-discussion" class="rc-button rc-button--primary js-save-discussion {{createIsDisabled}}" {{createIsDisabled}}>{{_ " Create "}}</button>
+				<button form="create-discussion" class="rc-button rc-button--primary js-save-discussion {{createIsDisabled}}" {{createIsDisabled}}>{{_ "Create"}}</button>
 			</div>
 		</div>
 	</section>

app/lib/server/functions/saveUserIdentity.js

@@ -11,15 +11,15 @@ import { updateGroupDMsName } from './updateGroupDMsName';
  * @param {string} userId user performing the action
  * @param {object} changes changes to the user
  */
-export function saveUserIdentity(userId, { _id, name: rawName, username: rawUsername, surname: rawSurname, patronymic: rawPatronymc }) {
+export function saveUserIdentity(userId, { _id, name: rawName, username: rawUsername, surname: rawSurname, patronymic: rawPatronymic }) {
 	if (!_id) {
 		return false;
 	}
 
 	const name = String(rawName).trim();
 	const username = String(rawUsername).trim();
 	const surname = String(rawSurname).trim();
-	const patronymic = String(rawPatronymc).trim();
+	const patronymic = String(rawPatronymic).trim();
 
 	const user = Users.findOneById(_id);
 
@@ -51,11 +51,11 @@ export function saveUserIdentity(userId, { _id, name: rawName, username: rawUser
 		}
 	}
 
-	// if (typeof rawPatronymc !== 'undefined' && patronymicChanged) {
-	// 	if (!setPatronymic(_id, patronymic, user)) {
-	// 		return false;
-	// 	}
-	// }
+	if (typeof rawPatronymic !== 'undefined' && patronymicChanged) {
+		if (!setPatronymic(_id, patronymic, user)) {
+			return false;
+		}
+	}
 
 	// if coming from old username, update all references
 	if (previousUsername && usernameChanged) {

app/reactions/client/init.js

@@ -94,7 +94,7 @@ Meteor.startup(function() {
 
 			return true;
 		},
-		order: 3,
+		order: 2,
 		group: ['menu'],
 	});
 });

app/ui/client/views/app/CreateDirectMessage.html

@@ -24,7 +24,7 @@
 				</div>
 			</form>
 			<div class="rc-input">
-				<button form="create-dm" class="rc-button rc-button--primary js-save-dm {{createIsDisabled}}" {{createIsDisabled}}>{{_ " Create "}}</button>
+				<button form="create-dm" class="rc-button rc-button--primary js-save-dm {{createIsDisabled}}" {{createIsDisabled}}>{{_ "Create"}}</button>
 			</div>
 		</div>
 	</section>

app/working-group-meetings/client/views/workingGroupMeeting.js

@@ -127,7 +127,6 @@ export function WorkingGroupMeetingPage() {
 			console.log('!fileupload_enabled');
 			return null;
 		}
-		console.log('fileuploadenabled');
 		const $input = $(document.createElement('input'));
 		$input.css('display', 'none');
 		$input.attr({

app/working-group/client/views/index.js

@@ -82,7 +82,7 @@ export function WorkingGroupPage() {
 	const onHeaderClick = (id) => {
 		const [sortBy, sortDirection] = sort;
 		if (sortBy === id) {
-			setSort([id, sortDirection === 'asc' ? 'workingGroupType' : 'asc']);
+			setSort([id, sortDirection === 'asc' ? 'workingGroup' : 'asc']);
 			return;
 		}
 		setSort([id, 'asc']);

client/components/GenericTable.js

@@ -6,7 +6,7 @@ import flattenChildren from 'react-keyed-flatten-children';
 import { useTranslation } from '../contexts/TranslationContext';
 
 function SortIcon({ direction }) {
-	return <Box is='svg' width='x16' height='x16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'>
+	return <Box is='svg' width='x24' height='x24' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'>
 		<path d='M5.33337 5.99999L8.00004 3.33333L10.6667 5.99999' stroke={direction === 'desc' ? '#9EA2A8' : '#E4E7EA' } strokeWidth='1.33333' strokeLinecap='round' strokeLinejoin='round'/>
 		<path d='M5.33337 10L8.00004 12.6667L10.6667 10' stroke={ direction === 'asc' ? '#9EA2A8' : '#E4E7EA'} strokeWidth='1.33333' strokeLinecap='round' strokeLinejoin='round'/>
 	</Box>;

client/components/basic/UserInfo.js

@@ -54,8 +54,15 @@ export const UserInfo = React.memo(function UserInfo({
 		{actions}
 
 		<Margins block='x4'>
-			<UserCard.Username name={(showRealNames && name) || username || name} status={status} />
-			<Info>{customStatus}</Info>
+			{shortFio && <>
+				<Label>{t('Full_Name')}</Label>
+				<Info>{shortFio}</Info>
+			</>}
+			{username && <>
+				<Label>{ t('Username') }</Label>
+				<UserCard.Username name={ username } status={ status } />
+				<Info>{ customStatus }</Info>
+			</>}
 
 			{!!roles && <>
 				<Label>{t('Roles')}</Label>
@@ -67,19 +74,9 @@ export const UserInfo = React.memo(function UserInfo({
 				<Info><UTCClock utcOffset={utcOffset}/></Info>
 			</>}
 
-			{username && username !== name && <>
-				<Label>{t('Username')}</Label>
-				<Info>{username}</Info>
-			</>}
-
 			<Label>{t('Last_login')}</Label>
 			<Info>{lastLogin ? timeAgo(lastLogin) : t('Never')}</Info>
 
-			{shortFio && <>
-				<Label>{t('Full_Name')}</Label>
-				<Info>{shortFio}</Info>
-			</>}
-
 			{nickname && <>
 				<Label>{t('Nickname')}</Label>
 				<Info>{nickname}</Info>