Skip to content

Commit b14e05c

Browse files
nerimartineznerimartinez
authored
Merge pull request #137 from cloudblue/add-pagination
Make pagination to work and integrate with backend
2 parents 069c9bf + 6368fa3 commit b14e05c

19 files changed

+281
-205
lines changed

connect_ext_ppr/static/deployment-details.6821e06b1fbacca9d4c7.js renamed to connect_ext_ppr/static/deployment-details.fd87698951c89fbe5e69.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

connect_ext_ppr/static/index.8af7ae08238431f57421.js renamed to connect_ext_ppr/static/index.00751d4e28bf7cf9b010.js

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connect_ext_ppr/static/index.078542b7141079d77ac1.css‎

Lines changed: 93 additions & 93 deletions
Large diffs are not rendered by default.

‎connect_ext_ppr/static/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link href="https://fonts.googleapis.com/css2?family=Roboto+Mono&family=Roboto:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&display=swap" rel="stylesheet">
1313
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
1414
<title>Index</title>
15-
<script defer src="vendors.d43ac28a3eb5fa40c6ce.js"></script><script defer src="index.8af7ae08238431f57421.js"></script><link href="index.078542b7141079d77ac1.css" rel="stylesheet"></head>
15+
<script defer src="vendors.d43ac28a3eb5fa40c6ce.js"></script><script defer src="index.00751d4e28bf7cf9b010.js"></script><link href="index.078542b7141079d77ac1.css" rel="stylesheet"></head>
1616

1717
<body>
1818
<div id="app"></div>

connect_ext_ppr/static/request-details.eba3a5545dfa7b83b78d.js renamed to connect_ext_ppr/static/request-details.d2e1e1181d6531e0ff8b.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ui/src/components/CreateDeploymentRequestDialog/MarketplacesTab.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ export default {
137137
async created() {
138138
try {
139139
this.loading = true;
140-
this.marketplaces = await getDeploymentMarketplaces(this.deploymentId);
140+
const depMktps = await getDeploymentMarketplaces(this.deploymentId);
141+
this.marketplaces = depMktps.collection;
141142
if (this.value.all) this.isAllSelected = true;
142143
else if (this.value.choices.length) this.selectedMarketplaces = this.value.choices;
143144
} catch (e) {

‎ui/src/components/CreateDeploymentRequestDialog/PprTab.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ export default {
110110
async created() {
111111
try {
112112
this.loading = true;
113-
this.pprs = await getPPRs(this.deploymentId);
113+
const pprs = await getPPRs(this.deploymentId);
114+
this.pprs = pprs.collection;
114115
if (this.localValue?.id) this.selectedPprVersion = this.localValue.id;
115116
} catch (e) {
116117
this.pprs = [];

‎ui/src/components/CreateDeploymentRequestDialog/index.vue‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,13 @@ export default {
260260
261261
async fetchDeployment() {
262262
if (this.deployment) return;
263-
264-
[this.localDeployment] = await getDeployments({
263+
const deployments = await getDeployments({
265264
hubId: this.form.hub.id,
266265
productId: this.form.product.id,
267266
});
268267
268+
[this.localDeployment] = deployments.collection;
269+
269270
this.goToNextStep();
270271
},
271272

‎ui/src/components/DeploymentConfigurationTab.vue‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
hide-go-to-page-section,
77
:prepare-row="prepareRow",
88
:updating="loading",
9-
showManagePanel,
9+
show-manage-panel,
10+
:update="load",
1011
)
1112
template(#buttons="")
1213
c-button(
@@ -202,6 +203,7 @@ export default {
202203
uploadErrorText: '',
203204
showErrorSnackbar: false,
204205
errorSnackbarText: '',
206+
localParams: { limit: 10, offset: 0 },
205207
};
206208
},
207209
@@ -264,7 +266,8 @@ export default {
264266
async getConfigs() {
265267
this.loading = true;
266268
try {
267-
this.localValue = await getDeploymentConfigurations(this.deploymentId);
269+
const conf = await getDeploymentConfigurations(this.deploymentId, this.localParams);
270+
this.localValue = conf.collection;
268271
} catch (e) {
269272
this.showErrorSnackbar = true;
270273
this.errorSnackbarText = e.message;
@@ -282,6 +285,12 @@ export default {
282285
this.errorSnackbarText = e.message;
283286
}
284287
},
288+
289+
load(params) {
290+
this.localParams = params;
291+
292+
return getDeploymentConfigurations(this.deploymentId, params);
293+
},
285294
},
286295
287296
created() {

‎ui/src/components/DeploymentMarketplacesTab.vue‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
:headers="headers",
66
:prepare-row="prepareRow",
77
:updating="loading",
8-
hide-all-pagination-sections,
8+
:update="load",
99
)
1010
template(#items="{ row, visibleHeaders }")
1111
tr.table__row.hoverable(:id="row.id")
@@ -61,20 +61,13 @@
6161

6262
<script>
6363
import {
64-
getDeploymentBatches,
6564
getDeploymentMarketplaces,
6665
} from '@/utils';
6766
6867
import cDataTable from '~components/cDataTable.vue';
6968
import DetailItem from '~components/DetailItem.vue';
7069
import Pic from '~components/Pic.vue';
7170
72-
import {
73-
enrich,
74-
} from '~utils';
75-
76-
77-
const enrichByBatchInfo = enrich('id', ['pricelist', 'id'], 'pricelist');
7871
7972
export default {
8073
components: {
@@ -109,15 +102,13 @@ export default {
109102
priceList: item.pricelist,
110103
};
111104
},
105+
106+
load(params) {
107+
return getDeploymentMarketplaces(this.deploymentId, params);
108+
},
112109
},
113110
114-
async created() {
115-
const marketplaces = await getDeploymentMarketplaces(this.deploymentId);
116-
const batches = await getDeploymentBatches(this.deploymentId);
117111
118-
this.marketplaces = enrichByBatchInfo(batches, marketplaces);
119-
this.loading = false;
120-
},
121112
};
122113
123114
</script>

0 commit comments

Comments
 (0)