Merge branch 'master' into UIPFU-77

folio-org · Jan 19, 2024 · ed139b0 · ed139b0
2 parents 359bca4 + 4e790e9
commit ed139b0
Show file tree

Hide file tree

Showing 32 changed files with 125 additions and 32 deletions.
diff --git a/src/UserSearchContainer.js b/src/UserSearchContainer.js
@@ -194,7 +194,7 @@ class UserSearchContainer extends React.Component {
 
     if (activeFilters.includes(UAS)) {
       const assignedUserIds = Object.keys(initialSelectedUsers);
-      const hasBothUASFilters = activeFilters.includes(`${ASSIGNED_FILTER_KEY}`) && activeFilters.includes(UNASSIGNED_FILTER_KEY);
+      const hasBothUASFilters = activeFilters.includes(ASSIGNED_FILTER_KEY) && activeFilters.includes(UNASSIGNED_FILTER_KEY);
       const hasNoneOfUASFilters = !activeFilters.includes(ASSIGNED_FILTER_KEY) && !activeFilters.includes(UNASSIGNED_FILTER_KEY);
       const uasFilterValue = activeFilters.split(',').filter(f => f.includes(UAS))[0].split('.')[1];
 

diff --git a/translations/ui-plugin-find-user/ar.json b/translations/ui-plugin-find-user/ar.json
@@ -14,5 +14,8 @@
     "inactive": "غير نشط",
     "modal.close": "إغلاق",
     "modal.save": "حفظ",
-    "modal.total": "إجمالي المحدد: {count}"
+    "modal.total": "إجمالي المحدد: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/ber.json b/translations/ui-plugin-find-user/ber.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/ca.json b/translations/ui-plugin-find-user/ca.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/cs_CZ.json b/translations/ui-plugin-find-user/cs_CZ.json
@@ -14,5 +14,8 @@
     "inactive": "Neaktivní",
     "modal.close": "Zavřít",
     "modal.save": "Uložit",
-    "modal.total": "Celkem vybráno: {count}"
+    "modal.total": "Celkem vybráno: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/da.json b/translations/ui-plugin-find-user/da.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Gem",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/de.json b/translations/ui-plugin-find-user/de.json
@@ -14,5 +14,8 @@
     "inactive": "Inaktiv",
     "modal.close": "Schließen",
     "modal.save": "Speichern",
-    "modal.total": "Insgesamt ausgewählt: {count}"
+    "modal.total": "Insgesamt ausgewählt: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/en_GB.json b/translations/ui-plugin-find-user/en_GB.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/en_SE.json b/translations/ui-plugin-find-user/en_SE.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/en_US.json b/translations/ui-plugin-find-user/en_US.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/es.json b/translations/ui-plugin-find-user/es.json
@@ -14,5 +14,8 @@
     "inactive": "Inactivo",
     "modal.close": "Cerrar",
     "modal.save": "Guardar",
-    "modal.total": "Total seleccionados: {count}"
+    "modal.total": "Total seleccionados: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/es_419.json b/translations/ui-plugin-find-user/es_419.json
@@ -14,5 +14,8 @@
     "inactive": "Inactivo",
     "modal.close": "Cerrar",
     "modal.save": "Guardar",
-    "modal.total": "Total seleccionados: {count}"
+    "modal.total": "Total seleccionados: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/es_ES.json b/translations/ui-plugin-find-user/es_ES.json
@@ -14,5 +14,8 @@
     "inactive": "Inactivo",
     "modal.close": "Cerrar",
     "modal.save": "Guardar",
-    "modal.total": "Total seleccionados: {count}"
+    "modal.total": "Total seleccionados: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/fr.json b/translations/ui-plugin-find-user/fr.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/fr_FR.json b/translations/ui-plugin-find-user/fr_FR.json
@@ -14,5 +14,8 @@
     "inactive": "Inactif",
     "modal.close": "Fermer",
     "modal.save": "Sauvegarder",
-    "modal.total": "Total sélectionné: {count}"
+    "modal.total": "Total sélectionné: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/he.json b/translations/ui-plugin-find-user/he.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/hi_IN.json b/translations/ui-plugin-find-user/hi_IN.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/hu.json b/translations/ui-plugin-find-user/hu.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/it_IT.json b/translations/ui-plugin-find-user/it_IT.json
@@ -14,5 +14,8 @@
     "inactive": "Inattivo",
     "modal.close": "Chiudi",
     "modal.save": "Salva",
-    "modal.total": "Totale selezionato: {count}"
+    "modal.total": "Totale selezionato: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/ja.json b/translations/ui-plugin-find-user/ja.json
@@ -14,5 +14,8 @@
     "inactive": "非アクティブ",
     "modal.close": "閉じる",
     "modal.save": "保存",
-    "modal.total": "選択済合計： {count}"
+    "modal.total": "選択済合計： {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/ko.json b/translations/ui-plugin-find-user/ko.json
@@ -14,5 +14,8 @@
     "inactive": "비활성",
     "modal.close": "닫기",
     "modal.save": "저장",
-    "modal.total": "선택된 총계: {count}"
+    "modal.total": "선택된 총계: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/nb.json b/translations/ui-plugin-find-user/nb.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/nn.json b/translations/ui-plugin-find-user/nn.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/pl.json b/translations/ui-plugin-find-user/pl.json
@@ -14,5 +14,8 @@
     "inactive": "Nieaktywny",
     "modal.close": "Zamknij",
     "modal.save": "Zapisz",
-    "modal.total": "Wybrano łącznie: {count}"
+    "modal.total": "Wybrano łącznie: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/pt_BR.json b/translations/ui-plugin-find-user/pt_BR.json
@@ -14,5 +14,8 @@
     "inactive": "Inativo",
     "modal.close": "Fechar",
     "modal.save": "Salvar",
-    "modal.total": "Total selecionado: {count}"
+    "modal.total": "Total selecionado: {count}",
+    "userAssignmentStatus": "Status de atribuição de usuário",
+    "assigned": "Atribuído",
+    "unassigned": "Não atribuído"
 }
diff --git a/translations/ui-plugin-find-user/pt_PT.json b/translations/ui-plugin-find-user/pt_PT.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/ru.json b/translations/ui-plugin-find-user/ru.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Сохранить",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/sk.json b/translations/ui-plugin-find-user/sk.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/sv.json b/translations/ui-plugin-find-user/sv.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/ur.json b/translations/ui-plugin-find-user/ur.json
@@ -14,5 +14,8 @@
     "inactive": "Inactive",
     "modal.close": "Close",
     "modal.save": "Save",
-    "modal.total": "Total selected: {count}"
+    "modal.total": "Total selected: {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/zh_CN.json b/translations/ui-plugin-find-user/zh_CN.json
@@ -14,5 +14,8 @@
     "inactive": "未激活",
     "modal.close": "关闭",
     "modal.save": "保存",
-    "modal.total": "已选总数： {count}"
+    "modal.total": "已选总数： {count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }
diff --git a/translations/ui-plugin-find-user/zh_TW.json b/translations/ui-plugin-find-user/zh_TW.json
@@ -14,5 +14,8 @@
     "inactive": "未啟用",
     "modal.close": "關閉",
     "modal.save": "儲存",
-    "modal.total": "已選總數：{count}"
+    "modal.total": "已選總數：{count}",
+    "userAssignmentStatus": "User Assignment Status",
+    "assigned": "Assigned",
+    "unassigned": "Unassigned"
 }