Merge pull request #19 from City-of-Turku/develop

Release v1.0.1
City-of-Turku · May 3, 2024 · 5db5eab · 5db5eab
2 parents 80d672a + 920cfc8
commit 5db5eab
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 28 deletions.
diff --git a/.github/workflows/codeql-analysis.yml → .github/workflows/codeql.yml b/.github/workflows/codeql-analysis.yml → .github/workflows/codeql.yml
@@ -18,7 +18,7 @@ on:
     # The branches below must be a subset of the branches above
     branches: [develop]
   schedule:
-    - cron: '29 10 * * 6'
+    - cron: '39 16 * * 1'
 
 jobs:
   analyze:
@@ -38,11 +38,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v3
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 The Mobility Profile UI
 
 [![Mobility Profile UI CI](https://github.com/City-of-Turku/mobility-profile-ui/actions/workflows/ci.yml/badge.svg)](https://github.com/City-of-Turku/mobility-profile-ui/actions/workflows/ci.yml)
-[![CodeQL](https://github.com/City-of-Turku/mobility-profile-ui/actions/workflows/codeql-analysis.yml/badge.svg?branch=develop)](https://github.com/City-of-Turku/mobility-profile-ui/actions/workflows/codeql-analysis.yml)
+[![CodeQL](https://github.com/City-of-Turku/mobility-profile-ui/actions/workflows/codeql.yml/badge.svg?branch=develop)](https://github.com/City-of-Turku/mobility-profile-ui/actions/workflows/codeql.yml)
 
 ## Requirements
 

diff --git a/src/components/Forms/UserForm/UserForm.tsx b/src/components/Forms/UserForm/UserForm.tsx
@@ -120,7 +120,6 @@ const UserForm = ({ answerStatus, setAnswerStatus }: UserFormProps) => {
       postal_code_other: null,
       optional_postal_code: null,
       optional_postal_code_other: null,
-      is_interested_in_mobility: false,
       result_can_be_used: false,
     },
   });
@@ -280,6 +279,7 @@ const UserForm = ({ answerStatus, setAnswerStatus }: UserFormProps) => {
                     disabled={isPostalCode}
                     aria-required="false"
                     aria-invalid={errors.postal_code_other ? true : false}
+                    autoComplete="off"
                     className="form-control text-field-w60"
                   />
                 </div>
@@ -345,6 +345,7 @@ const UserForm = ({ answerStatus, setAnswerStatus }: UserFormProps) => {
                     disabled={isOptionalPostalCode}
                     aria-required="false"
                     aria-invalid={errors.optional_postal_code_other ? true : false}
+                    autoComplete="off"
                     className="form-control text-field-w60"
                   />
                 </div>
@@ -359,24 +360,6 @@ const UserForm = ({ answerStatus, setAnswerStatus }: UserFormProps) => {
                   </div>
                 )}
               </div>
-              <div className="mb-2 container-sm center-text">
-                <p className="text-normal">
-                  {intl.formatMessage({ id: 'app.form.info.question' })}
-                </p>
-              </div>
-              <div className="mb-3 form-check container-sm center-text">
-                <input
-                  type="checkbox"
-                  {...register('is_interested_in_mobility', { required: false })}
-                  id="is_interested_in_mobility"
-                  aria-required="false"
-                  aria-invalid={errors.is_interested_in_mobility ? true : false}
-                  className="form-check-input"
-                />
-                <label htmlFor="is_interested_in_mobility" className="text-label">
-                  {intl.formatMessage({ id: 'app.form.interestedInMobility.label' })}
-                </label>
-              </div>
               <div className="mb-3 form-check container-sm center-text">
                 <input
                   type="checkbox"

diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -30,7 +30,6 @@
   "app.form.postalCode.other.text.small": "Fill this, in case you don't live in Turku",
   "app.form.email.invalid": "Enter valid email address",
   "app.form.numeric.field": "Enter valid postalcode",
-  "app.form.info.question": "Why did I do the test?",
   "app.form.postalCode.other.value": "Other postal code",
   "app.form.helperText.year": "Year",
   "app.form.helperText.postCode": "Post code",

diff --git a/src/i18n/fi.json b/src/i18n/fi.json
@@ -30,7 +30,6 @@
   "app.form.postalCode.other.text.small": "Täytä tämä, jos asut Turun ulkopuolella",
   "app.form.email.invalid": "Kirjoita kelvollinen sähköpostiosoite",
   "app.form.numeric.field": "Kirjoita kelvollinen postinumero",
-  "app.form.info.question": "Miksi tein testin?",
   "app.form.postalCode.other.value": "Muu postinumero",
   "app.form.helperText.year": "Vuosi",
   "app.form.helperText.postCode": "Postinumero",

diff --git a/src/i18n/sv.json b/src/i18n/sv.json
@@ -30,7 +30,6 @@
   "app.form.postalCode.other.text.small": "Fyll i detta om du bor utanför Åbo",
   "app.form.email.invalid": "Skriv in en giltig e-postadress",
   "app.form.numeric.field": "Skriv in en giltig postnummer",
-  "app.form.info.question": "Varför gjorde jag testet?",
   "app.form.postalCode.other.value": "Annat postnummer",
   "app.form.helperText.year": "År",
   "app.form.helperText.postCode": "Postnummer",