Updated ciam prod client-id

apps/mina-sidor-fa/src/app/pages/avrop/avrop.component.html

@@ -36,7 +36,8 @@
             ></digi-ng-progress-progressbar>
           </div>
         </div>
-        <div class="avrop__content">
+        <ng-container *ngIf="avropData$ | async as avropData">
+          <div class="avrop__content" *ngIf="avropData.data.length; else noAvrop">
             <div class="avrop__filter" *ngIf="currentStep === 1">
               <h3>Filter</h3>
               <msfa-avrop-filters></msfa-avrop-filters>
@@ -66,7 +67,6 @@
 
             <h3>Välj deltagare att tilldela handledare</h3>
             <msfa-avrop-list
-            *ngIf="avropData$ | async as avropData"
               [availableAvrop]="avropData.data"
               [paginationMeta]="avropData.meta"
               [selectedAvrop]="selectedAvrop$ | async"
@@ -78,7 +78,8 @@
               (paginated)="setNewPage($event)"
             ></msfa-avrop-list>
           </div>
-        <div class="avrop__footer" [ngSwitch]="currentStep">
+
+          <div class="avrop__footer" *ngIf="avropData.data.length" [ngSwitch]="currentStep">
             <digi-notification-alert
               *ngIf="error$ | async as error"
               af-heading="Felmeddelande"
@@ -110,6 +111,7 @@
               </ng-container>
             </div>
           </div>
+        </ng-container>
       </main>
     </digi-typography>
   </section>
@@ -120,4 +122,7 @@
   <ng-template #noAvailabeHandledare>
     <!-- lägg in lämpligt innehåll -->
   </ng-template>
+  <ng-template #noAvrop>
+    <p>Det finns för tillfället inga nya deltagare att tilldela.</p>
+  </ng-template>
 </msfa-layout>

apps/mina-sidor-fa/src/app/shared/models/contact-information.model.ts

@@ -1,3 +1,4 @@
+import { mapStringToSsn } from '@msfa-utils/map-string-to-ssn.util';
 import { Address, mapResponseToAddress } from './address.model';
 import { ContactInformationResponse } from './api/contact-information.response.model';
 import { mapResponseToPhoneNumber, PhoneNumber } from './phonenumber.model';
@@ -12,23 +13,15 @@ export interface ContactInformation {
   addresses: Address[];
 }
 
-export function mapResponseToContactInformation(contactInformation: ContactInformationResponse): ContactInformation {
+export function mapResponseToContactInformation(data: ContactInformationResponse): ContactInformation {
+  const { fornamn, efternamn, personnummer, epost, telekomadresser, adresser } = data;
   return {
-    firstName: contactInformation.fornamn,
+    firstName: fornamn || '',
-    lastName: contactInformation.efternamn,
+    lastName: efternamn || '',
-    fullName: `${contactInformation.fornamn} ${contactInformation.efternamn}`,
+    fullName: fornamn && efternamn ? `${fornamn} ${efternamn}` : '',
-    ssn: `${contactInformation.personnummer.substring(
+    ssn: personnummer ? mapStringToSsn(personnummer) : '',
-      0,
+    email: epost || '',
-      contactInformation.personnummer.length - 4
+    phoneNumbers: telekomadresser ? telekomadresser.map(phoneNumber => mapResponseToPhoneNumber(phoneNumber)) : [],
-    )}-${contactInformation.personnummer.substring(contactInformation.personnummer.length - 4)}`,
+    addresses: adresser ? adresser.map(address => mapResponseToAddress(address)) : null,
-    email: contactInformation.epost,
-    phoneNumbers: contactInformation.telekomadresser
-      ? contactInformation.telekomadresser.map(phoneNumber => {
-          return mapResponseToPhoneNumber(phoneNumber);
-        })
-      : [],
-    addresses: contactInformation.adresser
-      ? contactInformation.adresser.map(address => mapResponseToAddress(address))
-      : null,
   };
 }

apps/mina-sidor-fa/src/app/shared/models/employee.model.ts

@@ -1,4 +1,5 @@
 import { RoleEnum } from '@msfa-enums/role.enum';
+import { mapStringToSsn } from '@msfa-utils/map-string-to-ssn.util';
 import { EmployeeCompactResponse, EmployeeResponse } from './api/employee.response.model';
 import { EmployeeTjanst, mapResponseToEmployeeTjanst } from './employee-tjanst.model';
 import {
@@ -7,8 +8,6 @@ import {
 } from './employee-utforande-verksamhet.model';
 import { PaginationMeta } from './pagination-meta.model';
 
-const CURRENT_YEAR = new Date().getFullYear().toString().slice(2, 4);
-
 export interface EmployeeCompact {
   id: string;
   fullName: string;
@@ -16,7 +15,6 @@ export interface EmployeeCompact {
   allaUtforandeVerksamheter: boolean;
   utforandeVerksamheter: string[];
 }
-
 export interface Employee {
   id: string;
   firstName: string;
@@ -35,18 +33,6 @@ export interface EmployeesData {
   meta: PaginationMeta;
 }
 
-function mapResponseToSsn(ssn: string): string {
-  ssn = ssn.replaceAll('-', '');
-  if (ssn.length === 10) {
-    const century = +CURRENT_YEAR - +ssn.slice(0, 2) > 0 ? '20' : '19';
-    ssn = ssn.padStart(12, century);
-  }
-  if (ssn.length === 12) {
-    ssn = `${ssn.slice(0, 8)}-${ssn.slice(8, 12)}`;
-  }
-  return ssn;
-}
-
 export function mapResponseToEmployeeCompact(data: EmployeeCompactResponse): EmployeeCompact {
   const { ciamUserId, name, tjanst, allaUtforandeVerksamheter, utforandeVerksamhet } = data;
   return {
@@ -76,7 +62,7 @@ export function mapResponseToEmployee(data: EmployeeResponse): Employee {
     lastName,
     fullName: `${firstName} ${lastName}`,
     email,
-    ssn: ssn ? mapResponseToSsn(ssn) : null,
+    ssn: ssn ? mapStringToSsn(ssn) : null,
     roles: roles || [],
     tjanster: tjanster?.map(tjanst => mapResponseToEmployeeTjanst(tjanst)),
     allaUtforandeVerksamheter,

apps/mina-sidor-fa/src/app/shared/utils/map-string-to-ssn.util.ts

@@ -0,0 +1,13 @@
+const CURRENT_YEAR = new Date().getFullYear().toString().slice(2, 4);
+
+export function mapStringToSsn(ssn: string): string {
+  ssn = ssn.replaceAll('-', '');
+  if (ssn.length === 10) {
+    const century = +CURRENT_YEAR - +ssn.slice(0, 2) > 0 ? '20' : '19';
+    ssn = ssn.padStart(12, century);
+  }
+  if (ssn.length === 12) {
+    ssn = `${ssn.slice(0, 8)}-${ssn.slice(8, 12)}`;
+  }
+  return ssn;
+}

apps/mina-sidor-fa/src/environments/environment.prod.ts

@@ -2,7 +2,7 @@ import { Environment } from '@msfa-models/environment.model';
 
 export const environment: Environment = {
   environment: 'prod',
-  clientId: '',
+  clientId: '71010833-e445-4bbc-926a-775247b7a6e3',
   loginUrl: 'https://ciam.arbetsformedlingen.se/uas/oauth2/authorization?response_type=code&scope=openid',
   logoutUrl: 'https://ciam.arbetsformedlingen.se/uas/logout',
   production: true,