Merge pull request #258 from PROCOLLAB-github/fixes-program

fix naming of program add program & modal logic from edit project

Author: Awakich

.github/workflows/pull_request.yml

@@ -33,7 +33,7 @@ jobs:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_ACCESS_TOKEN }}
           NETLIFY_PREVIEW_APP: true # or perhaps like this
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NETLIFY_PR_ID: ${{ github.pr_id }}-social
+          NETLIFY_PR_ID: ${{ github.event.pull_request.number }}-social
       - name: Publish preview skills
         uses: netlify/actions/cli@master
         id: publish_preview_skills
@@ -44,7 +44,7 @@ jobs:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_ACCESS_TOKEN }}
           NETLIFY_PREVIEW_APP: true # or perhaps like this
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NETLIFY_PR_ID: ${{ github.pr_id }}-skills
+          NETLIFY_PR_ID: ${{ github.event.pull_request.number }}-skills
       - uses: mshick/add-pr-comment@v2
         with:
           message: |

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

@@ -92,7 +92,7 @@
             (click)="isProjectAssigned ? null : addNewProject()"
             customTypographyClass="text-body-12 bar__add-project"
           >
-            <span>{{ isProjectAssigned ? "вы подали проект" : "подать проект" }}</span>
+            <span>{{ isProjectAssigned ? "вы подали проект" : "создать заявку" }}</span>
             <i appIcon icon="plus" appSquare="10"></i>
           </app-button>
           } @if ((isUserManager || isUserExpert) && isUserMember) {

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

@@ -484,21 +484,29 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
     this.isAssignProjectToProgramModalOpen.set(false);
   }
 
-  private getFromProgramSeenKey(): string {
-    return `project_fromProgram_modal_seen_${this.profileId}`;
+  private getFromProgramSeenKey(type: "program" | "project"): string {
+    if (type === "program") {
+      return `project_fromProgram_modal_seen_${this.profileId}`;
+    } else return `project_modal_seen_${this.profileId}`;
   }
 
   private hasSeenFromProgramModal(): boolean {
     try {
-      return !!localStorage.getItem(this.getFromProgramSeenKey());
+      if (this.fromProgram) {
+        return !!localStorage.getItem(this.getFromProgramSeenKey("program"));
+      }
+      return !!localStorage.getItem(this.getFromProgramSeenKey("project"));
     } catch (e) {
       return false;
     }
   }
 
   private markSeenFromProgramModal(): void {
     try {
-      localStorage.setItem(this.getFromProgramSeenKey(), "1");
+      if (this.fromProgram) {
+        localStorage.setItem(this.getFromProgramSeenKey("program"), "1");
+      }
+      localStorage.setItem(this.getFromProgramSeenKey("project"), "1");
     } catch (e) {}
   }
 
@@ -679,7 +687,7 @@ export class ProjectEditComponent implements OnInit, AfterViewInit, OnDestroy {
       this.fromProgram = params["fromProgram"];
 
       const seen = this.hasSeenFromProgramModal();
-      if (this.fromProgram && !seen) {
+      if (!seen) {
         this.fromProgramOpen.set(true);
         this.markSeenFromProgramModal();
       } else {