Skip to content

Commit eb3bc31

Browse files
fix: css and search empty issue
1 parent e543e20 commit eb3bc31

File tree

2 files changed

+108
-7
lines changed

2 files changed

+108
-7
lines changed

src/components/ApplicationGroup/CreateAppGroup.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,6 @@ export default function CreateAppGroup({
163163
? _unauthorizedAppList.push({ id: app.id, appName: app.appName })
164164
: _authorizedAppList.push({ id: app.id, appName: app.appName })
165165
})
166-
_unauthorizedAppList = _unauthorizedAppList.filter(
167-
(app) =>
168-
selectedAppsMap[app.id] && (!selectedAppSearchText || app.appName.indexOf(selectedAppSearchText) >= 0),
169-
)
170166
setUnauthorizedAppList(_unauthorizedAppList)
171167
setAuthorizedAppList(_authorizedAppList)
172168
}
@@ -187,6 +183,10 @@ export default function CreateAppGroup({
187183
(app) =>
188184
selectedAppsMap[app.id] && (!selectedAppSearchText || app.appName.indexOf(selectedAppSearchText) >= 0),
189185
)
186+
const filteredUnAuthList = unauthorizedAppList.filter(
187+
(app) =>
188+
selectedAppsMap[app.id] && (!selectedAppSearchText || app.appName.indexOf(selectedAppSearchText) >= 0),
189+
)
190190
return (
191191
<div>
192192
<SearchBar
@@ -197,7 +197,7 @@ export default function CreateAppGroup({
197197
setSearchApplied={setSelectedAppSearchApplied}
198198
/>
199199
<div>
200-
{filteredAuthList.length <= 0
200+
{filteredAuthList.length <= 0 && filteredUnAuthList.length <= 0
201201
? renderEmptyState('No matching results')
202202
: filteredAuthList.map((app) => {
203203
return (
@@ -213,12 +213,12 @@ export default function CreateAppGroup({
213213
</div>
214214
)
215215
})}
216-
{unauthorizedAppList.length > 0 && (
216+
{filteredUnAuthList.length > 0 && (
217217
<div className="dc__bold ml-4">
218218
{`You don't have admin/manager pemission for the following ${filterParentTypeMsg}.`}
219219
</div>
220220
)}
221-
{unauthorizedAppList.map((app) => {
221+
{filteredUnAuthList.map((app) => {
222222
return (
223223
<Tippy
224224
key={`selected-app-${app.id}`}

src/components/app/details/app.scss

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,104 @@
5050
}
5151
}
5252
}
53+
54+
// .env-empty-state {
55+
// height: calc(100vh - 48px);
56+
// }
57+
58+
// .loading-state {
59+
// height: calc(100vh - 78px);
60+
// }
61+
62+
// .saved-env-filters__wrap {
63+
// padding: 6px 20px;
64+
// display: flex;
65+
// flex-wrap: wrap;
66+
// background-color: var(--white);
67+
// z-index: var(--app-list-header-index);
68+
69+
// .saved-env-filter {
70+
// display: flex;
71+
// align-items: center;
72+
// border-radius: 4px;
73+
// border: solid 1px var(--N200);
74+
// background-color: #f7fafc;
75+
// padding-left: 6px;
76+
// padding-right: 6px;
77+
// -webkit-user-select: none;
78+
// user-select: none;
79+
// margin: 0 12px 0 0;
80+
// min-height: 24px;
81+
// }
82+
83+
// .saved-env-filter-divider {
84+
// height: 24px;
85+
// width: 1px;
86+
// background-color: var(--N200);
87+
// }
88+
89+
// .saved-env-filter__close-btn {
90+
// font-size: 14px;
91+
// line-height: 1;
92+
// margin-left: 10px;
93+
// color: #72767a;
94+
// border: none;
95+
// padding: 1px;
96+
// background-color: #f7fafc;
97+
// }
98+
99+
// .saved-env-filters__clear-btn {
100+
// background-color: var(--white);
101+
// height: 24px;
102+
// text-transform: capitalize;
103+
// font-size: 12px;
104+
// font-weight: 600;
105+
// font-style: normal;
106+
// font-stretch: normal;
107+
// line-height: 1.5;
108+
// letter-spacing: normal;
109+
// padding: 7px 10px;
110+
// margin-right: 12px;
111+
// color: var(--B500);
112+
// border: none;
113+
// width: 115px;
114+
// }
115+
// }
116+
117+
// .env-details-page {
118+
// height: calc(100vh - 77px);
119+
120+
// .tab-list__tab-link {
121+
// padding: 0 0 8px 0;
122+
// }
123+
124+
// .tab-list__tab-link.active .tab-list__icon path {
125+
// fill: var(--B500);
126+
// }
127+
128+
// .tab-list__tab-link:hover path {
129+
// color: var(--B500);
130+
// text-decoration: none;
131+
// fill: var(--B500);
132+
// }
133+
// }
134+
135+
.create-group-container,
136+
.env-header-tab {
137+
.tab-list {
138+
.tab-list__tab {
139+
.tab-hover {
140+
&:hover,
141+
&.active {
142+
color: var(--B500);
143+
}
144+
}
145+
.apps-tab__active-tab {
146+
height: 2px;
147+
background-color: var(--B500);
148+
border-radius: 2px 2px 0px 0px;
149+
margin-top: -1px;
150+
}
151+
}
152+
}
153+
}

0 commit comments

Comments
 (0)