test: fix e2e tests

.gitignore

@@ -18,3 +18,4 @@ src/frontend/assets/scripts
 .adminbro
 example-app/cypress/videos
 example-app/cypress/screenshots
+.env

example-app/.env-example

@@ -0,0 +1,4 @@
+POSTGRES_USER="adminbro"
+POSTGRES_PASSWORD="adminbro"
+POSTGRES_DATABASE="adminbro-e2e"
+POSTGRES_HOST="localhost"

example-app/migrations/20200807110457-add-uniq-constrain-to-email.js

@@ -2,10 +2,13 @@
 
 module.exports = {
   // up: () => Promise.resolve(true),
-  up: queryInterface => queryInterface.addConstraint('ExternalEmployees', ['email'], {
+  up: queryInterface => queryInterface.addConstraint('ExternalEmployees', {
+    fields: ['email'],
     type: 'unique',
     name: 'external_employees_email_unique_constraint',
   }),
 
-  down: queryInterface => queryInterface.removeConstraint('ExternalEmployees', ['email']),
+  down: queryInterface => queryInterface.removeConstraint(
+    'ExternalEmployees', 'external_employees_email_unique_constraint',
+  ),
 }

src/frontend/components/app/notice.tsx

@@ -4,7 +4,7 @@ import { MessageBox } from '@admin-bro/design-system'
 
 import { NoticeMessageInState, ReduxState } from '../../store/store'
 import { dropNotice } from '../../store/actions/drop-notice'
-import { setNoticeProgress } from '../../store/actions/set-Notice-progress'
+import { setNoticeProgress } from '../../store/actions/set-notice-progress'
 
 const TIME_TO_DISAPPEAR = 3
 

src/frontend/components/app/records-table/record-in-list.tsx

@@ -65,7 +65,7 @@ const RecordInList: React.FC<Props> = (props) => {
     } else if (actionPerformed) {
       actionPerformed(actionResponse)
     }
-  }, [actionPerformed])
+  }, [actionPerformed, record])
 
   return (
     <TableRow onClick={(event): void => handleClick(event)} data-id={record.id}>
@@ -100,8 +100,8 @@ const RecordInList: React.FC<Props> = (props) => {
       <TableCell key="options">
         {recordActions.length ? (
           <DropDown stick="right">
-            <DropDownTrigger data-testid="actions-dropdown">
-              <Button variant="text" size="icon">
+            <DropDownTrigger>
+              <Button variant="text" size="icon" data-testid="actions-dropdown">
                 <Icon icon="OverflowMenuHorizontal" color="grey100" />
               </Button>
             </DropDownTrigger>

src/frontend/components/login/index.tsx

@@ -12,13 +12,11 @@ import {
   FormGroup,
   Button,
   Text,
-  H3,
   MessageBox,
   SoftwareBrothers,
 } from '@admin-bro/design-system'
 import { useTranslation } from '../../hooks'
 import { ReduxState } from '../../store/store'
-import SidebarBranding from '../app/sidebar/sidebar-branding'
 
 const GlobalStyle = createGlobalStyle`
   html, body, #app {

src/frontend/components/property-type/array/edit.tsx

@@ -53,7 +53,7 @@ const ItemRenderer: React.FC<Props & ItemRendererProps> = (props) => {
           onClick={(event): false => onDelete(event)}
           variant="danger"
         >
-          <Icon icon="Delete" />
+          <Icon icon="TrashCan" />
         </Button>
       </Box>
     </Box>

src/frontend/hooks/use-action.ts

@@ -1,18 +1,19 @@
+import React, { useCallback } from 'react'
 /* eslint-disable no-restricted-globals */
 /* eslint-disable no-undef */
 /* eslint-disable no-alert */
 import { AxiosResponse } from 'axios'
 import { useLocation, useHistory } from 'react-router'
-import { useMemo } from 'react'
+
 import ViewHelpers, {
   BulkActionParams,
   ResourceActionParams,
   RecordActionParams,
 } from '../../backend/utils/view-helpers'
 
 
-import { appendForceRefresh } from '../../../lib/frontend/components/actions/utils/append-force-refresh'
-import ApiClient from '../../../lib/frontend/utils/api-client'
+import { appendForceRefresh } from '../../frontend/components/actions/utils/append-force-refresh'
+import ApiClient from '../../frontend/utils/api-client'
 
 import { ActionResponse } from '../../backend/actions/action.interface'
 
@@ -67,7 +68,7 @@ export function useAction<K extends ActionResponse>(
     resourceId, recordId, recordIds,
   } = params as MergedActionParams
 
-  const href: string = useMemo(() => {
+  const setHref = useCallback(() => {
     if (isRecordAction(params, action)) {
       return h.recordActionUrl({ ...params, actionName, search: location.search })
     }
@@ -78,7 +79,9 @@ export function useAction<K extends ActionResponse>(
       return h.resourceActionUrl({ resourceId, actionName, search: location.search })
     }
     throw new Error('"actionType" should be either record, resource or bulk')
-  }, [resourceId, recordId, recordIds, actionName, location.search])
+  }, [resourceId, location, action])
+
+  const href = setHref()
 
   const callApi = (): Promise<AxiosResponse<K>> => {
     const api = new ApiClient()
@@ -89,22 +92,23 @@ export function useAction<K extends ActionResponse>(
       if (!recordId) {
         throw new Error('You have to specify "recordId" for record action')
       }
+      // TODO: change type from any - in general handle types for Action
       promise = api.recordAction({
         resourceId, actionName: action.name, recordId,
-      })
+      }) as any
       break
     case 'resource':
       promise = api.resourceAction({
         resourceId, actionName: action.name,
-      })
+      }) as any
       break
     case 'bulk':
       if (!recordIds) {
         throw new Error('You have to specify "recordIds" for bulk action')
       }
       promise = api.bulkAction({
         resourceId, actionName: action.name, recordIds,
-      })
+      }) as any
       break
     default:
       throw new Error('"actionType" should be either record, resource or bulk')
@@ -116,7 +120,8 @@ export function useAction<K extends ActionResponse>(
         addNotice(data.notice)
       }
       if (data.redirectUrl && location.pathname !== data.redirectUrl) {
-        history.push(appendForceRefresh(data.redirectUrl))
+        const appended = appendForceRefresh(data.redirectUrl)
+        history.push(appended)
       }
       if (onActionCall) {
         onActionCall(data)
@@ -129,13 +134,15 @@ export function useAction<K extends ActionResponse>(
 
   const handleClick = (event: React.MouseEvent<HTMLElement>): void => {
     event.preventDefault()
+    event.stopPropagation()
     if (action.guard && !confirm(action.guard)) {
       return
     }
     if (typeof action.component !== 'undefined' && action.component === false) {
       callApi()
+    } else {
+      history.push(href)
     }
-    history.push(href)
   }
 
   return {

src/frontend/utils/api-client.ts

@@ -1,6 +1,11 @@
 import axios, { AxiosResponse, AxiosInstance, AxiosRequestConfig } from 'axios'
-import { ResourceActionParams, BulkActionParams, RecordActionParams } from '../../../lib/backend/utils/view-helpers'
-import { ActionParams } from '../../backend/utils/view-helpers'
+import {
+  ResourceActionParams,
+  BulkActionParams,
+  RecordActionParams,
+  ActionParams,
+} from '../../backend/utils/view-helpers'
+
 /* eslint-disable no-alert */
 import RecordJSON from '../../backend/decorators/record-json.interface'
 import { RecordActionResponse, ActionResponse, BulkActionResponse } from '../../backend/actions/action.interface'
@@ -55,8 +60,9 @@ export type ActionAPIParams = AxiosRequestConfig & ActionParams
  * @memberof ApiClient
  * @property {any}   ...    any property supported by {@link AxiosRequestConfig}
  */
-export type ResourceActionAPIParams = AxiosRequestConfig & ResourceActionParams
-
+export type ResourceActionAPIParams = AxiosRequestConfig & ResourceActionParams & {
+  query?: string;
+}
 /**
  * Extends {@link ActionAPIParams}
  *
@@ -196,7 +202,7 @@ class ApiClient {
     const { resourceId, recordIds, actionName, data, ...axiosParams } = options
 
     const params = new URLSearchParams()
-    params.set('recordIds', recordIds.join(','))
+    params.set('recordIds', (recordIds || []).join(','))
 
     const response = await this.client.request({
       url: `/api/resources/${resourceId}/bulk/${actionName}`,