PRO-6172-Staging

customHttp.yml

@@ -1,12 +1,12 @@
 customHeaders:
-  - pattern: '**/*'
+  - pattern: "**/*"
     headers:
       - key: Content-Security-Policy
         value: >-
           default-src 'self' 'unsafe-inline' https://* https://api.razorpay.com wss:; 
           img-src https://* 'self' data: https://storage.googleapis.com; 
           style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://client.crisp.chat https://unpkg.com https://*; 
-          script-src 'self' 'unsafe-eval' 'unsafe-inline' https://* 'nonce-6A576D5A7134743777217A25432A462D' 'nonce-792F423F4528482B4D6251655368566D' 'sha256-C+IGLEBTrzg1cqDKPZqpHDyT8Xu0DaPNG2w4A4c/YwA=' 'sha256-5CHnVzl6ds4Czo4JIGZODmOQz6oAqOA2gFtZ5VbeqiY=' 'sha256-Uyj0M92yRd7fuZy0y0k0xpKoTyWNSDgZZXesLbzukrU=' https://unpkg.com https://www.google.com https://cdn.ckeditor.com https://edge.fullstory.com https://client.crisp.chat https://checkout.razorpay.com https://www.googletagmanager.com https://www.gstatic.com https://www.google-analytics.com; 
+          script-src 'self' 'unsafe-eval' 'unsafe-inline' https://* 'nonce-6A576D5A7134743777217A25432A462D' 'nonce-792F423F4528482B4D6251655368566D' 'sha256-C+IGLEBTrzg1cqDKPZqpHDyT8Xu0DaPNG2w4A4c/YwA=' 'sha256-5CHnVzl6ds4Czo4JIGZODmOQz6oAqOA2gFtZ5VbeqiY=' 'sha256-Uyj0M92yRd7fuZy0y0k0xpKoTyWNSDgZZXesLbzukrU=' 'nonce-HK0O08yJcxnAqWev' https://unpkg.com https://www.google.com https://cdn.ckeditor.com https://edge.fullstory.com https://client.crisp.chat https://checkout.razorpay.com https://www.googletagmanager.com https://www.gstatic.com https://www.google-analytics.com https://translate.google.com; 
           connect-src 'self' 'unsafe-inline' https://* https://rs.fullstory.com https://api-staging.civis.vote wss://client.relay.crisp.chat sentry.io https://*.sentry.io *.sentry.io https://api.civis.vote; 
           font-src 'self' https://* https://fonts.gstatic.com https://client.crisp.chat; 
-          frame-src 'self' https://* *.amazonaws.com https://api.razorpay.com; object-src 'self';
+          frame-src 'self' https://* *.amazonaws.com https://api.razorpay.com; object-src 'self';

server.js

@@ -53,4 +53,4 @@ app.get('*', function(req, res) {
     res.sendFile(path.join(__dirname + '/dist/civis/index.html'));
 });
 
-console.log("listing on port", PORT);
+console.log("listing on port", PORT);

src/app/graphql/queries.graphql.ts

@@ -1,7 +1,7 @@
 import gql from 'graphql-tag';
 
 export const CurrentUser = gql`
-query{
+query getCurrentUser{
   userCurrent {
     id
     bestRank
@@ -56,7 +56,7 @@ query{
 `;
 
 export const profanityList =  gql`
-query{
+query profanityList{
   profanityList {
     data {
       profaneWord

src/app/modules/consultations/consultation-profile/consultation-profile.graphql.ts

@@ -96,6 +96,22 @@ export const ConsultationProfile = gql`
       updatedAt
       publishedAt
       visibility
+      consultationPartnerResponses {
+        responseCount
+        organisation {
+          createdAt
+          employeeCount
+          id
+          name
+          officialUrl
+          updatedAt
+          logo {
+            filename
+            id
+            url
+          }
+        }
+      }
     }
   }
 `;
@@ -214,6 +230,22 @@ export const ConsultationProfileCurrentUser = gql`
       updatedAt
       publishedAt
       visibility
+      consultationPartnerResponses {
+        responseCount
+        organisation {
+          createdAt
+          employeeCount
+          id
+          name
+          officialUrl
+          updatedAt
+          logo {
+            filename
+            id
+            url
+          }
+        }
+      }
     }
   }
 `;

src/app/modules/consultations/consultation-profile/consultation-questionnaire/consultation-questionnaire.component.ts

@@ -327,25 +327,26 @@ export class ConsultationQuestionnaireComponent
         if (!isObjectEmpty(consultationResponse)) {
           if (this.currentUser) {
             this.metaPixelService.trackSubmitResponse();
+
             this.apollo
-            .watchQuery({
-              query: UserCountUser,
-              variables: { userId: this.currentUser.id },
-              fetchPolicy: "no-cache",
-            })
-            .valueChanges.pipe(map((res: any) => res.data.userCountUser))
-            .subscribe(
-              (data) => {
-                if (!this.profanity_count_changed) {
-                  this.userData = data;
-                  this.checkAndUpdateProfanityCount();
+              .watchQuery({
+                query: UserCountUser,
+                variables: { userId: this.currentUser.id },
+                fetchPolicy: "no-cache",
+              })
+              .valueChanges.pipe(map((res: any) => res.data.userCountUser))
+              .subscribe(
+                (data) => {
+                  if (!this.profanity_count_changed) {
+                    this.userData = data;
+                    this.checkAndUpdateProfanityCount();
+                  }
+                },
+                (err) => {
+                  const e = new Error(err);
+                  this.errorService.showErrorModal(err);
                 }
-              },
-              (err) => {
-                const e = new Error(err);
-                this.errorService.showErrorModal(err);
-              }
-            );
+              );
           } else {
             //If user is not authenticated, showing auth modal and storing consultation respose object to local storage
             this.authModal = true;
@@ -355,7 +356,7 @@ export class ConsultationQuestionnaireComponent
             );
           }
         }
-      }
+      } 
     } else {
       if (!this.responseFeedback) {
         this.consultationService.satisfactionRatingError.next(true);

src/app/modules/consultations/consultation-profile/consultation-response-text/consultation-response-text.component.scss

@@ -44,6 +44,11 @@
         .cke {
           height: 100% !important;
           border: none !important;
+
+          .cke_editable.cke_display_version_check-absolute:before {
+            display: none;
+          }
+
           .cke_inner {
             height: 100% !important;
             .cke_top {
@@ -79,4 +84,4 @@
         }
       }
     }
-}
+}

src/app/modules/consultations/consultation-profile/profile-card/profile-card.component.html

@@ -7,129 +7,91 @@
         <i class="fa fa-link" aria-hidden="true"></i>
       </a>
     </div>
-      <div class="ministry-detail">
-        <img [src]="profile?.ministry?.logo?.url" class="avatar avatar--42" alt=" " />
-        <p class="regular-text m-0">{{profile?.ministry?.name}}</p>
-      </div>
-      <div *ngIf="!summaryData">
-        <div *ngIf="!profile?.respondedOn || showResponseCreation">
-          <div class="d-flex justify-content-between align-items-center mb-1 mt-1">
-            <p class="days-remaining m-0">{{getRemainigDays(profile?.responseDeadline)}}</p>
-            <a  [href]="createCalendarEvent()" class="icon-circle" target="_blank">
-              <i class="fa fa-calendar-plus-o" aria-hidden="true"></i>
-            </a>
-          </div>
-          <button *ngIf="consultationStatus === 'active'" class="btn-submit mt-3 active" (click)='stepNext(profile?.respondedOn)' data-event="lead">
-            <p class="m-0">
-              <span>
-                <picture class="citizen-logo">
-                  <source srcset="assets/images/Vector.webp" type="image/webp">
-                  <source srcset="assets/images/Vector.jpg" type="image/jpeg">
-                  <img src="assets/images/Vector.jpg" />
-                </picture>
-              </span>
-              {{'SUBMIT RESPONSE' | translate}}
-            </p>
-            <span><i class="fa fa-angle-right"></i></span>
-          </button>
-        </div>
-        <div *ngIf="profile?.respondedOn && !showResponseCreation" class="response-submitted-block">
-          <div>
-            <span class="success-text mr-1"><i class="fa fa-check"></i></span>
-          </div>
-          <div>
-            <p class="mb-1 success-text">
-              {{'RESPONSE SUBMITTED' | translate}}
-            </p>
-            <p class="success-date m-0">{{convertDateFormat(profile?.respondedOn)}}</p>
-          </div>
-        </div>
-        <div class="share-block" *ngIf="profile?.visibility === 'public_consultation'">
-          <div class="share-block__position">
-            <div #shareOptionsElement class="share-pop-up" *ngIf="showShareOptions">
-                <a  class="share-btn"
-                [href]="getFbUrl(currentUrl)"
-                target="_blank">
-                  <span>
-                      <i class="fa fa-facebook"></i>
-                  </span>
-                </a>
-                <a  class="share-btn"
-                [href]="getTwitterUrl(currentUrl)"
-                target="_blank">
-                  <span>
-                      <i class="fa fa-twitter"></i>
-                  </span>
-                </a>
-                <a  class="share-btn"
-                [href]="getWhatsappUrl(currentUrl)"
-                target="_blank">
-                  <span>
-                      <i class="fa fa-whatsapp"></i>
-                  </span>
-                </a>
-                <a  class="share-btn"
-                [href]="getLinkedinUrl(currentUrl)"
-                target="_blank">
-                  <span>
-                      <i class="fa fa-linkedin"></i>
-                  </span>
-                </a>
-            </div>
-          </div>
-          <div class="spread-btn mt-3">
-            <button data-event="click-sidebar-share" #spreadButtonElement class="btn-circular"
-              (click)="showShareOptions = !showShareOptions">
-              <span class="mr-2 clr-blue"><i class="fa fa-share"></i></span>
-              <span class="blue-text bold-text">{{'Spread the word' | translate}}</span>
-            </button>
-            <button mat-button (click)="openDialog()" class="btn-circular" style="float: right;">
-              <span class="blue-text bold-text">{{'Glossary' | translate}}</span>
-            </button>
-          </div>
+    <div class="ministry-detail">
+      <img [src]="profile?.ministry?.logo?.url" class="avatar avatar--42" alt=" " />
+      <p class="regular-text m-0">{{profile?.ministry?.name}}</p>
+    </div>
+    <div *ngIf="!summaryData">
+      <div *ngIf="!profile?.respondedOn || showResponseCreation">
+        <div class="d-flex justify-content-between align-items-center mb-1 mt-1">
+          <p class="days-remaining m-0">{{getRemainigDays(profile?.responseDeadline)}}</p>
+          <a [href]="createCalendarEvent()" class="icon-circle" target="_blank">
+            <i class="fa fa-calendar-plus-o" aria-hidden="true"></i>
+          </a>
         </div>
-
+        <button *ngIf="consultationStatus === 'active'" class="btn-submit mt-3 active" (click)='stepNext(profile?.respondedOn)' data-event="lead">
+          <p class="m-0">
+            <span>
+              <picture class="citizen-logo">
+                <source srcset="assets/images/Vector.webp" type="image/webp">
+                <source srcset="assets/images/Vector.jpg" type="image/jpeg">
+                <img src="assets/images/Vector.jpg" />
+              </picture>
+            </span>
+            {{'SUBMIT RESPONSE' | translate}}
+          </p>
+          <span><i class="fa fa-angle-right"></i></span>
+        </button>
       </div>
-      <div *ngIf="summaryData" class="report-download-block">
+      <div *ngIf="profile?.respondedOn && !showResponseCreation" class="response-submitted-block">
         <div>
-          <button  class="btn-submit mt-3  active" (click)='downloadReport()'>
-            <p class="m-0">
-              <span><i class="fa fa-download"></i></span>
-              <span>{{'Download report as pdf' | translate}}</span>
-            </p>
-          </button>
+          <span class="success-text mr-1"><i class="fa fa-check"></i></span>
         </div>
+        <div>
+          <p class="mb-1 success-text">
+            {{'RESPONSE SUBMITTED' | translate}}
+          </p>
+          <p class="success-date m-0">{{convertDateFormat(profile?.respondedOn)}}</p>
+        </div>
+      </div>
+    </div>
+    <div class="share-block" *ngIf="profile?.visibility === 'public_consultation'">
+      <div class="spread-btn mt-3">
+        <button class="btn-circular" (click)="showShareOptions = !showShareOptions">
+          <span class="mr-2 clr-blue"><i class="fa fa-share"></i></span>
+          <span class="blue-text bold-text">{{'Spread the word' | translate}}</span>
+        </button>
       </div>
+    </div>
+    <hr class="divider-one" />
   </div>
 
-  <hr class="divider" />
-
   <div class="c-profile-card__bottom-section">
     <div class="d-flex justify-content-between mb-3">
       <p class="count-text m-0">{{'TOTAL RESPONSES' | translate}}</p>
       <p class="count-number bold-text text-right m-0">
         {{profile?.consultationResponsesCount ? profile?.consultationResponsesCount : 0}}
       </p>
     </div>
-    <div
-      class="d-flex justify-content-between mb-3"
-      *ngIf="profile?.reviewType && profile?.reviewType !== 'policy'"
-    >
+    <div class="d-flex justify-content-between mb-3" *ngIf="profile?.reviewType && profile?.reviewType !== 'policy'">
       <p class="count-text m-0">{{'TOTAL PUBLIC RESPONSES' | translate}}</p>
-      <p class="count-number bold-text text-right m-0" *ngIf="!summaryData; else summaryDataCount">
-        {{profile?.sharedResponses?.totalCount ? profile?.sharedResponses?.totalCount : 0 }}
+      <p class="count-number bold-text text-right m-0">
+        {{profile?.sharedResponses?.totalCount || 0}}
       </p>
-      <ng-template #summaryDataCount>
-        <p>
-          {{summaryData?.publicResponseCount ? summaryData?.publicResponseCount : 0}}
-        </p>
-      </ng-template>
+    </div>
+
+    <hr class="divider" />
+
+    <div *ngIf="profile?.consultationPartnerResponses?.length > 0">
+      <p class="count-text m-0">{{'PARTNER RESPONSES ' | translate}}</p>
+      <div *ngFor="let partner of profile?.consultationPartnerResponses">
+        <div class="partner-responses d-flex align-items-center">
+          <img [src]="partner?.organisation?.logo?.url" class="partner-logo" alt="Partner Logo" />
+          <div class="ml-3 partner-details">
+            <a [href]="getSecureUrl(partner?.organisation?.officialUrl)" target="_blank" class="partner-name">
+              {{ partner?.organisation?.name }}
+            </a>
+          </div>
+
+          <p class="response-count ml-auto">{{ partner?.responseCount || 0 }}</p>
+        </div>
+      </div>
+
+      <hr class="divider" />
+
     </div>
     <div class="d-flex justify-content-between">
-      <p class="count-text m-0">{{profile?.visibility === 'public_consultation' ?  'DRAFT MADE PUBLIC ON'  : 'CONSULTATION PUBLISHED ON' | translate}}</p>
-      <p class="count-number bold-text text-right m-0">{{convertDateFormat(profile?.publishedAt)}}</p>
+      <p class="publish-date">{{'Consultation published on' | translate}} {{convertToFormattedDate(profile?.publishedAt)}}</p>
     </div>
   </div>
 </div>
-<app-glossary *ngIf="showGlossaryModal" (close)="showGlossaryModal = false"></app-glossary>
-<app-confirm-email-modal *ngIf="showConfirmEmailModal" (close)="showConfirmEmailModal = false"></app-confirm-email-modal>