fixes for rendering SubmissionBox / splitLevel collections

Author: kaptron

app/controllers/api/v1/collections_controller.rb

@@ -23,7 +23,6 @@ def index
   before_action :check_cache, only: %i[show]
   def show
     check_getting_started_shell
-    check_4wfc_migration
 
     include = Collection.default_relationships_for_api
     if @collection.collection_type_challenge?
@@ -346,6 +345,7 @@ def check_getting_started_shell
     @collection.reload
   end
 
+  # no longer used (used to be a fallback check in collections#show)
   def check_4wfc_migration
     return if @collection.board_collection?
 

app/javascript/stores/jsonApi/Collection.js

@@ -76,6 +76,8 @@ class Collection extends SharedRecordMixin(BaseRecord) {
   tempTextCard = null
   @observable
   newPersistedTextCard = null
+  @observable
+  lastInsertedRow = 0
 
   attributesForAPI = [
     'name',
@@ -2002,6 +2004,14 @@ class Collection extends SharedRecordMixin(BaseRecord) {
       this.applyRowUpdate({ row, action })
       uiStore.update('isTransparentLoading', false)
 
+      if (this.isSplitLevel) {
+        runInAction(() => {
+          // this is used to adjust the splitLevel top row height in FoamcoreGrid
+          const incr = action === ROW_ACTIONS.INSERT ? 1 : -1
+          this.lastInsertedRow = row + incr
+        })
+      }
+
       if (!pushUndo) {
         return
       }

app/javascript/ui/grid/FoamcoreGrid.js

@@ -265,23 +265,31 @@ class FoamcoreGrid extends React.Component {
     const { gridW, gridH, gutter } = this.gridSettings
     const { relativeZoomLevel } = this
     const { collection, uiStore } = this.props
+    const { lastInsertedRow } = collection
     const maxCols = uiStore.maxCols(collection)
     // Max rows is the max row of any current cards (max_row_index)
     // + 1, since it is zero-indexed,
     const visRows = _.get(uiStore, 'visibleRows.num', 1)
     let maxRows = (
-      _.maxBy(collection.collection_cards, 'maxRow') || { maxRow: 1 }
+      _.maxBy(collection.collection_cards, 'maxRow') || { maxRow: 0 }
     ).maxRow
+
     if (collection.isSplitLevelBottom) {
       maxRows += 1
-    } else if (!collection.isSplitLevel) {
+    } else if (collection.isSplitLevel) {
+      if (collection.canEdit) {
+        maxRows = lastInsertedRow > maxRows ? lastInsertedRow : maxRows
+      }
+      maxRows += 1
+    } else {
       // + 2x the visible number of rows
       // for padding to allow scrolling beyond the current cards
       maxRows += visRows * 2
       if (collection.canEdit) {
         maxRows += 1
       }
     }
+
     const height = ((gridH + gutter) * maxRows) / relativeZoomLevel
     const width = ((gridW + gutter) * maxCols) / relativeZoomLevel
     return {

spec/requests/api/v1/collections_controller_spec.rb

@@ -147,18 +147,6 @@
       end
     end
 
-    context 'with a normal collection in need of 4WFC migration' do
-      let(:collection) { create(:collection, num_cards: 2, num_columns: nil, add_viewers: [user]) }
-
-      it 'calls BoardMigrator service' do
-        expect(CollectionGrid::BoardMigrator).to receive(:call).with(
-          collection: an_instance_of(Collection),
-          async: true,
-        )
-        get(path)
-      end
-    end
-
     it 'has no editors' do
       get(path)
       roles = json['data']['relationships']['roles']['data']