Merge branch 'main' into three-pane-okrs

oslokommune · Sep 28, 2023 · 2c438ad · 2c438ad
2 parents 3f8243a + c18ecc6
commit 2c438ad
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@ All notable changes to this project will be documented in this file. The format
 - Improved WCAG compliance with respect to text color contrast.
 - Fixed a problem that would sometimes cause an "infinite spinner" when a new
   version of the app was deployed.
+- Fixed cropping of dropdown menus when creating new
+  organizations/departments/products.
 
 ### Changed
 

diff --git a/src/components/drawers/EditItemDrawer.vue b/src/components/drawers/EditItemDrawer.vue
@@ -142,7 +142,11 @@
           :object-type="type"
         />
         <div v-else class="button-row">
-          <btn-delete :disabled="loading" @click="archive" />
+          <btn-delete
+            :disabled="loading"
+            :label="$t('admin.item.delete', { name: item.name })"
+            @click="archive"
+          />
         </div>
       </template>
     </template>

diff --git a/src/components/drawers/EditKeyResult.vue b/src/components/drawers/EditKeyResult.vue
@@ -140,7 +140,11 @@
           object-type="keyResult"
         />
         <div v-else class="button-row">
-          <btn-delete :disabled="loading" @click="archive" />
+          <btn-delete
+            :disabled="loading"
+            :label="$t('admin.keyResult.delete')"
+            @click="archive"
+          />
         </div>
       </template>
     </template>

diff --git a/src/components/drawers/EditObjective.vue b/src/components/drawers/EditObjective.vue
@@ -97,7 +97,11 @@
           object-type="objective"
         />
         <div v-else class="button-row">
-          <btn-delete :disabled="loading" @click="archive" />
+          <btn-delete
+            :disabled="loading"
+            :label="$t('admin.objective.delete')"
+            @click="archive"
+          />
         </div>
       </template>
     </template>

diff --git a/src/components/drawers/KpiDrawer.vue b/src/components/drawers/KpiDrawer.vue
@@ -206,7 +206,11 @@
           :text="$t('kpi.archived')"
         />
         <div v-else class="button-row">
-          <btn-delete :disabled="loading" @click="archive" />
+          <btn-delete
+            :disabled="loading"
+            :label="$t('admin.measurement.delete')"
+            @click="archive"
+          />
         </div>
       </template>
     </template>

diff --git a/src/components/layout/PageLayout.vue b/src/components/layout/PageLayout.vue
@@ -101,10 +101,6 @@ export default {
     }
   }
 
-  &__main {
-    overflow-x: hidden;
-  }
-
   &__footer {
     margin-top: auto;
   }

diff --git a/src/locale/locales/en-US.json b/src/locale/locales/en-US.json
@@ -425,6 +425,7 @@
     "item": {
       "change": "Edit {name}",
       "updated": "{name} was updated!",
+      "delete": "Delete {name}",
       "slugChangeInfo": "When changing the name of this item, the address to it might also change. In that case you will be automatically redirected after saving the form.",
       "redirectInfo": "You will be redirected in {count} seconds."
     },
@@ -433,19 +434,22 @@
       "created": "Objective was created!",
       "updated": "Objective was updated!",
       "change": "Edit objective",
+      "delete": "Delete objective",
       "useLastPeriod": "Set to last used period:"
     },
     "keyResult": {
       "new": "New key result",
       "created": "Key result was created!",
       "updated": "Key result was updated!",
-      "change": "Edit key result"
+      "change": "Edit key result",
+      "delete": "Delete key result"
     },
     "measurement": {
       "new": "New measurement",
       "created": "Measurement created!",
       "updated": "Measurement updated!",
-      "change": "Edit measurement"
+      "change": "Edit measurement",
+      "delete": "Delete measurement"
     },
     "apiSecret": "If you are using the API to update key results and/or measurements, you need to write an API Secret UUID here for the API call header (okr-team-secret)",
     "apiDocs": "API documentation",

diff --git a/src/locale/locales/nb-NO.json b/src/locale/locales/nb-NO.json
@@ -425,6 +425,7 @@
     "item": {
       "change": "Rediger {name}",
       "updated": "{name} ble endret!",
+      "delete": "Slett {name}",
       "slugChangeInfo": "Endring av navn kan også resultere i at gjeldende adresse for \"{name}\" endres. Du blir i så fall automatisk videresendt til den nye adressen etter at skjemaet lagres.",
       "redirectInfo": "Du videresendes om {count} sekunder."
     },
@@ -433,19 +434,22 @@
       "created": "Målet ble opprettet!",
       "updated": "Målet ble endret!",
       "change": "Rediger mål",
+      "delete": "Slett mål",
       "useLastPeriod": "Sett til sist brukte periode:"
     },
     "keyResult": {
       "new": "Nytt nøkkelresultat",
       "created": "Nøkkelresultatet ble opprettet!",
       "updated": "Nøkkelresultatet ble endret!",
-      "change": "Rediger Nøkkelresultat"
+      "change": "Rediger Nøkkelresultat",
+      "delete": "Slett nøkkelresultat"
     },
     "measurement": {
       "new": "Legg til måling",
       "created": "Målingen ble opprettet!",
       "updated": "Målingen ble endret!",
-      "change": "Rediger måling"
+      "change": "Rediger måling",
+      "delete": "Slett måling"
     },
     "apiSecret": "Hvis du har tenkt til å bruke API-et for å oppdatere nøkkelresultater og/eller målinger, så trenger du å skrive inn en streng her som legges inn i headeren til kallet (okr-team-secret)",
     "apiDocs": "API-dokumentasjon",