tsv2-library 0.2.64 → 0.2.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsv2-library",
-  "version": "0.2.64",
+  "version": "0.2.65",
   "author": "fixedassetv2-fe",
   "license": "ISC",
   "homepage": "https://github.com/fixedassetv2-fe/tsv2-library#readme",

package/src/presets/button/index.js

@@ -56,11 +56,13 @@ export default {
 
       // Primary Button
       {
-        'text-white dark:text-primary-800':
+        'text-white dark:!text-primary-800':
           !props.link &&
           props.severity === null &&
           !props.text &&
           !props.outlined &&
+          !props.disabled &&
+          !context.disabled &&
           !props.plain,
         'bg-primary dark:bg-primary-300':
           !props.link &&
@@ -117,10 +119,12 @@ export default {
 
       // Success Button
       {
-        'text-white dark:text-success-900':
+        'text-white dark:!text-success-900':
           props.severity === 'success' &&
           !props.text &&
           !props.outlined &&
+          !props.disabled &&
+          !context.disabled &&
           !props.plain,
         'bg-success dark:bg-success-300':
           props.severity === 'success' &&
@@ -204,10 +208,12 @@ export default {
 
       // Dark Button
       {
-        'text-white dark:text-general-900':
+        'text-white dark:!text-general-900':
           props.severity === 'dark' &&
           !props.text &&
           !props.outlined &&
+          !props.disabled &&
+          !context.disabled &&
           !props.plain,
         'bg-general-900 dark:bg-general-50':
           props.severity === 'dark' &&
@@ -233,10 +239,12 @@ export default {
 
       // Danger Button
       {
-        'text-white dark:text-danger-800':
+        'text-white dark:!text-danger-800':
           props.severity === 'danger' &&
           !props.text &&
           !props.outlined &&
+          !props.disabled &&
+          !context.disabled &&
           !props.plain,
         'bg-danger dark:bg-danger-200':
           props.severity === 'danger' &&

package/src/presets/calendar/index.js

@@ -121,7 +121,7 @@ export default {
       'min-h-[26.8px]',
 
       {
-        'hidden': props.dateFormat?.toString().toLowerCase() == 'dd/mm' && state.currentView === 'month',
+        'hidden': !props.dateFormat?.toString().toLowerCase().includes('y') && state.currentView === 'month',
       },
 
       //Font
@@ -209,7 +209,7 @@ export default {
   yearTitle: ({ props }) => ({
     class: [
       {
-        'hidden': props.dateFormat?.toString().toLowerCase() == 'dd/mm',
+        'hidden': !props.dateFormat?.toString().toLowerCase().includes('y'),
       },
 
       //Font

package/src/services/assetBrand.service.ts

@@ -0,0 +1,46 @@
+import axios, { AxiosInstance, AxiosResponse } from 'axios';
+
+export interface ServiceOptions {
+  headers?: Record<string, unknown>;
+  params?: Record<string, unknown>;
+}
+
+export interface AssetBrandDropdownOption {
+  _id: string;
+  key: number;
+  name: string;
+}
+
+export interface GetAssetBrandDropdownResponse {
+  data: AssetBrandDropdownOption[];
+}
+
+export const API = ({
+  headers = {},
+  params = {},
+}: ServiceOptions = {}): AxiosInstance => {
+  const user = JSON.parse(localStorage.getItem('user') ?? '{}');
+  const BASE_URL = import.meta.env.VITE_APP_ATTRIBUTES_API;
+
+  const instance = axios.create({
+    baseURL: `${BASE_URL}/v2/brands`,
+    headers: {
+      'Content-type': 'application/json',
+      'Authorization': `Bearer ${user.token}`,
+      ...headers,
+    },
+    params,
+  });
+
+  return instance;
+};
+
+const AssetBrandService = {
+  getAssetBrandDropdown: (): Promise<
+    AxiosResponse<GetAssetBrandDropdownResponse>
+  > => {
+    return API().get('/dropdown');
+  },
+};
+
+export default AssetBrandService;

package/src/services/assetName.service.ts

@@ -16,6 +16,22 @@ export type GetAssetNameListQueryParams = {
   tagType?: string;
 };
 
+export interface AssetNameDropdownOption {
+  _id: string;
+  key: number;
+  name: string;
+  category: {
+    _id: string;
+    name: string;
+    key: number;
+  };
+  tagType: string;
+}
+
+export interface GetAssetNameDropdownResponse {
+  data: AssetNameDropdownOption[];
+}
+
 export const API = ({
   headers = {},
   params = {},
@@ -65,10 +81,17 @@ const getOptions = (
   return API({ params }).get('/options');
 };
 
+const getAssetNameDropdown = (): Promise<
+  AxiosResponse<GetAssetNameDropdownResponse>
+> => {
+  return API().get('/dropdown');
+};
+
 export default {
   getAssetNameDetail,
   getAssetNameList,
   getAssetsByAssetName,
   getUnpairedAssetName,
+  getAssetNameDropdown,
   getOptions,
 };