Merge pull request #2056 from CodeNow/remove-org-demos

taylordolan · web-flow · commit b994035c287d · 2017-03-02T11:22:50.000-08:00
Remove org demos
diff --git a/client/assets/styles/scss/deprecated/demo-personal-only.scss b/client/assets/styles/scss/deprecated/demo-personal-only.scss
@@ -0,0 +1,12 @@
+//- ************************
+//- deprecated file, delete with $root.featureFlags.demoPersonalOnly
+.service-cta .demo-progress {
+  width: calc(100% + 30px);
+}
+
+.popover-demo.service-cta {
+  margin-bottom: 9px;
+  margin-top: 5px;
+}
+//- end deprecated file
+//- ************************
diff --git a/client/assets/styles/scss/popover/popover-demo-progress.scss b/client/assets/styles/scss/popover/popover-demo-progress.scss
@@ -18,7 +18,6 @@
   }
 
   .branch-step &,
-  .service-cta &,
   .team-cta & {
     width: calc(100% + 30px);
   }
diff --git a/client/assets/styles/scss/popover/popover-demo.scss b/client/assets/styles/scss/popover/popover-demo.scss
@@ -6,12 +6,6 @@
   top: 0;
   z-index: $z-views-sidebar;
 
-  // specific to the service cta
-  &.service-cta {
-    margin-bottom: 9px;
-    margin-top: 5px;
-  }
-
   // specific to the branch step
   &.branch-step {
     margin-top: 6px;
diff --git a/client/config/routes.js b/client/config/routes.js
@@ -287,7 +287,7 @@ module.exports = [
         featureFlags,
         populateCurrentOrgService // unused, but required so things are properly populated!
       ) {
-        if (featureFlags.flags.demoOrg && demoFlowService.isInDemoFlow()) {
+        if (demoFlowService.isInDemoFlow()) {
           return $state.go('base.instances', {
             userName: $stateParams.userName
           });
diff --git a/client/directives/components/instanceNavigtion/instanceNavigationInternalsView.jade b/client/directives/components/instanceNavigtion/instanceNavigationInternalsView.jade
@@ -19,7 +19,7 @@ a.grid-block.align-center.a-sref(
     | {{getNavigationName()}}
   button.grid-block.shrink.btn-gear(
     ng-class = "{'active': INC.popoverShown}"
-    ng-if = "!INC.currentOrg.isPersonalAccount() && (!$root.featureFlags.demoOrg || $root.featureFlags.demoOrg && !INC.isInDemoFlow())"
+    ng-if = "!INC.currentOrg.isPersonalAccount() && !INC.isInDemoFlow()"
     pop-over
     pop-over-active = "INC.popoverShown"
     pop-over-controller = "INC"
diff --git a/client/directives/components/newContainer/newContainerTooltipView.jade b/client/directives/components/newContainer/newContainerTooltipView.jade
@@ -1,15 +1,15 @@
 .arrow(
-  ng-class = "{'gray': (!$root.featureFlags.demoOrg && !NCC.isPersonalAccount()) || ($root.featureFlags.demoOrg && !NCC.isInDemoFlow())}"
+  ng-class = "{'gray': !NCC.isPersonalAccount() || !NCC.isInDemoFlow()}"
   style = "top: 39px;"
 )
 
 div(
-  ng-if = "!NCC.showAddServicesPopover()"
+  ng-if = "!NCC.showAddServicesPopover() && !$root.featureFlags.demoPersonalOnly"
   ng-include = "'templateMenuEmptyPopoverView'"
 )
 
 div(
-  ng-if = "NCC.showAddServicesPopover()"
+  ng-if = "NCC.showAddServicesPopover() || $root.featureFlags.demoPersonalOnly"
 )
   .grid-block.popover-header
     button.grid-block.align-center.btn.btn-radio(
diff --git a/client/directives/components/notifications/viewNotifications.jade b/client/directives/components/notifications/viewNotifications.jade
@@ -11,5 +11,5 @@
 .grid-block.vertical.noscroll(
   hang-tight
   instance = "dataInstance.data.instance"
-  ng-if = "CI.showHangTightMessage()"
+  ng-if = "CI.showHangTightMessage() && !$root.featureFlags.demoPersonalOnly"
 )
diff --git a/client/directives/environment/environmentView.jade b/client/directives/environment/environmentView.jade
@@ -46,7 +46,7 @@
 )
   .popover.popover-environment.in(
     configure-intro
-    ng-if = "$root.featureFlags.demoOrg && EC.shouldShowExplanationUi()"
+    ng-if = "EC.shouldShowExplanationUi()"
   )
 
   header.grid-block.align-center.environment-header(
diff --git a/client/directives/instances/instance/branchMenuPopover/templateMenuEmptyPopoverView.jade b/client/directives/instances/instance/branchMenuPopover/templateMenuEmptyPopoverView.jade
@@ -11,7 +11,7 @@
   ) Switch to a Team
 
 .grid-block.align-center.vertical.padding-md.empty(
-  ng-if = "!NCC.isPersonalAccount()"
+  ng-if = "!NCC.isPersonalAccount() && !$root.featureFlags.demoPersonalOnly"
 )
   img.grid-block.shrink.img(
     src = "/build/images/add-code-state.svg"
diff --git a/client/directives/instances/instance/instanceHeaderView.jade b/client/directives/instances/instance/instanceHeaderView.jade
@@ -73,7 +73,7 @@
   )
 
   .popover.bottom.in.popover-url.below-modals(
-    ng-if = "showUrlCallout()"
+    ng-if = "showUrlCallout() && !$root.featureFlags.demoPersonalOnly"
     ng-include = "'containerUrlPopoverView'"
   )
 
diff --git a/client/directives/instances/instanceList/servicesHeadingView.jade b/client/directives/instances/instanceList/servicesHeadingView.jade
@@ -2,7 +2,7 @@ span.grid-content.text-overflow Services
 //- div instead of button so safari doesn’t get weird with alignment
 .grid-block.align-center.shrink.btn.btn-xxs.white(
   ng-class = "{'active': addService}"
-  ng-click = "$root.featureFlags.demoOrg && CIS.shouldShowServicesCTA() && $emit('demo::end')"
+  ng-click = "CIS.shouldShowServicesCTA() && $emit('demo::end')"
   pop-over
   pop-over-active = "addService"
   pop-over-options = "{\"top\":-30,\"left\":100}"
diff --git a/client/directives/modals/modalChooseOrganization/chooseOrganizationModalController.js b/client/directives/modals/modalChooseOrganization/chooseOrganizationModalController.js
@@ -41,7 +41,6 @@ function ChooseOrganizationModalController(
     return !org.attrs.isPersonalAccount;
   });
   COMC.personalAccountOnly = grantedOrgs.models.length === 0 && nonPersonalWhitelistedOrgs.length === 0;
-  COMC.demoOrg = null;
 
   COMC.defaultBasePanel = 'orgSelection';
 
diff --git a/client/directives/navBar/viewNav.jade b/client/directives/navBar/viewNav.jade
@@ -5,7 +5,7 @@
 )
 
 a.a(
-  ng-if = "!CA.currentOrg.isPersonalAccount() && (!$root.featureFlags.demoOrg || $root.featureFlags.demoOrg && !CA.isInDemoFlow())"
+  ng-if = "!CA.currentOrg.isPersonalAccount() && (!CA.isInDemoFlow() || $root.featureFlags.demoPersonalOnly)"
   ui-sref = "base.config({ userName: CA.activeAccount.oauthName() })"
   ui-sref-active = "active"
 )
diff --git a/client/directives/popovers/popoverDemo/popoverDemoProgressView.jade b/client/directives/popovers/popoverDemo/popoverDemoProgressView.jade
@@ -6,5 +6,5 @@ progress-meter(
 a.link.small.text-gray-light(
   data-event-name = "Clicked: End Tour"
   ng-click = "endDemo()"
-  ng-if = "!isPersonalAccount || demoStep === 6"
+  ng-if = "(!isPersonalAccount && !$root.featureFlags.demoPersonalOnly) || demoStep === 6"
 ) End Demo
diff --git a/client/services/featureFlagService.js b/client/services/featureFlagService.js
@@ -17,7 +17,7 @@ function featureFlags(
     connections: false,
     contingencyPlan: false,
     demoAutoAddBranch: true,
-    demoOrg: true,
+    demoPersonalOnly: false, // no more demos for orgs
     demoOrgSelectUpdate: false, // updated org select for reduced github auth flow
     demoNoOrgs: false, // simulates no orgs in the org select upate
     demoPersistentAddTeam: false,
diff --git a/client/templates/instances/viewInstancesList.jade b/client/templates/instances/viewInstancesList.jade
@@ -3,7 +3,7 @@
 
   //- 'select demo' guide
   .grid-block.popover.in.margin-top-xs.popover-demo.demo-transition.js-animate(
-    ng-if = "CIS.shouldShowDemoSelector()"
+    ng-if = "CIS.shouldShowDemoSelector() && !$root.featureFlags.demoPersonalOnly"
   )
     .grid-block
       .slide.slide-out(
@@ -30,7 +30,7 @@
 
     //- search
     label.grid-block.shrink.vertical.label-search(
-      ng-if = "!CIS.shouldShowDemoSelector()"
+      ng-if = "!CIS.shouldShowDemoSelector() || $root.featureFlags.demoPersonalOnly"
     )
       input.input.input-xs.input-search(
         ng-model = "CIS.searchBranches"
@@ -51,19 +51,19 @@
 
     //- master cluster
     .grid-block.shrink.vertical.list-clusters.master-cluster.js-animate(
-      ng-if = "!CIS.shouldShowDemoSelector() && (!CIS.searchBranches || CIS.getFilteredInstanceList().length)"
+      ng-if = "(!CIS.shouldShowDemoSelector() || $root.featureFlags.demoPersonalOnly) && (!CIS.searchBranches || CIS.getFilteredInstanceList().length)"
     )
       .grid-block.shrink.align-center.list-item-cluster.list-clusters-heading(
         ng-include = "'servicesHeadingView'"
       )
 
       .grid-block.vertical.padding-sm.popover.bottom.in.popover-demo.service-cta(
         add-service-cta
-        ng-if = "CIS.shouldShowServicesCTA()"
+        ng-if = "CIS.shouldShowServicesCTA() && !$root.featureFlags.demoPersonalOnly"
       )
 
       .grid-block.align-center.padding-sm.popover.top.in.popover-demo(
-        ng-if = "CIS.showInstanceRunningPopover()"
+        ng-if = "CIS.showInstanceRunningPopover() && !$root.featureFlags.demoPersonalOnly"
         ng-include = "'popoverDemoUrlHiddenView'"
       )
 
@@ -90,12 +90,11 @@
           )
 
       .grid-block.vertical.shrink.well.empty.text-center(
-        ng-if = "!CIS.shouldShowDemoSelector() && !CIS.getFilteredInstanceList().length && !CIS.searchBranches"
+        ng-if = "(!CIS.shouldShowDemoSelector() || $root.featureFlags.demoPersonalOnly) && !CIS.getFilteredInstanceList().length && !CIS.searchBranches"
       ) 👆
         br
         .small First, use the button above to create your first service.
 
-
       .grid-block.shrink.align-center.list-item-cluster.list-clusters-heading(
         ng-if = "CIS.getFilteredTestingMasters().length"
       )
@@ -133,10 +132,9 @@
 
   //- wraps all branch clusters — hide until a branch has been added
   .demo-transition.js-animate(
-    ng-if = "!CIS.isInDemoFlow() || CIS.shouldShowBranchView()"
+    ng-if = "!CIS.isInDemoFlow() || CIS.shouldShowBranchView() || $root.featureFlags.demoPersonalOnly"
   )
 
-
     //- branch clusters
     .grid-block.vertical.shrink.list-clusters.js-animate(
       ng-if = "!masterInstance.attrs.isTesting || (masterInstance.attrs.isTesting && !masterInstance.attrs.testingParentId)"
@@ -186,6 +184,6 @@
 
       //- show only on demo repos
       .grid-block.vertical.padding-sm.popover.bottom.in.popover-demo.branch-step(
-        ng-if = "$root.featureFlags.demoAutoAddBranch && CIS.shouldShowAddBranchCTA(masterInstance)"
+        ng-if = "$root.featureFlags.demoAutoAddBranch && CIS.shouldShowAddBranchCTA(masterInstance) && !$root.featureFlags.demoPersonalOnly"
         ng-include = "'popoverDemoBranchContainerView'"
       )
diff --git a/client/templates/viewInstance.jade b/client/templates/viewInstance.jade
@@ -32,7 +32,7 @@
       ng-if = "\
         (dataInstance.data.showUpdatingMessage || dataInstance.data.showUpdatedMessage) ||\
         dataInstance.data.instance.isMigrating() ||\
-        CI.showHangTightMessage()\
+        (CI.showHangTightMessage() && !$root.featureFlags.demoPersonalOnly)\
       "
       ng-include = "'viewNotifications'"
     )

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`.branch-step &,`
`21`		`- .service-cta &,`
`22`	`21`	`.team-cta & {`
`23`	`22`	`width: calc(100% + 30px);`
`24`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`.arrow(`
`2`		`- ng-class = "{'gray': (!$root.featureFlags.demoOrg && !NCC.isPersonalAccount()) \|\| ($root.featureFlags.demoOrg && !NCC.isInDemoFlow())}"`
	`2`	`+ ng-class = "{'gray': !NCC.isPersonalAccount() \|\| !NCC.isInDemoFlow()}"`
`3`	`3`	`style = "top: 39px;"`
`4`	`4`	`)`
`5`	`5`
`6`	`6`	`div(`
`7`		`- ng-if = "!NCC.showAddServicesPopover()"`
	`7`	`+ ng-if = "!NCC.showAddServicesPopover() && !$root.featureFlags.demoPersonalOnly"`
`8`	`8`	`ng-include = "'templateMenuEmptyPopoverView'"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`div(`
`12`		`- ng-if = "NCC.showAddServicesPopover()"`
	`12`	`+ ng-if = "NCC.showAddServicesPopover() \|\| $root.featureFlags.demoPersonalOnly"`
`13`	`13`	`)`
`14`	`14`	`.grid-block.popover-header`
`15`	`15`	`button.grid-block.align-center.btn.btn-radio(`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@`
`11`	`11`	`.grid-block.vertical.noscroll(`
`12`	`12`	`hang-tight`
`13`	`13`	`instance = "dataInstance.data.instance"`
`14`		`- ng-if = "CI.showHangTightMessage()"`
	`14`	`+ ng-if = "CI.showHangTightMessage() && !$root.featureFlags.demoPersonalOnly"`
`15`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`)`
`47`	`47`	`.popover.popover-environment.in(`
`48`	`48`	`configure-intro`
`49`		`- ng-if = "$root.featureFlags.demoOrg && EC.shouldShowExplanationUi()"`
	`49`	`+ ng-if = "EC.shouldShowExplanationUi()"`
`50`	`50`	`)`
`51`	`51`
`52`	`52`	`header.grid-block.align-center.environment-header(`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`) Switch to a Team`
`12`	`12`
`13`	`13`	`.grid-block.align-center.vertical.padding-md.empty(`
`14`		`- ng-if = "!NCC.isPersonalAccount()"`
	`14`	`+ ng-if = "!NCC.isPersonalAccount() && !$root.featureFlags.demoPersonalOnly"`
`15`	`15`	`)`
`16`	`16`	`img.grid-block.shrink.img(`
`17`	`17`	`src = "/build/images/add-code-state.svg"`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`	`)`
`74`	`74`
`75`	`75`	`.popover.bottom.in.popover-url.below-modals(`
`76`		`- ng-if = "showUrlCallout()"`
	`76`	`+ ng-if = "showUrlCallout() && !$root.featureFlags.demoPersonalOnly"`
`77`	`77`	`ng-include = "'containerUrlPopoverView'"`
`78`	`78`	`)`
`79`	`79`