feat: add underLoginInjection and order prop for login injection components

Author: yaroslav8765

adminforth/index.ts

@@ -157,6 +157,10 @@ class AdminForth implements IAdminForth {
     this.activatePlugins();
     process.env.HEAVY_DEBUG && console.log('🔧 Plugins activated');
 
+    process.env.HEAVY_DEBUG && console.log('🔧 Validating after plugin activation...');
+    this.configValidator.validateAfterPluginsActivation();
+    process.env.HEAVY_DEBUG && console.log('🔧 Config validated');
+
     process.env.HEAVY_DEBUG && console.log('🔧 Creating ExpressServer...');
     this.express = new ExpressServer(this);
     process.env.HEAVY_DEBUG && console.log('🔧 ExpressServer created');

adminforth/modules/configValidator.ts

@@ -57,16 +57,9 @@ export default class ConfigValidator implements IConfigValidator {
     }
     injections.forEach((target, i) => {
       injections[i] = this.validateComponent(target, errors);
-      injections[i].meta.afInitialOrder = injections.length - i; // to keep initial order for sorting later
     });
-    // sort by (injection.meta?.afOrder || 0) * 1000 desc, fallback to initial order in array
-    return injections.sort(
-      (a, b) => (
-        (b.meta?.afOrder ?? 0) * 1000 || b.meta?.afInitialOrder
-      ) - (
-        (a.meta?.afOrder ?? 0) * 1000 || a.meta?.afInitialOrder
-      )
-    );
+    // sort by injection.meta?.afOrder || 0 desc
+    return injections;
   }
 
   checkCustomFileExists(filePath: string): Array<string> {
@@ -122,11 +115,12 @@ export default class ConfigValidator implements IConfigValidator {
 
     const loginPageInjections: AdminForthConfigCustomization['loginPageInjections'] = {
       underInputs: [],
+      underLoginButton: [],
       panelHeader: [],
     };
 
     if (this.inputConfig.customization?.loginPageInjections) {
-      const ALLOWED_LOGIN_INJECTIONS = ['underInputs', 'panelHeader']
+      const ALLOWED_LOGIN_INJECTIONS = ['underInputs', 'underLoginButton', 'panelHeader']
       Object.keys(this.inputConfig.customization.loginPageInjections).forEach((injection) => {
         if (ALLOWED_LOGIN_INJECTIONS.includes(injection)) {
           loginPageInjections[injection] = this.validateAndListifyInjectionNew(this.inputConfig.customization.loginPageInjections, injection, errors);
@@ -136,7 +130,6 @@ export default class ConfigValidator implements IConfigValidator {
         }
       });
     }
-    
     const globalInjections: AdminForthConfigCustomization['globalInjections'] = {
       userMenu: [],
       header: [],
@@ -814,7 +807,7 @@ export default class ConfigValidator implements IConfigValidator {
       });
 
       // if pageInjection is a string, make array with one element. Also check file exists
-  const possibleInjections = ['beforeBreadcrumbs', 'beforeActionButtons', 'afterBreadcrumbs', 'bottom', 'threeDotsDropdownItems', 'customActionIcons'];
+      const possibleInjections = ['beforeBreadcrumbs', 'beforeActionButtons', 'afterBreadcrumbs', 'bottom', 'threeDotsDropdownItems', 'customActionIcons'];
       const possiblePages = ['list', 'show', 'create', 'edit'];
 
       if (options.pageInjections) {
@@ -904,6 +897,17 @@ export default class ConfigValidator implements IConfigValidator {
 
   }
 
+  validateAfterPluginsActivation() {
+    const ALLOWED_LOGIN_INJECTIONS = ['underInputs', 'underLoginButton', 'panelHeader']
+    Object.entries(this.adminforth.config.customization).map(([key, value]) => {
+      Object.entries(value).map(([injection, target]) => {
+        if (ALLOWED_LOGIN_INJECTIONS.includes(injection)) {
+          (target as Array<AdminForthComponentDeclarationFull>).sort((a, b) => (b.meta?.afOrder ?? 0) - (a.meta?.afOrder ?? 0));
+        }
+      });
+    })
+  }
+
   validateConfig() {
     const errors = [];
     const warnings = [];

adminforth/spa/src/views/LoginView.vue

@@ -105,6 +105,12 @@
                         <Button @click="login" :loader="inProgress" :disabled="inProgress || disableLoginButton" class="w-full">
                           {{ $t('Login to your account') }}
                         </Button>
+                        <component 
+                          v-for="c in coreStore?.config?.loginPageInjections?.underLoginButton || []"
+                          :is="getCustomComponent(c)"
+                          :meta="c.meta"
+                          @update:disableLoginButton="setDisableLoginButton($event)"
+                        />
                     </form>
                 </div>
             </div>

adminforth/types/Back.ts

@@ -28,6 +28,7 @@ export interface ICodeInjector {
 
 export interface IConfigValidator {
   validateConfig(): void;
+  validateAfterPluginsActivation(): void;
   postProcessAfterDiscover(resource: AdminForthResource): void;
 }
 
@@ -794,6 +795,7 @@ interface AdminForthInputConfigCustomization {
    */
   loginPageInjections?: {
     underInputs?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
+    underLoginButton?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
     panelHeader?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
   }
 
@@ -1131,6 +1133,7 @@ export interface AdminForthConfigCustomization extends Omit<AdminForthInputConfi
 
   loginPageInjections: {
     underInputs: Array<AdminForthComponentDeclarationFull>,
+    underLoginButton?: AdminForthComponentDeclaration | Array<AdminForthComponentDeclaration>,
     panelHeader: Array<AdminForthComponentDeclarationFull>,
   },