hotfix edit profile, projects-filter in programs, news-card, & disabled select

Author: Awakich

projects/social_platform/src/app/office/features/detail/detail.component.html

@@ -256,8 +256,8 @@
                   size="medium"
                   class="cancel__button"
                   customTypographyClass="text-body-12"
-                  [disabled]="!selectedProjectId"
-                  [style.opacity]="!selectedProjectId ? '0.5' : '1'"
+                  [disabled]="!isProjectSelected"
+                  [class.cancel__button--disabled]="!isProjectSelected"
                   (click)="addProjectModal()"
                 >
                   выбрать проект

projects/social_platform/src/app/office/features/detail/detail.component.scss

@@ -229,6 +229,11 @@ $detail-bar-mb: 12px;
 
   &__button {
     margin-top: 20px;
+
+    &--disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
   }
 
   &__cross {

projects/social_platform/src/app/office/features/detail/detail.component.ts

@@ -90,7 +90,7 @@ export class DeatilComponent implements OnInit, OnDestroy {
   isProfileFill = false;
 
   // Переменные для работы с модалкой подачи проекта
-  selectedProjectId = 0;
+  selectedProjectId: number | null = null;
   dubplicatedProjectId = 0;
   memberProjects: Project[] = [];
 
@@ -167,7 +167,7 @@ export class DeatilComponent implements OnInit, OnDestroy {
     this.showSubmitProjectModal.set(!this.showSubmitProjectModal());
 
     if (!this.showSubmitProjectModal()) {
-      this.selectedProjectId = 0;
+      this.selectedProjectId = null;
     }
   }
 
@@ -197,7 +197,7 @@ export class DeatilComponent implements OnInit, OnDestroy {
    * Добавление проекта на программу
    */
   addProjectModal(): void {
-    if (!this.selectedProjectId) {
+    if (this.selectedProjectId === null) {
       return;
     }
 
@@ -208,6 +208,10 @@ export class DeatilComponent implements OnInit, OnDestroy {
     this.assignProjectToProgram(selectedProject!);
   }
 
+  get isProjectSelected(): boolean {
+    return this.selectedProjectId !== null;
+  }
+
   addNewProject(): void {
     this.projectsService.addProject();
   }

projects/social_platform/src/app/office/features/news-card/news-card.component.html

@@ -60,10 +60,10 @@
   </ul>
   } @if (newsTextExpandable && !editMode) {
   <div
-    class="read-more"
+    class="read-more text-body-10"
     (click)="onExpandNewsText(newsTextEl?.nativeElement, 'expanded', readMore)"
   >
-    {{ readMore ? "Скрыть" : "Читать полностью" }}
+    {{ readMore ? "скрыть" : "читать полностью" }}
   </div>
   } @if (!editMode) {
 

projects/social_platform/src/app/office/onboarding/stage-zero/stage-zero.component.scss

@@ -3,6 +3,7 @@
 .page {
   position: relative;
   margin-bottom: 50px;
+  padding-bottom: 130px;
 
   &__form {
     @include responsive.apply-desktop {

projects/social_platform/src/app/office/profile/edit/edit.component.ts

@@ -1037,7 +1037,39 @@ export class ProfileEditComponent implements OnInit, OnDestroy, AfterViewInit {
    * Валидирует всю форму и отправляет данные на сервер
    */
   saveProfile(): void {
-    if (!this.validationService.getFormValidation(this.profileForm) || this.profileFormSubmitting) {
+    const tempFields = [
+      "organizationName",
+      "entryYear",
+      "completionYear",
+      "description",
+      "educationLevel",
+      "educationStatus",
+      "organization",
+      "entryYearWork",
+      "completionYearWork",
+      "descriptionWork",
+      "jobPosition",
+      "language",
+      "languageLevel",
+      "title",
+      "status",
+      "year",
+      "files",
+    ];
+
+    tempFields.forEach(name => {
+      const control = this.profileForm.get(name);
+      if (control) {
+        control.clearValidators();
+        control.updateValueAndValidity();
+      }
+    });
+
+    const mainFieldsValid = ["firstName", "lastName", "birthday", "speciality"].every(
+      name => this.profileForm.get(name)?.valid
+    );
+
+    if (!mainFieldsValid || this.profileFormSubmitting) {
       this.isModalErrorSkillsChoose.set(true);
       return;
     }

projects/social_platform/src/app/office/program/detail/list/list.component.ts

@@ -27,7 +27,7 @@ import {
   tap,
   throttleTime,
 } from "rxjs";
-import { ProjectsFilterComponent } from "@office/projects/projects-filter/projects-filter.component";
+import { ProjectsFilterComponent } from "@office/program/detail/list/projects-filter/projects-filter.component";
 import Fuse from "fuse.js";
 import { ActivatedRoute, Router, RouterModule } from "@angular/router";
 import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from "@angular/forms";

projects/social_platform/src/app/office/program/detail/list/projects-filter/projects-filter.component.html

@@ -1,12 +1,12 @@
 <!-- @format -->
+<div class="filter__titles">
+  <p class="text-body-14">фильтры</p>
+  <!-- <a class="text-body-12 filter__clear" (click)="clearFilters()">Сбросить фильтры</a> -->
+</div>
+
 @if (filters()?.length) {
 <div class="filter">
   <div class="filter__body" [formGroup]="filterForm">
-    <div class="filter__titles">
-      <p class="text-body-14">фильтры</p>
-      <!-- <a class="text-body-12 filter__clear" (click)="clearFilters()">Сбросить фильтры</a> -->
-    </div>
-
     @if (filters()?.length && filterForm.controls) { @for (field of filters(); track field.id) { @if
     (filterForm.get(field.name)) {
     <div class="filter__block">

projects/social_platform/src/app/office/program/main/main.component.html

@@ -19,6 +19,11 @@
       <span class="text-body-12 programs__filter--text">участвую</span>
     </label>
 
-    <app-select size="big" placeholder="все" [options]="programOptionsFilter"></app-select>
+    <app-select
+      size="big"
+      placeholder="все"
+      [options]="programOptionsFilter"
+      [isDisabled]="true"
+    ></app-select>
   </div>
 </div>

projects/social_platform/src/app/ui/components/select/select.component.html

@@ -8,6 +8,7 @@
     [class.field__input--open]="isOpen"
     [class.field__input--small]="size === 'small'"
     [class.field__input--big]="size === 'big'"
+    [class.field__input--disabled]="disabled"
     (click)="isOpen = !isOpen; highlightedIndex = -1"
   >
     {{
@@ -30,7 +31,7 @@
     ></i>
     }
   </div>
-  @if (isOpen) {
+  @if (!isDisabled) { @if (isOpen) {
   <ul #dropdown class="field__options">
     @for (option of options; track option.id; let index = $index) {
     <li
@@ -43,5 +44,5 @@
     </li>
     }
   </ul>
-  }
+  } }
 </div>