- {t(audit.role)}: {
- (_.find(users, { user_id: audit.operator }) || {}).username
- }
+ {t(audit.role)}: {(
+ _.find(users, { user_id: audit.operator }) || {}
+ ).username || audit.operator}
{this.renderReason(audit)}
diff --git a/src/pages/Dashboard/Versions/index.jsx b/src/pages/Dashboard/Versions/index.jsx
index 4a0a3773..2e62c76f 100644
--- a/src/pages/Dashboard/Versions/index.jsx
+++ b/src/pages/Dashboard/Versions/index.jsx
@@ -32,8 +32,12 @@ export default class Versions extends Component {
}
componentWillUnmount() {
- const { appVersionStore } = this.props;
- appVersionStore.reset();
+ const { appVersionStore, match } = this.props;
+ const appId = _.get(match, 'params.appId', '');
+
+ if (appId) {
+ appVersionStore.reset();
+ }
}
toggleHistoryVersions(typeVersion) {
diff --git a/src/stores/app/index.js b/src/stores/app/index.js
index 84b805a6..7bd1c06a 100644
--- a/src/stores/app/index.js
+++ b/src/stores/app/index.js
@@ -141,6 +141,11 @@ class AppStore extends Store {
} else {
await this.fetch(appId);
+ // if can't get app, should not storage app info
+ if (!this.appDetail.app_id) {
+ return;
+ }
+
if (appDetail) {
const index = _.findIndex(apps, { app_id: appId });
apps.splice(index, 1, this.appDetail);
diff --git a/src/stores/app/version.js b/src/stores/app/version.js
index 8158f549..0c106566 100644
--- a/src/stores/app/version.js
+++ b/src/stores/app/version.js
@@ -5,7 +5,6 @@ import _, {
import { Base64 } from 'js-base64';
import ts from 'config/translation';
-import { t } from 'i18next';
import Store from '../Store';
const defaultStatus = [
@@ -160,6 +159,35 @@ export default class AppVersionStore extends Store {
this.isLoading = false;
};
+ @action
+ fetchActiveVersions = async (params = {}) => {
+ const defaultParams = {
+ sort_key: 'status_time',
+ limit: this.pageSize,
+ offset: (this.currentPage - 1) * this.pageSize
+ };
+
+ if (params.noLimit) {
+ defaultParams.limit = this.maxLimit;
+ defaultParams.offset = 0;
+ delete params.noLimit;
+ }
+
+ if (this.appId) {
+ defaultParams.app_id = this.appId;
+ }
+
+ this.isLoading = true;
+ const result = await this.request.get(
+ 'active_app_versions',
+ assign(defaultParams, params)
+ );
+ this.isLoading = false;
+
+ this.versions = get(result, 'app_version_set', []);
+ this.totalCount = get(result, 'total_count', 0);
+ };
+
@action
fetch = async (versionId = '') => {
this.isLoading = true;
@@ -257,7 +285,7 @@ export default class AppVersionStore extends Store {
@action
versionReview = async (handleType, versionId, role) => {
if (handleType === 'reject' && !this.reason) {
- return this.error(t('请您填写拒绝原因'));
+ return this.error('Please input the reason for reject');
}
const params = { version_id: versionId };
@@ -279,7 +307,7 @@ export default class AppVersionStore extends Store {
if (handleType === 'review') {
this.isTipsOpen = true;
} else {
- this.success(`${capitalize(handleType)} this version successfully.`);
+ this.success(`${role.toUpperCase()}_REVIEW_PASS`);
}
} else {
return result;
@@ -303,11 +331,15 @@ export default class AppVersionStore extends Store {
`app/${appId}/version/${versionId}/reviews`,
{
limit: this.maxLimit,
- sort_key: 'review_time'
+ sort_key: 'status_time',
+ reverse: true
}
);
this.reviewDetail = _.get(result, 'app_version_review_set[0]', {});
+ const { phase } = this.reviewDetail;
+ const userIds = _.map(phase, o => o.operator);
+ await this.userStore.fetchAll({ user_id: userIds });
};
// todo
@@ -431,9 +463,10 @@ export default class AppVersionStore extends Store {
};
@action
- fetchTypeVersions = async appId => {
+ fetchTypeVersions = async (appId, isActive) => {
+ const url = isActive ? 'active_app_versions' : 'app_versions';
this.isLoading = true;
- const result = await this.request.get('app_versions', {
+ const result = await this.request.get(url, {
limit: this.maxLimit,
app_id: appId
});
diff --git a/src/stores/cluster/index.js b/src/stores/cluster/index.js
index fb2cb727..f380c83a 100644
--- a/src/stores/cluster/index.js
+++ b/src/stores/cluster/index.js
@@ -104,6 +104,10 @@ export default class ClusterStore extends Store {
this.clusterCount = this.totalCount;
}
+ if (params.created_date === 30) {
+ this.monthCount = get(result, 'total_count', 0);
+ }
+
if (attachApps) {
const appIds = this.clusters.map(cluster => cluster.app_id);
if (appIds.length) {