@@ -1,7 +1,8 @@

 (defpackage :mfa-tool.aws-dispatcher

   (:use :cl)

   (:export #:aws-dispatcher #:update-stacks #:select-stack #:stacks #:stack

-           #:put-stack))

+           #:put-stack

+           #:refresh-stack))

 (in-package :mfa-tool.aws-dispatcher)

 (defclass aws-dispatcher ()

@@ -22,6 +23,12 @@

 (defprint-slots daydreamer.aws-result:stack

     (daydreamer.aws-result::%stack-name))

+(defclass refresh-stack ()

+  ((%stack :reader stack :initarg :stack)))

+(defprint-slots refresh-stack (%stack))

+(defun refresh-stack (stack)

+  (fw.lu:new 'refresh-stack stack))

+

 (defclass put-stack ()

   ((%stack :reader stack :initarg :stack)))

 (defun put-stack (stack)

@@ -55,6 +62,16 @@

 (defmethod mfa-tool.store:dispatch :after ((store aws-dispatcher) (action update-region))

   (mfa-tool.store:dispatch store :|Get Stacks|))

+(defmethod mfa-tool.store:dispatch :after ((store aws-dispatcher) (action refresh-stack))

+  (let ((new-value (daydreamer.aws-result:extract-stack

+                    (car

+                     (daydreamer.aws-result:extract-list

+                      (cdar

+                       (aws/cloudformation:describe-stacks

+                        :stack-name (daydreamer.aws-result:stack-name

+                                     (stack action)))))))))

+    (mfa-tool.store:dispatch store (put-stack new-value))))

+

 (defmethod mfa-tool.store:dispatch :after ((store aws-dispatcher) (action (eql :|Get Stacks|)))

   (bt:make-thread

    (lambda ()

@@ -24,10 +24,32 @@

                            (column "ParameterValue"))

            output))

+(defmethod mfa-tool.store:dispatch :after ((store stack-store)

+                                           (action (eql :refresh)))

+  (mfa-tool.store:dispatch store

+                           (mfa-tool.aws-dispatcher:refresh-stack

+                            (mfa-tool.stack-store:selected-stack

+                             store))))

+

+(defmethod mfa-tool.store:dispatch :after ((store stack-store)

+                                           (action mfa-tool.aws-dispatcher:put-stack))

+  (let* ((stack (mfa-tool.aws-dispatcher:stack action))

+         (old-stack (find (daydreamer.aws-result:stack-name stack)

+                          (available-stacks store)

+                          :key 'daydreamer.aws-result:stack-name

+                          :test 'equal))

+         (new-stacks (substitute stack old-stack (available-stacks store))))

+    (mfa-tool.store:dispatch store (mfa-tool.aws-dispatcher:select-stack stack))

+    (mfa-tool.store:dispatch store (mfa-tool.aws-dispatcher:update-stacks new-stacks))))

+

 (defmethod mfa-tool.store:dispatch :after ((store stack-store)

                                            (action mfa-tool.aws-dispatcher:update-stacks))

-  (alexandria:when-let ((stack (car (mfa-tool.aws-dispatcher:stacks action))))

-    (mfa-tool.store:dispatch store (mfa-tool.aws-dispatcher:select-stack stack))))

+  (when (not (selected-stack store))

+    (alexandria:when-let ((stack (car (mfa-tool.aws-dispatcher:stacks action))))

+      (mfa-tool.store:dispatch store (mfa-tool.aws-dispatcher:select-stack stack)))))

+

+(defmethod mfa-tool.store:execute ((store stack-store) (action (eql :refresh)))

+  )

 (defmethod mfa-tool.store:execute ((store stack-store) (action mfa-tool.aws-dispatcher:update-stacks))

   (setf (available-stacks store) (sort (mfa-tool.aws-dispatcher:stacks action)

@@ -41,3 +63,6 @@

           (parameters store) (mapcar 'parameter-columns (daydreamer.aws-result:parameters stack))

           (outputs store) (mapcar 'output-columns (daydreamer.aws-result:outputs stack)))))

+

+(defmethod mfa-tool.store:execute ((store stack-store) (action mfa-tool.aws-dispatcher:put-stack))

+  )

@@ -54,6 +54,11 @@

                   :selection-callback (dispatch-with-action-creator 'mfa-tool.aws-dispatcher:select-stack)

                   :callback-type :interface-data)

+   (refresh-status capi:push-button

+                   :text "Refresh"

+                   :callback-type :interface

+                   :callback (lambda (store)

+                               (mfa-tool.store:dispatch store :refresh)))

    (status-display capi:display-pane

                    :background :transparent

                    :reader status-display

@@ -100,8 +105,14 @@

                '(region-chooser

                  stack-chooser)

                :visible-max-width '(character 35))

+   (status-layout capi:row-layout

+                  '(status-display

+                    nil

+                    #+(or)open-web-console

+                    refresh-status)

+                  :adjust :center)

    (attribute-layout capi:column-layout

-                     '(status-display

+                     '(status-layout

                        parameters-display

                        outputs-display))

    (main-layout capi:row-layout

@@ -115,8 +126,9 @@

 (defmethod mfa-tool.store:execute :after ((interface stack-interface) (_ mfa-tool.aws-dispatcher:update-stacks))

   (with-pp (interface)

     (with-accessors ((stack-chooser stack-chooser)) interface

-      (setf (capi:collection-items stack-chooser)

-            (mfa-tool.stack-store:available-stacks interface)))))

+      (setf (capi:collection-items stack-chooser) (mfa-tool.stack-store:available-stacks interface)

+            (capi:choice-selected-item

+             (stack-chooser interface)) (mfa-tool.stack-store:selected-stack interface)))))

 (defun max-widths (cols)

   (loop for (col1 col2) in cols

@@ -135,6 +147,9 @@

       (capi:modify-multi-column-list-panel-columns

        parameters-display :columns (apply 'get-output-columns "Parameter" (max-widths parameters)))

+      (when (not (eq (capi:choice-selected-item (stack-chooser interface))

+                     (mfa-tool.aws-dispatcher:stack _)))

+        (setf (capi:choice-selected-item (stack-chooser interface)) (mfa-tool.stack-store:selected-stack interface)))

       (setf (capi:display-pane-text status-display)

             (format nil "~a: ~/mfa-tool.stack:format-stack-status/"

                     (daydreamer.aws-result:stack-name selected-stack)