Merge pull request #1553 from CodeNow/SAN-3912-dockerfile-mirroing

San 3912 dockerfile mirroing

Author: thejsj

client/assets/styles/scss/modals/modals-server-select.scss

@@ -165,7 +165,7 @@
       }
     }
 
-    &:active .btn-icon {
+    &:active:not(.disabled) .btn-icon {
       @extend %green;
       color: $white;
     }
@@ -200,6 +200,11 @@
       > .small {
         color: $gray-light;
       }
+
+      .btn-icon {
+        cursor: default;
+        opacity: .5;
+      }
     }
 
     &:active:not(.disabled),

client/directives/activePanel/directiveActivePanel.js

@@ -12,6 +12,7 @@ require('app')
  */
 function activePanel(
   $sce,
+  cleanStartCommand,
   keypather
 ) {
   return {
@@ -35,8 +36,7 @@ function activePanel(
 
       $scope.startCommand = function () {
         var cmd = keypather.get($scope, 'instance.containers.models[0].attrs.inspect.Config.Cmd[2]');
-        cmd = cmd || '';
-        return cmd.replace('until grep -q ethwe /proc/net/dev; do sleep 1; done;', '');
+        return cleanStartCommand(cmd);
       };
 
       $scope.showDebugCmd = false;

client/directives/activePanel/tabs/editor/directiveFileEditor.js

@@ -7,6 +7,7 @@ require('app')
  * @ngInject
  */
 function fileEditor(
+  $q,
   $rootScope,
   debounce,
   errs,
@@ -56,6 +57,9 @@ function fileEditor(
 
       function fetchFile() {
         delete $scope.hasError;
+        if ($scope.readOnly && keypather.get($scope.file, 'attrs.isRemoteCopy')) {
+          return $q.when(true);
+        }
         $scope.loading = true;
         return promisify($scope.file, 'fetch')()
           .then(resetFileBodyState)

client/directives/components/explorer/fileTreeDirView.jade

@@ -58,7 +58,7 @@ li.folder(
     li.file(
       ng-class = "{\
         active: acv.editing,\
-        disabled: !acv.id() || readOnly\
+        disabled: !acv.id() || readOnly || (acv.id() === fileModel.getMainAppCodeVersion().id()) \
       }"
       ng-repeat = "acv in fileModel.appCodeVersions.models | orderBy:'attrs.repo'"
       pop-over
@@ -71,9 +71,10 @@ li.folder(
       a(
         ng-class = "{\
           active: acv.editing,\
-          disabled: !acv.id()\
+          disabled: !acv.id() || acv.id() === fileModel.getMainAppCodeVersion().id()\
         }"
         ng-click = "popoverFileExplorerRepository.actions.editRepo(acv)"
+        ng-disabled = "acv.id() === fileModel.getMainAppCodeVersion().id()"
         pop-over
         pop-over-actions = "popoverFilesRepositoryCommitToggle.actions"
         pop-over-active = "acv.editing"

client/directives/components/serverModalButtons/serverModalButtonsDirective.js

@@ -18,7 +18,10 @@ function serverModalButtonsDirective(
     },
     link: function ($scope) {
       $scope.showSaveAndBuild = function () {
-        return (!$scope.SMC.instance && $scope.SMC.state.step < 4) || ($scope.SMC.isDirty() === 'build' && !$rootScope.isLoading[$scope.SMC.name]);
+        return (
+          (!$scope.SMC.instance && ($scope.SMC.state.advanced || $scope.SMC.state.step < 4)) ||
+          ($scope.SMC.isDirty() === 'build' && !$rootScope.isLoading[$scope.SMC.name])
+        );
       };
       $scope.createServerOrUpdate = function () {
         if ($scope.isPrimaryButtonDisabled()) {

client/directives/components/serverModalButtons/serverModalButtonsView.jade

@@ -1,6 +1,6 @@
 button.btn.btn-md.gray.btn-cancel.float-left.js-animate(
   ng-click = "SMC.actions.close()"
-  ng-if = "!SMC.instance && SMC.state.step < 4"
+  ng-if = "!SMC.instance"
   type = "button"
 ) Cancel
 
@@ -9,14 +9,14 @@ button.btn.btn-md.btn-done.white.float-right(
     'js-animate': SMC.state.step > 3\
   }"
   ng-click = "SMC.actions.close()"
-  ng-if = "SMC.instance || SMC.state.step > 3"
+  ng-if = "SMC.instance"
   type = "button"
 ) Done
 
 button.btn.btn-md.btn-primary.white.text-next.float-right(
   ng-click = "SMC.goToNextStep()"
   ng-disabled = "isPrimaryButtonDisabled()"
-  ng-if = "SMC.state.step < 3"
+  ng-if = "!SMC.instance && !SMC.isTabVisible('buildfiles')"
   type = "button"
 )
   span.btn-text.float-left Next
@@ -39,8 +39,8 @@ button.btn.btn-md.white.btn-primary.float-right.js-animate(
     'text-save-build': showSaveAndBuild()\
   }"
   ng-click = "thisForm.$invalid || createServerOrUpdate()"
-  ng-disabled = "(SMC.needToBeDirtyToSaved() && !SMC.isDirty()) || isPrimaryButtonDisabled()"
-  ng-if = "SMC.instance || SMC.state.step > 2"
+  ng-disabled = "(SMC.needsToBeDirtySaved() && !SMC.isDirty()) || isPrimaryButtonDisabled()"
+  ng-if = "SMC.instance || SMC.isTabVisible('buildfiles')"
   type = "submit"
 )
   span.btn-text.float-left Save

client/directives/environment/environmentBody/serverCards/serverCardView.jade

@@ -30,7 +30,10 @@ ul.card-body.load(
   li.btn.white(
     ng-click = "openEditServerModal('repository')"
     ng-class = "{'btn-hint': helpCards.cardIsActiveOnThisContainer(instance) && helpCards.getActiveCard().targets.repository}"
-    ng-if = "server.repo && (!server.advanced || $root.featureFlags.dockerfileMirroring)"
+    ng-if = "\
+      server.repo && \
+      (!server.advanced || $root.featureFlags.dockerfileMirroring) \
+    "
   )
     svg.iconnables
       use(
@@ -120,7 +123,10 @@ ul.card-body.load(
   li.btn.white(
     ng-click = "openEditServerModal('translation')"
     ng-class = "{'btn-hint': helpCards.cardIsActiveOnThisContainer(instance) && helpCards.getActiveCard().targets.findAndReplace}"
-    ng-if = "server.repo"
+    ng-if = "\
+      server.repo && \
+      !server.instance.hasDockerfileMirroring() \
+    "
   )
     svg.iconnables
       use(
@@ -135,7 +141,11 @@ ul.card-body.load(
   //- backup & restore
   li.btn.white(
     ng-click = "openEditServerModal('backup')"
-    ng-if = "!server.repo && $root.featureFlags.backup"
+    ng-if = "\
+      server.repo && \
+      !server.instance.hasDockerfileMirroring() && \
+      $root.featureFlags.backup \
+    "
   )
     svg.iconnables
       use(
@@ -160,7 +170,7 @@ ul.card-body.load(
     small.small.text-overflow(
       ng-if = "server.advanced"
     )
-      span.span.float-left {{$root.featureFlags.dockerfileMirroring ? 'Last updated 1m ago' : '—'}}
+      span.span.float-left —
       //- span.span.float-left Error: Dockerfile not found
 
 
@@ -189,7 +199,11 @@ ul.card-body.load(
       //- only repo containers can sync
       //- show this instead of the lock, when mirroring
       svg.iconnables.icons-sync(
-        ng-if = "$root.featureFlags.dockerfileMirroring && server.advanced"
+        ng-if = "\
+          $root.featureFlags.dockerfileMirroring && \
+          server.advanced && \
+          server.instance.hasDockerfileMirroring() \
+        "
       )
         use(
           xlink:href = "#icons-sync"
@@ -202,13 +216,16 @@ ul.card-body.load(
           xlink:href = "#icons-alert-alt"
         )
       svg.iconnables.icons-lock(
-        ng-if = "!$root.featureFlags.dockerfileMirroring && !server.advanced"
+        ng-if = "!server.advanced"
       )
         use(
           xlink:href = "#icons-lock"
         )
       svg.iconnables.icons-unlock(
-        ng-if = "!$root.featureFlags.dockerfileMirroring && server.advanced"
+        ng-if = "\
+          server.advanced && \
+          !($root.featureFlags.dockerfileMirroring || server.instance.hasDockerfileMirroring()) \
+        "
       )
         use(
           xlink:href = "#icons-unlock"

client/directives/environment/environmentController.js

@@ -56,7 +56,7 @@ function EnvironmentController(
     newContainer: function () {
       return ModalService.showModal({
         controller: 'NewContainerModalController',
-        controllerAs: 'NCMC',
+        controllerAs: 'MC', // Shared
         templateUrl: 'newContainerModalView'
       });
     },

client/directives/environment/modals/forms/formBuildfiles/viewFormBuildfiles.jade

@@ -47,7 +47,7 @@
     state = "SMC.state"
   )
   button.btn.btn-sm.white(
-    internal-modal-helper = "confirmSetupAdvancedModalView"
+    ng-click = "SMC.showAdvancedModeConfirm()"
     ng-if = "$root.featureFlags.dockerfileMirroring"
   )
     svg.iconnables.icons-lock
@@ -58,22 +58,26 @@
 
 //- add logic for repository containers only
 .grid-block.shrink.align-center.well.gray.in.row-xxs(
-  ng-if = "$root.featureFlags.dockerfileMirroring && SMC.state.advanced"
+  ng-if = "$root.featureFlags.dockerfileMirroring && SMC.state.advanced && !SMC.state.isNonRepoContainer"
 )
   svg.grid-content.row-xxs.shrink.iconnables.icons-sync
     use(
       xlink:href = "#icons-sync"
     )
   .grid-content.row-xxs.text-overflow(
-    ng-class = "{'padding-right': state.syncing}"
+    ng-class = "{'padding-right': SMC.state.advanced === 'isMirroringDockerfile'}"
   )
     div Mirror Dockerfile
     small.small(
-      ng-if = "state.syncing"
+      ng-if = "SMC.state.advanced === 'isMirroringDockerfile'"
     )
       span.span.text-overflow.float-left(
-        title = "reponame/path/to/dockerfile"
-      ) Mirroring from GitHub: reponame/path/to/dockerfile
+        ng-title = "SMC.state.contextVersion.attrs.buildDockerfilePath"
+      ) Mirroring from GitHub: {{ SMC.state.contextVersion.attrs.buildDockerfilePath }}
+    small.small(
+      ng-if = "SMC.state.advanced !== 'isMirroringDockerfile'"
+    )
+      span.span.text-overflow.float-left Mirror with a Dockerfile from this repo on GitHub.
       //- when there's an error
       //- svg.iconnables.icons-alert-alt.float-left
       //-   use(
@@ -92,16 +96,15 @@
             xlink:href = "#icons-help"
           )
       button.btn.btn-xxs.gray(
+        ng-if = "$root.featureFlags.dockerfileMirroringMultiple"
         internal-modal-helper = "changeMirrorView"
       ) Change…
-    small.small(
-      ng-if = "!state.syncing"
-    ) Mirror with a Dockerfile from this repo on GitHub.
 
   //- this should open the 'viewModalSync' view when syncing has not been set up
   label.toggle-wrapper
     input.toggle-input(
-      ng-model = "state.syncing"
+      ng-model = "SMC.switchBetweenAdvancedAndMirroring"
+      ng-model-options = "{getterSetter: true}"
       type = "checkbox"
     )
     .toggle-group.toggle-sm
@@ -114,7 +117,6 @@
     'ace-runnable-dark': !$root.featureFlags.imAfraidOfTheDark,\
     'ace-runnable-light': $root.featureFlags.imAfraidOfTheDark\
   }"
-  ng-init = "state.syncing = null"
 )
 
   .sidebar(
@@ -123,7 +125,7 @@
     explorer-title = "Build Files"
     file-model = "SMC.state.contextVersion"
     loading-promises-target = "editServerModal"
-    ng-if = "!state.syncing"
+    ng-if = "SMC.state.advanced !== 'isMirroringDockerfile'"
     open-items = "SMC.openItems"
     read-only = "!SMC.state.advanced"
     root-dir = "SMC.state.contextVersion.rootDir"
@@ -135,11 +137,11 @@
     file = "item"
     file-editor
     loading-promises-target = "editServerModal"
-    ng-class = "{'readonly': !SMC.state.advanced || state.syncing}"
+    ng-class = "{'readonly': !SMC.state.advanced || (SMC.state.advanced && SMC.state.advanced === 'isMirroringDockerfile') }"
     ng-if = "item.state.type === 'File'"
     ng-repeat = "item in SMC.openItems.models track by item.id()"
     ng-show = "item === SMC.openItems.activeHistory.last()"
-    read-only = "!SMC.state.advanced || state.syncing"
+    read-only = "!SMC.state.advanced || SMC.state.advanced === 'isMirroringDockerfile'"
     state = "SMC.state"
   )
 

client/directives/environment/modals/forms/formStack/stackSelectorFormDirective.js

@@ -19,6 +19,7 @@ function stackSelectorForm(
     scope: {
       loadingPromisesTarget: '@?',
       state: '=',
+      showStackSelector: '=',
       isNewContainer: '=?'
     },
     link: function ($scope) {

client/directives/environment/modals/forms/formStack/viewFormStack.jade

@@ -1,4 +1,5 @@
 .label.clearfix(
+  ng-if = "showStackSelector"
   ng-include = "'viewFormStackSelector'"
 )
 

client/directives/environment/modals/modalChangeMirror/changeMirrorView.jade

@@ -3,7 +3,9 @@
     ng-class = "{'in': active}"
   )
     .popover-header Choose Dockerfile
-      svg.iconnables.icons-close
+      svg.iconnables.icons-close(
+        ng-click = "MC.cancel()"
+      )
         use(
           xlink:href = "#icons-close"
         )
@@ -14,12 +16,15 @@
       onload = "fromTool = true"
     )
     footer.modal-footer.clearfix
-      button.btn.btn-md.white.float-left Cancel
+      button.btn.btn-md.white.float-left(
+        ng-click = "MC.cancel()"
+      ) Cancel
       button.btn.btn-md.green.float-right.btn-spinner(
-        ng-disabled = "!dockerfile.selection"
+        ng-click = "MC.confirm(MC.state.dockerfile)"
+        ng-disabled = "!MC.state.dockerfile"
       )
         //- add the 'in' class to .btn-spinner when spinning!
         //- .spinner-wrapper.spinner-white.spinner-sm.in(
         //-   ng-include = "'spinner'"
         //- )
-        | Start Mirroring
+        | Start Mirroring