|
3 | 3 | groups.unshift(groups.delete(OodSupport::Process.group)) |
4 | 4 | end.map(&:name).grep(/^P./) |
5 | 5 |
|
6 | | - classrooms = OodAppkit.clusters.each_with_object({}) do |cluster, hash| |
7 | | - if cluster.kubernetes? |
8 | | - hash.merge!(cluster.custom_config[:classrooms].to_h) |
9 | | - end |
10 | | - end.select do |k,v| |
11 | | - k.start_with?('jupyter') && groups.include?(v) |
12 | | - end.map do |k,v| |
13 | | - tokens = k.gsub('jupyter/', '').split('/') |
| 6 | + classrooms = OodAppkit.clusters.map do |cluster| |
| 7 | + [ cluster.id.to_s, cluster.custom_config[:classrooms].to_h ] |
| 8 | + end.to_h.map do |cluster_id, classrooms| |
| 9 | + classes = classrooms.select do |k,v| |
| 10 | + k.start_with?('jupyter') && groups.include?(v) |
| 11 | + end.map do |k,v| |
| 12 | + tokens = k.gsub('jupyter/', '').split('/') |
14 | 13 |
|
15 | | - { |
16 | | - name: tokens[0].nil? ? 'unknown' : tokens[0], |
17 | | - size: tokens[1].nil? ? 1 : tokens[1].to_i, |
18 | | - time: tokens[2].nil? ? 1 : tokens[2].to_i, |
19 | | - compute_cluster: tokens[3].nil? ? 'pitzer' : tokens[3].to_s, |
20 | | - module_type: tokens[4].nil? ? 'default' : tokens[4].to_s, |
21 | | - account: v, |
22 | | - } |
23 | | - end |
| 14 | + { |
| 15 | + name: tokens[0].nil? ? 'unknown' : tokens[0], |
| 16 | + size: tokens[1].nil? ? 1 : tokens[1].to_i, |
| 17 | + time: tokens[2].nil? ? 1 : tokens[2].to_i, |
| 18 | + cluster_fs: tokens[3].nil? ? 'pitzer' : tokens[3].to_s, |
| 19 | + module_type: tokens[4].nil? ? 'default' : tokens[4].to_s, |
| 20 | + cluster: cluster_id.to_s, |
| 21 | + account: v, |
| 22 | + } |
| 23 | + end.reject do |arr| |
| 24 | + arr.empty? |
| 25 | + end |
| 26 | + end.flatten |
24 | 27 | -%> |
25 | 28 | --- |
26 | | -cluster: |
27 | | - - "kubernetes" |
28 | | - - "kubernetes-test" |
29 | | - - "kubernetes-dev" |
30 | 29 | form: |
| 30 | + - cluster |
31 | 31 | - classroom |
32 | 32 | - account |
33 | 33 | - jupyterlab_switch |
34 | 34 | - size |
35 | 35 | - time |
36 | | - - compute_cluster |
| 36 | + - cluster_fs |
37 | 37 | - module_type |
38 | 38 | attributes: |
| 39 | + cluster: |
| 40 | + widget: "hidden_field" |
39 | 41 | account: |
40 | 42 | widget: "hidden_field" |
41 | | - compute_cluster: |
| 43 | + cluster_fs: |
42 | 44 | widget: "hidden_field" |
43 | 45 | module_type: |
44 | 46 | widget: "hidden_field" |
@@ -117,8 +119,9 @@ attributes: |
117 | 119 | - [ |
118 | 120 | "<%= cr[:name].gsub('_', ' ') %>", "<%= cr[:name] %>", |
119 | 121 | data-set-account: "<%= cr[:account] %>", |
120 | | - data-set-compute-cluster: "<%= cr[:compute_cluster] %>", |
121 | | - data-set-module-type: "<%= cr[:module_type] %>" |
| 122 | + data-set-cluster-fs: "<%= cr[:cluster_fs] %>", |
| 123 | + data-set-module-type: "<%= cr[:module_type] %>", |
| 124 | + data-set-cluster: "<%= cr[:cluster] %>" |
122 | 125 | ] |
123 | 126 | <%- end %> |
124 | 127 | <%- else -%> |
|
0 commit comments