Merge pull request #97 from builderz-io/hot-fixes

Hot fixes
builderz-io · Nov 26, 2024 · f21ac9b · f21ac9b
2 parents 8b8a26f + 26a01a3
commit f21ac9b
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 9 deletions.
diff --git a/web-interface/app/plugins/builds/vplugins.min.js b/web-interface/app/plugins/builds/vplugins.min.js
diff --git a/web-interface/app/plugins/src/farm/farm.js b/web-interface/app/plugins/src/farm/farm.js
@@ -101,6 +101,7 @@ const Farm = ( function() { // eslint-disable-line no-unused-vars
           role: 'Plot',
           join: 4,
           privacy: 1,
+          noKeyDwnl: true,
         },
         draw: function( path ) {
           Farm.draw( path );

diff --git a/web-interface/app/plugins/src/group/components.js b/web-interface/app/plugins/src/group/components.js
@@ -242,9 +242,9 @@ const GroupComponents = ( function() {
 
     if ( entity.role !== 'Plot' ) {return ''}
 
-    const groupsOfUser = V.aE().holderOf
+    const groupsOfUser = V.aE() ? V.aE().holderOf
       .filter( item => item.c === 'Group' )
-      .map( item => item.a );
+      .map( item => item.a ) : [];
 
     const addNewGroupButton = V.cN(
       {

diff --git a/web-interface/app/plugins/src/marketplace/marketplace.js b/web-interface/app/plugins/src/marketplace/marketplace.js
@@ -109,6 +109,21 @@ const Marketplace = ( function() { // eslint-disable-line no-unused-vars
         }
         return res;
       } );
+
+      if( V.aE() ) {
+        let heldUuidEs = V.aE().holderOf.map( item => item.a );
+
+        heldUuidEs = heldUuidEs.length > 15 ? heldUuidEs.slice( 0, 15 ) : heldUuidEs;
+
+        for ( let i = 0; i < heldUuidEs.length; i++ ) {
+          await V.getEntity( heldUuidEs[i] ).then( res => {
+            if ( res.success ) {
+              V.setCache( 'highlights', res.data );
+            }
+            return res;
+          } );
+        }
+      }
     }
 
     if ( query.success ) {

diff --git a/web-interface/app/theme/builds/vtheme.min.js b/web-interface/app/theme/builds/vtheme.min.js
diff --git a/web-interface/app/theme/src/join/routine.js b/web-interface/app/theme/src/join/routine.js
@@ -15,7 +15,7 @@ const JoinRoutine = ( function() { // eslint-disable-line no-unused-vars
 
   let entityData = {};
 
-  let cardSet, cardIndex = 0, fourDigitString, keyFileText;
+  let cardSet, cardIndex = 0, fourDigitString, keyFileText, noKeyDwnl;
 
   /* ============== user interface strings ============== */
 
@@ -242,12 +242,27 @@ const JoinRoutine = ( function() { // eslint-disable-line no-unused-vars
     V.gN( '.join-download__btn' ).innerText = V.getString( ui.downloadAgain );
     V.gN( '.join-submit__btn' ).classList.remove( 'hidden' );
     V.gN( '.join-submit__btn' ).addEventListener( 'click', reloadOnCallToActionBtn.bind( { fullId: this.fullId } ) );
+    rearrangeButtons();
   }
 
   function reloadOnCallToActionBtn() {
     // location = window.location.origin + V.castPathOrId( this.fullId );
   }
 
+  function rearrangeButtons() {
+    // Select the elements
+    const joinDownload = document.querySelector( '.join-download' );
+    const joinSubmitWrapper = document.querySelector( '.join-submit-wrapper' );
+
+    if ( joinDownload && joinSubmitWrapper ) {
+      // Move the join-submit-wrapper to the position of join-download
+      joinDownload.parentNode.insertBefore( joinSubmitWrapper, joinDownload );
+
+      // Remove the join-download button
+      joinDownload.remove();
+    }
+  }
+
   /* ================== private methods ================= */
 
   function advanceCard() {
@@ -268,7 +283,7 @@ const JoinRoutine = ( function() { // eslint-disable-line no-unused-vars
     /* name */
     if ( cardIndex == 0 ) {
       const input = V.getNode( '.join-form__input' ).value;
-      const title = V.castEntityTitle( input, 'Person' ); // validation of the title
+      const title = V.castEntityTitle( input, entityData.role ); // validation of the title
 
       if ( title.success ) {
         entityData.title = title.data[0];
@@ -586,15 +601,21 @@ Initialized by: ${ window.location.host }
 
           document.dispatchEvent(
             new CustomEvent( 'ENTITY_CREATED', {
-              detail: { entity: E }
-            } )
+              detail: { entity: E },
+            } ),
           );
 
           if ( E.role != 'Person' ) {
             V.setState( 'tmpEditable', [ E.fullId ] );
             drawSuccess();
             notifySuccess( E.fullId, E.role );
-            setDownloadKeyBtn();
+            if ( noKeyDwnl ) {
+              setTimeout( delayCallToActionBtn.bind( { fullId: E.fullId } ), 1200 );
+              V.setNode( '.join-header__bottom', 'clear' );
+            }
+            else {
+              setDownloadKeyBtn();
+            }
             return;
           }
 
@@ -714,6 +735,8 @@ Initialized by: ${ window.location.host }
     cardSet = 'set' + ( use.join || settings.defaultSet );
     cardIndex = 0;
 
+    noKeyDwnl = use.noKeyDwnl;
+
     entityData.role = use.role;
     entityData.privacy = ( use.privacy == 0 ? undefined : use.privacy )
                          || ( settings.defaultPrivacy == 0 ? undefined : settings.defaultPrivacy );