diff --git a/Dockerfile b/Dockerfile index c4ab36117..fcd9940d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,16 +6,15 @@ ENV PATH /usr/src/app/node_modules/.bin:$PATH COPY package.json /usr/src/app/package.json -RUN npm install -g @angular/cli@12.2.17 - +RUN npm install --location=global @angular/cli@12.2.17 RUN npm install - COPY . . RUN ng build --prod + FROM nginx:1.19.3 COPY --from=builder /usr/src/app/dist/web-app /usr/share/nginx/html diff --git a/src/app/core/shell/toolbar/toolbar.component.html b/src/app/core/shell/toolbar/toolbar.component.html index 2a897d4ff..3f80721fa 100644 --- a/src/app/core/shell/toolbar/toolbar.component.html +++ b/src/app/core/shell/toolbar/toolbar.component.html @@ -13,7 +13,7 @@ - Institution + {{ 'Institution' | translate }} diff --git a/src/app/system/system.service.ts b/src/app/system/system.service.ts index 69ca3c871..f8bacc397 100644 --- a/src/app/system/system.service.ts +++ b/src/app/system/system.service.ts @@ -275,8 +275,8 @@ export class SystemService { * @param jobId Job Id to be edited * @returns {Observable} Fetches Scheduler Job. */ - runSelectedJob(jobId: string): Observable { - return this.http.post(`/jobs/${jobId}?command=executeJob`, this.emptyPayload); + runSelectedJob(jobId: string): Promise { + return this.http.post(`/jobs/${jobId}?command=executeJob`, this.emptyPayload).toPromise(); } /*