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
117625fb
Commit
117625fb
authored
Jul 20, 2021
by
Vitaly Slobodin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove flash messages
parent
bdd752c9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
9 deletions
+3
-9
ee/app/assets/javascripts/trials/extend_reactivate_trial/components/extend_reactivate_trial_button.vue
...ivate_trial/components/extend_reactivate_trial_button.vue
+3
-4
ee/app/assets/javascripts/trials/extend_reactivate_trial/constants.js
...s/javascripts/trials/extend_reactivate_trial/constants.js
+0
-1
ee/spec/frontend/trials/extend_reactivate_trial/components/extend_reactivate_trial_button_spec.js
...e_trial/components/extend_reactivate_trial_button_spec.js
+0
-4
No files found.
ee/app/assets/javascripts/trials/extend_reactivate_trial/components/extend_reactivate_trial_button.vue
View file @
117625fb
<
script
>
import
{
GlButton
,
GlModal
,
GlModalDirective
}
from
'
@gitlab/ui
'
;
import
{
extendTrial
,
reactivateTrial
}
from
'
ee/api/subscriptions_api
'
;
import
createFlash
,
{
FLASH_TYPES
}
from
'
~/flash
'
;
import
createFlash
from
'
~/flash
'
;
import
{
refreshCurrentPage
}
from
'
~/lib/utils/url_utility
'
;
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
{
i18n
,
TRIAL_ACTION_EXTEND
,
TRIAL_ACTIONS
}
from
'
../constants
'
;
...
...
@@ -29,7 +30,6 @@ export default {
},
data
()
{
return
{
isButtonVisible
:
true
,
isLoading
:
false
,
};
},
...
...
@@ -65,8 +65,7 @@ export default {
await
action
(
this
.
namespaceId
)
.
then
(()
=>
{
createFlash
({
message
:
this
.
i18nContext
.
flashText
,
type
:
FLASH_TYPES
.
SUCCESS
});
this
.
isButtonVisible
=
false
;
refreshCurrentPage
();
})
.
catch
((
error
)
=>
{
createFlash
({
...
...
ee/app/assets/javascripts/trials/extend_reactivate_trial/constants.js
View file @
117625fb
...
...
@@ -18,7 +18,6 @@ export const i18n = Object.freeze({
modalText
:
s__
(
'
Billings|By reactivating your trial, you will receive an additional 30 days of %{planName}. Your trial can be only reactivated once.
'
,
),
flashText
:
s__
(
'
Billings|Your trial has been reactivated for an additional 30 days.
'
),
trialActionError
:
s__
(
'
Billings|An error occurred while reactivating your trial.
'
),
},
});
ee/spec/frontend/trials/extend_reactivate_trial/components/extend_reactivate_trial_button_spec.js
View file @
117625fb
...
...
@@ -35,10 +35,6 @@ describe('ExtendReactivateTrialButton', () => {
});
});
it
(
'
renders the button visible
'
,
()
=>
{
expect
(
findButton
().
isVisible
()).
toBe
(
true
);
});
it
(
'
does not have loading icon
'
,
()
=>
{
expect
(
findButton
().
props
(
'
loading
'
)).
toBe
(
false
);
});
...
...
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