Merge pull request #810 from traPtitech/main

MultipleChoiceが選択されないで編集されることを考慮
traPtitech · Feb 15, 2022 · 774b7bb · 774b7bb
2 parents 2550471 + ad00f10
commit 774b7bb
Show file tree

Hide file tree

Showing 8 changed files with 179 additions and 371 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1.3.0
 
 # build backend
-FROM golang:1.17.5-alpine as server-build
+FROM golang:1.17.6-alpine as server-build
 RUN --mount=type=cache,target=/var/cache/apk \
   apk add --update git
 
@@ -16,7 +16,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
   go build -o /anke-to -ldflags "-s -w"
 
 #build frontend
-FROM node:16.13.1-alpine3.14 as client-build
+FROM node:16.13.2-alpine3.14 as client-build
 WORKDIR /github.com/traPtitech/anke-to/client
 RUN --mount=type=cache,target=/var/cache/apk \
   apk add --update --no-cache python3 make g++

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/src/bin/common.js b/client/src/bin/common.js
@@ -104,7 +104,9 @@ export default {
         })
         break
       case 'MultipleChoice':
-        question.selected = responseData.option_response[ 0 ]
+        if (responseData.option_response) {
+          question.selected = responseData.option_response[ 0 ]
+        }
         break
       case 'LinearScale':
         question.selected = toNumber(responseData.response)

diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.5-alpine as build-step
+FROM golang:1.17.7-alpine as build-step
 RUN apk add --update --no-cache ca-certificates git
 
 WORKDIR /go/src/github.com/traPtitech/anke-to

diff --git a/docker/staging/Dockerfile b/docker/staging/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1.3.0
 
 # build backend
-FROM golang:1.17.5-alpine as server-build
+FROM golang:1.17.7-alpine as server-build
 RUN --mount=type=cache,target=/var/cache/apk \
   apk add --update git
 
@@ -16,7 +16,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
   go build -o /anke-to -ldflags "-s -w"
 
 #build frontend
-FROM node:16.13.1-alpine3.14 as client-build
+FROM node:16.14.0-alpine3.14 as client-build
 WORKDIR /github.com/traPtitech/anke-to/client
 RUN --mount=type=cache,target=/var/cache/apk \
   apk add --update --no-cache python3 make g++

diff --git a/docker/tuning/Dockerfile.server b/docker/tuning/Dockerfile.server
@@ -1,4 +1,4 @@
-FROM golang:1.17.5-alpine as build-step
+FROM golang:1.17.7-alpine as build-step
 RUN apk add --update --no-cache ca-certificates git
 
 WORKDIR /go/src/github.com/traPtitech/anke-to