Skip to content

Commit d049c71

Browse files
author
jleveugle
committed
fix(storages): improve margin and remove back-button
1 parent 0137b0a commit d049c71

File tree

4 files changed

+107
-120
lines changed

4 files changed

+107
-120
lines changed

‎packages/manager/modules/pci/src/projects/project/storages/cloud-archives/cloud-archive/cloud-archive.routing.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ export default /* @ngInject */ ($stateProvider) => {
1414
containerId,
1515
objectId: object.name,
1616
}),
17-
goBack: /* @ngInject */ ($state, projectId) => () => $state.go('pci.projects.project.storages.archives', {
18-
projectId,
19-
}),
2017
},
2118
});
2219
};

‎packages/manager/modules/pci/src/projects/project/storages/containers/container/container.component.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export default {
88
archive: '<',
99
projectId: '<',
1010
containerId: '<',
11-
goBack: '<',
1211
addObject: '<',
1312
deleteObject: '<',
1413
},

‎packages/manager/modules/pci/src/projects/project/storages/containers/container/container.html‎

Lines changed: 107 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,125 @@
11
<div
22
data-ui-view>
3-
<div class="p-5">
3+
<h1 class="text-truncate"
4+
data-ng-if="!$ctrl.isLoading && $ctrl.container"
5+
data-ng-bind="$ctrl.container.name"></h1>
46

5-
<oui-back-button
6-
data-on-click="$ctrl.goBack()">{{:: 'pci_projects_project_storages_containers_container_back_label' | translate }}</oui-back-button>
7+
<cui-message-container data-messages="$ctrl.messages"></cui-message-container>
78

8-
<h1 class="text-truncate"
9-
data-ng-if="!$ctrl.isLoading && $ctrl.container"
10-
data-ng-bind="$ctrl.container.name"></h1>
9+
<oui-spinner data-size="m" data-ng-if="$ctrl.isLoading"></oui-spinner>
1110

12-
<cui-message-container data-messages="$ctrl.messages"></cui-message-container>
11+
<div data-ng-if="!$ctrl.isLoading && $ctrl.container">
12+
<div class="oui-box">
13+
<p data-translate="pci_projects_project_storages_containers_container_archive_info_storedObjects"
14+
data-translate-value-count="{{ $ctrl.container.storedObjects }}"
15+
data-ng-if="$ctrl.archive"></p>
1316

14-
<oui-spinner data-size="m" data-ng-if="$ctrl.isLoading"></oui-spinner>
17+
<p data-translate="pci_projects_project_storages_containers_container_object_info_storedObjects"
18+
data-translate-value-count="{{ $ctrl.container.storedObjects }}"
19+
data-ng-if="!$ctrl.archive"></p>
1520

16-
<div data-ng-if="!$ctrl.isLoading && $ctrl.container">
17-
<div class="oui-box">
18-
<p data-translate="pci_projects_project_storages_containers_container_archive_info_storedObjects"
19-
data-translate-value-count="{{ $ctrl.container.storedObjects }}"
20-
data-ng-if="$ctrl.archive"></p>
21+
<p data-translate="pci_projects_project_storages_containers_container_info_storedBytes"
22+
data-translate-value-bytes="{{$ctrl.container.storedBytes | RAUnitsBits}}"></p>
2123

22-
<p data-translate="pci_projects_project_storages_containers_container_object_info_storedObjects"
23-
data-translate-value-count="{{ $ctrl.container.storedObjects }}"
24-
data-ng-if="!$ctrl.archive"></p>
25-
26-
<p data-translate="pci_projects_project_storages_containers_container_info_storedBytes"
27-
data-translate-value-bytes="{{$ctrl.container.storedBytes | RAUnitsBits}}"></p>
28-
29-
<div>
30-
<span data-translate="pci_projects_project_storages_containers_container_info_publicUrl"></span>
31-
<button type="button" class="oui-popover-button"
32-
data-oui-popover="{{ 'pci_projects_project_storages_containers_container_info_publicUrl_help' | translate }}">
33-
</button>
34-
<oui-clipboard data-model="$ctrl.container.publicUrl"></oui-clipboard>
35-
</div>
24+
<div>
25+
<span data-translate="pci_projects_project_storages_containers_container_info_publicUrl"></span>
26+
<button type="button" class="oui-popover-button"
27+
data-oui-popover="{{ 'pci_projects_project_storages_containers_container_info_publicUrl_help' | translate }}">
28+
</button>
29+
<oui-clipboard data-model="$ctrl.container.publicUrl"></oui-clipboard>
30+
</div>
3631

37-
<div>
38-
<span data-translate="pci_projects_project_storages_containers_container_archive_info_staticUrl"
39-
data-ng-if="$ctrl.archive"></span>
40-
<span data-translate="pci_projects_project_storages_containers_container_object_info_staticUrl"
41-
data-ng-if="!$ctrl.archive"></span>
42-
<oui-clipboard data-model="$ctrl.container.staticUrl"></oui-clipboard>
43-
</div>
32+
<div>
33+
<span data-translate="pci_projects_project_storages_containers_container_archive_info_staticUrl"
34+
data-ng-if="$ctrl.archive"></span>
35+
<span data-translate="pci_projects_project_storages_containers_container_object_info_staticUrl"
36+
data-ng-if="!$ctrl.archive"></span>
37+
<oui-clipboard data-model="$ctrl.container.staticUrl"></oui-clipboard>
38+
</div>
4439

45-
<div data-ng-if="$ctrl.archive">
46-
<p data-translate="pci_projects_project_storages_containers_container_archive_info_user"
47-
data-translate-value-user="{{:: $ctrl.defaultUser }}"></p>
48-
<p>
49-
<span data-translate="pci_projects_project_storages_containers_container_archive_info_password"></span>
50-
<span data-ng-bind="$ctrl.defaultPassword"></span>
51-
</p>
52-
</div>
40+
<div data-ng-if="$ctrl.archive">
41+
<p data-translate="pci_projects_project_storages_containers_container_archive_info_user"
42+
data-translate-value-user="{{:: $ctrl.defaultUser }}"></p>
43+
<p>
44+
<span data-translate="pci_projects_project_storages_containers_container_archive_info_password"></span>
45+
<span data-ng-bind="$ctrl.defaultPassword"></span>
46+
</p>
5347
</div>
48+
</div>
5449

55-
<oui-datagrid
56-
data-rows="$ctrl.container.objects"
57-
data-columns-parameters="$ctrl.columnsParameters"
58-
data-page-size="25">
59-
<oui-column
60-
data-title=":: 'pci_projects_project_storages_containers_container_name_label' | translate"
61-
data-property="name"
62-
data-type="string"
63-
data-searchable
64-
data-sortable="asc"
65-
data-filterable>
66-
<span data-ng-bind="::$value" class="text-truncate"></span>
67-
</oui-column>
68-
<oui-column
69-
data-title=":: 'pci_projects_project_storages_containers_container_lastModified_label' | translate"
70-
data-property="lastModified"
71-
data-type="date"
72-
data-sortable
73-
data-filterable>
74-
<span data-ng-bind="$value | date:'medium'"></span>
75-
</oui-column>
76-
<oui-column
77-
data-title=":: 'pci_projects_project_storages_containers_container_size_label' | translate"
78-
data-property="size"
79-
data-type="number"
80-
data-sortable>
81-
<span data-ng-bind="$value | RAUnitsBits"></span>
82-
</oui-column>
83-
<oui-column
84-
data-title=":: 'pci_projects_project_storages_containers_container_contentType_label' | translate"
85-
data-property="contentType"
86-
data-sortable
87-
data-type="string">
88-
</oui-column>
89-
<oui-column
90-
name="retrievalState"
91-
data-title=":: 'pci_projects_project_storages_containers_container_retrievalState_label' | translate"
92-
data-property="retrievalState"
93-
data-sortable
94-
data-type="string">
95-
<span
96-
data-ng-if="$row.retrievalState === 'sealed' || $row.retrievalState === 'unsealed'"
97-
data-ng-bind="'pci_projects_project_storages_containers_container_retrievalState_' + $row.retrievalState | translate"></span>
98-
<span
99-
data-ng-if="$row.retrievalState === 'unsealing'"
100-
data-ng-bind="$row.retrievalDate | date:'medium'"></span>
50+
<oui-datagrid
51+
data-rows="$ctrl.container.objects"
52+
data-columns-parameters="$ctrl.columnsParameters"
53+
data-page-size="25">
54+
<oui-column
55+
data-title=":: 'pci_projects_project_storages_containers_container_name_label' | translate"
56+
data-property="name"
57+
data-type="string"
58+
data-searchable
59+
data-sortable="asc"
60+
data-filterable>
61+
<span data-ng-bind="::$value" class="text-truncate"></span>
62+
</oui-column>
63+
<oui-column
64+
data-title=":: 'pci_projects_project_storages_containers_container_lastModified_label' | translate"
65+
data-property="lastModified"
66+
data-type="date"
67+
data-sortable
68+
data-filterable>
69+
<span data-ng-bind="$value | date:'medium'"></span>
70+
</oui-column>
71+
<oui-column
72+
data-title=":: 'pci_projects_project_storages_containers_container_size_label' | translate"
73+
data-property="size"
74+
data-type="number"
75+
data-sortable>
76+
<span data-ng-bind="$value | RAUnitsBits"></span>
77+
</oui-column>
78+
<oui-column
79+
data-title=":: 'pci_projects_project_storages_containers_container_contentType_label' | translate"
80+
data-property="contentType"
81+
data-sortable
82+
data-type="string">
83+
</oui-column>
84+
<oui-column
85+
name="retrievalState"
86+
data-title=":: 'pci_projects_project_storages_containers_container_retrievalState_label' | translate"
87+
data-property="retrievalState"
88+
data-sortable
89+
data-type="string">
90+
<span
91+
data-ng-if="$row.retrievalState === 'sealed' || $row.retrievalState === 'unsealed'"
92+
data-ng-bind="'pci_projects_project_storages_containers_container_retrievalState_' + $row.retrievalState | translate"></span>
93+
<span
94+
data-ng-if="$row.retrievalState === 'unsealing'"
95+
data-ng-bind="$row.retrievalDate | date:'medium'"></span>
10196

102-
</oui-column>
97+
</oui-column>
10398

104-
<oui-action-menu data-align="end" data-compact>
105-
<oui-action-menu-item
106-
data-on-click="$ctrl.downloadObject($row)"
107-
data-ng-if="!$ctrl.archive || $row.retrievalState === 'unsealed'">
108-
<span data-translate="pci_projects_project_storages_containers_container_download_label"></span>
109-
</oui-action-menu-item>
110-
<oui-action-menu-item
111-
data-on-click="$ctrl.unsealObject($row)"
112-
data-ng-if="$ctrl.archive && $row.retrievalState === 'sealed'">
113-
<span data-translate="pci_projects_project_storages_containers_container_unseal_label"></span>
114-
</oui-action-menu-item>
115-
<oui-action-menu-item
116-
data-on-click="$ctrl.deleteObject($row)">
117-
<span data-translate="pci_projects_project_storages_containers_container_delete_label"></span>
99+
<oui-action-menu data-align="end" data-compact>
100+
<oui-action-menu-item
101+
data-on-click="$ctrl.downloadObject($row)"
102+
data-ng-if="!$ctrl.archive || $row.retrievalState === 'unsealed'">
103+
<span data-translate="pci_projects_project_storages_containers_container_download_label"></span>
104+
</oui-action-menu-item>
105+
<oui-action-menu-item
106+
data-on-click="$ctrl.unsealObject($row)"
107+
data-ng-if="$ctrl.archive && $row.retrievalState === 'sealed'">
108+
<span data-translate="pci_projects_project_storages_containers_container_unseal_label"></span>
118109
</oui-action-menu-item>
119-
</oui-action-menu>
110+
<oui-action-menu-item
111+
data-on-click="$ctrl.deleteObject($row)">
112+
<span data-translate="pci_projects_project_storages_containers_container_delete_label"></span>
113+
</oui-action-menu-item>
114+
</oui-action-menu>
120115

121-
<extra-top>
122-
<oui-button
123-
data-on-click="$ctrl.addObject()" >
124-
<span class="oui-icon oui-icon-add pr-1" aria-hidden="true"></span>
125-
<span data-ng-bind=":: 'pci_projects_project_storages_containers_container_add_' + ($ctrl.archive ? 'archive' : 'object') + '_label' | translate"></span>
126-
</oui-button>
127-
</extra-top>
128-
</oui-datagrid>
129-
</div>
116+
<extra-top>
117+
<oui-button
118+
data-on-click="$ctrl.addObject()" >
119+
<span class="oui-icon oui-icon-add pr-1" aria-hidden="true"></span>
120+
<span data-ng-bind=":: 'pci_projects_project_storages_containers_container_add_' + ($ctrl.archive ? 'archive' : 'object') + '_label' | translate"></span>
121+
</oui-button>
122+
</extra-top>
123+
</oui-datagrid>
130124
</div>
131125
</div>

‎packages/manager/modules/pci/src/projects/project/storages/objects/object/object.routing.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ export default /* @ngInject */ ($stateProvider) => {
1414
containerId,
1515
objectId: object.name,
1616
}),
17-
goBack: /* @ngInject */ ($state, projectId) => () => $state.go('pci.projects.project.storages.objects', {
18-
projectId,
19-
}),
2017
},
2118
});
2219
};

0 commit comments

Comments
 (0)