Update survey titles and labels for clarity: reflect focus on Copilot impact and time savings

backend/src/models/survey.model.ts

@@ -29,71 +29,68 @@ class Survey extends Model<SurveyType> {
   declare percentTimeSaved: number;
   declare timeUsedFor: string;
   declare reason: string;
+  declare createdAt: CreationOptional<Date>;
+  declare updatedAt: CreationOptional<Date>;
   declare kudos?: number; // Add kudos property
-  declare createdAt?: Date;
-  declare updatedAt?: Date;
-}
 
-Survey.init({
-  id: {
-    type: DataTypes.INTEGER,
-    autoIncrement: true,
-    primaryKey: true,
-  },
-  status: {
-    type: DataTypes.STRING,
-    allowNull: true,
-  },
-  hits: {
-    type: DataTypes.INTEGER,
-    allowNull: true,
-  },
-  userId: {
-    type: DataTypes.STRING,
-    allowNull: true,
-  },
-  usedCopilot: {
-    type: DataTypes.BOOLEAN,
-    allowNull: false,
-  },
-  percentTimeSaved: {
-    type: DataTypes.INTEGER,
-    allowNull: false,
-    set(value: number) {
-      this.setDataValue('percentTimeSaved', !this.usedCopilot ? 0 : value);
-    }
-  },
-  reason: {
-    type: DataTypes.STRING(4096),
-    allowNull: true,
-  },
-  timeUsedFor: {
-    type: DataTypes.STRING,
-    allowNull: false,
-  },
-  owner: {
-    type: DataTypes.STRING,
-    allowNull: false,
-  },
-  repo: {
-    type: DataTypes.STRING,
-    allowNull: false,
-  },
-  prNumber: {
-    type: DataTypes.INTEGER,
-    allowNull: true,
-  },
-  kudos: {
-    type: DataTypes.INTEGER,
-    allowNull: true,
-    defaultValue: 0,
-  },
-  createdAt: DataTypes.DATE,
-  updatedAt: DataTypes.DATE
-}, {
-  sequelize,
-  modelName: 'Survey',
-  timestamps: true,
-});
+  static initModel(sequelize: Sequelize) {
+    Survey.init({
+      id: {
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
+        primaryKey: true,
+      },
+      status: {
+        type: DataTypes.STRING,
+        allowNull: true,
+      },
+      hits: {
+        type: DataTypes.INTEGER,
+        allowNull: true,
+      },
+      userId: {
+        type: DataTypes.STRING,
+        allowNull: true,
+      },
+      usedCopilot: {
+        type: DataTypes.BOOLEAN,
+        allowNull: false,
+      },
+      percentTimeSaved: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+        set(value: number) {
+          this.setDataValue('percentTimeSaved', !this.usedCopilot ? 0 : value);
+        }
+      },
+      reason: {
+        type: DataTypes.STRING(4096),
+        allowNull: true,
+      },
+      timeUsedFor: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      },
+      org: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      },
+      repo: {
+        type: DataTypes.STRING,
+        allowNull: false,
+      },
+      prNumber: {
+        type: DataTypes.INTEGER,
+        allowNull: true,
+      },
+      createdAt: DataTypes.DATE,
+      updatedAt: DataTypes.DATE
+    }, {
+      sequelize,
+      modelName: 'Survey',
+      timestamps: true,
+    });
+  }
+}
 
 export { Survey, SurveyType };

frontend/src/app/main/copilot/copilot-surveys/new-copilot-survey/new-copilot-survey.component.ts

@@ -1,7 +1,7 @@
 import { Component, forwardRef, OnInit } from '@angular/core';
 import { AppModule } from '../../../../app.module';
 import { FormBuilder, FormControl, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
-import { CopilotSurveyService, Survey } from '../../../../services/copilot-survey.service';
+import { CopilotSurveyService, Survey } from '../../../../services/api/copilot-survey.service';
 import { ActivatedRoute, Params } from '@angular/router';
 
 @Component({

frontend/src/app/main/main.component.html

@@ -47,17 +47,24 @@
   </mat-sidenav>
   <mat-sidenav-content>
     <mat-toolbar color="primary">
-      <ng-container *ngIf="isHandset$ | async">
-        <button type="button" aria-label="Toggle sidenav" mat-icon-button (click)="drawer.toggle()">
-          <mat-icon aria-label="Side nav toggle icon">menu</mat-icon>
-        </button>
-      </ng-container>
-      <ng-container *ngIf="installation.owner as owner">
-        <div class="header">
-          <div class="mat-card-avatar" mat-card-avatar style="background-size: cover;" [style.background-image]="'url(' + owner.avatar_url + ')'"></div>
-          <h1>{{owner.login}}</h1>
+      @if (isHandset$ | async) {
+      <button type="button" aria-label="Toggle sidenav" mat-icon-button (click)="drawer.toggle()">
+        <mat-icon aria-label="Side nav toggle icon">menu</mat-icon>
+      </button>
+      }
+      <div class="header">
+        <div *ngIf="installationsService.currentInstallation.asObservable() | async as installation" class="mat-card-avatar" mat-card-avatar style="background-size: cover;"
+          [style.background-image]="'url(' + installation?.account?.avatar_url + ')'">
         </div>
-      </ng-container>
+        <h1>
+          <mat-select [ngModel]="(installationsService.currentInstallation.asObservable() | async)?.id || 1" (ngModelChange)="installationsService.setInstallation($event)">
+            <mat-option [value]="1">Enterprise</mat-option>
+            @for (installation of installationsService.getInstallations() | async; track installation.id) {
+            <mat-option [value]="installation.id">{{ installation.account?.login }}</mat-option>
+            }
+          </mat-select>
+        </h1>
+      </div>
       <span class="spacer"></span>
     </mat-toolbar>
     <div class="sidenav-content">

frontend/src/app/services/api/copilot-survey.service.ts

@@ -1,7 +1,6 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { serverUrl } from './server.service';
-import { Observable } from 'rxjs';
+import { serverUrl } from '../server.service';
 
 export interface Survey {
   id?: number;
@@ -28,28 +27,30 @@ export class CopilotSurveyService {
 
   constructor(private http: HttpClient) { }
 
-  createSurvey(survey: Survey): Observable<Survey> {
+  createSurvey(survey: Survey) {
     return this.http.post<Survey>(this.apiUrl, survey);
   }
 
-  getAllSurveys(): Observable<Survey[]> {
-    return this.http.get<Survey[]>(this.apiUrl);
+  getAllSurveys(org?: string) {
+    return this.http.get<Survey[]>(this.apiUrl, {
+      params: org ? { org } : undefined
+    });
   }
 
-  getRecentSurveysWithGoodReasons(minReasonLength: number = 20): Observable<Survey[]> {
+  getRecentSurveysWithGoodReasons(minReasonLength: number = 20){
     //const params = new HttpParams().set('minReasonLength', minReasonLength.toString());
     return this.http.get<Survey[]>(`${this.apiUrl}/recent-good-reasons/${minReasonLength}`);
   }
 
-  getSurveyById(id: number): Observable<Survey> {
+  getSurveyById(id: number) {
     return this.http.get<Survey>(`${this.apiUrl}/${id}`);
   }
 
   deleteSurvey(id: number) {
     return this.http.delete(`${this.apiUrl}/${id}`);
   }
 
-  updateSurvey(survey: Survey): Observable<Survey> {
+  updateSurvey(survey: Survey)  {
     return this.http.put<Survey>(`${this.apiUrl}/${survey.id}`, survey);
   }
 }