Merge branch 'next' of github.com:devforth/adminforth into next

Author: ivictbor

adminforth/dataConnectors/baseConnector.ts

@@ -68,12 +68,28 @@ export default class AdminForthBaseConnector implements IAdminForthDataSourceCon
       // go through all filters in array and call validation+normalization for each
       // as soon as error is encountered, there is no point in calling validation for other filters
       // if error is not encountered all filters will be validated and normalized
-      return filters.reduce((result, f) => {
+      return filters.reduce((result, f, fIndex) => {
         if (!result.ok) {
           return result;
         }
 
-        return this.validateAndNormalizeFilters(f, resource);
+        const filterValidation = this.validateAndNormalizeFilters(f, resource);
+
+        // in case column isArray and enumerator/foreign resource - IN filter must be transformed into OR filter
+        if (filterValidation.ok && f.operator == AdminForthFilterOperators.IN) {
+          const column = resource.dataSourceColumns.find((col) => col.name == (f as IAdminForthSingleFilter).field);
+          // console.log(`\n~~~ column: ${JSON.stringify(column, null, 2)}\n~~~ resource.columns: ${JSON.stringify(resource.dataSourceColumns, null, 2)}\n~~~ filter: ${JSON.stringify(f, null, 2)}\n`);
+          if (column.isArray?.enabled && (column.enum || column.foreignResource)) {
+            filters[fIndex] = {
+              operator: AdminForthFilterOperators.OR,
+              subFilters: f.value.map((v: any) => {
+                return { field: column.name, operator: AdminForthFilterOperators.LIKE, value: v };
+              }),
+            };
+          }
+        }
+
+        return filterValidation;
       }, { ok: true, error: '' });
     }
 

adminforth/documentation/docs/tutorial/05-Plugins/11-oauth.md

@@ -244,6 +244,7 @@ plugins: [
     adapters: [
       ...
       new AdminForthAdapterKeycloakOauth2({
+          name: "Keycloak",
           clientID: process.env.KEYCLOAK_CLIENT_ID,
           clientSecret: process.env.KEYCLOAK_CLIENT_SECRET,
           keycloakUrl: process.env.KEYCLOAK_URL,

adminforth/spa/src/components/ResourceListTable.vue

@@ -227,7 +227,8 @@
           contenteditable="true" 
           class="min-w-10 outline-none inline-block w-auto min-w-10 py-1.5 px-3 text-sm text-center text-gray-700 border border-gray-300 dark:border-gray-700 dark:text-gray-400 dark:bg-gray-800 z-10"
           @keydown="onPageKeydown($event)"
-          @input="page = parseInt($event.target.innerText) || ''"
+          @input="onPageInput($event)"
+          @blur="validatePageInput()"
         >
           {{ pageInput }}
         </div>
@@ -355,6 +356,10 @@ async function onPageKeydown(event) {
     (!['Backspace', 'ArrowRight', 'ArrowLeft'].includes(event.code)
     && isNaN(String.fromCharCode(event.keyCode)))) {
     event.preventDefault();
+    if (event.code === 'Enter') {
+      validatePageInput();
+      event.target.blur();
+    }
   }
 }
 
@@ -575,6 +580,16 @@ async function startCustomAction(actionId, row) {
   }
 }
 
+function onPageInput(event) {
+  pageInput.value = event.target.innerText;
+}
+
+function validatePageInput() {
+  const newPage = parseInt(pageInput.value) || 1;
+  const validPage = Math.max(1, Math.min(newPage, totalPages.value));
+  page.value = validPage;
+  pageInput.value = validPage.toString();
+}
 
 </script>
 

adminforth/types/Adapters.ts

@@ -33,4 +33,5 @@ export interface OAuth2Adapter {
   getTokenFromCode(code: string, redirect_uri: string): Promise<{ email: string }>;
   getIcon(): string;
   getButtonText?(): string;
+  getName?(): string;
 }

dev-demo/resources/users.ts

@@ -134,6 +134,7 @@ export default {
           useOpenID: true,
         }),
         new AdminForthAdapterKeycloakOauth2({
+          name: "Keycloak",
           clientID: process.env.KEYCLOAK_CLIENT_ID,
           clientSecret: process.env.KEYCLOAK_CLIENT_SECRET,
           keycloakUrl: process.env.KEYCLOAK_URL,