Merge pull request #73 from FDA/origin/Sep2022

Origin/sep2022

app/assets/config/manifest.js

@@ -1 +1,3 @@
-{}
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

app/assets/javascripts/_precision/precision.app.editor.coffee

@@ -1,12 +1,13 @@
 class AppEditorModel
-  constructor: (app, ubuntuReleases, @mode = 'edit') ->
+  constructor: (app, ubuntuReleases, @availableInstances, @mode = 'edit') ->
     @isNewApp = @mode != 'edit'
     @saving = ko.observable(false)
     @loadingAssets = ko.observable(false)
     @errorMessage = ko.observable()
 
     @ubuntuReleases = ko.observableArray(ubuntuReleases)
     @dxid = app?.dxid
+    @entityType = app?.entity_type
     @name = ko.observable(app?.name)
     @name.cache = ko.computed(
       read: () =>
@@ -67,7 +68,6 @@ class AppEditorModel
 
     @internetAccess = ko.observable(app?.spec?.internet_access ? false)
 
-    @availableInstances = Precision.INSTANCES
     @defaultInstanceType = app?.spec?.instance_type ? "baseline-8"
     @instanceType = ko.observable(@defaultInstanceType)
 
@@ -205,6 +205,7 @@ class AppEditorModel
       ordered_assets: @getAssetsForSave()
       packages: @packages.peek()
       code: @code.peek() ? ""
+      entity_type: @entityType
 
     Precision.api('/api/apps', params)
       .done((data) =>

app/assets/javascripts/_precision/precision.app.input.coffee

@@ -404,7 +404,7 @@ class AppInputModel
             data.toString()
           )
         when 'float'
-          value = _.map(value, (data) =>
+          value = _.map(value.split(','), (data) =>
             data = $.trim(data)
             parseFloat(data, 10)
           )

app/assets/javascripts/_precision/precision.autocomplete.coffee

@@ -4,18 +4,20 @@ class AutocompleteModel
   EVENTS = {
     CHANGE_EVENT: "#{PREFIX}.change",
     KEYUP: "#{PREFIX}.keyup",
-    SETVALUE: "#{PREFIX}.setvalue"
+    SETVALUE: "#{PREFIX}.setvalue",
+    OPTION_CLICK: "#{PREFIX}.optionClick"
   }
 
   createEvents = () -> {
     CHANGE_EVENT: new Event(EVENTS.CHANGE_EVENT),
     KEYUP: new Event(EVENTS.KEYUP),
-    SETVALUE: new Event(EVENTS.SETVALUE)
+    SETVALUE: new Event(EVENTS.SETVALUE),
+    OPTION_CLICK: new Event(EVENTS.OPTION_CLICK)
   }
 
-  dispatchEvent = (el, e, eName) ->
-    el.dispatchEvent(e)
-    $(el).trigger(eName)
+  dispatchEvent = (el, e, eName, data) ->
+    el.dispatchEvent(e, [data])
+    $(el).trigger(eName, [data])
 
   convertOptionValues = (options = []) ->
     simpleTypes = ['string', 'number', 'boolean']
@@ -62,13 +64,14 @@ class AutocompleteModel
 
   renderInputGroup = () ->
     inputGroup = document.createElement('div')
-    inputGroup.classList.add('#{PREFIX}--input-group')
+    inputGroup.classList.add("#{PREFIX}--input-group")
     return inputGroup
 
-  renderRootNode = () ->
+  renderRootNode = (inputNode) ->
     rootNode = document.createElement('div')
     rootNode.classList.add("#{PREFIX}")
     rootNode.classList.add("#{PREFIX}--wrapper")
+    rootNode.classList.add("#{PREFIX}--lg") if inputNode.classList.contains('input-lg')
     return rootNode
 
   renderHiddenInput = (hiddenInput) ->
@@ -127,6 +130,7 @@ class AutocompleteModel
     @value = e.target.getAttribute('data-value')
     @nodes.hiddenInput.value = @value
     @dispatchInputEvent('SETVALUE')
+    @dispatchInputEvent('OPTION_CLICK', @value)
 
   onKeyUp: (e) =>
     @dispatchInputEvent('KEYUP')
@@ -161,8 +165,8 @@ class AutocompleteModel
     if notAutocomplete and notHidden
       @nodes.optionsContainer.classList.add('hidden')
 
-  dispatchInputEvent: (event) ->
-    dispatchEvent(@nodes.inputNode, @events[event], @eventNames[event])
+  dispatchInputEvent: (event, data) ->
+    dispatchEvent(@nodes.inputNode, @events[event], @eventNames[event], data)
 
   disabled: (disabled) ->
     if disabled
@@ -175,7 +179,7 @@ class AutocompleteModel
     @eventNames = EVENTS
 
     @nodes = {}
-    @nodes.rootNode = renderRootNode()
+    @nodes.rootNode = renderRootNode(@params.inputNode)
     @nodes.inputNode = renderInputNode(@params.inputNode)
     @nodes.hiddenInput = renderHiddenInput(@params.inputNode)
     @nodes.inputGroup = renderInputGroup()
@@ -224,3 +228,9 @@ class AutocompleteModel
 
 window.Precision ||= {}
 window.Precision.autocomplete = AutocompleteModel
+
+### PARAMS ###
+# @params.inputNode - input type text (DOM Node, not JQuery) [DOM Node] [REQUIRED]
+# @params.getOptionsAsync - Promise to get options with api [function -> promise]
+# @params.disabled - disable input node [boolean]
+# @params.options - default options [Array[int|string|boolean]] | [Array[Object{value, label}]]

app/assets/javascripts/_precision/precision.coffee

@@ -31,24 +31,6 @@ window.Precision.CK_CONFIG =
   autoGrow_minHeight: 400
   autoGrow_onStartup: true
 
-window.Precision.INSTANCES = [
-  {value: "baseline-2", label: "Baseline 2"}
-  {value: "baseline-4", label: "Baseline 4"}
-  {value: "baseline-8", label: "Baseline 8"}
-  {value: "baseline-16", label: "Baseline 16"}
-  {value: "baseline-36", label: "Baseline 36"}
-  {value: "himem-2", label: "High Mem 2"}
-  {value: "himem-4", label: "High Mem 4"}
-  {value: "himem-8", label: "High Mem 8"}
-  {value: "himem-16", label: "High Mem 16"}
-  {value: "himem-32", label: "High Mem 32"}
-  {value: "hidisk-2", label: "High Disk 2"}
-  {value: "hidisk-4", label: "High Disk 4"}
-  {value: "hidisk-8", label: "High Disk 8"}
-  {value: "hidisk-16", label: "High Disk 16"}
-  {value: "hidisk-36", label: "High Disk 36"}
-]
-
 window.Precision.carousel =
   # Source: http://jsfiddle.net/technotarek/gXN2u/
   setHeight: (id) ->

app/assets/javascripts/_precision/precision.dataTable.coffee

@@ -0,0 +1,7 @@
+DataTable = $.fn.dataTable
+dom = "<'row'<'col-sm-4'l><'col-sm-12'f>><'row'<'col-sm-24'tr>><'row'<'col-sm-10'i><'col-sm-14'p>>"
+
+$.extend( true, DataTable.defaults, {
+	dom: dom,
+	renderer: 'bootstrap'
+})

app/assets/javascripts/_precision/precision.nav.dropdown.coffee

@@ -0,0 +1,84 @@
+TABLE_CONFIG = [
+  {
+    resource: 'Compute',
+    usage: (stats) -> stats.computeCharges,
+    bold: false,
+  },
+  {
+    resource: 'Storage',
+    usage: (stats) -> stats.storageCharges,
+    bold: false,
+  },
+  {
+    resource: 'Data Egress',
+    usage: (stats) -> stats.dataEgressCharges,
+    bold: false,
+  },
+  {
+    resource: 'Total',
+    usage: (stats) -> stats.totalCharges,
+    bold: true,
+  },
+  {
+    resource: 'Usage Limit',
+    usage: (stats) -> stats.usageLimit,
+    bold: false,
+  },
+  {
+    resource: 'Usage Available',
+    usage: (stats) -> stats.usageAvailable,
+    bold: true,
+  },
+  {
+    resource: 'Job Limit',
+    usage: (stats) -> stats.jobLimit,
+    bold: true,
+  },
+]
+
+createCloudResourceSpendingsTable = (data) ->
+  TABLE_CONFIG.map((row) -> {
+    resource: row.resource,
+    usage: "$#{row.usage(data).toFixed(2)}",
+    bold: row.bold
+  })
+class NavBarDropdownModel
+  getCloudResourcesModalElement: () ->
+    $('#cloud_resources_modal')
+  # First and foremost apologies my sincerest apologies to knockoutJS gods, this is not creation as it was originally intended
+  # these params are passed, because this fn is invoked with "afterRender" template workaround
+  # No idea what is happening
+  loadStats: (isLoadingObservable, resourceTableObservable) ->
+    error = false
+    isLoadingObservable(true)
+    $.ajax('/api/user/cloud_resources', {
+      method: 'GET',
+      contentType: 'application/json',
+      dataType: 'json',
+      jsonp: false,
+      success: (data) ->
+        data
+      error: (xhr, status, err) ->
+        Precision.alert.showAboveAll('Something went wrong while loading cloud user spendings')
+        error = true
+    }).done((data) =>
+      table = createCloudResourceSpendingsTable(data)
+      resourceTableObservable(table)
+    ).always(=>
+      isLoadingObservable(false)
+    )
+  showCloudResourcesModal: () ->
+    # Need to reinitialize element, because template rendering most likely occurs between constructor and "loadStats" call, that invalidates the ref
+    @cloudResourcesModal = @getCloudResourcesModalElement() if @cloudResourcesModal.length == 0
+    @cloudResourcesModal.modal('show')
+  constructor: (tableConfig) ->
+    @cloudResourcesModal = @getCloudResourcesModalElement()
+    @resourceTable = ko.observable()
+    @isLoading = ko.observable(false)
+
+
+$(document).ready(() =>
+  $headerContainer = $("body header")
+  viewModel = new NavBarDropdownModel()
+  ko.applyBindings(viewModel, $headerContainer[0])
+)