Maintenance project Q3 (#2800)

* bsfy 281 skip button for first plan (#2796) * added skip activation button * lintfix * env/requests/repo tooltips (#2797) * fix rubocop
travis-ci · Apr 9, 2024 · ee53906 · ee53906
1 parent 0ccf6d1
commit ee53906
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 6 deletions.
diff --git a/app/components/billing/authorization.js b/app/components/billing/authorization.js
@@ -34,10 +34,6 @@ export default Component.extend({
     return this.isSubscribed && this.hasSubscriptionPermissions && !this.freeV2Plan && !this.isTrial && !this.cancellationRequested;
   }),
 
-  hasSubscriptionPermissions: computed('account.hasSubscriptionPermissions', 'account.permissions', function () {
-    return this.account.hasSubscriptionPermissions && (!this.account.isOrganization || this.account.permissions.plan_create);
-  }),
-
   hasSubscriptionPermissions: computed('account.hasSubscriptionPermissions', 'account.permissions', function () {
     return this.account.hasSubscriptionPermissions && (!this.account.isOrganization || this.account.permissions.plan_create);
   }),

diff --git a/app/components/billing/first-plan.js b/app/components/billing/first-plan.js
@@ -196,6 +196,15 @@ export default Component.extend({
     }
   }).drop(),
 
+
+  skipSubscription() {
+    this.storage.clearBillingData();
+    this.storage.clearSelectedPlanId();
+    this.storage.wizardStep = 2;
+    this.wizard.update.perform(2);
+    this.router.transitionTo('account.repositories');
+  },
+
   newV2Subscription() {
     const plan = this.store.createRecord('v2-plan-config');
     const billingInfo = this.store.createRecord('v2-billing-info');
@@ -280,6 +289,9 @@ export default Component.extend({
         this.createSubscription.perform();
       }
     },
+    skipActivation() {
+      this.skipSubscription();
+    },
     changeCountry(country) {
       this.set('country', country);
       this.hasLocalRegistration = false;

diff --git a/app/styles/app/layouts/activation.scss b/app/styles/app/layouts/activation.scss
@@ -95,6 +95,18 @@
     margin-bottom: 44px;
   }
 
+  #first-plan-skip {
+    margin-top: 60px;
+    margin-bottom: 10px;
+  }
+  #first-plan-skip-button {
+    margin-right: -140px;
+    padding-left: 110px;
+    font-size: 14px;
+    font-weight: 600;
+    color: $ansi-green;
+  }
+
   .not-required-form-elem {
     width: 100%;
     margin-bottom: 10px;

diff --git a/app/styles/app/layouts/settings.scss b/app/styles/app/layouts/settings.scss
@@ -498,3 +498,12 @@ $env-var-value-background: lighten($cement-grey, 20);
     margin-left: 20px;
   }
 }
+
+.ember-tooltip {
+  min-width: 200px;
+  max-width: 1316px;
+
+  .tooltip-inner {
+  }
+
+}
diff --git a/app/templates/components/billing/first-plan.hbs b/app/templates/components/billing/first-plan.hbs
@@ -250,5 +250,15 @@
 
   </div>
 
+  <div class='mt-5 float-right' id="first-plan-skip">
+    {{#unless this.isLoading}}
+    <button id="first-plan-skip-button" class="no-button" {{action 'skipActivation' }}
+      data-test-skip-payment='true'>
+      skip
+    </button>
+    {{/unless}}
+  </div>
+
+
 </TravisForm>
 {{/if}}
diff --git a/app/templates/components/env-var.hbs b/app/templates/components/env-var.hbs
@@ -1,4 +1,5 @@
-<div class="env-var-name">
+<EmberTooltip @text={{this.envVar.name}} @targetId='env-var-name-{{envVar.id}}'  @popperContainer='body'/>
+<div class="env-var-name" id='env-var-name-{{envVar.id}}'>
   {{this.envVar.name}}
 </div>
 <div class="env-var-value">

diff --git a/app/templates/components/owner-repo-tile.hbs b/app/templates/components/owner-repo-tile.hbs
@@ -18,6 +18,7 @@
           @route="repo"
           @models={{array this.repo.provider this.repo.urlOwnerName this.repo.urlName}}
           @query={{hash serverType=this.repo.serverType}}
+          @title={{this.repo.name}}
           class="label-align"
         >
           <span class="repo-title-text">

diff --git a/app/templates/components/requests-item.hbs b/app/templates/components/requests-item.hbs
@@ -34,7 +34,10 @@
   </span>
 </div>
 <div class="row-item fade-out" data-requests-item-commit-message>
-  {{{format-message this.request.commit.message short="true" repo=this.build.repo}}}
+  <span id='requests-item-{{request.id}}-commit-message'>
+    <EmberTooltip @text={{this.request.commit.message}} @targetId='requests-item-{{request.id}}-commit-message' @popperContainer='body'/>
+    {{{format-message this.request.commit.message short="true" repo=this.build.repo}}}
+  </span>
 </div>
 <div class="row-item" data-requests-item-build>
   {{#if this.build}}