Merge pull request code-dot-org#26707 from code-dot-org/pool_controller

Add Pools page to level builder

Author: ajpal

dashboard/app/controllers/blocks_controller.rb

@@ -2,6 +2,10 @@ class BlocksController < ApplicationController
   before_action :require_levelbuilder_mode, except: :index
   load_and_authorize_resource find_by: :name
 
+  def index
+    @blocks = Block.load_and_cache_by_pool(params[:pool])
+  end
+
   def new
     @block.pool = params[:pool]
     render 'edit'

dashboard/app/controllers/pools_controller.rb

@@ -0,0 +1,5 @@
+class PoolsController < ApplicationController
+  def index
+    @pools = Block.all_pool_names
+  end
+end

dashboard/app/views/blocks/index.html.haml

@@ -1,6 +1,8 @@
 %h1= 'Blocks'
+= link_to "Back to Pools", pools_path
+%br/
 = link_to 'Create a New Block', new_block_path
 %h2= 'Edit an existing block'
 %ul
-  - Block.order(:name).all.each do |b|
-    %li= link_to b.name, edit_block_path(id: b.name)
+  - @blocks.each do |b|
+    %li= link_to b[:name], edit_block_path(id: b[:name])

dashboard/app/views/home/_levelbuilder.html.haml

@@ -5,7 +5,7 @@
       = link_to 'Scripts', scripts_path
       = link_to '(Update all)', scripts_path(rake: '1'), data: { confirm: 'Are you sure want to re-seed script data?'}
     %li= link_to t('builder.manage'), levels_path
-    %li= link_to 'Blocks', blocks_path
+    %li= link_to 'Pools', pools_path
     %li= link_to 'Shared Functions', shared_blockly_functions_path
     %li= link_to 'Helper Libraries', libraries_path
     %li= link_to 'Gallery', 'projects/public'

dashboard/app/views/levels/new.html.haml

@@ -18,7 +18,7 @@
     =link_to 'Build a Dance Lab Level', new_level_path(type: 'Dancelab')
     %ul
       %li
-        Hour of Code 2018. Edit #{link_to 'library', edit_library_path(id: 'DanceLab')}, #{link_to 'blocks', blocks_path}.
+        Hour of Code 2018. Edit #{link_to 'library', edit_library_path(id: 'DanceLab')}, #{link_to 'blocks', blocks_path(pool: 'Dancelab')}.
   %li= link_to 'Build a Minecraft Level', new_level_path(type: 'Craft')
   %li= link_to 'Build a Star Wars Grid Level', new_level_path(type: 'StarWarsGrid')
 

dashboard/app/views/pools/index.html.haml

@@ -0,0 +1,5 @@
+%h1= 'Pools'
+%h2= 'Choose a block Pool'
+%ul
+  - @pools.each do |p|
+    %li= link_to p, blocks_path(pool: p)

dashboard/config/routes.rb

@@ -213,7 +213,10 @@
   get '/lang/:locale', to: 'home#set_locale', user_return_to: '/'
   get '*i18npath/lang/:locale', to: 'home#set_locale'
 
-  resources :blocks, constraints: {id: /[^\/]+/}
+  get 'pools', to: 'pools#index', as: 'pools'
+  scope 'pools/:pool' do
+    resources :blocks, constraints: {id: /[^\/]+/}
+  end
   resources :shared_blockly_functions, path: '/functions'
   resources :libraries
 

dashboard/test/controllers/blocks_controller_test.rb

@@ -9,7 +9,7 @@ class BlocksControllerTest < ActionController::TestCase
     Rails.application.config.stubs(:levelbuilder_mode).returns true
     sign_in @levelbuilder
 
-    get :index
+    get :index, params: {pool: :pool}
     assert_response :success
   end
 end

dashboard/test/controllers/pools_controller_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class PoolsControllerTest < ActionController::TestCase
+  test 'can list pools' do
+    get :index
+    assert_response :success
+  end
+end