Merge pull request #510 from merico-dev/update-config-ui-docker-build

fix: docker build and update placeholder text

Author: Jonathan O'Donnell

config-ui/Dockerfile

@@ -1,15 +1,11 @@
 FROM node:14-alpine
 
-ARG REGISTRY=https://registry.npmjs.org/
-COPY ./server/package.json /src/package.json
-
+COPY package.json /src/package.json
 WORKDIR /src
+RUN npm i
 
-RUN npm i --registry=${REGISTRY}
-
-COPY out .
-COPY ./server/server.js .
+COPY . /src
 
-CMD ["npm", "run", "server"]
+CMD ["npm", "run", "dev"]
 
 EXPOSE 4000

config-ui/pages/plugins/jira/MappingTag.jsx

@@ -1,7 +1,7 @@
 import { Tooltip, Position, FormGroup, Label, Tag, TagInput } from '@blueprintjs/core'
 import styles from '../../../styles/Home.module.css'
 
-const MappingTag = ({labelIntent, labelName, onChange, rightElement, helperText, typeOrStatus, values}) => {
+const MappingTag = ({labelIntent, labelName, onChange, rightElement, helperText, typeOrStatus, values, placeholderText}) => {
   return <>
     <p>Issue {typeOrStatus === 'type' ? 'types' : 'statuses' } mapped to&nbsp;&nbsp;<Tag intent={labelIntent}>{labelName}</Tag></p>
 
@@ -16,7 +16,7 @@ const MappingTag = ({labelIntent, labelName, onChange, rightElement, helperText,
         <Tooltip content={`Map custom Jira types to main ${labelName} status`} position={Position.TOP}>
           <Label>
           <TagInput
-            placeholder="Add Tags..."
+            placeholder={placeholderText}
             values={values || []}
             fill={true}
             onChange={value => setTimeout(() => onChange([...new Set(value)]), 0)}

config-ui/pages/plugins/jira/MappingTagStatus.jsx

@@ -5,6 +5,7 @@ const MappingTagStatus = ({reqValue, resValue, envName, clearBtnReq, clearBtnRes
     <MappingTag
       labelName="Rejected"
       labelIntent="danger"
+      placeholderText="Add Issue Statuses..."
       values={reqValue}
       helperText={envName}
       rightElement={clearBtnReq}
@@ -13,6 +14,7 @@ const MappingTagStatus = ({reqValue, resValue, envName, clearBtnReq, clearBtnRes
     <MappingTag
       labelName="Resolved"
       labelIntent="success"
+      placeholderText="Add Issue Statuses..."
       values={resValue}
       helperText={envName}
       rightElement={clearBtnRes}

config-ui/pages/plugins/jira/index.page.jsx

@@ -225,6 +225,7 @@ export default function Home(props) {
               labelName="Bug"
               labelIntent="danger"
               typeOrStatus="type"
+              placeholderText="Add Issue Types..."
               values={typeMappingBug}
               helperText="JIRA_ISSUE_TYPE_MAPPING"
               rightElement={<ClearButton onClick={() => setTypeMappingBug([])} />}
@@ -235,6 +236,7 @@ export default function Home(props) {
               labelName="Incident"
               labelIntent="warning"
               typeOrStatus="type"
+              placeholderText="Add Issue Types..."
               values={typeMappingIncident}
               helperText="JIRA_ISSUE_TYPE_MAPPING"
               rightElement={<ClearButton onClick={() => setTypeMappingIncident([])} />}
@@ -245,6 +247,7 @@ export default function Home(props) {
               labelName="Requirement"
               labelIntent="primary"
               typeOrStatus="type"
+              placeholderText="Add Issue Types..."
               values={typeMappingRequirement}
               helperText="JIRA_ISSUE_TYPE_MAPPING"
               rightElement={<ClearButton onClick={() => setTypeMappingRequirement([])} />}