Skip to content

Commit

Permalink
Merge pull request #14 from lnls-sirius/dev
Browse files Browse the repository at this point in the history
Fix docker error
  • Loading branch information
RafaelLyra8 authored Apr 19, 2023
2 parents ff10c5e + aacee0b commit 02e141a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
6 changes: 3 additions & 3 deletions front_end/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM node:19-alpine3.16 AS builder
FROM node:19.6 AS builder

# General information about the code
LABEL maintainer="Rafael Lyra <rafael.lyra@lnls.br>"
LABEL maintainer="SwC <swc@lnls.br>"

# Set the container directories
WORKDIR /app
Expand All @@ -10,7 +10,7 @@ COPY package*.json ./
COPY . .

# Install typescript with the desired packages with npm
RUN npm install --loglevel verbose --force
RUN npm install --loglevel verbose
RUN npm install typescript ts-node

RUN npm run build
Expand Down
14 changes: 8 additions & 6 deletions front_end/src/components/ArchiverChart/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,14 @@ class ArchiverChart extends Component<ArchChartInterface, DetListInterface>{
if(pv_name && pvInfo.value!=null && pvInfo.date!=null){
const pvname: string = pv_name.replace("RAD:", "");
this.setDate();
this.datasetsChart[pvname].push({
x: pvInfo.date,
y: pvInfo.value
});
if(this.datasetsChart[pvname][0].x < this.date_interval[0]){
this.datasetsChart[pvname].shift();
if(pvname in this.datasetsChart){
this.datasetsChart[pvname].push({
x: pvInfo.date,
y: pvInfo.value
});
if(this.datasetsChart[pvname][0].x < this.date_interval[0]){
this.datasetsChart[pvname].shift();
}
}
}
}
Expand Down

0 comments on commit 02e141a

Please sign in to comment.