fix tag padding, redirect in program-member, skills in vacancies & project-vacancy-card, submitProject

Author: Awakich

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

@@ -205,6 +205,11 @@ export class DeatilComponent implements OnInit, OnDestroy {
       project => project.id === this.selectedProjectId
     );
 
+    if (!selectedProject) {
+      this.snackbarService.error("Проект не найден. Попробуйте выбрать другой проект.");
+      return;
+    }
+
     this.assignProjectToProgram(selectedProject!);
   }
 
@@ -222,6 +227,11 @@ export class DeatilComponent implements OnInit, OnDestroy {
    * Перенаправление её на редактирование "нового" проекта
    */
   assignProjectToProgram(project: Project): void {
+    if (!project || !project.id) {
+      this.snackbarService.error("Ошибка при выборе проекта");
+      return;
+    }
+
     if (this.info().id) {
       this.projectService
         .assignProjectToProgram(project.id, Number(this.route.snapshot.params["programId"]))
@@ -231,7 +241,7 @@ export class DeatilComponent implements OnInit, OnDestroy {
             this.assignProjectToProgramModalMessage.set(r);
             this.isAssignProjectToProgramModalOpen.set(true);
             this.toggleSubmitProjectModal();
-            this.selectedProjectId = 0;
+            this.selectedProjectId = null;
           },
 
           error: err => {

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

@@ -21,7 +21,7 @@
       @for (listItem of searchedList; track listItem.id) {
       <li class="page__item">
         @if (listType === 'projects' || listType === 'members') {
-        <a [routerLink]="[routerLink]">
+        <a [routerLink]="routerLink(listItem.id)">
           <app-info-card
             [type]="listType"
             [profileId]="listItem.id"
@@ -59,7 +59,7 @@
         <div class="filter__controls">
           <label class="filter__tags" (click)="setValue($event)">
             <app-checkbox [checked]="this.filterForm.get('filterTag')?.value"></app-checkbox>
-            <p class="text-body-12">проекты без оценки</p>
+            <p class="text-body-12">проекты с оценкой</p>
           </label>
         </div>
       </form>

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

@@ -142,8 +142,6 @@ export class ProgramListComponent implements OnInit, OnDestroy, AfterViewInit {
       this.listType = data["listType"];
     });
 
-    console.log(this.listType);
-
     const routeData$ = this.route.data.pipe(map(r => r["data"])).subscribe(data => {
       this.listTotalCount = data.count;
       this.list = data.results;

projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.html

@@ -42,7 +42,7 @@
       >{{ skill.name }}</app-tag
     >
     } @if (vacancy.requiredSkills.length > 5) {
-    <p class="vacancy__skill--more">+ {{ vacancy.requiredSkills.length - 5 }}</p>
+    <p class="vacancy__skill--more text-body-10">+ {{ vacancy.requiredSkills.length - 5 }}</p>
     }
   </div>
 
@@ -51,8 +51,11 @@
     <div class="text-body-10 about__text">
       <p #descEl [innerHTML]="vacancy.description | parseLinks | parseBreaks"></p>
       @if (descriptionExpandable) {
-      <div class="read-more" (click)="onExpandDescription(descEl, 'expanded', readFullDescription)">
-        {{ readFullDescription ? "Скрыть" : "Подробнее" }}
+      <div
+        class="read-more text-body-10"
+        (click)="onExpandDescription(descEl, 'expanded', readFullDescription)"
+      >
+        {{ readFullDescription ? "cкрыть" : "подробнее" }}
       </div>
       }
     </div>

projects/social_platform/src/app/office/projects/detail/shared/project-vacancy-card/project-vacancy-card.component.scss

@@ -62,14 +62,13 @@
 
   &__skills {
     display: flex;
-    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: center;
     gap: 2px;
     margin-top: 8px;
   }
 
   &__skill {
-    display: inline-flex;
-
     &--more {
       color: var(--accent);
     }

projects/social_platform/src/app/ui/components/tag/tag.component.scss

@@ -4,7 +4,7 @@
   display: flex;
   align-items: center;
   max-width: 300px;
-  padding: 3px 20px;
+  padding: 2px 20px;
   overflow: hidden;
   color: var(--accent);
   text-overflow: ellipsis;