Skip to content

Commit 4923d16

Browse files
bcb37bcb37
committed
review changes
1 parent 303918d commit 4923d16

File tree

5 files changed

+53
-55
lines changed

5 files changed

+53
-55
lines changed

‎backend/packages/Upgrade/src/api/services/ExperimentService.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1797,43 +1797,43 @@ export class ExperimentService {
17971797
private paginatedSearchString(params: IExperimentSearchParams): string {
17981798
const type = params.key;
17991799
// escape % and ' characters
1800-
const serachString = params.string.replace(/%/g, '\\$&').replace(/'/g, "''");
1801-
if (type === EXPERIMENT_SEARCH_KEY.ID && !isUUID(serachString)) {
1800+
const searchString = params.string.replace(/%/g, '\\$&').replace(/'/g, "''");
1801+
if (type === EXPERIMENT_SEARCH_KEY.ID && !isUUID(searchString)) {
18021802
return '';
18031803
}
18041804

1805-
const likeString = `ILIKE '%${serachString}%'`;
1806-
const searchString: string[] = [];
1805+
const likeString = `ILIKE '%${searchString}%'`;
1806+
const searchArray: string[] = [];
18071807
switch (type) {
18081808
case EXPERIMENT_SEARCH_KEY.NAME:
1809-
searchString.push(`${type} ${likeString}`);
1809+
searchArray.push(`${type} ${likeString}`);
18101810
break;
18111811
case EXPERIMENT_SEARCH_KEY.STATUS:
1812-
searchString.push(`state::TEXT ${likeString}`);
1812+
searchArray.push(`state::TEXT ${likeString}`);
18131813
break;
18141814
case EXPERIMENT_SEARCH_KEY.CONTEXT:
1815-
searchString.push(`ARRAY_TO_STRING(${type}, ',') ${likeString}`);
1815+
searchArray.push(`ARRAY_TO_STRING(${type}, ',') ${likeString}`);
18161816
break;
18171817
case EXPERIMENT_SEARCH_KEY.TAG:
1818-
searchString.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
1818+
searchArray.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
18191819
break;
18201820
case EXPERIMENT_SEARCH_KEY.ID:
1821-
searchString.push(`experiment.id = '${serachString}'`);
1821+
searchArray.push(`experiment.id = '${searchString}'`);
18221822
break;
18231823
default:
1824-
searchString.push(`name ${likeString}`);
1825-
searchString.push(`state::TEXT ${likeString}`);
1826-
searchString.push(`ARRAY_TO_STRING(context, ',') ${likeString}`);
1827-
searchString.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
1828-
searchString.push(`partitions.site ${likeString}`);
1829-
searchString.push(`partitions.target ${likeString}`);
1830-
if (isUUID(serachString)) {
1831-
searchString.push(`experiment.id = '${serachString}'`);
1824+
searchArray.push(`name ${likeString}`);
1825+
searchArray.push(`state::TEXT ${likeString}`);
1826+
searchArray.push(`ARRAY_TO_STRING(context, ',') ${likeString}`);
1827+
searchArray.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
1828+
searchArray.push(`partitions.site ${likeString}`);
1829+
searchArray.push(`partitions.target ${likeString}`);
1830+
if (isUUID(searchString)) {
1831+
searchArray.push(`experiment.id = '${searchString}'`);
18321832
}
18331833
break;
18341834
}
18351835

1836-
const searchStringConcatenated = `(${searchString.join(' OR ')})`;
1836+
const searchStringConcatenated = `(${searchArray.join(' OR ')})`;
18371837
return searchStringConcatenated;
18381838
}
18391839

‎backend/packages/Upgrade/src/api/services/FeatureFlagService.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -804,40 +804,40 @@ export class FeatureFlagService {
804804
private paginatedSearchString(params: IFeatureFlagSearchParams): string {
805805
const type = params.key;
806806
// escape % and ' characters
807-
const serachString = params.string.replace(/%/g, '\\$&').replace(/'/g, "''");
808-
if (type === FLAG_SEARCH_KEY.ID && !isUUID(serachString)) {
807+
const searchString = params.string.replace(/%/g, '\\$&').replace(/'/g, "''");
808+
if (type === FLAG_SEARCH_KEY.ID && !isUUID(searchString)) {
809809
return '';
810810
}
811-
const likeString = `ILIKE '%${serachString}%'`;
812-
const searchString: string[] = [];
811+
const likeString = `ILIKE '%${searchString}%'`;
812+
const searchArray: string[] = [];
813813
switch (type) {
814814
case FLAG_SEARCH_KEY.NAME:
815-
searchString.push(`${type} ${likeString}`);
815+
searchArray.push(`${type} ${likeString}`);
816816
break;
817817
case FLAG_SEARCH_KEY.STATUS:
818-
searchString.push(`status::TEXT ${likeString}`);
818+
searchArray.push(`status::TEXT ${likeString}`);
819819
break;
820820
case FLAG_SEARCH_KEY.CONTEXT:
821-
searchString.push(`ARRAY_TO_STRING(${type}, ',') ${likeString}`);
821+
searchArray.push(`ARRAY_TO_STRING(${type}, ',') ${likeString}`);
822822
break;
823823
case FLAG_SEARCH_KEY.TAG:
824-
searchString.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
824+
searchArray.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
825825
break;
826826
case FLAG_SEARCH_KEY.ID:
827-
searchString.push(`feature_flag.id = '${serachString}'`);
827+
searchArray.push(`feature_flag.id = '${searchString}'`);
828828
break;
829829
default:
830-
searchString.push(`name ${likeString}`);
831-
searchString.push(`status::TEXT ${likeString}`);
832-
searchString.push(`ARRAY_TO_STRING(context, ',') ${likeString}`);
833-
searchString.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
834-
if (isUUID(serachString)) {
835-
searchString.push(`feature_flag.id = '${serachString}'`);
830+
searchArray.push(`name ${likeString}`);
831+
searchArray.push(`status::TEXT ${likeString}`);
832+
searchArray.push(`ARRAY_TO_STRING(context, ',') ${likeString}`);
833+
searchArray.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
834+
if (isUUID(searchString)) {
835+
searchArray.push(`feature_flag.id = '${searchString}'`);
836836
}
837837
break;
838838
}
839839

840-
const searchStringConcatenated = `(${searchString.join(' OR ')})`;
840+
const searchStringConcatenated = `(${searchArray.join(' OR ')})`;
841841
return searchStringConcatenated;
842842
}
843843

‎backend/packages/Upgrade/src/api/services/SegmentService.ts‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,7 @@ export class SegmentService {
222222

223223
if (searchParams) {
224224
const whereClause = this.paginatedSearchString(searchParams);
225-
if (whereClause) {
226-
paginatedParentSubQuery = paginatedParentSubQuery.andWhere(whereClause);
227-
}
225+
paginatedParentSubQuery = paginatedParentSubQuery.where(whereClause);
228226
}
229227
const countQuery = paginatedParentSubQuery.clone().andWhere('segment.type=:type', { type: SEGMENT_TYPE.PUBLIC });
230228
paginatedParentSubQuery = paginatedParentSubQuery.andWhere('segment.type = :type').offset(skip).limit(take);
@@ -247,33 +245,33 @@ export class SegmentService {
247245
private paginatedSearchString(params: ISegmentSearchParams): string {
248246
const type = params.key;
249247
// escape % and ' characters
250-
const serachString = params.string.replace(/%/g, '\\$&').replace(/'/g, "''");
251-
if (type === SEGMENT_SEARCH_KEY.ID && !isUUID(serachString)) {
252-
return null;
248+
const searchString = params.string.replace(/%/g, '\\$&').replace(/'/g, "''");
249+
if (type === SEGMENT_SEARCH_KEY.ID && !isUUID(searchString)) {
250+
return '';
253251
}
254-
const likeString = `ILIKE '%${serachString}%'`;
255-
const searchString: string[] = [];
252+
const likeString = `ILIKE '%${searchString}%'`;
253+
const searchArray: string[] = [];
256254
switch (type) {
257255
case SEGMENT_SEARCH_KEY.NAME || SEGMENT_SEARCH_KEY.CONTEXT:
258-
searchString.push(`${type} ${likeString}`);
256+
searchArray.push(`${type} ${likeString}`);
259257
break;
260258
case SEGMENT_SEARCH_KEY.TAG:
261-
searchString.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
259+
searchArray.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
262260
break;
263261
case SEGMENT_SEARCH_KEY.ID:
264-
searchString.push(`segment.id = '${serachString}'`);
262+
searchArray.push(`segment.id = '${searchString}'`);
265263
break;
266264
default:
267-
searchString.push(`${SEGMENT_SEARCH_KEY.NAME} ${likeString}`);
268-
searchString.push(`${SEGMENT_SEARCH_KEY.CONTEXT} ${likeString}`);
269-
searchString.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
270-
if (isUUID(serachString)) {
271-
searchString.push(`segment.id = '${serachString}'`);
265+
searchArray.push(`${SEGMENT_SEARCH_KEY.NAME} ${likeString}`);
266+
searchArray.push(`${SEGMENT_SEARCH_KEY.CONTEXT} ${likeString}`);
267+
searchArray.push(`ARRAY_TO_STRING(tags, ',') ${likeString}`);
268+
if (isUUID(searchString)) {
269+
searchArray.push(`segment.id = '${searchString}'`);
272270
}
273271
break;
274272
}
275273

276-
const searchStringConcatenated = `(${searchString.join(' OR ')})`;
274+
const searchStringConcatenated = `(${searchArray.join(' OR ')})`;
277275
return searchStringConcatenated;
278276
}
279277

‎backend/packages/Upgrade/src/api/services/UserService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ export class UserService {
120120
private paginatedSearchString(params: UserSearchParamsValidator): string {
121121
const type = params.key;
122122
// escape % and ' characters
123-
const serachString = params.string.replace(/%/g, '\\$&').replace(/'/g, "''");
124-
const likeString = `ILIKE '%${serachString}%'`;
123+
const searchString = params.string.replace(/%/g, '\\$&').replace(/'/g, "''");
124+
const likeString = `ILIKE '%${searchString}%'`;
125125
const likes: string[] = [];
126126
if (type === USER_SEARCH_SORT_KEY.ALL) {
127127
likes.push(`users.email::TEXT ${likeString}`);

‎frontend/projects/upgrade/src/app/features/dashboard/home/components/experiment-list/experiment-list.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export class ExperimentListComponent implements OnInit, OnDestroy, AfterViewInit
128128
!!data.tags.filter((tags) => tags.toLocaleLowerCase().includes(filter)).length ||
129129
this.isPartitionFound(data, filter) ||
130130
!!data.context.filter((context) => context.toLocaleLowerCase().includes(filter)).length ||
131-
data.id.includes(filter)
131+
data.id.toLowerCase() === filter
132132
);
133133
case EXPERIMENT_SEARCH_KEY.NAME:
134134
return data.name.toLocaleLowerCase().includes(filter);
@@ -137,7 +137,7 @@ export class ExperimentListComponent implements OnInit, OnDestroy, AfterViewInit
137137
case EXPERIMENT_SEARCH_KEY.CONTEXT:
138138
return !!data.context.filter((context) => context.toLocaleLowerCase().includes(filter)).length;
139139
case EXPERIMENT_SEARCH_KEY.ID:
140-
return data.id.includes(filter);
140+
return data.id.toLowerCase() === filter;
141141
}
142142
};
143143
}

0 commit comments

Comments
 (0)