enh

apps/admin-ui/app/(drawer)/add-tag/index.tsx

@@ -4,16 +4,19 @@ import { useRouter } from 'expo-router';
 import { AppContainer, MyText, tw } from 'common-ui';
 import TagForm from '@/src/components/TagForm';
 import { useCreateTag } from '@/src/api-hooks/tag.api';
+import { trpc } from '@/src/trpc-client';
 
 interface TagFormData {
   tagName: string;
   tagDescription: string;
   isDashboardTag: boolean;
+  relatedStores: number[];
 }
 
 export default function AddTag() {
   const router = useRouter();
   const { mutate: createTag, isPending: isCreating } = useCreateTag();
+  const { data: storesData } = trpc.admin.store.getStores.useQuery();
 
   const handleSubmit = (values: TagFormData, image?: { uri?: string }) => {
     const formData = new FormData();
@@ -25,6 +28,9 @@ export default function AddTag() {
     }
     formData.append('isDashboardTag', values.isDashboardTag.toString());
     
+    // Add related stores
+    formData.append('relatedStores', JSON.stringify(values.relatedStores));
+
     // Add image if uploaded
     if (image?.uri) {
       const filename = image.uri.split('/').pop() || 'image.jpg';
@@ -58,6 +64,7 @@ export default function AddTag() {
     tagName: '',
     tagDescription: '',
     isDashboardTag: false,
+    relatedStores: [],
   };
 
   return (
@@ -70,6 +77,7 @@ export default function AddTag() {
           initialValues={initialValues}
           onSubmit={handleSubmit}
           isLoading={isCreating}
+          stores={storesData?.stores.map(store => ({ id: store.id, name: store.name })) || []}
         />
       </View>
     </AppContainer>

apps/admin-ui/app/(drawer)/edit-tag/index.tsx

@@ -4,11 +4,13 @@ import { useRouter, useLocalSearchParams } from 'expo-router';
 import { AppContainer, MyText, tw } from 'common-ui';
 import TagForm from '@/src/components/TagForm';
 import { useGetTag, useUpdateTag } from '@/src/api-hooks/tag.api';
+import { trpc } from '@/src/trpc-client';
 
 interface TagFormData {
   tagName: string;
   tagDescription: string;
   isDashboardTag: boolean;
+  relatedStores: number[];
   existingImageUrl?: string;
 }
 
@@ -19,6 +21,7 @@ export default function EditTag() {
 
   const { data: tagData, isLoading: isLoadingTag, error: tagError } = useGetTag(tagIdNum!);
   const { mutate: updateTag, isPending: isUpdating } = useUpdateTag();
+  const { data: storesData } = trpc.admin.store.getStores.useQuery();
 
   const handleSubmit = (values: TagFormData, image?: { uri?: string }) => {
     if (!tagIdNum) return;
@@ -32,6 +35,9 @@ export default function EditTag() {
     }
     formData.append('isDashboardTag', values.isDashboardTag.toString());
     
+    // Add related stores
+    formData.append('relatedStores', JSON.stringify(values.relatedStores));
+
     // Add image if uploaded
     if (image?.uri) {
       const filename = image.uri.split('/').pop() || 'image.jpg';
@@ -86,6 +92,7 @@ export default function EditTag() {
     tagName: tag.tagName,
     tagDescription: tag.tagDescription || '',
     isDashboardTag: tag.isDashboardTag,
+    relatedStores: tag.relatedStores || [],
     existingImageUrl: tag.imageUrl || undefined,
   };
 
@@ -100,6 +107,7 @@ export default function EditTag() {
           existingImageUrl={tag.imageUrl || undefined}
           onSubmit={handleSubmit}
           isLoading={isUpdating}
+          stores={storesData?.stores.map(store => ({ id: store.id, name: store.name })) || []}
         />
       </View>
     </AppContainer>

apps/admin-ui/src/api-hooks/tag.api.ts

@@ -7,6 +7,7 @@ export interface CreateTagPayload {
   tagDescription?: string;
   imageUrl?: string;
   isDashboardTag: boolean;
+  relatedStores?: number[];
 }
 
 export interface UpdateTagPayload {
@@ -14,6 +15,7 @@ export interface UpdateTagPayload {
   tagDescription?: string;
   imageUrl?: string;
   isDashboardTag: boolean;
+  relatedStores?: number[];
 }
 
 export interface Tag {
@@ -22,6 +24,7 @@ export interface Tag {
   tagDescription: string | null;
   imageUrl: string | null;
   isDashboardTag: boolean;
+  relatedStores: number[];
   createdAt?: string;
 }
 

apps/admin-ui/src/components/TagForm.tsx

@@ -3,14 +3,20 @@ import { View, TouchableOpacity } from 'react-native';
 import { Image } from 'expo-image';
 import { Formik } from 'formik';
 import * as Yup from 'yup';
-import { MyTextInput, MyText, Checkbox, ImageUploader, tw, useFocusCallback } from 'common-ui';
+import { MyTextInput, MyText, Checkbox, ImageUploader, tw, useFocusCallback, BottomDropdown } from 'common-ui';
 import usePickImage from 'common-ui/src/components/use-pick-image';
 import MaterialIcons from '@expo/vector-icons/MaterialIcons';
 
+interface StoreOption {
+  id: number;
+  name: string;
+}
+
 interface TagFormData {
   tagName: string;
   tagDescription: string;
   isDashboardTag: boolean;
+  relatedStores: number[];
 }
 
 interface TagFormProps {
@@ -19,6 +25,7 @@ interface TagFormProps {
   existingImageUrl?: string;
   onSubmit: (values: TagFormData, image?: { uri?: string }) => void;
   isLoading: boolean;
+  stores?: StoreOption[];
 }
 
 const TagForm = forwardRef<any, TagFormProps>(({
@@ -27,6 +34,7 @@ const TagForm = forwardRef<any, TagFormProps>(({
   existingImageUrl = '',
   onSubmit,
   isLoading,
+  stores = [],
 }, ref) => {
   const [image, setImage] = useState<{ uri?: string } | null>(null);
   const [isDashboardTagChecked, setIsDashboardTagChecked] = useState<boolean>(Boolean(initialValues.isDashboardTag));
@@ -120,6 +128,27 @@ const TagForm = forwardRef<any, TagFormProps>(({
               <MyText style={tw`ml-3 text-gray-800`}>Mark as Dashboard Tag</MyText>
             </View>
 
+            {/* Related Stores Dropdown */}
+            <View style={tw`mb-6`}>
+              <MyText style={tw`text-lg font-bold mb-2 text-gray-800`}>
+                Related Stores
+              </MyText>
+              <BottomDropdown
+                label="Select Related Stores"
+                placeholder="Select stores..."
+                value={values.relatedStores.map(id => id.toString())}
+                options={stores.map(store => ({
+                  label: store.name,
+                  value: store.id.toString(),
+                }))}
+                onValueChange={(selectedValues) => {
+                  const numericValues = (selectedValues as string[]).map(v => parseInt(v));
+                  formikSetFieldValue('relatedStores', numericValues);
+                }}
+                multiple={true}
+              />
+            </View>
+
             <TouchableOpacity
               onPress={() => handleSubmit()}
               disabled={isLoading}

apps/backend/drizzle/0071_moaning_shadow_king.sql

@@ -0,0 +1 @@
+ALTER TABLE "mf"."product_tag_info" ADD COLUMN "related_stores" jsonb;

apps/backend/drizzle/meta/_journal.json

@@ -498,6 +498,13 @@
       "when": 1769958949864,
       "tag": "0070_known_ares",
       "breakpoints": true
+    },
+    {
+      "idx": 71,
+      "version": "7",
+      "when": 1770321591876,
+      "tag": "0071_moaning_shadow_king",
+      "breakpoints": true
     }
   ]
 }

apps/backend/src/admin-apis/product-tags.controller.ts

@@ -10,7 +10,7 @@ import { deleteS3Image } from "../lib/delete-image";
  * Create a new product tag
  */
 export const createTag = async (req: Request, res: Response) => {
-  const { tagName, tagDescription, isDashboardTag } = req.body;
+  const { tagName, tagDescription, isDashboardTag, relatedStores } = req.body;
 
   if (!tagName) {
     throw new ApiError("Tag name is required", 400);
@@ -33,6 +33,18 @@ export const createTag = async (req: Request, res: Response) => {
     imageUrl = await imageUploadS3(req.file.buffer, req.file.mimetype, key);
   }
 
+  // Parse relatedStores if it's a string (from FormData)
+  let parsedRelatedStores: number[] = [];
+  if (relatedStores) {
+    try {
+      parsedRelatedStores = typeof relatedStores === 'string' 
+        ? JSON.parse(relatedStores) 
+        : relatedStores;
+    } catch (e) {
+      parsedRelatedStores = [];
+    }
+  }
+
   const [newTag] = await db
     .insert(productTagInfo)
     .values({
@@ -40,6 +52,7 @@ export const createTag = async (req: Request, res: Response) => {
       tagDescription,
       imageUrl,
       isDashboardTag: isDashboardTag || false,
+      relatedStores: parsedRelatedStores,
     })
     .returning();
 
@@ -103,7 +116,7 @@ export const getTagById = async (req: Request, res: Response) => {
  */
 export const updateTag = async (req: Request, res: Response) => {
   const { id } = req.params;
-  const { tagName, tagDescription, isDashboardTag } = req.body;
+  const { tagName, tagDescription, isDashboardTag, relatedStores } = req.body;
 
   // Get the current tag to check for existing image
   const currentTag = await db.query.productTagInfo.findFirst({
@@ -135,6 +148,18 @@ export const updateTag = async (req: Request, res: Response) => {
     imageUrl = await imageUploadS3(req.file.buffer, req.file.mimetype, key);
   }
 
+  // Parse relatedStores if it's a string (from FormData)
+  let parsedRelatedStores: number[] | undefined;
+  if (relatedStores !== undefined) {
+    try {
+      parsedRelatedStores = typeof relatedStores === 'string' 
+        ? JSON.parse(relatedStores) 
+        : relatedStores;
+    } catch (e) {
+      parsedRelatedStores = [];
+    }
+  }
+
   const [updatedTag] = await db
     .update(productTagInfo)
     .set({
@@ -142,6 +167,7 @@ export const updateTag = async (req: Request, res: Response) => {
       tagDescription,
       imageUrl,
       isDashboardTag,
+      relatedStores: parsedRelatedStores,
     })
     .where(eq(productTagInfo.id, parseInt(id)))
     .returning();

apps/backend/src/db/schema.ts

@@ -173,6 +173,7 @@ export const productTagInfo = mf.table('product_tag_info', {
   tagDescription: varchar('tag_description', { length: 500 }),
   imageUrl: varchar('image_url', { length: 500 }),
   isDashboardTag: boolean('is_dashboard_tag').notNull().default(false),
+  relatedStores: jsonb('related_stores').$defaultFn(() => []),
   createdAt: timestamp('created_at').notNull().defaultNow(),
 });
 

packages/ui/index.ts

@@ -64,8 +64,8 @@ const isDevMode = Constants.executionEnvironment !== "standalone";
 // const BASE_API_URL = 'http://10.0.2.2:4000';
 // const BASE_API_URL = 'http://192.168.100.101:4000';
 // const BASE_API_URL = 'http://192.168.1.7:4000';
-let BASE_API_URL = "https://mf.freshyo.in";
+// let BASE_API_URL = "https://mf.freshyo.in";
-  //  let BASE_API_URL = 'http://192.168.100.104:4000';
+   let BASE_API_URL = 'http://192.168.100.104:4000';
   //  let BASE_API_URL = 'http://192.168.29.176:4000';
 
 // if(isDevMode) {