@autobusal/common 1.0.5 → 1.0.7

package/ApiDetails/Content.tsx

@@ -3,7 +3,7 @@ import { Paragraph } from '../index';
 import { success } from '@autobusal/utilities';
 import DevPos from './Devpos';
 import { DevPosForm } from './types';
-import { GetSettings, PostSettings } from './services';
+import { useGetSettings, usePostSettings } from './services';
 
 interface Props {
   id: number
@@ -12,9 +12,9 @@ interface Props {
 }
 
 const Content = ({ id, type, t }: Props): JSX.Element => {
-  const { data, isLoading } = GetSettings(id, type);
+  const { data, isLoading } = useGetSettings(id, type);
 
-  const { mutate: SaveSettings, isPending } = PostSettings(id, type);
+  const { mutate: SaveSettings, isPending } = usePostSettings(id, type);
 
   if (isLoading) {
     return <Paragraph count={ 3 } />;

package/ApiDetails/services.ts

@@ -3,7 +3,7 @@ import { apiClient } from '@autobusal/providers';
 import { ApiDetailsData } from '@autobusal/providers/types/users';
 import { DevPosForm } from './types';
 
-export const GetSettings = (id: number, type: string): UseQueryResult<ApiDetailsData | string> => (
+export const useGetSettings = (id: number, type: string): UseQueryResult<ApiDetailsData | string> => (
   useQuery({
     queryKey: ['apidetails-get-settings', { id, type }],
     queryFn: async () => (
@@ -21,7 +21,7 @@ export const GetSettings = (id: number, type: string): UseQueryResult<ApiDetails
   })
 );
 
-export const PostSettings = (id: number, type: string): UseMutationResult<void, Error, DevPosForm, unknown> => (
+export const usePostSettings = (id: number, type: string): UseMutationResult<void, Error, DevPosForm, unknown> => (
   useMutation({
     mutationKey: ['apidetails-update-settings'],
     mutationFn: async (data: DevPosForm) => (

package/ChangeLanguage/ChangeLanguage.tsx

@@ -3,7 +3,7 @@ import { TFunction, i18n } from 'i18next';
 import { IoGlobeOutline } from 'react-icons/io5';
 import { useOutside } from '@autobusal/hooks';
 import { Container, Title, ContainerButtons, ButtonChange } from './styles';
-import { GetSettings } from '@autobusal/providers/services';
+import { useGetSettings } from '@autobusal/providers/services';
 
 interface Props {
   type: 'top' | 'bottom'
@@ -15,7 +15,7 @@ interface Props {
 const ChangeLanguage = ({ type, t, i18n, onClose }: Props): JSX.Element => {
   const ref = useRef<HTMLDivElement>(null);
 
-  const { data } = GetSettings();
+  const { data } = useGetSettings();
 
   useOutside(ref, onClose);
 

package/IpLogs/View.tsx

@@ -1,7 +1,7 @@
 import { TFunction } from 'i18next';
 import { Table, Row } from '../index';
 import { Container } from './styles';
-import { GetLogs } from './services';
+import { useGetLogs } from './services';
 
 interface Props {
   id: number
@@ -11,7 +11,7 @@ interface Props {
 }
 
 const View = ({ id, page, type, t }: Props): JSX.Element => {
-  const { data, isLoading, isFetching } = GetLogs(id, type, page);
+  const { data, isLoading, isFetching } = useGetLogs(id, type, page);
 
   const rows = data?.data.map(item => (
     <Row

package/IpLogs/services.ts

@@ -3,7 +3,7 @@ import { apiClient } from '@autobusal/providers';
 import { LogData } from '@autobusal/providers/types/users';
 import { PaginationData } from '@autobusal/providers/types/pagination';
 
-export const GetLogs = (id: number, type: string, page: number): UseQueryResult<PaginationData<LogData>> => (
+export const useGetLogs = (id: number, type: string, page: number): UseQueryResult<PaginationData<LogData>> => (
   useQuery({
     queryKey: ['ip-logs', { id, type, page }],
     queryFn: async () => {

package/Policy/Policy.tsx

@@ -1,6 +1,6 @@
 import { TFunction } from 'i18next';
 import Modal from '../Modal/Modal';
-import { GetPolicy } from './services';
+import { useGetPolicy } from './services';
 
 interface Props {
   id: number
@@ -9,7 +9,7 @@ interface Props {
 }
 
 const Policy = ({ id, t, onClose }: Props): JSX.Element => {
-  const { data, isFetching } = GetPolicy(id);
+  const { data, isFetching } = useGetPolicy(id);
 
   return (
     <Modal

package/Policy/services.ts

@@ -2,7 +2,7 @@ import { useQuery, UseQueryResult } from '@tanstack/react-query';
 import { apiClient } from '@autobusal/providers';
 import { PolicyData } from '@autobusal/providers/types/routes';
 
-export const GetPolicy = (id: number): UseQueryResult<PolicyData> => (
+export const useGetPolicy = (id: number): UseQueryResult<PolicyData> => (
   useQuery({
     queryKey: ['route-policy', { id }],
     queryFn: async () => (

package/Report/Send.tsx

@@ -5,7 +5,7 @@ import { Button } from '../index';
 import { Validate, Display } from '@autobusal/utilities';
 import { Success } from './styles';
 import { ReportForm } from './types';
-import { PostReport } from './services';
+import { usePostReport } from './services';
 
 interface Props {
   type: string
@@ -15,7 +15,7 @@ interface Props {
 const Send = ({ type, t }: Props): JSX.Element => {
   const { register, handleSubmit, formState: { errors } } = useForm<ReportForm>();
 
-  const { mutate: Send, isPending, isSuccess } = PostReport(type);
+  const { mutate: Send, isPending, isSuccess } = usePostReport(type);
 
   const onSubmit = (data: ReportForm): void => {
     Send(data);

package/Report/services.ts

@@ -2,7 +2,7 @@ import { UseMutationResult, useMutation } from '@tanstack/react-query';
 import { apiClient } from '@autobusal/providers';
 import { ReportForm } from './types';
 
-export const PostReport = (type: string): UseMutationResult<void, Error, ReportForm, unknown> => (
+export const usePostReport = (type: string): UseMutationResult<void, Error, ReportForm, unknown> => (
   useMutation({
     mutationKey: ['operator-locations-move', { type }],
     mutationFn: async (data: ReportForm) => (

package/Viewer/Data.tsx

@@ -32,7 +32,7 @@ const Data = ({ id, item, refs, t, onUpdate }: Props): (JSX.Element | null) => {
 
   switch (item.type) {
     case 'checkbox':
-      return <input type="checkbox" value={ 1 } defaultChecked={ Number(item.value) == 1 } { ...refs(item.name, Validate(String(item.rules), t)) } />;
+      return <input type="checkbox" value={ 1 } defaultChecked={ Number(item.value) === 1 } { ...refs(item.name, Validate(String(item.rules), t)) } />;
 
     case 'checkbox-list':
     case 'checkbox-list-all':

package/Viewer/Items/TextareaHtml.tsx

@@ -29,6 +29,7 @@ const TextareaHtml = ({ name, value, validation, t, refs, onUpdate }: Props): JS
         onEditorChange={ onChange }
         initialValue={ value ?? '' }
         tinymceScriptSrc="/tinymce/tinymce.min.js"
+        licenseKey="gpl"
         init={{
           height: 350,
           menubar: false,

package/Viewer/Loading.tsx

@@ -0,0 +1,14 @@
+import { TFunction } from 'i18next';
+import { Inline } from '../Loading/Loading';
+
+interface Props {
+  t: TFunction<'common'>
+}
+
+const Loading = ({ t }: Props): JSX.Element => (
+  <div className="box">
+    <Inline text={ t('table.loading_data', { ns: 'common' }) } />
+  </div>
+);
+
+export default Loading;

package/Viewer/Viewer.tsx

@@ -1,5 +1,6 @@
 import { useForm } from 'react-hook-form';
 import { TFunction } from 'i18next';
+import Loading from './Loading';
 import Item from './Item';
 import Actions from './Actions';
 import { Container } from './styles';
@@ -9,6 +10,7 @@ interface Props {
   id: number
   type?: 'simple'
   data: ViewData[]
+  fetching?: boolean
   pending?: boolean
   actions?: string[]
   t: TFunction<'common'>
@@ -16,8 +18,12 @@ interface Props {
   onDelete?: (data?: any) => void
 }
 
-const Viewer = ({ id, type, data, pending, actions, t, onSave, onDelete }: Props): JSX.Element => {
+const Viewer = ({ id, type, data, fetching, pending, actions, t, onSave, onDelete }: Props): JSX.Element => {
   const { register, handleSubmit, formState: { errors }, setValue } = useForm<any>();
+  
+  if (fetching) {
+    return <Loading t={ t } />;
+  }
 
   const items = data.map((item, index) => (
     <Item

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobusal/common",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "type": "module",
   "main": "index.ts"
 }