Merge pull request #782 from invoiceninja/develop

Sync develop and main
invoiceninja · Jun 16, 2023 · 4962958 · 4962958
2 parents a0b5ff6 + 2b858fa
commit 4962958
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 63 deletions.
diff --git a/src/components/forms/Combobox.tsx b/src/components/forms/Combobox.tsx
@@ -355,9 +355,7 @@ export function ComboboxAsync<T = any>({
 
   const onEmptyValues = (query: string) => {
     setUrl((current) => {
-      if (query.length > 0 && current) {
-        current.searchParams.set('filter', query);
-      }
+      current.searchParams.set('filter', query);
 
       return new URL(current.href);
     });

diff --git a/src/components/forms/InputField.tsx b/src/components/forms/InputField.tsx
@@ -15,7 +15,6 @@ import { DebounceInput } from 'react-debounce-input';
 import { AiFillEye, AiFillEyeInvisible } from 'react-icons/ai';
 import CommonProps from '../../common/interfaces/common-props.interface';
 import { InputLabel } from './InputLabel';
-import { DatePicker } from '$app/components/forms/Datepicker';
 
 interface Props extends CommonProps {
   label?: string | null;
@@ -64,45 +63,33 @@ export function InputField(props: Props) {
       )}
 
       <div className="relative">
-        {props.type === 'date' ? (
-          <DatePicker
-            id={props.id}
-            required={props.required}
-            value={props.value}
-            onChange={props.onChange}
-            onValueChange={props.onValueChange}
-            disabled={props.disabled}
-            minDate={props.min}
-          />
-        ) : (
-          <DebounceInput
-            min={props.min}
-            maxLength={props.maxLength}
-            disabled={props.disabled}
-            element={props.element || 'input'}
-            inputRef={props.innerRef}
-            debounceTimeout={props.debounceTimeout ?? 300}
-            required={props.required}
-            id={props.id}
-            type={inputType}
-            className={classNames(
-              `w-full py-2 px-3 rounded text-sm text-gray-900 dark:bg-gray-800 dark:border-transparent dark:text-gray-100 disabled:bg-gray-100 disabled:cursor-not-allowed ${props.className}`,
-              {
-                'border border-gray-300': props.border !== false,
-              }
-            )}
-            placeholder={props.placeholder || ''}
-            onChange={(event) => {
-              props.onValueChange && props.onValueChange(event.target.value);
-              props.onChange && props.onChange(event);
-            }}
-            value={props.value}
-            list={props.list}
-            rows={props.textareaRows || 5}
-            step={props.step}
-            data-cy={props.cypressRef}
-          />
-        )}
+        <DebounceInput
+          min={props.min}
+          maxLength={props.maxLength}
+          disabled={props.disabled}
+          element={props.element || 'input'}
+          inputRef={props.innerRef}
+          debounceTimeout={props.debounceTimeout ?? 300}
+          required={props.required}
+          id={props.id}
+          type={inputType}
+          className={classNames(
+            `w-full py-2 px-3 rounded text-sm text-gray-900 dark:bg-gray-800 dark:border-transparent dark:text-gray-100 disabled:bg-gray-100 disabled:cursor-not-allowed ${props.className}`,
+            {
+              'border border-gray-300': props.border !== false,
+            }
+          )}
+          placeholder={props.placeholder || ''}
+          onChange={(event) => {
+            props.onValueChange && props.onValueChange(event.target.value);
+            props.onChange && props.onChange(event);
+          }}
+          value={props.value}
+          list={props.list}
+          rows={props.textareaRows || 5}
+          step={props.step}
+          data-cy={props.cypressRef}
+        />
 
         {isInitialTypePassword && (
           <span className="absolute top-1/4 right-3 cursor-pointer">

diff --git a/src/pages/credits/edit/Edit.tsx b/src/pages/credits/edit/Edit.tsx
@@ -118,6 +118,7 @@ export default function Edit() {
           onContactCheckboxChange={handleInvitationChange}
           errorMessage={errors?.errors.client_id}
           readonly
+          textOnly
         />
 
         <CreditDetails handleChange={handleChange} errors={errors} />

diff --git a/src/pages/invoices/common/components/ClientSelector.tsx b/src/pages/invoices/common/components/ClientSelector.tsx
@@ -18,6 +18,7 @@ import { ChangeEvent, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ClientSelector as Selector } from '$app/components/clients/ClientSelector';
 import { route } from '$app/common/helpers/route';
+import { useHasPermission } from '$app/common/hooks/permissions/useHasPermission';
 
 interface Props {
   readonly?: boolean;
@@ -27,6 +28,7 @@ interface Props {
   onContactCheckboxChange: (contactId: string, value: boolean) => unknown;
   errorMessage?: string | string[];
   disableWithSpinner?: boolean;
+  textOnly?: boolean;
 }
 
 export function ClientSelector(props: Props) {
@@ -52,32 +54,53 @@ export function ClientSelector(props: Props) {
         .then((client) => setClient(client));
   }, [resource?.client_id]);
 
+  const hasPermission = useHasPermission();
+
   return (
     <Card className="col-span-12 xl:col-span-4 h-max" withContainer>
       <div className="flex  flex-col justify-between space-y-2">
-        <Selector
-          inputLabel={t('client')}
-          onChange={(client) => props.onChange(client.id)}
-          value={resource?.client_id}
-          readonly={props.readonly || !resource}
-          clearButton={Boolean(resource?.client_id)}
-          onClearButtonClick={props.onClearButtonClick}
-          initiallyVisible={!resource?.client_id}
-          errorMessage={props.errorMessage}
-          disableWithSpinner={props.disableWithSpinner}
-        />
+        {hasPermission('view_client') ? (
+          props.textOnly ? (
+            <p className="text-gray-900 text-sm">
+              {resource?.client?.display_name}
+            </p>
+          ) : (
+            <Selector
+              inputLabel={t('client')}
+              onChange={(client) => props.onChange(client.id)}
+              value={resource?.client_id}
+              readonly={props.readonly || !resource}
+              clearButton={Boolean(resource?.client_id)}
+              onClearButtonClick={props.onClearButtonClick}
+              initiallyVisible={!resource?.client_id}
+              errorMessage={props.errorMessage}
+              disableWithSpinner={props.disableWithSpinner}
+            />
+          )
+        ) : (
+          <p className="text-gray-900 text-sm">
+            {resource?.client?.display_name}
+          </p>
+        )}
 
         {client && (
           <div className="space-x-2">
-            <Link to={route('/clients/:id/edit', { id: client.id })}>
-              {t('edit_client')}
-            </Link>
+            {hasPermission('edit_client') && (
+              <Link to={route('/clients/:id/edit', { id: client.id })}>
+                {t('edit_client')}
+              </Link>
+            )}
 
-            <span className="text-sm text-gray-800">/</span>
+            {hasPermission('view_client') ||
+              (hasPermission('edit_client') && (
+                <span className="text-sm text-gray-800">/</span>
+              ))}
 
-            <Link to={route('/clients/:id', { id: client.id })}>
-              {t('view_client')}
-            </Link>
+            {hasPermission('view_client') && (
+              <Link to={route('/clients/:id', { id: client.id })}>
+                {t('view_client')}
+              </Link>
+            )}
           </div>
         )}
       </div>

diff --git a/src/pages/invoices/edit/Edit.tsx b/src/pages/invoices/edit/Edit.tsx
@@ -129,6 +129,7 @@ export default function Edit() {
           onClearButtonClick={() => handleChange('client_id', '')}
           onContactCheckboxChange={handleInvitationChange}
           errorMessage={errors?.errors.client_id}
+          textOnly
           readonly
         />
 

diff --git a/src/pages/quotes/edit/Edit.tsx b/src/pages/quotes/edit/Edit.tsx
@@ -117,6 +117,7 @@ export default function Edit() {
           onClearButtonClick={() => handleChange('client_id', '')}
           onContactCheckboxChange={handleInvitationChange}
           errorMessage={errors?.errors.client_id}
+          textOnly
           readonly
         />
 

diff --git a/src/pages/recurring-invoices/edit/Edit.tsx b/src/pages/recurring-invoices/edit/Edit.tsx
@@ -165,6 +165,7 @@ export default function Edit() {
           onClearButtonClick={() => handleChange('client_id', '')}
           onContactCheckboxChange={handleInvitationChange}
           errorMessage={errors?.errors.client_id}
+          textOnly
           readonly
         />
 

diff --git a/src/pages/settings/account-management/component/Plan.tsx b/src/pages/settings/account-management/component/Plan.tsx
@@ -8,7 +8,7 @@
  * @license https://www.elastic.co/licensing/elastic-license
  */
 
-import { date, isHosted, isSelfHosted } from '$app/common/helpers';
+import { date, isDemo, isHosted, isSelfHosted } from '$app/common/helpers';
 import { useCurrentAccount } from '$app/common/hooks/useCurrentAccount';
 import { useCurrentCompanyDateFormats } from '$app/common/hooks/useCurrentCompanyDateFormats';
 import { useCurrentUser } from '$app/common/hooks/useCurrentUser';
@@ -54,7 +54,7 @@ export function Plan() {
         </Element>
       )}
 
-      {isSelfHosted() && <License />}
+      {isSelfHosted() && !isDemo() && <License />}
     </Card>
   );
 }