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
548e22a4
Commit
548e22a4
authored
Apr 12, 2021
by
Angelo Gulina
Committed by
Savas Vedova
Apr 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Subscription Details: add Subscription Breakdown View
parent
59f03403
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
205 additions
and
1 deletion
+205
-1
ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_breakdown.vue
...dmin/cloud_licenses/components/subscription_breakdown.vue
+95
-0
ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_details_table.vue
.../cloud_licenses/components/subscription_details_table.vue
+3
-1
ee/spec/frontend/admin/cloud_licenses/components/subscription_breakdown_spec.js
.../cloud_licenses/components/subscription_breakdown_spec.js
+107
-0
No files found.
ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_breakdown.vue
0 → 100644
View file @
548e22a4
<
script
>
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
licensedToHeaderText
,
manageSubscriptionButtonText
,
subscriptionDetailsHeaderText
,
syncSubscriptionButtonText
,
}
from
'
../constants
'
;
import
SubscriptionDetailsCard
from
'
./subscription_details_card.vue
'
;
import
SubscriptionDetailsHistory
from
'
./subscription_details_history.vue
'
;
import
SubscriptionDetailsUserInfo
from
'
./subscription_details_user_info.vue
'
;
export
const
subscriptionDetailsFields
=
[
'
id
'
,
'
plan
'
,
'
lastSync
'
,
'
startsAt
'
,
'
renews
'
];
export
const
licensedToFields
=
[
'
name
'
,
'
email
'
,
'
company
'
];
export
default
{
i18n
:
{
licensedToHeaderText
,
manageSubscriptionButtonText
,
subscriptionDetailsHeaderText
,
syncSubscriptionButtonText
,
},
name
:
'
SubscriptionBreakdown
'
,
components
:
{
SubscriptionDetailsHistory
,
GlButton
,
SubscriptionDetailsCard
,
SubscriptionDetailsUserInfo
,
},
props
:
{
subscription
:
{
type
:
Object
,
required
:
true
,
},
subscriptionList
:
{
type
:
Array
,
required
:
true
,
},
},
data
()
{
return
{
subscriptionDetailsFields
,
licensedToFields
,
};
},
computed
:
{
hasSubscription
()
{
return
Boolean
(
Object
.
keys
(
this
.
subscription
).
length
);
},
hasSubscriptionHistory
()
{
return
Boolean
(
this
.
subscriptionList
.
length
);
},
canMangeSubscription
()
{
return
false
;
},
},
};
</
script
>
<
template
>
<div>
<section
class=
"row gl-mb-5"
>
<div
class=
"col-md-6 gl-mb-5"
>
<subscription-details-card
:details-fields=
"subscriptionDetailsFields"
:header-text=
"$options.i18n.subscriptionDetailsHeaderText"
:subscription=
"subscription"
>
<template
v-if=
"canMangeSubscription"
#footer
>
<gl-button
category=
"primary"
variant=
"confirm"
>
{{
$options
.
i18n
.
syncSubscriptionButtonText
}}
</gl-button>
<gl-button>
{{
$options
.
i18n
.
manageSubscriptionButtonText
}}
</gl-button>
</
template
>
</subscription-details-card>
</div>
<div
class=
"col-md-6 gl-mb-5"
>
<subscription-details-card
:details-fields=
"licensedToFields"
:header-text=
"$options.i18n.licensedToHeaderText"
:subscription=
"subscription"
/>
</div>
</section>
<subscription-details-user-info
v-if=
"hasSubscription"
:subscription=
"subscription"
/>
<subscription-details-history
v-if=
"hasSubscriptionHistory"
:current-subscription-id=
"subscription.id"
:subscription-list=
"subscriptionList"
/>
</div>
</template>
ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_details_table.vue
View file @
548e22a4
...
@@ -66,7 +66,9 @@ export default {
...
@@ -66,7 +66,9 @@ export default {
<
template
>
<
template
>
<gl-table
v-if=
"hasContent"
:fields=
"$options.fields"
:items=
"details"
class=
"gl-m-0!"
>
<gl-table
v-if=
"hasContent"
:fields=
"$options.fields"
:items=
"details"
class=
"gl-m-0!"
>
<template
#cell(label)=
"
{ item }">
<template
#cell(label)=
"
{ item }">
<p
class=
"gl-font-weight-bold"
data-testid=
"details-label"
>
{{
item
.
label
}}
:
</p>
<p
class=
"gl-font-weight-bold gl-text-gray-800"
data-testid=
"details-label"
>
{{
item
.
label
}}
:
</p>
</
template
>
</
template
>
<
template
#cell(value)=
"{ item }"
>
<
template
#cell(value)=
"{ item }"
>
...
...
ee/spec/frontend/admin/cloud_licenses/components/subscription_breakdown_spec.js
0 → 100644
View file @
548e22a4
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
SubscriptionBreakdown
,
{
licensedToFields
,
subscriptionDetailsFields
,
}
from
'
ee/pages/admin/cloud_licenses/components/subscription_breakdown.vue
'
;
import
SubscriptionDetailsCard
from
'
ee/pages/admin/cloud_licenses/components/subscription_details_card.vue
'
;
import
SubscriptionDetailsHistory
from
'
ee/pages/admin/cloud_licenses/components/subscription_details_history.vue
'
;
import
SubscriptionDetailsUserInfo
from
'
ee/pages/admin/cloud_licenses/components/subscription_details_user_info.vue
'
;
import
{
licensedToHeaderText
,
subscriptionDetailsHeaderText
,
}
from
'
ee/pages/admin/cloud_licenses/constants
'
;
import
{
extendedWrapper
}
from
'
helpers/vue_test_utils_helper
'
;
import
{
license
,
subscriptionHistory
}
from
'
../mock_data
'
;
describe
(
'
Subscription Breakdown
'
,
()
=>
{
let
wrapper
;
const
findDetailsCards
=
()
=>
wrapper
.
findAllComponents
(
SubscriptionDetailsCard
);
const
findDetailsHistory
=
()
=>
wrapper
.
findComponent
(
SubscriptionDetailsHistory
);
const
findDetailsUserInfo
=
()
=>
wrapper
.
findComponent
(
SubscriptionDetailsUserInfo
);
const
createComponent
=
({
props
,
stubs
}
=
{})
=>
{
wrapper
=
extendedWrapper
(
shallowMount
(
SubscriptionBreakdown
,
{
propsData
:
{
subscription
:
license
.
ULTIMATE
,
subscriptionList
:
subscriptionHistory
,
...
props
,
},
stubs
,
}),
);
};
afterEach
(()
=>
{
wrapper
.
destroy
();
});
describe
(
'
with subscription data
'
,
()
=>
{
beforeEach
(()
=>
{
createComponent
();
});
it
(
'
shows 2 details card
'
,
()
=>
{
expect
(
findDetailsCards
()).
toHaveLength
(
2
);
});
it
(
'
provides the correct props to the cards
'
,
()
=>
{
const
props
=
findDetailsCards
().
wrappers
.
map
((
w
)
=>
w
.
props
());
expect
(
props
).
toEqual
([
{
detailsFields
:
subscriptionDetailsFields
,
headerText
:
subscriptionDetailsHeaderText
,
subscription
:
license
.
ULTIMATE
,
},
{
detailsFields
:
licensedToFields
,
headerText
:
licensedToHeaderText
,
subscription
:
license
.
ULTIMATE
,
},
]);
});
it
(
'
shows the user info
'
,
()
=>
{
expect
(
findDetailsUserInfo
().
exists
()).
toBe
(
true
);
});
it
(
'
provides the correct props to the user info component
'
,
()
=>
{
expect
(
findDetailsUserInfo
().
props
(
'
subscription
'
)).
toBe
(
license
.
ULTIMATE
);
});
it
.
todo
(
'
shows a button to sync the subscription
'
);
it
.
todo
(
'
shows a button to manage the subscription
'
);
});
describe
(
'
with subscription history data
'
,
()
=>
{
beforeEach
(()
=>
{
createComponent
();
});
it
(
'
shows the subscription history
'
,
()
=>
{
expect
(
findDetailsHistory
().
exists
()).
toBe
(
true
);
});
it
(
'
provides the correct props to the subscription history component
'
,
()
=>
{
expect
(
findDetailsHistory
().
props
(
'
currentSubscriptionId
'
)).
toBe
(
license
.
ULTIMATE
.
id
);
expect
(
findDetailsHistory
().
props
(
'
subscriptionList
'
)).
toBe
(
subscriptionHistory
);
});
});
describe
(
'
with empty data
'
,
()
=>
{
it
(
'
does not show user info
'
,
()
=>
{
createComponent
({
props
:
{
subscription
:
{}
}
});
expect
(
findDetailsUserInfo
().
exists
()).
toBe
(
false
);
});
it
(
'
does not show subscription history
'
,
()
=>
{
createComponent
({
props
:
{
subscriptionList
:
[]
}
});
expect
(
findDetailsHistory
().
exists
()).
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