Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0aebc9be
Commit
0aebc9be
authored
Jun 18, 2021
by
Angelo Gulina
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused button
parent
8212bb98
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
48 deletions
+1
-48
ee/app/assets/javascripts/admin/subscriptions/show/components/subscription_breakdown.vue
.../subscriptions/show/components/subscription_breakdown.vue
+0
-14
ee/app/assets/javascripts/admin/subscriptions/show/constants.js
.../assets/javascripts/admin/subscriptions/show/constants.js
+0
-1
ee/spec/frontend/admin/subscriptions/components/subscription_activation_form_spec.js
...criptions/components/subscription_activation_form_spec.js
+1
-5
ee/spec/frontend/admin/subscriptions/components/subscription_breakdown_spec.js
...n/subscriptions/components/subscription_breakdown_spec.js
+0
-25
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
ee/app/assets/javascripts/admin/subscriptions/show/components/subscription_breakdown.vue
View file @
0aebc9be
...
...
@@ -3,7 +3,6 @@ import { GlButton, GlModalDirective } from '@gitlab/ui';
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
{
activateCloudLicense
,
enterActivationCode
,
licensedToHeaderText
,
manageSubscriptionButtonText
,
subscriptionSyncStatus
,
...
...
@@ -26,7 +25,6 @@ export const modalId = 'subscription-activation-modal';
export
default
{
i18n
:
{
activateCloudLicense
,
enterActivationCode
,
licensedToHeaderText
,
manageSubscriptionButtonText
,
removeLicense
,
...
...
@@ -74,9 +72,6 @@ export default {
canActivateSubscription
()
{
return
this
.
isLicenseFileType
;
},
canEnterActivationCode
()
{
return
this
.
isCloudType
;
},
canManageSubscription
()
{
return
this
.
customersPortalUrl
&&
this
.
hasSubscription
;
},
...
...
@@ -178,15 +173,6 @@ export default {
>
{{
$options
.
i18n
.
activateCloudLicense
}}
</gl-button>
<gl-button
v-if=
"canEnterActivationCode"
v-gl-modal=
"$options.modal.id"
category=
"primary"
variant=
"confirm"
data-testid=
"subscription-enter-code-action"
>
{{
$options
.
i18n
.
enterActivationCode
}}
</gl-button>
<gl-button
v-if=
"canUploadLicense"
:href=
"licenseUploadPath"
...
...
ee/app/assets/javascripts/admin/subscriptions/show/constants.js
View file @
0aebc9be
...
...
@@ -16,7 +16,6 @@ export const howToActivateSubscription = s__(
);
export
const
activateLabel
=
s__
(
'
SuperSonics|Activate
'
);
export
const
activateSubscription
=
s__
(
'
SuperSonics|Activate subscription
'
);
export
const
enterActivationCode
=
s__
(
'
SuperSonics|Enter activation code
'
);
export
const
activateCloudLicense
=
s__
(
'
SuperSonics|Activate cloud license
'
);
export
const
noActiveSubscription
=
s__
(
`SuperSonics|You do not have an active subscription`
);
export
const
subscriptionDetailsHeaderText
=
s__
(
'
SuperSonics|Subscription details
'
);
...
...
ee/spec/frontend/admin/subscriptions/components/subscription_activation_form_spec.js
View file @
0aebc9be
...
...
@@ -42,11 +42,7 @@ describe('CloudLicenseApp', () => {
template
:
`<input />`
,
});
const
createFakeEvent
=
()
=>
({
preventDefault
,
stopPropagation
,
});
const
createFakeEvent
=
()
=>
({
preventDefault
,
stopPropagation
});
const
createComponentWithApollo
=
({
props
=
{},
mutationMock
}
=
{})
=>
{
wrapper
=
extendedWrapper
(
shallowMount
(
SubscriptionActivationForm
,
{
...
...
ee/spec/frontend/admin/subscriptions/components/subscription_breakdown_spec.js
View file @
0aebc9be
...
...
@@ -45,7 +45,6 @@ describe('Subscription Breakdown', () => {
const
findLicenseRemoveAction
=
()
=>
wrapper
.
findByTestId
(
'
license-remove-action
'
);
const
findActivateSubscriptionAction
=
()
=>
wrapper
.
findByTestId
(
'
subscription-activate-subscription-action
'
);
const
findEnterCodeAction
=
()
=>
wrapper
.
findByTestId
(
'
subscription-enter-code-action
'
);
const
findSubscriptionMangeAction
=
()
=>
wrapper
.
findByTestId
(
'
subscription-manage-action
'
);
const
findSubscriptionSyncAction
=
()
=>
wrapper
.
findByTestId
(
'
subscription-sync-action
'
);
const
findSubscriptionActivationModal
=
()
=>
wrapper
.
findComponent
(
SubscriptionActivationModal
);
...
...
@@ -258,21 +257,6 @@ describe('Subscription Breakdown', () => {
expect
(
findActivateSubscriptionAction
().
exists
()).
toBe
(
shouldShow
);
},
);
it
.
each
`
type | shouldShow
${
subscriptionTypes
.
LICENSE_FILE
}
|
${
false
}
${
subscriptionTypes
.
CLOUD
}
|
${
true
}
`
(
'
with url is $url and type is $type the enter activation code button is shown: $shouldShow
'
,
({
type
,
shouldShow
})
=>
{
const
props
=
{
subscription
:
{
...
license
.
ULTIMATE
,
type
}
};
const
stubs
=
{
GlCard
,
SubscriptionDetailsCard
};
createComponent
({
props
,
stubs
});
expect
(
findEnterCodeAction
().
exists
()).
toBe
(
shouldShow
);
},
);
});
describe
(
'
with a license file
'
,
()
=>
{
...
...
@@ -401,13 +385,4 @@ describe('Subscription Breakdown', () => {
});
});
});
describe
(
'
activating a new subscription
'
,
()
=>
{
it
(
'
shows a modal
'
,
()
=>
{
createComponent
({
stubs
:
{
GlCard
,
SubscriptionDetailsCard
}
});
findEnterCodeAction
().
vm
.
$emit
(
'
click
'
);
expect
(
glModalDirective
).
toHaveBeenCalledWith
(
modalId
);
});
});
});
locale/gitlab.pot
View file @
0aebc9be
...
...
@@ -31434,9 +31434,6 @@ msgstr ""
msgid "SuperSonics|Cloud license"
msgstr ""
msgid "SuperSonics|Enter activation code"
msgstr ""
msgid "SuperSonics|Expires on"
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment