Web: Client: People: Fixed displaying for some values at user profile for personal mode

2022-05-20 15:27:42 +03:00 · 2022-05-20 15:27:42 +03:00 · bfaefee8fd
commit bfaefee8fd
parent 5f3db9ab0d
3 changed files with 141 additions and 136 deletions
--- a/products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
+++ b/products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
@ -323,11 +323,11 @@ class ProfileInfo extends React.PureComponent {
        )}
        {mobilePhone && (
          <InfoItem>
-            <InfoItemLabel>{t("PhoneLbl")}:</InfoItemLabel>
+            <InfoItemLabel>{t("Profile:PhoneLbl")}:</InfoItemLabel>
            <InfoItemValue>{mobilePhone}</InfoItemValue>
          </InfoItem>
        )}
-        {sex && (
+        {!personal && sex && (
          <InfoItem>
            <InfoItemLabel>{t("Translations:Sex")}:</InfoItemLabel>
            <InfoItemValue className="profile-info_sex">
@ -335,7 +335,7 @@ class ProfileInfo extends React.PureComponent {
            </InfoItemValue>
          </InfoItem>
        )}
-        {birthday && (
+        {!personal && birthday && (
          <InfoItem>
            <InfoItemLabel>{t("Translations:Birthdate")}:</InfoItemLabel>
            <InfoItemValue className="profile-info_birthdate">
@ -359,7 +359,7 @@ class ProfileInfo extends React.PureComponent {
            </InfoItemValue>
          </InfoItem>
        )}
-        {location && (
+        {!personal && location && (
          <InfoItem>
            <InfoItemLabel>{t("Common:Location")}:</InfoItemLabel>
            <InfoItemValue className="profile-info_location">
@ -394,7 +394,9 @@ class ProfileInfo extends React.PureComponent {
                    className="language-combo"
                    showDisabledItems={true}
                    dropDownMaxHeight={364}
-                    manualWidth="240px"
+                    manualWidth="320px"
+                    isDefaultMode={false}
+                    withBlur={window.innerWidth <= 428}
                  />
                  <HelpButton
                    place="bottom"
--- a/products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
+++ b/products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
@ -533,7 +533,7 @@ class SectionBodyContent extends React.PureComponent {
          </ToggleWrapper>
        )}

-        {profile.notes && (
+        {!personal && profile.notes && (
          <ToggleWrapper isContacts={true}>
            <ToggleContent label={t("Common:Comments")} isOpen={true}>
              <Text className="profile-comments" as="span">
@ -542,14 +542,14 @@ class SectionBodyContent extends React.PureComponent {
            </ToggleContent>
          </ToggleWrapper>
        )}
-        {profile.contacts && (
+        {!personal && profile.contacts && (
          <ToggleWrapper isContacts={true}>
            <ToggleContent label={t("ContactInformation")} isOpen={true}>
              <Text as="span">{infoContacts}</Text>
            </ToggleContent>
          </ToggleWrapper>
        )}
-        {socialContacts && (
+        {!personal && socialContacts && (
          <ToggleWrapper isContacts={true}>
            <ToggleContent
              label={t("Translations:SocialProfiles")}
--- a/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
+++ b/products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
@ -840,18 +840,20 @@ class UpdateUserForm extends React.Component {
              maxLength={50}
              maxLabelWidth={maxLabelWidth}
            />
-            <DateField
-              calendarHeaderContent={`${t("CalendarSelectDate")}:`}
-              labelText={`${t("Translations:Birthdate")}:`}
-              inputName="birthday"
-              inputClassName="date-picker_input-birthday"
-              inputValue={birthdayDateValue}
-              inputIsDisabled={isLoading}
-              inputOnChange={this.onBirthdayDateChange}
-              inputTabIndex={6}
-              locale={language}
-              maxLabelWidth={maxLabelWidth}
-            />
+            {!personal && (
+              <DateField
+                calendarHeaderContent={`${t("CalendarSelectDate")}:`}
+                labelText={`${t("Translations:Birthdate")}:`}
+                inputName="birthday"
+                inputClassName="date-picker_input-birthday"
+                inputValue={birthdayDateValue}
+                inputIsDisabled={isLoading}
+                inputOnChange={this.onBirthdayDateChange}
+                inputTabIndex={6}
+                locale={language}
+                maxLabelWidth={maxLabelWidth}
+              />
+            )}
            <RadioField
              labelText={`${t("Translations:Sex")}:`}
              radioName="sex"
@ -865,127 +867,128 @@ class UpdateUserForm extends React.Component {
              maxLabelWidth={maxLabelWidth}
            />
            {!personal && (
-              <RadioField
-                labelText={`${t("Common:Type")}:`}
-                radioName="isVisitor"
-                radioValue={profile.isVisitor.toString()}
-                radioOptions={[
-                  { value: "true", label: guestCaption },
-                  { value: "false", label: userCaption },
-                ]}
-                radioIsDisabled={
-                  isLoading || disableProfileType || radioIsDisabled || isMy
-                }
-                radioOnChange={this.onUserTypeChange}
-                tooltipContent={tooltipTypeContent}
-                helpButtonHeaderContent={t("Common:Type")}
-                maxLabelWidth={maxLabelWidth}
-              />
-            )}
-            {!personal && (
-              <DateField
-                calendarHeaderContent={`${t("CalendarSelectDate")}:`}
-                labelText={`${regDateCaption}:`}
-                inputName="workFrom"
-                inputClassName="date-picker_input-reg-date"
-                inputValue={calendarWorkFrom}
-                inputIsDisabled={
-                  isLoading ||
-                  !isAdmin ||
-                  calendarMinDate >= new Date().setHours(0, 0, 0, 0)
-                }
-                inputOnChange={this.onWorkFromDateChange}
-                inputTabIndex={7}
-                calendarMinDate={calendarMinDate}
-                locale={language}
-                maxLabelWidth={maxLabelWidth}
-                //calendarMaxDate={calendarMinDate}
-              />
-            )}
-            <TextField
-              labelText={`${t("Common:Location")}:`}
-              inputName="location"
-              inputValue={profile.location}
-              inputIsDisabled={isLoading}
-              inputOnChange={this.onInputChange}
-              inputTabIndex={8}
-              maxLabelWidth={maxLabelWidth}
-            />
-            {!personal && (
-              <TextField
-                labelText={`${userPostCaption}:`}
-                inputName="title"
-                inputValue={profile.title}
-                inputIsDisabled={isLoading || !isAdmin}
-                inputOnChange={this.onInputChange}
-                inputTabIndex={9}
-                maxLabelWidth={maxLabelWidth}
-              />
-            )}
-            {!isMy && !personal && (
-              <DepartmentField
-                labelText={`${groupCaption}:`}
-                isDisabled={isLoading || !isAdmin}
-                showGroupSelectorButtonTitle={t("Common:AddButton")}
-                onShowGroupSelector={this.onShowGroupSelector}
-                onCloseGroupSelector={this.onCloseGroupSelector}
-                onRemoveGroup={this.onRemoveGroup}
-                selectorIsVisible={selector.visible}
-                selectorOptions={selector.options}
-                selectorSelectedOptions={selector.selected}
-                selectorSelectAllText={t("Common:SelectAll")}
-                selectorOnSearchGroups={this.onSearchGroups}
-                selectorOnSelectGroups={this.onSelectGroups}
-                maxLabelWidth={maxLabelWidth}
-              />
+              <>
+                <RadioField
+                  labelText={`${t("Common:Type")}:`}
+                  radioName="isVisitor"
+                  radioValue={profile.isVisitor.toString()}
+                  radioOptions={[
+                    { value: "true", label: guestCaption },
+                    { value: "false", label: userCaption },
+                  ]}
+                  radioIsDisabled={
+                    isLoading || disableProfileType || radioIsDisabled || isMy
+                  }
+                  radioOnChange={this.onUserTypeChange}
+                  tooltipContent={tooltipTypeContent}
+                  helpButtonHeaderContent={t("Common:Type")}
+                  maxLabelWidth={maxLabelWidth}
+                />
+                <DateField
+                  calendarHeaderContent={`${t("CalendarSelectDate")}:`}
+                  labelText={`${regDateCaption}:`}
+                  inputName="workFrom"
+                  inputClassName="date-picker_input-reg-date"
+                  inputValue={calendarWorkFrom}
+                  inputIsDisabled={
+                    isLoading ||
+                    !isAdmin ||
+                    calendarMinDate >= new Date().setHours(0, 0, 0, 0)
+                  }
+                  inputOnChange={this.onWorkFromDateChange}
+                  inputTabIndex={7}
+                  calendarMinDate={calendarMinDate}
+                  locale={language}
+                  maxLabelWidth={maxLabelWidth}
+                  //calendarMaxDate={calendarMinDate}
+                />
+                <TextField
+                  labelText={`${t("Common:Location")}:`}
+                  inputName="location"
+                  inputValue={profile.location}
+                  inputIsDisabled={isLoading}
+                  inputOnChange={this.onInputChange}
+                  inputTabIndex={8}
+                  maxLabelWidth={maxLabelWidth}
+                />
+                <TextField
+                  labelText={`${userPostCaption}:`}
+                  inputName="title"
+                  inputValue={profile.title}
+                  inputIsDisabled={isLoading || !isAdmin}
+                  inputOnChange={this.onInputChange}
+                  inputTabIndex={9}
+                  maxLabelWidth={maxLabelWidth}
+                />
+                {!isMy && (
+                  <DepartmentField
+                    labelText={`${groupCaption}:`}
+                    isDisabled={isLoading || !isAdmin}
+                    showGroupSelectorButtonTitle={t("Common:AddButton")}
+                    onShowGroupSelector={this.onShowGroupSelector}
+                    onCloseGroupSelector={this.onCloseGroupSelector}
+                    onRemoveGroup={this.onRemoveGroup}
+                    selectorIsVisible={selector.visible}
+                    selectorOptions={selector.options}
+                    selectorSelectedOptions={selector.selected}
+                    selectorSelectAllText={t("Common:SelectAll")}
+                    selectorOnSearchGroups={this.onSearchGroups}
+                    selectorOnSelectGroups={this.onSelectGroups}
+                    maxLabelWidth={maxLabelWidth}
+                  />
+                )}
+              </>
            )}
          </MainFieldsContainer>
        </MainContainer>
        {!personal && (
-          <InfoFieldContainer
-            headerText={t("Common:Comments")}
-            marginBottom={"42px"}
-          >
-            <Textarea
-              placeholder={t("WriteComment")}
-              name="notes"
-              value={profile.notes}
-              isDisabled={isLoading}
-              onChange={this.onInputChange}
-              tabIndex={10}
-            />
-          </InfoFieldContainer>
+          <>
+            <InfoFieldContainer
+              headerText={t("Common:Comments")}
+              marginBottom={"42px"}
+            >
+              <Textarea
+                placeholder={t("WriteComment")}
+                name="notes"
+                value={profile.notes}
+                isDisabled={isLoading}
+                onChange={this.onInputChange}
+                tabIndex={10}
+              />
+            </InfoFieldContainer>
+
+            <InfoFieldContainer
+              headerText={t("ContactInformation")}
+              marginBottom={"42px"}
+            >
+              <ContactsField
+                pattern={pattern.contact}
+                contacts={contacts.contact}
+                isDisabled={isLoading}
+                addItemText={t("AddContact")}
+                onItemAdd={this.onContactsItemAdd}
+                onItemTypeChange={this.onContactsItemTypeChange}
+                onItemTextChange={this.onContactsItemTextChange}
+                onItemRemove={this.onContactsItemRemove}
+              />
+            </InfoFieldContainer>
+            <InfoFieldContainer
+              headerText={t("Translations:SocialProfiles")}
+              {...(isTabletView && { marginBottom: "36px" })}
+            >
+              <ContactsField
+                pattern={pattern.social}
+                contacts={contacts.social}
+                isDisabled={isLoading}
+                addItemText={t("AddContact")}
+                onItemAdd={this.onContactsItemAdd}
+                onItemTypeChange={this.onContactsItemTypeChange}
+                onItemTextChange={this.onContactsItemTextChange}
+                onItemRemove={this.onContactsItemRemove}
+              />
+            </InfoFieldContainer>
+          </>
        )}
-        <InfoFieldContainer
-          headerText={t("ContactInformation")}
-          marginBottom={"42px"}
-        >
-          <ContactsField
-            pattern={pattern.contact}
-            contacts={contacts.contact}
-            isDisabled={isLoading}
-            addItemText={t("AddContact")}
-            onItemAdd={this.onContactsItemAdd}
-            onItemTypeChange={this.onContactsItemTypeChange}
-            onItemTextChange={this.onContactsItemTextChange}
-            onItemRemove={this.onContactsItemRemove}
-          />
-        </InfoFieldContainer>
-        <InfoFieldContainer
-          headerText={t("Translations:SocialProfiles")}
-          {...(isTabletView && { marginBottom: "36px" })}
-        >
-          <ContactsField
-            pattern={pattern.social}
-            contacts={contacts.social}
-            isDisabled={isLoading}
-            addItemText={t("AddContact")}
-            onItemAdd={this.onContactsItemAdd}
-            onItemTypeChange={this.onContactsItemTypeChange}
-            onItemTextChange={this.onContactsItemTextChange}
-            onItemRemove={this.onContactsItemRemove}
-          />
-        </InfoFieldContainer>
        <div>
          <Button
            label={t("Common:SaveButton")}