feat: add organization name variable (#854)

* Updated mock backend paths & added orgName as env variable

* fix docker compose

* Updated getting started frontend documentation

* Removed duplicate mock data, edited yml & docu

* Fixed #795 by adding a white background

* Revert "Fixed #795 by adding a white background"

This reverts commit d4ec2e2.

---------

Co-authored-by: DanielHabenicht <daniel-habenicht@outlook.de>

Author: mr-woodapple

Phonebook.Frontend/Dockerfile

@@ -30,6 +30,7 @@ ARG EMPLOYEE_PICTURES_ENDPOINT
 ARG ASSETS_ENDPOINT
 ARG CONTACT_EMAIL
 ARG CONTACT_URL
+ARG ORGANIZATION_NAME
 
 RUN rm -r ./*
 COPY ./nginx/ ./

Phonebook.Frontend/docker-compose.yml

@@ -29,11 +29,9 @@ services:
       EMPLOYEE_PICTURES_ENDPOINT: 'https://pictures.example.com/'
       ASSETS_ENDPOINT: 'https://localhost:8081/api/assets'
       ROOMPLANNINGTOOL_URL: 'http://example.com'
+      ORGANIZATION_NAME: 'Your very fancy Company'
     ports:
       - 80:80
-    volumes:
-      - ./nginx.conf /etc/nginx/nginx.conf
-      - ./conf.d /etc/nginx/conf.d
     restart: always
     # stdin_open: true
     # tty: true

Phonebook.Frontend/src/app/shared/components/user/user-detail/user-detail.component.html

@@ -165,9 +165,7 @@ <h4 mat-line i18n="@@ColumnTitleMobile">Mobile</h4>
           </mat-list-item>
           <mat-list-item *ngIf="person.Contacts.Fax !== ''">
             <mat-icon mat-list-icon>print</mat-icon>
-            <h4 mat-line i18n="Datapoint|Label for Person.Fax data@@DataPersonFax">
-              Fax
-            </h4>
+            <h4 mat-line i18n="Datapoint|Label for Person.Fax data@@DataPersonFax"> Fax </h4>
             <p mat-line>
               <app-interactive-attribute-field
                 [value]="person.Contacts.Fax"
@@ -252,9 +250,7 @@ <h3 mat-subheader i18n="@@UserDetailComponentSubTitleFurtherInformation">
           <mat-list-item>
             <mat-icon mat-list-icon>business</mat-icon>
             <h4 mat-line>
-              <ng-container i18n="@@ColumnTitleOrgUnit">
-                Organization Unit
-              </ng-container>
+              <ng-container i18n="@@ColumnTitleOrgUnit"> Organization Unit </ng-container>
               <a mat-button [routerLink]="organigramLink">
                 <span
                   class="mat-small"

Phonebook.Frontend/src/app/shared/components/user/user-detail/user-detail.component.ts

@@ -80,7 +80,7 @@ export class UserDetailComponent implements OnInit, OnChanges, OnDestroy {
         { value: this.person.Contacts.Phone, param: { type: 'work' } },
       ],
       organization: {
-        value: 'T-Systems Multimedia Solutions',
+        value: runtimeEnvironment.organizationName,
         param: { type: ['work'] },
       },
       categories: [...this.person.Business.OrgUnit, ...this.person.Business.ShortOrgUnit],

Phonebook.Frontend/src/environments/EnvironmentInterfaces.ts

@@ -54,6 +54,10 @@ export interface RuntimeEnvironmentInterface {
    * The Base Url of the RocketChat Messenger
    */
   readonly rocketChatUrl?: string;
+  /**
+   * The name of your company/organization. Empty string if not set.
+   */
+  readonly organizationName: string;
 }
 
 export enum Environment {

Phonebook.Frontend/src/environments/runtime-environment.ts

@@ -18,4 +18,5 @@ export const runtimeEnvironment: RuntimeEnvironmentInterface = {
     ENV.roomPlanningToolUrl !== '${ROOMPLANNINGTOOL_URL}' ? ENV.roomPlanningToolUrl : undefined,
   contactUrl: ENV.contactUrl !== '${CONTACT_URL}' ? ENV.contactUrl : undefined,
   rocketChatUrl: ENV.rocketChatUrl !== '${ROCKETCHAT_URL}' ? ENV.rocketChatUrl : undefined,
+  organizationName: ENV.organizationName !== '${ORGANIZATION_NAME}' ? ENV.organizationName : '',
 };

Phonebook.Frontend/src/index.html

@@ -17,6 +17,7 @@
         roomPlanningToolUrl: '${ROOMPLANNINGTOOL_URL}',
         contactUrl: '${CONTACT_URL}',
         rocketChatUrl: '${ROCKETCHAT_URL}',
+        organizationName: '${ORGANIZATION_NAME}',
       };
     </script>
     <base href="/" />

Phonebook.Frontend/substitute_variables.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # State all required variables here
-requiredVariables=( BASE_URL SERVER_NAME ENVIRONMENT ENVIRONMENT_TAG ASSETS_ENDPOINT CONTACT_EMAIL CONTACT_URL)
+requiredVariables=( BASE_URL SERVER_NAME ENVIRONMENT ENVIRONMENT_TAG ASSETS_ENDPOINT CONTACT_EMAIL CONTACT_URL ORGANIZATION_NAME)
 
 # State all optional variables here
 optionalVariables=( RAVEN_URL EMPLOYEE_PICTURES_ENDPOINT ROOMPLANNINGTOOL_URL ROCKETCHAT_URL)

Phonebook/phonebook/templates/frontend-deployment.yaml

@@ -64,6 +64,8 @@ spec:
               value: "{{ .Values.assetsEndpoint }}"
             - name: ROCKETCHAT_URL
               value: "{{ .Values.rocketChatUrl }}"
+            - name: ORGANIZATION_NAME
+              value: "{{ .Values.organizationName }}"
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

demo/source/index.js

@@ -160,11 +160,11 @@ function generateBranch() {
 }
 
 fs.writeFileSync(
-  './mocks/synthetic/persons.json',
+  './mocks/synthetic/api/people.json',
   JSON.stringify(generateArray(1500, generatePerson))
 );
-fs.writeFileSync('./mocks/synthetic/rooms.json', JSON.stringify(rooms));
+fs.writeFileSync('./mocks/synthetic/api/rooms.json', JSON.stringify(rooms));
 fs.writeFileSync(
-  './mocks/synthetic/branches.json',
+  './mocks/synthetic/api/OrgUnit.json',
   JSON.stringify(generateArray(cityCount * 2, generateBranch))
 );