filter is fixed

Author: talhainvenxion

src/ui/components/Filters/index.tsx

@@ -26,7 +26,7 @@ export const getInitialFilterState = () => {
       options: [
         {
           value: 'name',
-          label: 'Stack Name',
+          label: 'Name',
           type: 'string',
         },
         {
@@ -116,7 +116,7 @@ export const getInitialFilterStateForPipeline = () => {
       options: [
         {
           value: 'name',
-          label: 'Pipeline Name',
+          label: 'Name',
           type: 'string',
         },
         {

src/ui/components/inputs/index.tsx

@@ -18,7 +18,10 @@ export const InputWithLabel = ({
 }): JSX.Element => (
   <FlexBox.Column fullWidth>
     <Box paddingBottom="xs">
-      <Paragraph size="body" style={{ color: labelColor ? labelColor : 'black'}}>
+      <Paragraph
+        size="body"
+        style={{ color: labelColor ? labelColor : 'black' }}
+      >
         <label htmlFor={name}>{label}</label>
       </Paragraph>
     </Box>
@@ -121,7 +124,7 @@ export const TextInput = ({
   type?: string;
 }): JSX.Element => (
   <BaseInput
-    {...props} 
+    {...props}
     hasError={hasError}
     onChange={(e: any): void => {
       onChangeText(e.target.value);

src/ui/layouts/session/Login/Form.tsx

@@ -3,6 +3,7 @@ import {
   Box,
   FormEmailField,
   FormPasswordField,
+  FormTextField,
   PrimaryButton,
 } from '../../../components';
 import { translate } from './translate';
@@ -33,7 +34,7 @@ export const Form: React.FC = () => {
   return (
     <Box marginTop="xxl">
       <Box marginBottom="lg">
-        <FormEmailField
+        <FormTextField
           label={translate('form.username.label')}
           labelColor="#ffffff"
           placeholder={translate('form.username.placeholder')}

src/utils/tableFilters.ts

@@ -1,7 +1,6 @@
 import { formatDateToDisplay } from './date';
 
 export const getFilteredDataForTable = (data: any, filter: any) => {
-  debugger;
   filter.forEach((f: any) => {
     // temporary because api format changed after filter implementation this need to be refactor
     if (f.column.label === 'Owner' || f.column.label === 'Author') {
@@ -17,7 +16,7 @@ export const getFilteredDataForTable = (data: any, filter: any) => {
       if (f.type.value === 'start_with') {
         data = data.filter((os: any) => {
           if (f.column.value && f.value) {
-            return os.user.name.toLowerCase().includes(f.value.toLowerCase());
+            return os.user.name.toLowerCase().startsWith(f.value.toLowerCase());
           }
           return true;
         });
@@ -26,7 +25,7 @@ export const getFilteredDataForTable = (data: any, filter: any) => {
       if (f.type.value === 'end_with') {
         data = data.filter((os: any) => {
           if (f.column.value && f.value) {
-            return os.user.name.toLowerCase().includes(f.value.toLowerCase());
+            return os.user.name.toLowerCase().endsWith(f.value.toLowerCase());
           }
           return true;
         });
@@ -35,15 +34,15 @@ export const getFilteredDataForTable = (data: any, filter: any) => {
       if (f.type.value === 'equal') {
         data = data.filter((os: any) => {
           if (f.column.value && f.value) {
-            return os.user.name.toLowerCase().includes(f.value.toLowerCase());
+            return os.user.name.toLowerCase() === f.value.toLowerCase();
           }
           return true;
         });
       }
       if (f.type.value === 'not_equal') {
         data = data.filter((os: any) => {
           if (f.column.value && f.value) {
-            return os.user.name.toLowerCase().includes(!f.value.toLowerCase());
+            return os.user.name.toLowerCase() !== f.value.toLowerCase();
           }
           return true;
         });
@@ -52,7 +51,7 @@ export const getFilteredDataForTable = (data: any, filter: any) => {
 
     if (
       (f.column.type === 'string' && f.column.label !== 'Owner') ||
-      f.column.label === 'Author'
+      f.column.label !== 'Author'
     ) {
       if (f.type.value === 'contains') {
         data = data.filter((os: any) => {
@@ -66,7 +65,7 @@ export const getFilteredDataForTable = (data: any, filter: any) => {
       if (f.type.value === 'start_with') {
         data = data.filter((os: any) => {
           if (f.column.value && f.value) {
-            return os.user.name.toLowerCase().includes(f.value.toLowerCase());
+            return os.user.name.toLowerCase().startsWith(f.value.toLowerCase());
           }
           return true;
         });
@@ -75,7 +74,7 @@ export const getFilteredDataForTable = (data: any, filter: any) => {
       if (f.type.value === 'end_with') {
         data = data.filter((os: any) => {
           if (f.column.value && f.value) {
-            return os.user.name.toLowerCase().includes(f.value.toLowerCase());
+            return os.user.name.toLowerCase().endsWith(f.value.toLowerCase());
           }
           return true;
         });
@@ -84,15 +83,15 @@ export const getFilteredDataForTable = (data: any, filter: any) => {
       if (f.type.value === 'equal') {
         data = data.filter((os: any) => {
           if (f.column.value && f.value) {
-            return os.user.name.toLowerCase().includes(f.value.toLowerCase());
+            return os.user.name.toLowerCase() === f.value.toLowerCase();
           }
           return true;
         });
       }
       if (f.type.value === 'not_equal') {
         data = data.filter((os: any) => {
           if (f.column.value && f.value) {
-            return os.user.name.toLowerCase().includes(!f.value.toLowerCase());
+            return os.user.name.toLowerCase() !== f.value.toLowerCase();
           }
           return true;
         });