upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 12:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8542 from jwangyangls/fix-warning

Browse Source 
Fix the part of warnings when ng build
This commit is contained in:
jwangyangls 2019-08-02 15:16:57 +08:00 committed by GitHub
commit 6cf91717cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/portal/lib/ng-package.json
View File

@ -8,6 +8,13 @@
"@ngx-translate/core": "ngx-translate-core",
"@ngx-translate/core/index": "ngx-translate-core",
"ngx-markdown": "ngx-markdown"
}
},
"umdModuleIds": {
"@clr/angular" : "angular",
"ngx-markdown" : "ngxMarkdown",
"@ngx-translate/http-loader" : "httpLoader",
"ngx-cookie" : "ngxCookie",
"@ngx-translate/core" : "core$1"
}
}
}

9
src/portal/lib/ng-package.prod.json
View File

@ -7,6 +7,13 @@
"@ngx-translate/core": "ngx-translate-core",
"@ngx-translate/core/index": "ngx-translate-core",
"ngx-markdown": "ngx-markdown"
}
},
"umdModuleIds": {
"@clr/angular" : "angular",
"ngx-markdown" : "ngxMarkdown",
"@ngx-translate/http-loader" : "httpLoader",
"ngx-cookie" : "ngxCookie",
"@ngx-translate/core" : "core$1"
}
}
}

38
src/portal/src/app/project/summary/summary.component.html
View File

@ -3,22 +3,22 @@
<div class="display-flex project-detail pt-1">
<h5 class="mt-0">{{'SUMMARY.PROJECT_REPOSITORY' | translate}}</h5>
<ul class="list-unstyled">
<li>{{summaryInformation.repo_count}}</li>
<li>{{summaryInformation?.repo_count}}</li>
</ul>
</div>
<div class="display-flex project-detail pt-1" *ngIf="withHelmChart">
<h5 class="mt-0">{{'SUMMARY.PROJECT_HELM_CHART' | translate}}</h5>
<ul class="list-unstyled">
<li>{{summaryInformation.chart_count}}</li>
<li>{{summaryInformation?.chart_count}}</li>
</ul>
</div>
<div class="display-flex project-detail pt-1">
<h5 class="mt-0">{{'SUMMARY.PROJECT_MEMBER' | translate}}</h5>
<ul class="list-unstyled">
<li>{{ summaryInformation.project_admin_count }} {{'SUMMARY.ADMIN' | translate}}</li>
<li>{{ summaryInformation.master_count }} {{'SUMMARY.MASTER' | translate}}</li>
<li>{{ summaryInformation.developer_count }} {{'SUMMARY.DEVELOPER' | translate}}</li>
<li>{{ summaryInformation.guest_count }} {{'SUMMARY.GUEST' | translate}}</li>
<li>{{ summaryInformation?.project_admin_count }} {{'SUMMARY.ADMIN' | translate}}</li>
<li>{{ summaryInformation?.master_count }} {{'SUMMARY.MASTER' | translate}}</li>
<li>{{ summaryInformation?.developer_count }} {{'SUMMARY.DEVELOPER' | translate}}</li>
<li>{{ summaryInformation?.guest_count }} {{'SUMMARY.GUEST' | translate}}</li>
</ul>
</div>
</div>
@ -28,40 +28,40 @@
<div class="ml-1">
<div class="display-flex quotas-progress">
<label class="mr-1">{{'SUMMARY.ARTIFACT_COUNT' | translate}}</label>
<label class="progress-label">{{ summaryInformation.quota.used.count }} {{ 'QUOTA.OF' | translate }}
{{ summaryInformation.quota.hard.count ===-1?('QUOTA.UNLIMITED' | translate): summaryInformation.quota.hard.count }}
<label class="progress-label">{{ summaryInformation?.quota?.used?.count }} {{ 'QUOTA.OF' | translate }}
{{ summaryInformation?.quota?.hard?.count ===-1?('QUOTA.UNLIMITED' | translate): summaryInformation?.quota?.hard?.count }}
</label>
</div>
<div>
<div class="progress-block progress-min-width progress-div">
<div class="progress success" [class.danger]="summaryInformation.quota.hard.count!==-1?summaryInformation.quota.used.count/summaryInformation.quota.hard.count>0.9:false">
<div class="progress success" [class.danger]="summaryInformation?.quota?.hard?.count!==-1?summaryInformation?.quota?.used?.count/summaryInformation?.quota?.hard?.count>0.9:false">
<progress
value="{{summaryInformation.quota.hard.count===-1? 0 : summaryInformation.quota.used.count}}"
max="{{summaryInformation.quota.hard.count}}" data-displayval="100%"></progress>
value="{{summaryInformation?.quota?.hard?.count===-1? 0 : summaryInformation?.quota?.used?.count}}"
max="{{summaryInformation?.quota?.hard?.count}}" data-displayval="100%"></progress>
</div>
</div>
</div>
<div class="display-flex quotas-progress">
<label class="mr-1">{{'SUMMARY.STORAGE_CONSUMPTION' | translate}}</label>
<label class="progress-label">
{{ summaryInformation.quota.hard.storage !== -1 ?(getIntegerAndUnit(summaryInformation.quota.hard.storage, summaryInformation.quota.used.storage).partNumberUsed
+ getIntegerAndUnit(summaryInformation.quota.hard.storage, summaryInformation.quota.used.storage).partCharacterUsed) : getSuitableUnit(summaryInformation.quota.used.storage)}}
{{ summaryInformation?.quota?.hard?.storage !== -1 ?(getIntegerAndUnit(summaryInformation?.quota?.hard?.storage, summaryInformation?.quota?.used?.storage).partNumberUsed
+ getIntegerAndUnit(summaryInformation?.quota?.hard?.storage, summaryInformation?.quota?.used?.storage).partCharacterUsed) : getSuitableUnit(summaryInformation?.quota?.used?.storage)}}
<!-- {{ getSuitableUnit(summaryInformation.quota.used.storage) }} -->
<!-- {{ getSuitableUnit(summaryInformation?.quota?.used?.storage) }} -->
{{ 'QUOTA.OF' | translate }}
{{ summaryInformation.quota.hard.storage ===-1? ('QUOTA.UNLIMITED' | translate) : getIntegerAndUnit(summaryInformation.quota.hard.storage, summaryInformation.quota.used.storage).partNumberHard }}
{{ summaryInformation.quota.hard.storage ===-1? '': getIntegerAndUnit(summaryInformation.quota.hard.storage, summaryInformation.quota.used.storage).partCharacterHard }}
{{ summaryInformation?.quota?.hard?.storage ===-1? ('QUOTA.UNLIMITED' | translate) : getIntegerAndUnit(summaryInformation?.quota?.hard?.storage, summaryInformation?.quota?.used?.storage).partNumberHard }}
{{ summaryInformation?.quota?.hard?.storage ===-1? '': getIntegerAndUnit(summaryInformation?.quota?.hard?.storage, summaryInformation?.quota?.used?.storage).partCharacterHard }}
</label>
</div>
<div>
<div class="progress-block progress-min-width progress-div">
<div class="progress success"
[class.danger]="summaryInformation.quota.hard.storage!==-1?summaryInformation.quota.used.storage/summaryInformation.quota.hard.storage>0.9:false">
[class.danger]="summaryInformation?.quota?.hard?.storage!==-1?summaryInformation?.quota?.used?.storage/summaryInformation?.quota?.hard?.storage>0.9:false">
<progress
value="{{summaryInformation.quota.hard.storage===-1? 0 : summaryInformation.quota.used.storage}}"
max="{{summaryInformation.quota.hard.storage}}" data-displayval="100%"></progress>
value="{{summaryInformation?.quota?.hard?.storage===-1? 0 : summaryInformation?.quota?.used?.storage}}"
max="{{summaryInformation?.quota?.hard?.storage}}" data-displayval="100%"></progress>
</div>
</div>
</div>