diff --git a/Dockerfile b/Dockerfile index 98bff78..4b995f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,11 @@ -FROM golang:alpine +FROM golang:1.15-alpine WORKDIR /src RUN apk add --update npm git RUN go get -u github.com/jteeuwen/go-bindata/... COPY ./webapp/package.json webapp/package.json +COPY ./webapp/package-lock.json webapp/package-lock.json RUN cd ./webapp && \ - npm install + npm ci COPY . . RUN cd ./webapp && \ npm run build diff --git a/webapp/src/components/Board.tsx b/webapp/src/components/Board.tsx index f60ffbf..ee43d24 100644 --- a/webapp/src/components/Board.tsx +++ b/webapp/src/components/Board.tsx @@ -699,7 +699,7 @@ class Board extends Component { providedDraggable.draggableProps.style )}> - this.setState({ showCreateFeatureModal: true, createFeatureModalMilestoneId: m.id, createFeatureModalSubWorkflowId: sw.id }) : undefined} /> + 0} link={this.props.url + "/f/" + f.id} bottomLink={index === ff.length - 1 && !viewOnly ? () => this.setState({ showCreateFeatureModal: true, createFeatureModalMilestoneId: m.id, createFeatureModalSubWorkflowId: sw.id }) : undefined} /> )} diff --git a/webapp/src/components/Card.tsx b/webapp/src/components/Card.tsx index e5ea848..cfe32bf 100644 --- a/webapp/src/components/Card.tsx +++ b/webapp/src/components/Card.tsx @@ -13,6 +13,7 @@ type Props = { nbrOfComments?: number annotations: string estimate?: number + hasDescription?: boolean }; type State = {}; @@ -48,6 +49,14 @@ class Card extends Component { null } + {this.props.hasDescription ? +
+ notes +
+ : + null + } + {this.props.nbrOfComments! > 0 ?
{this.props.nbrOfComments!}chat_bubble_outline