Merge branch 'dev' of https://github.com/SyncrowIOT/web into SP-1246

Refactor routine creation UI for improved code organization

assets/icons/delete_space_link_icon.svg

@@ -0,0 +1,21 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_6702_36698)">
+<circle cx="20" cy="20" r="15" fill="#F4F4F4"/>
+<path d="M26.4 13.1094H23.7333V12.582C23.7333 11.7097 23.0156 11 22.1333 11H17.8667C16.9844 11 16.2667 11.7097 16.2667 12.582V13.1094H13.6C12.7178 13.1094 12 13.8191 12 14.6914C12 15.392 12.4631 15.9873 13.1024 16.1947L14.0537 27.5493C14.1222 28.3628 14.8226 29 15.6481 29H24.3519C25.1775 29 25.8778 28.3628 25.9464 27.5491L26.8976 16.1947C27.5369 15.9873 28 15.392 28 14.6914C28 13.8191 27.2822 13.1094 26.4 13.1094ZM17.3333 12.582C17.3333 12.2913 17.5726 12.0547 17.8667 12.0547H22.1333C22.4274 12.0547 22.6667 12.2913 22.6667 12.582V13.1094H17.3333V12.582ZM24.8833 27.4618C24.8605 27.7329 24.6271 27.9453 24.3519 27.9453H15.6481C15.373 27.9453 15.1395 27.7329 15.1167 27.462L14.1793 16.2734H25.8207L24.8833 27.4618ZM26.4 15.2188H13.6C13.3059 15.2188 13.0667 14.9822 13.0667 14.6914C13.0667 14.4006 13.3059 14.1641 13.6 14.1641H26.4C26.6941 14.1641 26.9333 14.4006 26.9333 14.6914C26.9333 14.9822 26.6941 15.2188 26.4 15.2188Z" fill="#999999"/>
+<path d="M17.8656 26.3307L17.3323 17.8229C17.314 17.5322 17.0596 17.3111 16.767 17.3292C16.473 17.3472 16.2494 17.5974 16.2676 17.8881L16.801 26.396C16.8185 26.6756 17.0533 26.8907 17.3328 26.8907C17.6416 26.8907 17.8846 26.6335 17.8656 26.3307Z" fill="#999999"/>
+<path d="M20.0001 17.3281C19.7056 17.3281 19.4668 17.5642 19.4668 17.8555V26.3633C19.4668 26.6545 19.7056 26.8906 20.0001 26.8906C20.2947 26.8906 20.5335 26.6545 20.5335 26.3633V17.8555C20.5335 17.5642 20.2947 17.3281 20.0001 17.3281Z" fill="#999999"/>
+<path d="M23.233 17.3292C22.9396 17.3111 22.6859 17.5321 22.6677 17.8229L22.1343 26.3307C22.1162 26.6213 22.3397 26.8716 22.6337 26.8896C22.9278 26.9076 23.1808 26.6865 23.199 26.3959L23.7323 17.8881C23.7505 17.5974 23.527 17.3472 23.233 17.3292Z" fill="#999999"/>
+</g>
+<defs>
+<filter id="filter0_d_6702_36698" x="0" y="0" width="40" height="40" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_6702_36698"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_6702_36698" result="shape"/>
+</filter>
+</defs>
+</svg>

assets/icons/delete_space_model.svg

@@ -0,0 +1,6 @@
+<svg width="16" height="18" viewBox="0 0 16 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.4 2.10938H11.7333V1.58203C11.7333 0.709699 11.0156 0 10.1333 0H5.86667C4.98443 0 4.26667 0.709699 4.26667 1.58203V2.10938H1.6C0.71776 2.10938 0 2.81907 0 3.69141C0 4.392 0.463111 4.9873 1.1024 5.19472L2.05369 16.5493C2.1222 17.3628 2.82258 18 3.64814 18H12.3519C13.1775 18 13.8778 17.3628 13.9464 16.5491L14.8976 5.19469C15.5369 4.9873 16 4.392 16 3.69141C16 2.81907 15.2822 2.10938 14.4 2.10938ZM5.33333 1.58203C5.33333 1.29125 5.57259 1.05469 5.86667 1.05469H10.1333C10.4274 1.05469 10.6667 1.29125 10.6667 1.58203V2.10938H5.33333V1.58203ZM12.8833 16.4618C12.8605 16.7329 12.6271 16.9453 12.3519 16.9453H3.64814C3.37298 16.9453 3.13952 16.7329 3.11673 16.462L2.17934 5.27344H13.8207L12.8833 16.4618ZM14.4 4.21875H1.6C1.30592 4.21875 1.06667 3.98218 1.06667 3.69141C1.06667 3.40063 1.30592 3.16406 1.6 3.16406H14.4C14.6941 3.16406 14.9333 3.40063 14.9333 3.69141C14.9333 3.98218 14.6941 4.21875 14.4 4.21875Z" fill="#999999"/>
+<path d="M5.86561 15.3307L5.33228 6.82286C5.31404 6.53215 5.05957 6.31106 4.76698 6.32916C4.47297 6.3472 4.24943 6.59744 4.26764 6.88811L4.80097 15.396C4.8185 15.6756 5.05331 15.8907 5.33278 15.8907C5.64165 15.8907 5.88456 15.6335 5.86561 15.3307Z" fill="#999999"/>
+<path d="M7.99989 6.32812C7.70534 6.32812 7.46655 6.56423 7.46655 6.85547V15.3633C7.46655 15.6545 7.70534 15.8906 7.99989 15.8906C8.29443 15.8906 8.53322 15.6545 8.53322 15.3633V6.85547C8.53322 6.56423 8.29443 6.32812 7.99989 6.32812Z" fill="#999999"/>
+<path d="M11.233 6.32915C10.9396 6.31112 10.6859 6.53215 10.6677 6.82285L10.1343 15.3307C10.1162 15.6213 10.3397 15.8716 10.6337 15.8896C10.9278 15.9076 11.1808 15.6865 11.199 15.3959L11.7323 6.8881C11.7505 6.5974 11.527 6.34715 11.233 6.32915Z" fill="#999999"/>
+</svg>

assets/icons/scenesPlayIcon.svg

@@ -0,0 +1,17 @@
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_6675_32326)">
+<path d="M18 3C9.71584 3 3 9.71572 3 18C3 26.2843 9.71584 33 18 33C26.2842 33 33 26.2843 33 18C33 9.71572 26.2842 3 18 3ZM23.1844 18.7951L15.6844 23.4826C15.5326 23.5774 15.3601 23.625 15.1875 23.625C15.0312 23.625 14.8746 23.5861 14.7329 23.5073C14.4349 23.3421 14.25 23.0285 14.25 22.6875V13.3125C14.25 12.9715 14.4349 12.6579 14.7329 12.4927C15.0309 12.3265 15.3953 12.3366 15.6844 12.5174L23.1844 17.2049C23.4584 17.3766 23.625 17.6769 23.625 18C23.625 18.3231 23.4584 18.6235 23.1844 18.7951Z" fill="#F4F4F4"/>
+</g>
+<defs>
+<filter id="filter0_d_6675_32326" x="0" y="0" width="36" height="36" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_6675_32326"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_6675_32326" result="shape"/>
+</filter>
+</defs>
+</svg>

assets/icons/scenesPlayIconCheck.svg

@@ -0,0 +1,30 @@
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_7280_5211)">
+<circle cx="18" cy="18" r="15" fill="#F4F4F4"/>
+</g>
+<g filter="url(#filter1_i_7280_5211)">
+<path d="M25.1663 13.187C24.8231 12.8439 24.2666 12.8439 23.9234 13.1871L16.1621 20.9484L12.0766 16.8628C11.7334 16.5196 11.1768 16.5196 10.8336 16.8628C10.4904 17.206 10.4904 17.7625 10.8336 18.1057L15.5406 22.8127C15.7122 22.9844 15.9372 23.0701 16.1621 23.0701C16.3869 23.0701 16.6119 22.9843 16.7835 22.8127L25.1663 14.43C25.5095 14.0868 25.5095 13.5303 25.1663 13.187Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_7280_5211" x="0" y="0" width="36" height="36" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_7280_5211"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_7280_5211" result="shape"/>
+</filter>
+<filter id="filter1_i_7280_5211" x="10.5762" y="12.9297" width="14.8475" height="10.1406" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_7280_5211"/>
+</filter>
+</defs>
+</svg>

assets/icons/space_link_icon.svg

@@ -0,0 +1,25 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_6702_36714)">
+<circle cx="20" cy="20" r="15" fill="#F4F4F4"/>
+<path d="M21.1979 12.3395L18.26 15.2772C17.7228 15.8146 17.3477 16.4536 17.1345 17.1328C16.437 17.3525 15.798 17.7393 15.2772 18.26L12.3395 21.1979C10.5536 22.9837 10.5534 25.8744 12.3395 27.6605C14.1253 29.4464 17.0161 29.4466 18.8022 27.6605L21.7399 24.7227C22.2773 24.1855 22.6522 23.5465 22.8655 22.8671C23.5631 22.6475 24.202 22.2607 24.7227 21.7399L27.6605 18.8022C29.4464 17.0162 29.4467 14.1256 27.6605 12.3395C25.8746 10.5536 22.984 10.5534 21.1979 12.3395ZM17.266 20.2484C17.4886 20.7914 17.8199 21.2998 18.26 21.7399C18.6877 22.1674 19.1965 22.5054 19.7513 22.7343L16.8137 25.6721C16.1284 26.3572 15.0133 26.3574 14.328 25.6721C13.6427 24.9867 13.6427 23.8717 14.328 23.1864L17.2657 20.2485C17.2659 20.2485 17.2659 20.2485 17.266 20.2484ZM21.2428 24.2256L18.3049 27.1633C16.7939 28.6745 14.3479 28.6747 12.8366 27.1633C11.3254 25.6523 11.3253 23.2062 12.8366 21.695L15.7744 18.7571C16.1166 18.4149 16.5191 18.1412 16.9579 17.9488C16.8924 18.4845 16.9223 19.014 17.0364 19.5199C16.9419 19.5905 16.8524 19.6676 16.7686 19.7514L13.8309 22.6892C12.8715 23.6487 12.8715 25.2097 13.8309 26.1691C14.7903 27.1285 16.3513 27.1285 17.3108 26.1691L20.2485 23.2313C21.2089 22.2709 21.209 20.7119 20.2485 19.7514C19.7355 19.2383 19.6105 18.4924 19.8554 17.8663C20.3734 18.059 20.8488 18.3631 21.2428 18.7571C22.7504 20.2647 22.7505 22.7179 21.2428 24.2256ZM27.1633 18.3049L24.2256 21.2428C23.8834 21.585 23.4809 21.8587 23.0421 22.0511C23.1076 21.5154 23.0777 20.986 22.9637 20.4801C23.058 20.4095 23.1477 20.3323 23.2313 20.2485L26.1692 17.3108C27.1286 16.3514 27.1286 14.7903 26.1692 13.8309C25.3077 12.9695 23.9604 12.8807 22.9987 13.5684C22.8408 13.6813 22.8044 13.9009 22.9173 14.0588C23.0301 14.2168 23.2497 14.2533 23.4077 14.1403C24.1093 13.6386 25.0615 13.7174 25.6721 14.328C26.3574 15.0133 26.3574 16.1283 25.6721 16.8137L22.7342 19.7514C22.7342 19.7514 22.7342 19.7514 22.7341 19.7515C22.5113 19.2085 22.1801 18.7002 21.7399 18.26C21.3124 17.8325 20.8035 17.4945 20.2487 17.2656L21.4465 16.0678C21.5837 15.9306 21.5837 15.708 21.4465 15.5707C21.3091 15.4335 21.0867 15.4335 20.9493 15.5707L19.7514 16.7686C18.7911 17.729 18.7909 19.2879 19.7514 20.2485C20.2645 20.7615 20.3894 21.5076 20.1446 22.1337C19.6266 21.941 19.1511 21.6368 18.7571 21.2427C17.2497 19.7352 17.2495 17.282 18.7571 15.7744L21.695 12.8366C23.2061 11.3254 25.6522 11.3252 27.1633 12.8366C28.6745 14.3476 28.6747 16.7937 27.1633 18.3049Z" fill="#999999"/>
+<path d="M22.5443 14.8262C22.5443 15.0204 22.3869 15.1777 22.1929 15.1777C21.9987 15.1777 21.8413 15.0204 21.8413 14.8262C21.8413 14.632 21.9987 14.4746 22.1929 14.4746C22.3869 14.4746 22.5443 14.632 22.5443 14.8262Z" fill="#999999"/>
+<path d="M15.7755 15.774C15.9128 15.6368 15.9128 15.4142 15.7755 15.2769L14.2841 13.7855C14.1468 13.6483 13.9243 13.6483 13.787 13.7855C13.6498 13.9228 13.6498 14.1455 13.787 14.2828L15.2784 15.7742C15.4158 15.9114 15.6383 15.9114 15.7755 15.774Z" fill="#999999"/>
+<path d="M12.3378 16.9062C12.1437 16.9062 11.9863 17.0636 11.9863 17.2577C11.9863 17.4519 12.1437 17.6092 12.3378 17.6092H14.447C14.641 17.6092 14.7984 17.4519 14.7984 17.2577C14.7984 17.0636 14.641 16.9062 14.447 16.9062H12.3378Z" fill="#999999"/>
+<path d="M16.9062 12.2314V14.3405C16.9062 14.5346 17.0636 14.6921 17.2577 14.6921C17.4519 14.6921 17.6092 14.5346 17.6092 14.3405V12.2314C17.6092 12.0373 17.4519 11.8799 17.2577 11.8799C17.0636 11.8799 16.9062 12.0373 16.9062 12.2314Z" fill="#999999"/>
+<path d="M24.227 24.2259C24.0897 24.3631 24.0897 24.5857 24.227 24.7231L25.7184 26.2145C25.7871 26.2831 25.877 26.3175 25.967 26.3175C26.2772 26.3175 26.4377 25.9397 26.2155 25.7173L24.7242 24.2259C24.5868 24.0887 24.3643 24.0887 24.227 24.2259Z" fill="#999999"/>
+<path d="M23.0605 27.7673V25.6581C23.0605 25.464 22.903 25.3066 22.709 25.3066C22.5148 25.3066 22.3574 25.464 22.3574 25.6581V27.7673C22.3574 27.9614 22.5148 28.1187 22.709 28.1187C22.903 28.1187 23.0605 27.9614 23.0605 27.7673Z" fill="#999999"/>
+<path d="M27.7693 23.0586C27.9633 23.0586 28.1207 22.9011 28.1207 22.707C28.1207 22.5128 27.9633 22.3555 27.7693 22.3555H25.66C25.466 22.3555 25.3086 22.5128 25.3086 22.707C25.3086 22.9011 25.466 23.0586 25.66 23.0586H27.7693Z" fill="#999999"/>
+</g>
+<defs>
+<filter id="filter0_d_6702_36714" x="0" y="0" width="40" height="40" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_6702_36714"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_6702_36714" result="shape"/>
+</filter>
+</defs>
+</svg>

assets/icons/spaseLocationIcon.svg

@@ -0,0 +1,4 @@
+<svg width="15" height="14" viewBox="0 0 15 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.13597 13.8173C7.21711 13.9314 7.35373 14 7.5 14C7.64627 14 7.78289 13.9315 7.86403 13.8173C8.89942 12.3614 10.4245 10.5632 11.4872 8.73444C12.3369 7.27221 12.75 6.02509 12.75 4.92188C12.75 2.20795 10.3948 0 7.5 0C4.60515 0 2.25 2.20795 2.25 4.92188C2.25 6.02509 2.66309 7.27221 3.51283 8.73444C4.57476 10.5618 6.10271 12.3644 7.13597 13.8173ZM7.5 0.820312C9.91237 0.820312 11.875 2.66027 11.875 4.92188C11.875 5.88448 11.4968 7.00323 10.7188 8.342C9.80277 9.91834 8.49557 11.5174 7.5 12.8617C6.50457 11.5176 5.19729 9.91843 4.2812 8.342C3.5032 7.00323 3.125 5.88448 3.125 4.92188C3.125 2.66027 5.08763 0.820312 7.5 0.820312Z" fill="#999999"/>
+<path d="M7.5 7.38281C8.94742 7.38281 10.125 6.27884 10.125 4.92188C10.125 3.56491 8.94742 2.46094 7.5 2.46094C6.05257 2.46094 4.875 3.56491 4.875 4.92188C4.875 6.27884 6.05257 7.38281 7.5 7.38281ZM7.5 3.28125C8.46495 3.28125 9.25 4.01723 9.25 4.92188C9.25 5.82652 8.46495 6.5625 7.5 6.5625C6.53505 6.5625 5.75 5.82652 5.75 4.92188C5.75 4.01723 6.53505 3.28125 7.5 3.28125Z" fill="#999999"/>
+</svg>

assets/icons/success_icon.svg

@@ -0,0 +1,3 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M43.2614 20.4808C44.1769 21.3963 44.1769 22.8804 43.2614 23.7955L27.5381 39.5192C26.6226 40.4343 25.139 40.4343 24.2235 39.5192L16.7386 32.0338C15.8231 31.1188 15.8231 29.6347 16.7386 28.7196C17.6537 27.8041 19.1377 27.8041 20.0528 28.7196L25.8806 34.5474L39.9467 20.4808C40.8623 19.5657 42.3463 19.5657 43.2614 20.4808ZM60 30C60 46.5825 46.5802 60 30 60C13.4175 60 0 46.5802 0 30C0 13.4175 13.4198 0 30 0C46.5825 0 60 13.4198 60 30ZM55.3125 30C55.3125 16.0085 43.9897 4.6875 30 4.6875C16.0085 4.6875 4.6875 16.0103 4.6875 30C4.6875 43.9915 16.0103 55.3125 30 55.3125C43.9915 55.3125 55.3125 43.9897 55.3125 30Z" fill="#023DFE" fill-opacity="0.7"/>
+</svg>

assets/images/delete_space_link_icon.svg

@@ -0,0 +1,21 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_6702_36698)">
+<circle cx="20" cy="20" r="15" fill="#F4F4F4"/>
+<path d="M26.4 13.1094H23.7333V12.582C23.7333 11.7097 23.0156 11 22.1333 11H17.8667C16.9844 11 16.2667 11.7097 16.2667 12.582V13.1094H13.6C12.7178 13.1094 12 13.8191 12 14.6914C12 15.392 12.4631 15.9873 13.1024 16.1947L14.0537 27.5493C14.1222 28.3628 14.8226 29 15.6481 29H24.3519C25.1775 29 25.8778 28.3628 25.9464 27.5491L26.8976 16.1947C27.5369 15.9873 28 15.392 28 14.6914C28 13.8191 27.2822 13.1094 26.4 13.1094ZM17.3333 12.582C17.3333 12.2913 17.5726 12.0547 17.8667 12.0547H22.1333C22.4274 12.0547 22.6667 12.2913 22.6667 12.582V13.1094H17.3333V12.582ZM24.8833 27.4618C24.8605 27.7329 24.6271 27.9453 24.3519 27.9453H15.6481C15.373 27.9453 15.1395 27.7329 15.1167 27.462L14.1793 16.2734H25.8207L24.8833 27.4618ZM26.4 15.2188H13.6C13.3059 15.2188 13.0667 14.9822 13.0667 14.6914C13.0667 14.4006 13.3059 14.1641 13.6 14.1641H26.4C26.6941 14.1641 26.9333 14.4006 26.9333 14.6914C26.9333 14.9822 26.6941 15.2188 26.4 15.2188Z" fill="#999999"/>
+<path d="M17.8656 26.3307L17.3323 17.8229C17.314 17.5322 17.0596 17.3111 16.767 17.3292C16.473 17.3472 16.2494 17.5974 16.2676 17.8881L16.801 26.396C16.8185 26.6756 17.0533 26.8907 17.3328 26.8907C17.6416 26.8907 17.8846 26.6335 17.8656 26.3307Z" fill="#999999"/>
+<path d="M20.0001 17.3281C19.7056 17.3281 19.4668 17.5642 19.4668 17.8555V26.3633C19.4668 26.6545 19.7056 26.8906 20.0001 26.8906C20.2947 26.8906 20.5335 26.6545 20.5335 26.3633V17.8555C20.5335 17.5642 20.2947 17.3281 20.0001 17.3281Z" fill="#999999"/>
+<path d="M23.233 17.3292C22.9396 17.3111 22.6859 17.5321 22.6677 17.8229L22.1343 26.3307C22.1162 26.6213 22.3397 26.8716 22.6337 26.8896C22.9278 26.9076 23.1808 26.6865 23.199 26.3959L23.7323 17.8881C23.7505 17.5974 23.527 17.3472 23.233 17.3292Z" fill="#999999"/>
+</g>
+<defs>
+<filter id="filter0_d_6702_36698" x="0" y="0" width="40" height="40" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_6702_36698"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_6702_36698" result="shape"/>
+</filter>
+</defs>
+</svg>

assets/images/space_link_icon.svg

@@ -0,0 +1,25 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_6702_36714)">
+<circle cx="20" cy="20" r="15" fill="#F4F4F4"/>
+<path d="M21.1979 12.3395L18.26 15.2772C17.7228 15.8146 17.3477 16.4536 17.1345 17.1328C16.437 17.3525 15.798 17.7393 15.2772 18.26L12.3395 21.1979C10.5536 22.9837 10.5534 25.8744 12.3395 27.6605C14.1253 29.4464 17.0161 29.4466 18.8022 27.6605L21.7399 24.7227C22.2773 24.1855 22.6522 23.5465 22.8655 22.8671C23.5631 22.6475 24.202 22.2607 24.7227 21.7399L27.6605 18.8022C29.4464 17.0162 29.4467 14.1256 27.6605 12.3395C25.8746 10.5536 22.984 10.5534 21.1979 12.3395ZM17.266 20.2484C17.4886 20.7914 17.8199 21.2998 18.26 21.7399C18.6877 22.1674 19.1965 22.5054 19.7513 22.7343L16.8137 25.6721C16.1284 26.3572 15.0133 26.3574 14.328 25.6721C13.6427 24.9867 13.6427 23.8717 14.328 23.1864L17.2657 20.2485C17.2659 20.2485 17.2659 20.2485 17.266 20.2484ZM21.2428 24.2256L18.3049 27.1633C16.7939 28.6745 14.3479 28.6747 12.8366 27.1633C11.3254 25.6523 11.3253 23.2062 12.8366 21.695L15.7744 18.7571C16.1166 18.4149 16.5191 18.1412 16.9579 17.9488C16.8924 18.4845 16.9223 19.014 17.0364 19.5199C16.9419 19.5905 16.8524 19.6676 16.7686 19.7514L13.8309 22.6892C12.8715 23.6487 12.8715 25.2097 13.8309 26.1691C14.7903 27.1285 16.3513 27.1285 17.3108 26.1691L20.2485 23.2313C21.2089 22.2709 21.209 20.7119 20.2485 19.7514C19.7355 19.2383 19.6105 18.4924 19.8554 17.8663C20.3734 18.059 20.8488 18.3631 21.2428 18.7571C22.7504 20.2647 22.7505 22.7179 21.2428 24.2256ZM27.1633 18.3049L24.2256 21.2428C23.8834 21.585 23.4809 21.8587 23.0421 22.0511C23.1076 21.5154 23.0777 20.986 22.9637 20.4801C23.058 20.4095 23.1477 20.3323 23.2313 20.2485L26.1692 17.3108C27.1286 16.3514 27.1286 14.7903 26.1692 13.8309C25.3077 12.9695 23.9604 12.8807 22.9987 13.5684C22.8408 13.6813 22.8044 13.9009 22.9173 14.0588C23.0301 14.2168 23.2497 14.2533 23.4077 14.1403C24.1093 13.6386 25.0615 13.7174 25.6721 14.328C26.3574 15.0133 26.3574 16.1283 25.6721 16.8137L22.7342 19.7514C22.7342 19.7514 22.7342 19.7514 22.7341 19.7515C22.5113 19.2085 22.1801 18.7002 21.7399 18.26C21.3124 17.8325 20.8035 17.4945 20.2487 17.2656L21.4465 16.0678C21.5837 15.9306 21.5837 15.708 21.4465 15.5707C21.3091 15.4335 21.0867 15.4335 20.9493 15.5707L19.7514 16.7686C18.7911 17.729 18.7909 19.2879 19.7514 20.2485C20.2645 20.7615 20.3894 21.5076 20.1446 22.1337C19.6266 21.941 19.1511 21.6368 18.7571 21.2427C17.2497 19.7352 17.2495 17.282 18.7571 15.7744L21.695 12.8366C23.2061 11.3254 25.6522 11.3252 27.1633 12.8366C28.6745 14.3476 28.6747 16.7937 27.1633 18.3049Z" fill="#999999"/>
+<path d="M22.5443 14.8262C22.5443 15.0204 22.3869 15.1777 22.1929 15.1777C21.9987 15.1777 21.8413 15.0204 21.8413 14.8262C21.8413 14.632 21.9987 14.4746 22.1929 14.4746C22.3869 14.4746 22.5443 14.632 22.5443 14.8262Z" fill="#999999"/>
+<path d="M15.7755 15.774C15.9128 15.6368 15.9128 15.4142 15.7755 15.2769L14.2841 13.7855C14.1468 13.6483 13.9243 13.6483 13.787 13.7855C13.6498 13.9228 13.6498 14.1455 13.787 14.2828L15.2784 15.7742C15.4158 15.9114 15.6383 15.9114 15.7755 15.774Z" fill="#999999"/>
+<path d="M12.3378 16.9062C12.1437 16.9062 11.9863 17.0636 11.9863 17.2577C11.9863 17.4519 12.1437 17.6092 12.3378 17.6092H14.447C14.641 17.6092 14.7984 17.4519 14.7984 17.2577C14.7984 17.0636 14.641 16.9062 14.447 16.9062H12.3378Z" fill="#999999"/>
+<path d="M16.9062 12.2314V14.3405C16.9062 14.5346 17.0636 14.6921 17.2577 14.6921C17.4519 14.6921 17.6092 14.5346 17.6092 14.3405V12.2314C17.6092 12.0373 17.4519 11.8799 17.2577 11.8799C17.0636 11.8799 16.9062 12.0373 16.9062 12.2314Z" fill="#999999"/>
+<path d="M24.227 24.2259C24.0897 24.3631 24.0897 24.5857 24.227 24.7231L25.7184 26.2145C25.7871 26.2831 25.877 26.3175 25.967 26.3175C26.2772 26.3175 26.4377 25.9397 26.2155 25.7173L24.7242 24.2259C24.5868 24.0887 24.3643 24.0887 24.227 24.2259Z" fill="#999999"/>
+<path d="M23.0605 27.7673V25.6581C23.0605 25.464 22.903 25.3066 22.709 25.3066C22.5148 25.3066 22.3574 25.464 22.3574 25.6581V27.7673C22.3574 27.9614 22.5148 28.1187 22.709 28.1187C22.903 28.1187 23.0605 27.9614 23.0605 27.7673Z" fill="#999999"/>
+<path d="M27.7693 23.0586C27.9633 23.0586 28.1207 22.9011 28.1207 22.707C28.1207 22.5128 27.9633 22.3555 27.7693 22.3555H25.66C25.466 22.3555 25.3086 22.5128 25.3086 22.707C25.3086 22.9011 25.466 23.0586 25.66 23.0586H27.7693Z" fill="#999999"/>
+</g>
+<defs>
+<filter id="filter0_d_6702_36714" x="0" y="0" width="40" height="40" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_6702_36714"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_6702_36714" result="shape"/>
+</filter>
+</defs>
+</svg>

assets/images/success_icon.svg

@@ -0,0 +1,3 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M43.2614 20.4808C44.1769 21.3963 44.1769 22.8804 43.2614 23.7955L27.5381 39.5192C26.6226 40.4343 25.139 40.4343 24.2235 39.5192L16.7386 32.0338C15.8231 31.1188 15.8231 29.6347 16.7386 28.7196C17.6537 27.8041 19.1377 27.8041 20.0528 28.7196L25.8806 34.5474L39.9467 20.4808C40.8623 19.5657 42.3463 19.5657 43.2614 20.4808ZM60 30C60 46.5825 46.5802 60 30 60C13.4175 60 0 46.5802 0 30C0 13.4175 13.4198 0 30 0C46.5825 0 60 13.4198 60 30ZM55.3125 30C55.3125 16.0085 43.9897 4.6875 30 4.6875C16.0085 4.6875 4.6875 16.0103 4.6875 30C4.6875 43.9915 16.0103 55.3125 30 55.3125C43.9915 55.3125 55.3125 43.9897 55.3125 30Z" fill="#023DFE" fill-opacity="0.7"/>
+</svg>

lib/common/dialog_textfield_dropdown.dart

@@ -1,160 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class DialogTextfieldDropdown extends StatefulWidget {
-  final List<String> items;
-  final ValueChanged<String> onSelected;
-  final String? initialValue;
-
-  const DialogTextfieldDropdown({
-    Key? key,
-    required this.items,
-    required this.onSelected,
-    this.initialValue,
-  }) : super(key: key);
-
-  @override
-  _DialogTextfieldDropdownState createState() =>
-      _DialogTextfieldDropdownState();
-}
-
-class _DialogTextfieldDropdownState extends State<DialogTextfieldDropdown> {
-  bool _isOpen = false;
-  late OverlayEntry _overlayEntry;
-  final TextEditingController _controller = TextEditingController();
-  late List<String> _filteredItems; // Filtered items list
-
-  @override
-  void initState() {
-    super.initState();
-    _controller.text = widget.initialValue ?? 'Select Tag';
-    _filteredItems = List.from(widget.items); // Initialize filtered items
-  }
-
-  void _toggleDropdown() {
-    if (_isOpen) {
-      _closeDropdown();
-    } else {
-      _openDropdown();
-    }
-  }
-
-  void _openDropdown() {
-    _overlayEntry = _createOverlayEntry();
-    Overlay.of(context).insert(_overlayEntry);
-    _isOpen = true;
-  }
-
-  void _closeDropdown() {
-    _overlayEntry.remove();
-    _isOpen = false;
-  }
-
-  OverlayEntry _createOverlayEntry() {
-    final renderBox = context.findRenderObject() as RenderBox;
-    final size = renderBox.size;
-    final offset = renderBox.localToGlobal(Offset.zero);
-
-    return OverlayEntry(
-      builder: (context) {
-        return GestureDetector(
-          onTap: () {
-            _closeDropdown();
-          },
-          behavior: HitTestBehavior.translucent,
-          child: Stack(
-            children: [
-              Positioned(
-                left: offset.dx,
-                top: offset.dy + size.height,
-                width: size.width,
-                child: Material(
-                  elevation: 4.0,
-                  child: Container(
-                    color: ColorsManager.whiteColors,
-                    constraints: const BoxConstraints(
-                      maxHeight: 200.0,
-                    ),
-                    child: ListView.builder(
-                      shrinkWrap: true,
-                      itemCount: _filteredItems.length,
-                      itemBuilder: (context, index) {
-                        final item = _filteredItems[index];
-                        return Container(
-                          decoration: const BoxDecoration(
-                            border: Border(
-                              bottom: BorderSide(
-                                color: ColorsManager.lightGrayBorderColor,
-                                width: 1.0,
-                              ),
-                            ),
-                          ),
-                          child: ListTile(
-                            title: Text(item,
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .bodyMedium
-                                    ?.copyWith(
-                                        color: ColorsManager.textPrimaryColor)),
-                            onTap: () {
-                              _controller.text = item;
-                              widget.onSelected(item);
-                              setState(() {
-                                _filteredItems
-                                    .remove(item); // Remove selected item
-                              });
-                              _closeDropdown();
-                            },
-                          ),
-                        );
-                      },
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: _toggleDropdown,
-      child: Container(
-        padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
-        decoration: BoxDecoration(
-          border: Border.all(color: ColorsManager.transparentColor),
-          borderRadius: BorderRadius.circular(8.0),
-        ),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Expanded(
-              child: TextFormField(
-                controller: _controller,
-                onChanged: (value) {
-                  setState(() {
-                    _filteredItems = widget.items
-                        .where((item) =>
-                            item.toLowerCase().contains(value.toLowerCase()))
-                        .toList(); // Filter items dynamically
-                  });
-                  widget.onSelected(value);
-                },
-                style: Theme.of(context).textTheme.bodyMedium,
-                decoration: const InputDecoration(
-                  hintText: 'Enter or Select tag',
-                  border: InputBorder.none,
-                ),
-              ),
-            ),
-            const Icon(Icons.arrow_drop_down),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/common/tag_dialog_textfield_dropdown.dart

@@ -0,0 +1,185 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class TagDialogTextfieldDropdown extends StatefulWidget {
+  final List<Tag> items;
+  final ValueChanged<Tag> onSelected;
+  final Tag? initialValue;
+  final String product;
+
+  const TagDialogTextfieldDropdown({
+    Key? key,
+    required this.items,
+    required this.onSelected,
+    this.initialValue,
+    required this.product,
+  }) : super(key: key);
+
+  @override
+  _DialogTextfieldDropdownState createState() => _DialogTextfieldDropdownState();
+}
+
+class _DialogTextfieldDropdownState extends State<TagDialogTextfieldDropdown> {
+  bool _isOpen = false;
+  OverlayEntry? _overlayEntry;
+  final TextEditingController _controller = TextEditingController();
+  final FocusNode _focusNode = FocusNode();
+  List<Tag> _filteredItems = [];
+
+  @override
+  void initState() {
+    super.initState();
+    _controller.text = widget.initialValue?.tag ?? '';
+
+    _filterItems();
+
+    _focusNode.addListener(() {
+      if (!_focusNode.hasFocus) {
+        _closeDropdown();
+      }
+    });
+  }
+
+  void _filterItems() {
+    setState(() {
+      _filteredItems = widget.items.where((tag) => tag.product?.uuid == widget.product).toList();
+    });
+  }
+
+  void _toggleDropdown() {
+    if (_isOpen) {
+      _closeDropdown();
+    } else {
+      _openDropdown();
+    }
+  }
+
+  void _openDropdown() {
+    _overlayEntry = _createOverlayEntry();
+    Overlay.of(context).insert(_overlayEntry!);
+    _isOpen = true;
+  }
+
+  void _closeDropdown() {
+    if (_isOpen && _overlayEntry != null) {
+      _overlayEntry!.remove();
+      _overlayEntry = null;
+      _isOpen = false;
+    }
+  }
+
+  OverlayEntry _createOverlayEntry() {
+    final renderBox = context.findRenderObject() as RenderBox;
+    final size = renderBox.size;
+    final offset = renderBox.localToGlobal(Offset.zero);
+
+    return OverlayEntry(
+      builder: (context) {
+        return GestureDetector(
+          onTap: _closeDropdown,
+          behavior: HitTestBehavior.translucent,
+          child: Stack(
+            children: [
+              Positioned(
+                left: offset.dx,
+                top: offset.dy + size.height,
+                width: size.width,
+                child: Material(
+                  elevation: 4.0,
+                  child: Container(
+                    color: ColorsManager.whiteColors,
+                    constraints: const BoxConstraints(maxHeight: 200.0),
+                    child: StatefulBuilder(
+                      builder: (context, setStateDropdown) {
+                        return ListView.builder(
+                          shrinkWrap: true,
+                          itemCount: _filteredItems.length,
+                          itemBuilder: (context, index) {
+                            final tag = _filteredItems[index];
+
+                            return Container(
+                              decoration: const BoxDecoration(
+                                border: Border(
+                                  bottom: BorderSide(
+                                    color: ColorsManager.lightGrayBorderColor,
+                                    width: 1.0,
+                                  ),
+                                ),
+                              ),
+                              child: ListTile(
+                                title: Text(tag.tag ?? '',
+                                    style: Theme.of(context)
+                                        .textTheme
+                                        .bodyMedium
+                                        ?.copyWith(color: ColorsManager.textPrimaryColor)),
+                                onTap: () {
+                                  _controller.text = tag.tag ?? '';
+                                  widget.onSelected(tag);
+                                  setState(() {
+                                    _filteredItems.remove(tag);
+                                  });
+                                  _closeDropdown();
+                                },
+                              ),
+                            );
+                          },
+                        );
+                      },
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => FocusScope.of(context).unfocus(),
+      behavior: HitTestBehavior.opaque,
+      child: Container(
+        padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
+        decoration: BoxDecoration(
+          border: Border.all(color: ColorsManager.transparentColor),
+          borderRadius: BorderRadius.circular(8.0),
+        ),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Expanded(
+              child: TextFormField(
+                controller: _controller,
+                focusNode: _focusNode,
+                onFieldSubmitted: (value) {
+                  final selectedTag = _filteredItems.firstWhere((tag) => tag.tag == value,
+                      orElse: () => Tag(tag: value));
+                  widget.onSelected(selectedTag);
+                  _closeDropdown();
+                },
+                onTapOutside: (event) {
+                  widget.onSelected(_filteredItems.firstWhere((tag) => tag.tag == _controller.text,
+                      orElse: () => Tag(tag: _controller.text)));
+                  _closeDropdown();
+                },
+                style: Theme.of(context).textTheme.bodyMedium,
+                decoration: const InputDecoration(
+                  hintText: 'Enter or Select a tag',
+                  border: InputBorder.none,
+                ),
+              ),
+            ),
+            GestureDetector(
+              onTap: _toggleDropdown,
+              child: const Icon(Icons.arrow_drop_down),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/common/widgets/custom_expansion_tile.dart

@@ -56,24 +56,6 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
       children: [
         Row(
           children: [
-            // Checkbox with independent state management
-            Checkbox(
-              value: false,
-              onChanged: (bool? value) {
-                setState(() {});
-              },
-              side: WidgetStateBorderSide.resolveWith((states) {
-                return const BorderSide(color: ColorsManager.grayBorder);
-              }),
-              fillColor: WidgetStateProperty.resolveWith((states) {
-                if (states.contains(WidgetState.selected)) {
-                  return ColorsManager.grayBorder;
-                } else {
-                  return ColorsManager.checkBoxFillColor;
-                }
-              }),
-              checkColor: ColorsManager.whiteColors,
-            ),
             // Expand/collapse icon, now wrapped in a GestureDetector for specific onTap
             if (widget.children != null && widget.children!.isNotEmpty)
               GestureDetector(
@@ -84,7 +66,9 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
                   });
                 },
                 child: Icon(
-                  _isExpanded ? Icons.keyboard_arrow_down : Icons.keyboard_arrow_right,
+                  _isExpanded
+                      ? Icons.keyboard_arrow_down
+                      : Icons.keyboard_arrow_right,
                   color: ColorsManager.lightGrayColor,
                   size: 16.0, // Adjusted size for better alignment
                 ),
@@ -101,8 +85,10 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
                   _capitalizeFirstLetter(widget.title),
                   style: TextStyle(
                     color: widget.isSelected
-                        ? ColorsManager.blackColor // Change color to black when selected
-                        : ColorsManager.lightGrayColor, // Gray when not selected
+                        ? ColorsManager
+                            .blackColor // Change color to black when selected
+                        : ColorsManager
+                            .lightGrayColor, // Gray when not selected
                     fontWeight: FontWeight.w400,
                   ),
                 ),
@@ -111,9 +97,11 @@ class CustomExpansionTileState extends State<CustomExpansionTile> {
           ],
         ),
         // The expanded section (children) that shows when the tile is expanded
-        if (_isExpanded && widget.children != null && widget.children!.isNotEmpty)
+        if (_isExpanded &&
+            widget.children != null &&
+            widget.children!.isNotEmpty)
           Padding(
-            padding: const EdgeInsets.only(left: 48.0), // Indented children
+            padding: const EdgeInsets.only(left: 24.0), // Indented children
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: widget.children!,

lib/common/widgets/search_bar.dart

@@ -3,18 +3,33 @@ import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-class CustomSearchBar extends StatelessWidget {
+class CustomSearchBar extends StatefulWidget {
   final TextEditingController? controller;
   final String hintText;
+  final String? searchQuery;
   final Function(String)? onSearchChanged; // Callback for search input changes
 
   const CustomSearchBar({
     super.key,
     this.controller,
+    this.searchQuery = '',
     this.hintText = 'Search',
     this.onSearchChanged,
   });
 
+  @override
+  State<CustomSearchBar> createState() => _CustomSearchBarState();
+}
+
+class _CustomSearchBarState extends State<CustomSearchBar> {
+  @override
+  void dispose() {
+    if (widget.controller != null) {
+      widget.controller!.dispose();
+    }
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -36,16 +51,17 @@ class CustomSearchBar extends StatelessWidget {
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(12),
         ),
-        child: TextField(
-          controller: controller,
+        child: TextFormField(
+          controller: widget.controller,
+          initialValue: widget.searchQuery,
           style: const TextStyle(
             color: Colors.black,
           ),
-          onChanged: onSearchChanged, // Call the callback on text change
+          onChanged: widget.onSearchChanged, // Call the callback on text change
           decoration: InputDecoration(
             filled: true,
             fillColor: ColorsManager.textFieldGreyColor,
-            hintText: hintText,
+            hintText: widget.hintText,
             hintStyle: Theme.of(context).textTheme.bodyLarge!.copyWith(
                   color: ColorsManager.lightGrayColor,
                   fontSize: 12,

lib/common/widgets/spaces_side_tree.dart

@@ -1,25 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-
-class SpacesSideTree extends StatefulWidget {
-  final List<CommunityModel> communities;
-  final String? selectedSpaceUuid;
-  const SpacesSideTree({
-    super.key,
-    required this.communities,
-    this.selectedSpaceUuid,
-  });
-
-  @override
-  State<SpacesSideTree> createState() => _SpacesSideTreeState();
-}
-
-class _SpacesSideTreeState extends State<SpacesSideTree> {
-  String _searchQuery = '';
-  String? _selectedSpaceUuid;
-  String? _selectedId;
-  @override
-  Widget build(BuildContext context) {
-    return const Placeholder();
-  }
-}

lib/main.dart

@@ -4,11 +4,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:go_router/go_router.dart';
-import 'package:syncrow_web/firebase_options_dev.dart';
 import 'package:syncrow_web/firebase_options_prod.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
@@ -16,6 +16,7 @@ import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.da
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
@@ -33,9 +34,7 @@ Future<void> main() async {
 }
 
 class MyApp extends StatelessWidget {
-  MyApp({
-    super.key,
-  });
+  MyApp({super.key});
 
   final GoRouter _router = GoRouter(
     initialLocation: RoutesConst.auth,
@@ -56,6 +55,9 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
+          BlocProvider<CreateRoutineBloc>(
+            create: (context) => CreateRoutineBloc(),
+          ),
           BlocProvider(
               create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
@@ -78,6 +80,8 @@ class MyApp extends StatelessWidget {
               PointerDeviceKind.unknown,
             },
           ),
+          key: NavigationService.navigatorKey,
+          // scaffoldMessengerKey: NavigationService.snackbarKey,
           theme: myTheme,
           routerConfig: _router,
         ));

lib/main_dev.dart

@@ -8,6 +8,7 @@ import 'package:syncrow_web/firebase_options_dev.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
@@ -55,6 +56,9 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
+               BlocProvider<CreateRoutineBloc>(
+            create: (context) => CreateRoutineBloc(),
+          ),
           BlocProvider(
               create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(

lib/pages/access_management/bloc/access_bloc.dart

@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_event.dart';
 import 'package:syncrow_web/pages/access_management/bloc/access_state.dart';
 import 'package:syncrow_web/pages/access_management/model/password_model.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/hour_picker_dialog.dart';
 import 'package:syncrow_web/services/access_mang_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
@@ -30,8 +31,9 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
   Future<void> _onFetchTableData(
       FetchTableData event, Emitter<AccessState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
       emit(AccessLoaded());
-      data = await AccessMangApi().fetchVisitorPassword();
+      data = await AccessMangApi().fetchVisitorPassword(projectUuid);
       filteredData = data;
       updateTabsCount();
       emit(TableLoaded(data));
@@ -88,8 +90,8 @@ class AccessBloc extends Bloc<AccessEvent, AccessState> {
         return Theme(
           data: ThemeData.light().copyWith(
             colorScheme: ColorScheme.light(
-              primary: ColorsManager.blackColor, 
-              onPrimary: Colors.white, 
+              primary: ColorsManager.blackColor,
+              onPrimary: Colors.white,
               onSurface: ColorsManager.grayColor,
             ),
             textButtonTheme: TextButtonThemeData(

lib/pages/auth/bloc/auth_bloc.dart

@@ -9,6 +9,9 @@ import 'package:syncrow_web/pages/auth/model/login_with_email_model.dart';
 import 'package:syncrow_web/pages/auth/model/region_model.dart';
 import 'package:syncrow_web/pages/auth/model/token.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/services/auth_api.dart';
 import 'package:syncrow_web/utils/constants/strings_manager.dart';
 import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
@@ -31,8 +34,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
   ////////////////////////////// forget password //////////////////////////////////
   final TextEditingController forgetEmailController = TextEditingController();
-  final TextEditingController forgetPasswordController =
-      TextEditingController();
+  final TextEditingController forgetPasswordController = TextEditingController();
   final TextEditingController forgetOtp = TextEditingController();
   final forgetFormKey = GlobalKey<FormState>();
   final forgetEmailKey = GlobalKey<FormState>();
@@ -49,8 +51,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       return;
     }
     _remainingTime = 1;
-    add(UpdateTimerEvent(
-        remainingTime: _remainingTime, isButtonEnabled: false));
+    add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
     try {
       forgetEmailValidate = '';
       _remainingTime = (await AuthenticationAPI.sendOtp(
@@ -87,8 +88,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         _timer?.cancel();
         add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
       } else {
-        add(UpdateTimerEvent(
-            remainingTime: _remainingTime, isButtonEnabled: false));
+        add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
       }
     });
   }
@@ -98,8 +98,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
   }
 
-  Future<void> changePassword(
-      ChangePasswordEvent event, Emitter<AuthState> emit) async {
+  Future<void> changePassword(ChangePasswordEvent event, Emitter<AuthState> emit) async {
     emit(LoadingForgetState());
     try {
       var response = await AuthenticationAPI.verifyOtp(
@@ -115,8 +114,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       }
     } on DioException catch (e) {
       final errorData = e.response!.data;
-      String errorMessage =
-          errorData['error']['message'] ?? 'something went wrong';
+      String errorMessage = errorData['error']['message'] ?? 'something went wrong';
       validate = errorMessage;
       emit(AuthInitialState());
     }
@@ -130,9 +128,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   void _onUpdateTimer(UpdateTimerEvent event, Emitter<AuthState> emit) {
-    emit(TimerState(
-        isButtonEnabled: event.isButtonEnabled,
-        remainingTime: event.remainingTime));
+    emit(TimerState(isButtonEnabled: event.isButtonEnabled, remainingTime: event.remainingTime));
   }
 
   /////////////////////////////////////  login  /////////////////////////////////////
@@ -180,18 +176,15 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         return;
       }
 
-
       if (token.accessTokenIsNotEmpty) {
         FlutterSecureStorage storage = const FlutterSecureStorage();
-        await storage.write(
-            key: Token.loginAccessTokenKey, value: token.accessToken);
+        await storage.write(key: Token.loginAccessTokenKey, value: token.accessToken);
         const FlutterSecureStorage().write(
             key: UserModel.userUuidKey,
             value: Token.decodeToken(token.accessToken)['uuid'].toString());
         user = UserModel.fromToken(token);
         loginEmailController.clear();
         loginPasswordController.clear();
-        debugPrint("token " + token.accessToken);
         emit(LoginSuccess());
       } else {
         emit(const LoginFailure(error: 'Something went wrong'));
@@ -342,14 +335,12 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   static Future<String> getTokenAndValidate() async {
     try {
       const storage = FlutterSecureStorage();
-      final firstLaunch = await SharedPreferencesHelper.readBoolFromSP(
-              StringsManager.firstLaunch) ??
-          true;
+      final firstLaunch =
+          await SharedPreferencesHelper.readBoolFromSP(StringsManager.firstLaunch) ?? true;
       if (firstLaunch) {
         storage.deleteAll();
       }
-      await SharedPreferencesHelper.saveBoolToSP(
-          StringsManager.firstLaunch, false);
+      await SharedPreferencesHelper.saveBoolToSP(StringsManager.firstLaunch, false);
       final value = await storage.read(key: Token.loginAccessTokenKey) ?? '';
       if (value.isEmpty) {
         return 'Token not found';
@@ -402,9 +393,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     final String formattedTime = [
       if (days > 0) '${days}d', // Append 'd' for days
       if (days > 0 || hours > 0)
-        hours
-            .toString()
-            .padLeft(2, '0'), // Show hours if there are days or hours
+        hours.toString().padLeft(2, '0'), // Show hours if there are days or hours
       minutes.toString().padLeft(2, '0'),
       seconds.toString().padLeft(2, '0'),
     ].join(':');
@@ -442,8 +431,10 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(LoginInitial());
   }
 
-  static logout() {
-    const storage = FlutterSecureStorage();
+  static Future<void> logout(BuildContext context) async {
+    final storage = FlutterSecureStorage();
+    ProjectManager.clearProjectUUID();
+    context.read<SpaceTreeBloc>().add(ClearAllData());
     storage.deleteAll();
   }
 }

lib/pages/auth/model/project_model.dart

@@ -0,0 +1,27 @@
+class Project {
+  final String uuid;
+  final String name;
+  final String description;
+
+  const Project({
+    required this.uuid,
+    required this.name,
+    required this.description,
+  });
+
+  factory Project.fromJson(Map<String, dynamic> json) {
+    return Project(
+      uuid: json['uuid'] as String,
+      name: json['name'] as String,
+      description: json['description'] as String,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'uuid': uuid,
+      'name': name,
+      'description': description,
+    };
+  }
+}

lib/pages/auth/model/user_model.dart

@@ -1,3 +1,4 @@
+import 'package:syncrow_web/pages/auth/model/project_model.dart';
 import 'package:syncrow_web/pages/auth/model/token.dart';
 
 class UserModel {
@@ -13,6 +14,7 @@ class UserModel {
   final bool? hasAcceptedWebAgreement;
   final DateTime? webAgreementAcceptedAt;
   final UserRole? role;
+  final Project? project;
 
   UserModel({
     required this.uuid,
@@ -26,6 +28,7 @@ class UserModel {
     required this.hasAcceptedWebAgreement,
     required this.webAgreementAcceptedAt,
     required this.role,
+    required this.project,
   });
 
   factory UserModel.fromJson(Map<String, dynamic> json) {
@@ -43,6 +46,8 @@ class UserModel {
           ? DateTime.parse(json['webAgreementAcceptedAt'])
           : null,
       role: json['role'] != null ? UserRole.fromJson(json['role']) : null,
+      project:
+          json['project'] != null ? Project.fromJson(json['project']) : null,
     );
   }
 
@@ -64,6 +69,7 @@ class UserModel {
       phoneNumber: null,
       isEmailVerified: null,
       isAgreementAccepted: null,
+      project: null
     );
   }
 

lib/pages/common/bloc/project_manager.dart

@@ -0,0 +1,19 @@
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
+
+class ProjectManager {
+  static Future<String?> getProjectUUID() async {
+    final projectUuid = await SharedPreferencesHelper.readStringFromSP(
+        StringsManager.projectKey);
+    return projectUuid.isNotEmpty ? projectUuid : null;
+  }
+
+  static Future<void> setProjectUUID(String newUUID) async {
+    await SharedPreferencesHelper.saveStringToSP(
+        StringsManager.projectKey, newUUID);
+  }
+
+  static Future<void> clearProjectUUID() async {
+    await SharedPreferencesHelper.removeValueFromSP(StringsManager.projectKey);
+  }
+}

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart

@@ -1,6 +1,7 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
@@ -8,7 +9,8 @@ import 'package:syncrow_web/services/devices_mang_api.dart';
 part 'device_managment_event.dart';
 part 'device_managment_state.dart';
 
-class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementState> {
+class DeviceManagementBloc
+    extends Bloc<DeviceManagementEvent, DeviceManagementState> {
   int _selectedIndex = 0;
   List<AllDevicesModel> _devices = [];
   int _onlineCount = 0;
@@ -31,19 +33,24 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     on<UpdateSelection>(_onUpdateSelection);
   }
 
-  Future<void> _onFetchDevices(FetchDevices event, Emitter<DeviceManagementState> emit) async {
+  Future<void> _onFetchDevices(
+      FetchDevices event, Emitter<DeviceManagementState> emit) async {
     emit(DeviceManagementLoading());
     try {
       List<AllDevicesModel> devices = [];
       _devices.clear();
       var spaceBloc = event.context.read<SpaceTreeBloc>();
+           final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       if (spaceBloc.state.selectedCommunities.isEmpty) {
-        devices = await DevicesManagementApi().fetchDevices('', '');
+        devices = await DevicesManagementApi().fetchDevices('', '', projectUuid);
       } else {
         for (var community in spaceBloc.state.selectedCommunities) {
-          List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
+          List<String> spacesList =
+              spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
           for (var space in spacesList) {
-            devices.addAll(await DevicesManagementApi().fetchDevices(community, space));
+            devices.addAll(await DevicesManagementApi().fetchDevices(
+                community, space, projectUuid));
           }
         }
       }
@@ -66,7 +73,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onFilterDevices(FilterDevices event, Emitter<DeviceManagementState> emit) async {
+  void _onFilterDevices(
+      FilterDevices event, Emitter<DeviceManagementState> emit) async {
     if (_devices.isNotEmpty) {
       _filteredDevices = List.from(_devices.where((device) {
         switch (event.filter) {
@@ -97,7 +105,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  Future<void> _onResetFilters(ResetFilters event, Emitter<DeviceManagementState> emit) async {
+  Future<void> _onResetFilters(
+      ResetFilters event, Emitter<DeviceManagementState> emit) async {
     currentProductName = '';
     _selectedDevices.clear();
     _filteredDevices = List.from(_devices);
@@ -113,7 +122,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     ));
   }
 
-  void _onResetSelectedDevices(ResetSelectedDevices event, Emitter<DeviceManagementState> emit) {
+  void _onResetSelectedDevices(
+      ResetSelectedDevices event, Emitter<DeviceManagementState> emit) {
     _selectedDevices.clear();
 
     if (state is DeviceManagementLoaded) {
@@ -139,12 +149,14 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onSelectedFilterChanged(SelectedFilterChanged event, Emitter<DeviceManagementState> emit) {
+  void _onSelectedFilterChanged(
+      SelectedFilterChanged event, Emitter<DeviceManagementState> emit) {
     _selectedIndex = event.selectedIndex;
     add(FilterDevices(_getFilterFromIndex(_selectedIndex)));
   }
 
-  void _onSelectDevice(SelectDevice event, Emitter<DeviceManagementState> emit) {
+  void _onSelectDevice(
+      SelectDevice event, Emitter<DeviceManagementState> emit) {
     final selectedUuid = event.selectedDevice.uuid;
 
     if (_selectedDevices.any((device) => device.uuid == selectedUuid)) {
@@ -155,7 +167,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
 
     List<AllDevicesModel> clonedSelectedDevices = List.from(_selectedDevices);
 
-    bool isControlButtonEnabled = _checkIfControlButtonEnabled(clonedSelectedDevices);
+    bool isControlButtonEnabled =
+        _checkIfControlButtonEnabled(clonedSelectedDevices);
 
     if (state is DeviceManagementLoaded) {
       emit(DeviceManagementLoaded(
@@ -164,7 +177,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
         onlineCount: _onlineCount,
         offlineCount: _offlineCount,
         lowBatteryCount: _lowBatteryCount,
-        selectedDevice: clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
+        selectedDevice:
+            clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
         isControlButtonEnabled: isControlButtonEnabled,
       ));
     } else if (state is DeviceManagementFiltered) {
@@ -174,13 +188,15 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
         onlineCount: _onlineCount,
         offlineCount: _offlineCount,
         lowBatteryCount: _lowBatteryCount,
-        selectedDevice: clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
+        selectedDevice:
+            clonedSelectedDevices.isNotEmpty ? clonedSelectedDevices : null,
         isControlButtonEnabled: isControlButtonEnabled,
       ));
     }
   }
 
-  void _onUpdateSelection(UpdateSelection event, Emitter<DeviceManagementState> emit) {
+  void _onUpdateSelection(
+      UpdateSelection event, Emitter<DeviceManagementState> emit) {
     List<AllDevicesModel> selectedDevices = [];
     List<AllDevicesModel> devicesToSelectFrom = [];
 
@@ -223,7 +239,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
 
   bool _checkIfControlButtonEnabled(List<AllDevicesModel> selectedDevices) {
     if (selectedDevices.length > 1) {
-      final productTypes = selectedDevices.map((device) => device.productType).toSet();
+      final productTypes =
+          selectedDevices.map((device) => device.productType).toSet();
       return productTypes.length == 1;
     } else if (selectedDevices.length == 1) {
       return true;
@@ -234,8 +251,10 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
   void _calculateDeviceCounts() {
     _onlineCount = _devices.where((device) => device.online == true).length;
     _offlineCount = _devices.where((device) => device.online == false).length;
-    _lowBatteryCount =
-        _devices.where((device) => device.batteryLevel != null && device.batteryLevel! < 20).length;
+    _lowBatteryCount = _devices
+        .where((device) =>
+            device.batteryLevel != null && device.batteryLevel! < 20)
+        .length;
   }
 
   String _getFilterFromIndex(int index) {
@@ -251,7 +270,8 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
     }
   }
 
-  void _onSearchDevices(SearchDevices event, Emitter<DeviceManagementState> emit) {
+  void _onSearchDevices(
+      SearchDevices event, Emitter<DeviceManagementState> emit) {
     if ((event.community == null || event.community!.isEmpty) &&
         (event.unitName == null || event.unitName!.isEmpty) &&
         (event.productName == null || event.productName!.isEmpty)) {
@@ -280,22 +300,33 @@ class DeviceManagementBloc extends Bloc<DeviceManagementEvent, DeviceManagementS
       final filteredDevices = devicesToSearch.where((device) {
         final matchesCommunity = event.community == null ||
             event.community!.isEmpty ||
-            (device.community?.name?.toLowerCase().contains(event.community!.toLowerCase()) ??
+            (device.community?.name
+                    ?.toLowerCase()
+                    .contains(event.community!.toLowerCase()) ??
                 false);
         final matchesUnit = event.unitName == null ||
             event.unitName!.isEmpty ||
             (device.spaces != null &&
                 device.spaces!.isNotEmpty &&
-                device.spaces![0].spaceName!.toLowerCase().contains(event.unitName!.toLowerCase()));
+                device.spaces![0].spaceName!
+                    .toLowerCase()
+                    .contains(event.unitName!.toLowerCase()));
         final matchesProductName = event.productName == null ||
             event.productName!.isEmpty ||
-            (device.name?.toLowerCase().contains(event.productName!.toLowerCase()) ?? false);
+            (device.name
+                    ?.toLowerCase()
+                    .contains(event.productName!.toLowerCase()) ??
+                false);
         final matchesDeviceName = event.productName == null ||
             event.productName!.isEmpty ||
-            (device.categoryName?.toLowerCase().contains(event.productName!.toLowerCase()) ??
+            (device.categoryName
+                    ?.toLowerCase()
+                    .contains(event.productName!.toLowerCase()) ??
                 false);
 
-        return matchesCommunity && matchesUnit && (matchesProductName || matchesDeviceName);
+        return matchesCommunity &&
+            matchesUnit &&
+            (matchesProductName || matchesDeviceName);
       }).toList();
 
       emit(DeviceManagementFiltered(

lib/pages/device_managment/all_devices/models/devices_model.dart

@@ -244,6 +244,7 @@ SOS
           SwitchFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
           ModeFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
           TempSetFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
+          CurrentTempFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
           LevelFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
           ChildLockFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
         ];

lib/pages/device_managment/all_devices/models/factory_reset_model.dart

@@ -2,14 +2,17 @@ import 'package:flutter/foundation.dart';
 
 class FactoryResetModel {
   final List<String> devicesUuid;
+  final String operationType;
 
   FactoryResetModel({
     required this.devicesUuid,
+    this.operationType = "RESET",
   });
 
   factory FactoryResetModel.fromJson(Map<String, dynamic> json) {
     return FactoryResetModel(
       devicesUuid: List<String>.from(json['devicesUuid']),
+      operationType: "RESET",
     );
   }
 

lib/pages/device_managment/all_devices/view/device_managment_page.dart

@@ -3,6 +3,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/widgets/device_managment_body.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart';
 import 'package:syncrow_web/pages/routines/view/routines_view.dart';
@@ -39,9 +41,15 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                   backgroundColor: null,
                 ),
                 onPressed: () {
+                  BlocProvider.of<CreateRoutineBloc>(context)
+                      .add(const ResetSelectedEvent());
+
                   context
                       .read<RoutineBloc>()
                       .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
+                  context
+                      .read<DeviceManagementBloc>()
+                      .add(FetchDevices(context));
                 },
                 child: Text(
                   'Devices',
@@ -59,6 +67,9 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                   backgroundColor: null,
                 ),
                 onPressed: () {
+                  BlocProvider.of<CreateRoutineBloc>(context)
+                      .add(const ResetSelectedEvent());
+
                   context
                       .read<RoutineBloc>()
                       .add(const TriggerSwitchTabsEvent(isRoutineTab: true));

lib/pages/device_managment/all_devices/widgets/device_search_filters.dart

@@ -12,77 +12,95 @@ class DeviceSearchFilters extends StatefulWidget {
   State<DeviceSearchFilters> createState() => _DeviceSearchFiltersState();
 }
 
-class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperResponsiveLayout {
-  final TextEditingController communityController = TextEditingController();
-  final TextEditingController unitNameController = TextEditingController();
-  final TextEditingController productNameController = TextEditingController();
+class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
+    with HelperResponsiveLayout {
+  late final TextEditingController _unitNameController;
+  late final TextEditingController _productNameController;
+
+  @override
+  void initState() {
+    _unitNameController = TextEditingController();
+    _productNameController = TextEditingController();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _unitNameController.dispose();
+    _productNameController.dispose();
+    super.dispose();
+  }
+
+  List<Widget> get _widgets => [
+        _buildSearchField(
+          "Space Name",
+          _unitNameController,
+          200,
+        ),
+        _buildSearchField(
+          "Device Name / Product Name",
+          _productNameController,
+          300,
+        ),
+        _buildSearchResetButtons(),
+      ];
 
   @override
   Widget build(BuildContext context) {
-    return isExtraLargeScreenSize(context)
-        ? Row(
-            children: [
-              _buildSearchField("Community", communityController, 200),
-              const SizedBox(width: 20),
-              _buildSearchField("Space Name", unitNameController, 200),
-              const SizedBox(width: 20),
-              _buildSearchField("Device Name / Product Name", productNameController, 300),
-              const SizedBox(width: 20),
-              _buildSearchResetButtons(),
-            ],
-          )
-        : Wrap(
-            spacing: 20,
-            runSpacing: 10,
-            children: [
-              _buildSearchField(
-                "Community",
-                communityController,
-                200,
-              ),
-              _buildSearchField("Space Name", unitNameController, 200),
-              _buildSearchField(
-                "Device Name / Product Name",
-                productNameController,
-                300,
-              ),
-              _buildSearchResetButtons(),
-            ],
-          );
+    if (isExtraLargeScreenSize(context)) {
+      return Row(
+        children: _widgets.map(
+          (e) {
+            return Padding(
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              child: e,
+            );
+          },
+        ).toList(),
+      );
+    }
+
+    return Wrap(
+      spacing: 20,
+      runSpacing: 10,
+      children: _widgets,
+    );
   }
 
-  Widget _buildSearchField(String title, TextEditingController controller, double width) {
-    return Container(
-      child: StatefulTextField(
-        title: title,
-        width: width,
-        elevation: 2,
-        controller: controller,
-        onSubmitted: () {
-          context.read<DeviceManagementBloc>().add(SearchDevices(
-              productName: productNameController.text,
-              unitName: unitNameController.text,
-              community: communityController.text,
-              searchField: true));
-        },
-        onChanged: (p0) {},
-      ),
+  Widget _buildSearchField(
+    String title,
+    TextEditingController controller,
+    double width,
+  ) {
+    return StatefulTextField(
+      title: title,
+      width: width,
+      elevation: 2,
+      controller: controller,
+      onSubmitted: () {
+        final searchDevicesEvent = SearchDevices(
+          productName: _productNameController.text,
+          unitName: _unitNameController.text,
+          searchField: true,
+        );
+        context.read<DeviceManagementBloc>().add(searchDevicesEvent);
+      },
+      onChanged: (p0) {},
     );
   }
 
   Widget _buildSearchResetButtons() {
     return SearchResetButtons(
-      onSearch: () {
-        context.read<DeviceManagementBloc>().add(SearchDevices(
-            community: communityController.text,
-            unitName: unitNameController.text,
-            productName: productNameController.text,
-            searchField: true));
-      },
+      onSearch: () => context.read<DeviceManagementBloc>().add(
+            SearchDevices(
+              unitName: _unitNameController.text,
+              productName: _productNameController.text,
+              searchField: true,
+            ),
+          ),
       onReset: () {
-        communityController.clear();
-        unitNameController.clear();
-        productNameController.clear();
+        _unitNameController.clear();
+        _productNameController.clear();
         context.read<DeviceManagementBloc>()
           ..add(ResetFilters())
           ..add(FetchDevices(context));

lib/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart

@@ -29,7 +29,7 @@ class TwoGangSwitchBloc extends Bloc<TwoGangSwitchEvent, TwoGangSwitchState> {
       final status =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = TwoGangStatusModel.fromJson(event.deviceId, status.status);
-      _listenToChanges(emit);
+      _listenToChanges(event.deviceId);
       emit(TwoGangSwitchStatusLoaded(deviceStatus));
     } catch (e) {
       emit(TwoGangSwitchError(e.toString()));

lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart

@@ -30,7 +30,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       var response = await DevicesManagementApi().getDeviceStatus(deviceId);
       deviceStatus = WallSensorModel.fromJson(response.status);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
-      _listenToChanges(emit);
+      _listenToChanges(emit, deviceId);
     } catch (e) {
       emit(WallSensorFailedState(error: e.toString()));
       return;
@@ -52,7 +52,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     }
   }
 
-  _listenToChanges(Emitter<WallSensorState> emit) {
+  _listenToChanges(Emitter<WallSensorState> emit, deviceId) {
     try {
       DatabaseReference ref =
           FirebaseDatabase.instance.ref('device-status/$deviceId');

lib/pages/home/bloc/home_bloc.dart

@@ -2,16 +2,19 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
-// import 'package:graphview/GraphView.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/home/bloc/home_state.dart';
 import 'package:syncrow_web/pages/home/home_model/home_item_model.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/services/home_api.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
   // final Graph graph = Graph()..isTree = true;
@@ -48,9 +51,13 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
 
   Future _fetchUserInfo(FetchUserInfo event, Emitter<HomeState> emit) async {
     try {
-      var uuid =
-          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
+      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       user = await HomeApi().fetchUserInfo(uuid);
+
+      if (user != null && user!.project != null) {
+        await ProjectManager.setProjectUUID(user!.project!.uuid);
+        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>().add(InitialEvent());
+      }
       add(FetchTermEvent());
       add(FetchPolicyEvent());
 
@@ -81,12 +88,10 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     }
   }
 
-  Future _confirmUserAgreement(
-      ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
+  Future _confirmUserAgreement(ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
     try {
       emit(LoadingHome());
-      var uuid =
-          await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
+      var uuid = await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       policy = await HomeApi().confirmUserAgreements(uuid);
       emit(PolicyAgreement());
     } catch (e) {
@@ -110,6 +115,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       icon: Assets.accessIcon,
       active: true,
       onPress: (context) {
+        context.read<SpaceTreeBloc>().add(ClearCachedData());
         context.go(RoutesConst.accessManagementPage);
       },
       color: null,
@@ -119,6 +125,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       icon: Assets.spaseManagementIcon,
       active: true,
       onPress: (context) {
+        context.read<SpaceTreeBloc>().add(ClearCachedData());
         context.go(RoutesConst.spacesManagementPage);
       },
       color: ColorsManager.primaryColor,
@@ -128,6 +135,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       icon: Assets.devicesIcon,
       active: true,
       onPress: (context) {
+        context.read<SpaceTreeBloc>().add(ClearCachedData());
         BlocProvider.of<RoutineBloc>(context)
             .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
         context.go(RoutesConst.deviceManagementPage);

lib/pages/home/view/agreement_and_privacy_dialog.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:go_router/go_router.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -162,7 +164,7 @@ class _AgreementAndPrivacyDialogState extends State<AgreementAndPrivacyDialog> {
               children: [
                 InkWell(
                   onTap: () {
-                    AuthBloc.logout();
+                    AuthBloc.logout(context);
                     context.go(RoutesConst.auth);
                   },
                   child: const Text("Cancel"),

lib/pages/roles_and_permission/model/edit_user_model.dart

@@ -219,6 +219,9 @@ class UserSpaceModel {
   final double x;
   final double y;
   final String icon;
+  final String communityUuid;
+
+  //communityUuid
 
   UserSpaceModel({
     required this.uuid,
@@ -231,22 +234,23 @@ class UserSpaceModel {
     required this.x,
     required this.y,
     required this.icon,
+    required this.communityUuid,
   });
 
   /// Create a [UserSpaceModel] from JSON data
   factory UserSpaceModel.fromJson(Map<String, dynamic> json) {
     return UserSpaceModel(
-      uuid: json['uuid'] as String,
-      createdAt: json['createdAt'] as String,
-      updatedAt: json['updatedAt'] as String,
-      spaceTuyaUuid: json['spaceTuyaUuid'] as String?,
-      spaceName: json['spaceName'] as String,
-      invitationCode: json['invitationCode'] as String?,
-      disabled: json['disabled'] as bool,
-      x: (json['x'] as num).toDouble(),
-      y: (json['y'] as num).toDouble(),
-      icon: json['icon'] as String,
-    );
+        uuid: json['uuid'] as String,
+        createdAt: json['createdAt'] as String,
+        updatedAt: json['updatedAt'] as String,
+        spaceTuyaUuid: json['spaceTuyaUuid'] as String?,
+        spaceName: json['spaceName'] as String,
+        invitationCode: json['invitationCode'] as String?,
+        disabled: json['disabled'] as bool,
+        x: (json['x'] as num).toDouble(),
+        y: (json['y'] as num).toDouble(),
+        icon: json['icon'] as String,
+        communityUuid: json['communityUuid'] as String);
   }
 
   /// Convert the [UserSpaceModel] to JSON
@@ -262,6 +266,7 @@ class UserSpaceModel {
       'x': x,
       'y': y,
       'icon': icon,
+      'communityUuid': communityUuid
     };
   }
 }

lib/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart

@@ -1,5 +1,7 @@
 import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/custom_dialog.dart';
 import 'package:syncrow_web/pages/roles_and_permission/model/edit_user_model.dart';
 import 'package:syncrow_web/pages/roles_and_permission/model/role_type_model.dart';
@@ -7,11 +9,14 @@ import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialo
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/model/permission_option_model.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/model/tree_node_model.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/services/user_permission.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 
 class UsersBloc extends Bloc<UsersEvent, UsersState> {
   UsersBloc() : super(UsersInitial()) {
@@ -61,8 +66,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
   void isCompleteSpacesFun(
       CheckSpacesStepStatus event, Emitter<UsersState> emit) {
     emit(UsersLoadingState());
-    List<String> selectedIds = getSelectedIds(updatedCommunities);
-    isCompleteSpaces = selectedIds.isNotEmpty;
+    var spaceBloc =
+        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
+
+    isCompleteSpaces = spaceBloc.state.selectedCommunities.isNotEmpty;
     emit(ChangeStatusSteps());
   }
 
@@ -74,7 +81,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
 
   Future<List<SpaceModel>> _fetchSpacesForCommunity(
       String communityUuid) async {
-    return await CommunitySpaceManagementApi().getSpaceHierarchy(communityUuid);
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+    return await CommunitySpaceManagementApi()
+        .getSpaceHierarchy(communityUuid, projectUuid);
   }
 
   List<TreeNode> updatedCommunities = [];
@@ -84,8 +94,10 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
       LoadCommunityAndSpacesEvent event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       List<CommunityModel> communities =
-          await CommunitySpaceManagementApi().fetchCommunities();
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
       communityIds = communities.map((community) => community.uuid).toList();
       updatedCommunities = await Future.wait(
         communities.map((community) async {
@@ -328,20 +340,24 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
 
   void _sendInvitUser(SendInviteUsers event, Emitter<UsersState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       emit(UsersLoadingState());
-      List<String> selectedIds = getSelectedIds(updatedCommunities)
-          .where((id) => !communityIds.contains(id))
-          .toList();
+      // List<String> selectedIds =
+      //     getSelectedIds(updatedCommunities).where((id) => !communityIds.contains(id)).toList();
+
+      List<String> selectedSpacesId = getSelectedSpacesIds();
+      // List<String> selectedIds = getSelectedIds(updatedCommunities);
 
       bool res = await UserPermissionApi().sendInviteUser(
-        email: emailController.text,
-        firstName: firstNameController.text,
-        jobTitle: jobTitleController.text,
-        lastName: lastNameController.text,
-        phoneNumber: phoneController.text,
-        roleUuid: roleSelected,
-        spaceUuids: selectedIds,
-      );
+          email: emailController.text,
+          firstName: firstNameController.text,
+          jobTitle: jobTitleController.text,
+          lastName: lastNameController.text,
+          phoneNumber: phoneController.text,
+          roleUuid: roleSelected,
+          spaceUuids: selectedSpacesId,
+          projectUuid: projectUuid);
 
       if (res) {
         showCustomDialog(
@@ -370,22 +386,31 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }
   }
 
+  List<String> getSelectedSpacesIds() {
+    List<String> selectedSpacesId = [];
+    var spaceBloc =
+        NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
+    for (var community in spaceBloc.state.selectedCommunities) {
+      selectedSpacesId
+          .addAll(spaceBloc.state.selectedCommunityAndSpaces[community] ?? []);
+    }
+    return selectedSpacesId;
+  }
+
   _editInviteUser(EditInviteUsers event, Emitter<UsersState> emit) async {
     try {
       emit(UsersLoadingState());
-      List<String> selectedIds = getSelectedIds(updatedCommunities)
-          .where((id) => !communityIds.contains(id))
-          .toList();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       bool res = await UserPermissionApi().editInviteUser(
-        userId: event.userId,
-        firstName: firstNameController.text,
-        jobTitle: jobTitleController.text,
-        lastName: lastNameController.text,
-        phoneNumber: phoneController.text,
-        roleUuid: roleSelected,
-        spaceUuids: selectedIds,
-      );
+          userId: event.userId,
+          firstName: firstNameController.text,
+          jobTitle: jobTitleController.text,
+          lastName: lastNameController.text,
+          phoneNumber: phoneController.text,
+          roleUuid: roleSelected,
+          spaceUuids: getSelectedSpacesIds(),
+          projectUuid: projectUuid);
       if (res == true) {
         showCustomDialog(
           barrierDismissible: false,
@@ -490,8 +515,13 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     emit(UsersLoadingState());
 
     try {
+      var spaceBloc =
+          NavigationService.navigatorKey.currentContext!.read<SpaceTreeBloc>();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       if (event.uuid?.isNotEmpty ?? false) {
-        final res = await UserPermissionApi().fetchUserById(event.uuid);
+        final res =
+            await UserPermissionApi().fetchUserById(event.uuid, projectUuid);
 
         if (res != null) {
           // Populate the text controllers
@@ -501,13 +531,20 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
           phoneController.text = res.phoneNumber ?? '';
           jobTitleController.text = res.jobTitle ?? '';
           res.roleType;
-          if (updatedCommunities.isNotEmpty) {
-            // Create a list of UUIDs to mark
-            final uuidsToMark = res.spaces.map((space) => space.uuid).toList();
-            // Print all IDs and mark nodes in updatedCommunities
-            debugPrint('Printing and marking nodes in updatedCommunities:');
-            _printAndMarkNodes(updatedCommunities, uuidsToMark);
-          }
+          res.spaces.map((space) {
+            selectedIds.add(space.uuid);
+            CommunityModel community = spaceBloc.state.communityList
+                .firstWhere((item) => item.uuid == space.communityUuid);
+            spaceBloc.add(OnSpaceSelected(community, space.uuid, []));
+          }).toList();
+
+          // if (updatedCommunities.isNotEmpty) {
+          //   // Create a list of UUIDs to mark
+          //   final uuidsToMark = res.spaces.map((space) => space.uuid).toList();
+          //   // Print all IDs and mark nodes in updatedCommunities
+          //   debugPrint('Printing and marking nodes in updatedCommunities:');
+          //   _printAndMarkNodes(updatedCommunities, uuidsToMark);
+          // }
           final roleId = roles
               .firstWhere((element) =>
                   element.type ==
@@ -600,4 +637,16 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
     }
     return null;
   }
+
+  @override
+  Future<void> close() {
+    emailController.dispose();
+    firstNameController.dispose();
+    lastNameController.dispose();
+    emailController.dispose();
+    phoneController.dispose();
+    jobTitleController.dispose();
+    roleSearchController.dispose();
+    return super.close();
+  }
 }

lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart

@@ -24,7 +24,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
   Widget build(BuildContext context) {
     return BlocProvider(
         create: (BuildContext context) => UsersBloc()
-          ..add(const LoadCommunityAndSpacesEvent())
+          // ..add(const LoadCommunityAndSpacesEvent())
           ..add(const RoleEvent()),
         child: BlocConsumer<UsersBloc, UsersState>(
             listener: (context, state) {},

lib/pages/roles_and_permission/users_page/add_user_dialog/view/build_tree_view.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
@@ -19,7 +20,6 @@ class TreeView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final _blocRole = BlocProvider.of<UsersBloc>(context);
-    debugPrint('TreeView constructed with userId = $userId');
     return BlocProvider(
       create: (_) => UsersBloc(),
       // ..add(const LoadCommunityAndSpacesEvent()),

lib/pages/roles_and_permission/users_page/add_user_dialog/view/edit_user_dialog.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
@@ -25,13 +26,12 @@ class _EditUserDialogState extends State<EditUserDialog> {
   Widget build(BuildContext context) {
     return BlocProvider(
         create: (BuildContext context) => UsersBloc()
-          ..add(const LoadCommunityAndSpacesEvent())
+          // ..add(const LoadCommunityAndSpacesEvent())
           ..add(const RoleEvent())
           ..add(GetUserByIdEvent(uuid: widget.userId)),
         child: BlocConsumer<UsersBloc, UsersState>(listener: (context, state) {
           if (state is SpacesLoadedState) {
-            BlocProvider.of<UsersBloc>(context)
-                .add(GetUserByIdEvent(uuid: widget.userId));
+            BlocProvider.of<UsersBloc>(context).add(GetUserByIdEvent(uuid: widget.userId));
           }
         }, builder: (context, state) {
           final _blocRole = BlocProvider.of<UsersBloc>(context);
@@ -39,8 +39,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
           return Dialog(
               child: Container(
             decoration: const BoxDecoration(
-                color: Colors.white,
-                borderRadius: BorderRadius.all(Radius.circular(20))),
+                color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))),
             width: 900,
             child: Column(
               children: [
@@ -69,8 +68,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             children: [
                               _buildStep1Indicator(1, "Basics", _blocRole),
                               _buildStep2Indicator(2, "Spaces", _blocRole),
-                              _buildStep3Indicator(
-                                  3, "Role & Permissions", _blocRole),
+                              _buildStep3Indicator(3, "Role & Permissions", _blocRole),
                             ],
                           ),
                         ),
@@ -118,15 +116,13 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             if (currentStep < 3) {
                               currentStep++;
                               if (currentStep == 2) {
-                                _blocRole
-                                    .add(CheckStepStatus(isEditUser: true));
+                                _blocRole.add(CheckStepStatus(isEditUser: true));
                               } else if (currentStep == 3) {
                                 _blocRole.add(const CheckSpacesStepStatus());
                               }
                             } else {
-                              _blocRole.add(EditInviteUsers(
-                                  context: context,
-                                   userId: widget.userId!));
+                              _blocRole
+                                  .add(EditInviteUsers(context: context, userId: widget.userId!));
                             }
                           });
                         },
@@ -135,8 +131,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
                           style: TextStyle(
                               color: (_blocRole.isCompleteSpaces == false ||
                                           _blocRole.isCompleteBasics == false ||
-                                          _blocRole.isCompleteRolePermissions ==
-                                              false) &&
+                                          _blocRole.isCompleteRolePermissions == false) &&
                                       currentStep == 3
                                   ? ColorsManager.grayColor
                                   : ColorsManager.secondaryColor),
@@ -209,12 +204,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
-                        ? ColorsManager.blackColor
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
                   ),
                 ),
               ],
@@ -272,12 +263,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
-                        ? ColorsManager.blackColor
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
                   ),
                 ),
               ],
@@ -334,12 +321,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step
-                        ? ColorsManager.blackColor
-                        : ColorsManager.greyColor,
-                    fontWeight: currentStep == step
-                        ? FontWeight.bold
-                        : FontWeight.normal,
+                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
+                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
                   ),
                 ),
               ],

lib/pages/roles_and_permission/users_page/add_user_dialog/view/spaces_access_view.dart

@@ -1,14 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
-import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
-import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/view/build_tree_view.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:syncrow_web/utils/style.dart';
 
 class SpacesAccessView extends StatelessWidget {
   final String? userId;
@@ -27,10 +22,8 @@ class SpacesAccessView extends StatelessWidget {
             children: [
               Text(
                 'Spaces access',
-                style: context.textTheme.bodyLarge?.copyWith(
-                    fontWeight: FontWeight.w700,
-                    fontSize: 20,
-                    color: Colors.black),
+                style: context.textTheme.bodyLarge
+                    ?.copyWith(fontWeight: FontWeight.w700, fontSize: 20, color: Colors.black),
               ),
               const SizedBox(
                 height: 35,
@@ -42,77 +35,78 @@ class SpacesAccessView extends StatelessWidget {
               const SizedBox(
                 height: 25,
               ),
-              Expanded(
-                child: SizedBox(
-                  child: Column(
-                    children: [
-                      Expanded(
-                        flex: 2,
-                        child: Container(
-                          decoration: const BoxDecoration(
-                            color: ColorsManager.circleRolesBackground,
-                            borderRadius: BorderRadius.only(
-                                topRight: Radius.circular(20),
-                                topLeft: Radius.circular(20)),
-                          ),
-                          child: Padding(
-                            padding: const EdgeInsets.all(8.0),
-                            child: Row(
-                              children: [
-                                Expanded(
-                                  child: Container(
-                                    decoration: BoxDecoration(
-                                        borderRadius: const BorderRadius.all(
-                                            Radius.circular(20)),
-                                        border: Border.all(
-                                            color: ColorsManager.grayBorder)),
-                                    child: TextFormField(
-                                      style:
-                                          const TextStyle(color: Colors.black),
-                                      // controller: _blocRole.firstNameController,
-                                      onChanged: (value) {
-                                        _blocRole.add(SearchAnode(
-                                            nodes: _blocRole.updatedCommunities,
-                                            searchTerm: value));
-                                      },
-                                      decoration: textBoxDecoration(radios: 20)!
-                                          .copyWith(
-                                        fillColor: Colors.white,
-                                        suffixIcon: Padding(
-                                          padding:
-                                              const EdgeInsets.only(right: 16),
-                                          child: SvgPicture.asset(
-                                            Assets.textFieldSearch,
-                                            width: 24,
-                                            height: 24,
-                                          ),
-                                        ),
-                                        hintStyle: context.textTheme.bodyMedium
-                                            ?.copyWith(
-                                                fontWeight: FontWeight.w400,
-                                                fontSize: 12,
-                                                color: ColorsManager.textGray),
-                                      ),
-                                    ),
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                        ),
-                      ),
-                      Expanded(
-                          flex: 7,
-                          child: Container(
-                              color: ColorsManager.circleRolesBackground,
-                              padding: const EdgeInsets.all(8.0),
-                              child: Container(
-                                  color: ColorsManager.whiteColors,
-                                  child: TreeView(userId: userId))))
-                    ],
-                  ),
-                ),
-              ),
+              Expanded(child: SpaceTreeView(onSelect: () {}))
+              // Expanded(
+              //   child: SizedBox(
+              //     child: Column(
+              //       children: [
+              //         Expanded(
+              //           flex: 2,
+              //           child: Container(
+              //             decoration: const BoxDecoration(
+              //               color: ColorsManager.circleRolesBackground,
+              //               borderRadius: BorderRadius.only(
+              //                   topRight: Radius.circular(20),
+              //                   topLeft: Radius.circular(20)),
+              //             ),
+              //             child: Padding(
+              //               padding: const EdgeInsets.all(8.0),
+              //               child: Row(
+              //                 children: [
+              //                   Expanded(
+              //                     child: Container(
+              //                       decoration: BoxDecoration(
+              //                           borderRadius: const BorderRadius.all(
+              //                               Radius.circular(20)),
+              //                           border: Border.all(
+              //                               color: ColorsManager.grayBorder)),
+              //                       child: TextFormField(
+              //                         style:
+              //                             const TextStyle(color: Colors.black),
+              //                         // controller: _blocRole.firstNameController,
+              //                         onChanged: (value) {
+              //                           _blocRole.add(SearchAnode(
+              //                               nodes: _blocRole.updatedCommunities,
+              //                               searchTerm: value));
+              //                         },
+              //                         decoration: textBoxDecoration(radios: 20)!
+              //                             .copyWith(
+              //                           fillColor: Colors.white,
+              //                           suffixIcon: Padding(
+              //                             padding:
+              //                                 const EdgeInsets.only(right: 16),
+              //                             child: SvgPicture.asset(
+              //                               Assets.textFieldSearch,
+              //                               width: 24,
+              //                               height: 24,
+              //                             ),
+              //                           ),
+              //                           hintStyle: context.textTheme.bodyMedium
+              //                               ?.copyWith(
+              //                                   fontWeight: FontWeight.w400,
+              //                                   fontSize: 12,
+              //                                   color: ColorsManager.textGray),
+              //                         ),
+              //                       ),
+              //                     ),
+              //                   ),
+              //                 ],
+              //               ),
+              //             ),
+              //           ),
+              //         ),
+              //         Expanded(
+              //             flex: 7,
+              //             child: Container(
+              //                 color: ColorsManager.circleRolesBackground,
+              //                 padding: const EdgeInsets.all(8.0),
+              //                 child: Container(
+              //                     color: ColorsManager.whiteColors,
+              //                     child: TreeView(userId: userId))))
+              //       ],
+              //     ),
+              //   ),
+              // ),
             ],
           ),
         ),

lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart

@@ -1,10 +1,13 @@
 import 'dart:async';
-import 'package:bloc/bloc.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/roles_and_permission/model/roles_user_model.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/bloc/user_table_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/bloc/user_table_state.dart';
 import 'package:syncrow_web/services/user_permission.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 
 class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   UserTableBloc() : super(TableInitial()) {
@@ -46,10 +49,12 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _getUsers(GetUsers event, Emitter<UserTableState> emit) async {
     emit(UsersLoadingState());
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       roleTypes.clear();
       jobTitle.clear();
       createdBy.clear();
-      users = await UserPermissionApi().fetchUsers();
+      users = await UserPermissionApi().fetchUsers(projectUuid);
       users.sort((a, b) {
         final dateA = _parseDateTime(a.createdDate);
         final dateB = _parseDateTime(b.createdDate);
@@ -96,9 +101,11 @@ class UserTableBloc extends Bloc<UserTableEvent, UserTableState> {
   Future<void> _changeUserStatus(
       ChangeUserStatus event, Emitter<UserTableState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       emit(UsersLoadingState());
-      bool res = await UserPermissionApi().changeUserStatusById(
-          event.userId, event.newStatus == "disabled" ? false : true);
+      bool res = await UserPermissionApi().changeUserStatusById(event.userId,
+          event.newStatus == "disabled" ? false : true, projectUuid);
       if (res == true) {
         add(const GetUsers());
       }

lib/pages/roles_and_permission/users_page/users_table/view/users_page.dart

@@ -13,6 +13,8 @@ import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/vi
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/view/de_activate_filter.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/view/name_filter.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/users_table/view/user_table.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -25,8 +27,7 @@ class UsersPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final TextEditingController searchController = TextEditingController();
 
-    Widget actionButton(
-        {bool isActive = false, required String title, Function()? onTap}) {
+    Widget actionButton({bool isActive = false, required String title, Function()? onTap}) {
       return InkWell(
         onTap: onTap,
         child: Padding(
@@ -59,8 +60,7 @@ class UsersPage extends StatelessWidget {
                     : ColorsManager.disabledPink.withOpacity(0.5),
           ),
           child: Padding(
-            padding:
-                const EdgeInsets.only(left: 10, right: 10, bottom: 5, top: 5),
+            padding: const EdgeInsets.only(left: 10, right: 10, bottom: 5, top: 5),
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.center,
               mainAxisAlignment: MainAxisAlignment.center,
@@ -84,15 +84,12 @@ class UsersPage extends StatelessWidget {
     }
 
     Widget changeIconStatus(
-        {required String userId,
-        required String status,
-        required Function()? onTap}) {
+        {required String userId, required String status, required Function()? onTap}) {
       return Center(
         child: InkWell(
           onTap: onTap,
           child: Padding(
-            padding:
-                const EdgeInsets.only(left: 5, right: 5, bottom: 5, top: 5),
+            padding: const EdgeInsets.only(left: 5, right: 5, bottom: 5, top: 5),
             child: SvgPicture.asset(
               status == "invited"
                   ? Assets.invitedIcon
@@ -160,6 +157,7 @@ class UsersPage extends StatelessWidget {
                       const SizedBox(width: 20),
                       InkWell(
                         onTap: () {
+                          context.read<SpaceTreeBloc>().add(ClearCachedData());
                           showDialog(
                             context: context,
                             barrierDismissible: false,
@@ -198,14 +196,10 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrder,
                           aToZTap: () {
-                            context
-                                .read<UserTableBloc>()
-                                .add(const SortUsersByNameAsc());
+                            context.read<UserTableBloc>().add(const SortUsersByNameAsc());
                           },
                           zToaTap: () {
-                            context
-                                .read<UserTableBloc>()
-                                .add(const SortUsersByNameDesc());
+                            context.read<UserTableBloc>().add(const SortUsersByNameDesc());
                           },
                         );
                       }
@@ -214,9 +208,8 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.jobTitle)
                             item: _blocRole.selectedJobTitles.contains(item),
                         };
-                        final RenderBox overlay = Overlay.of(context)
-                            .context
-                            .findRenderObject() as RenderBox;
+                        final RenderBox overlay =
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
 
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
@@ -256,9 +249,8 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.roleTypes)
                             item: _blocRole.selectedRoles.contains(item),
                         };
-                        final RenderBox overlay = Overlay.of(context)
-                            .context
-                            .findRenderObject() as RenderBox;
+                        final RenderBox overlay =
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 4,
@@ -278,10 +270,9 @@ class UsersPage extends StatelessWidget {
                                 .map((entry) => entry.key)
                                 .toList();
                             Navigator.of(context).pop();
-                            context.read<UserTableBloc>().add(
-                                FilterUsersByRoleEvent(
-                                    selectedRoles: selectedItems,
-                                    sortOrder: _blocRole.currentSortRole));
+                            context.read<UserTableBloc>().add(FilterUsersByRoleEvent(
+                                selectedRoles: selectedItems,
+                                sortOrder: _blocRole.currentSortRole));
                           },
                           onSortAtoZ: (v) {
                             _blocRole.currentSortRole = v;
@@ -296,14 +287,10 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrder,
                           aToZTap: () {
-                            context
-                                .read<UserTableBloc>()
-                                .add(const DateNewestToOldestEvent());
+                            context.read<UserTableBloc>().add(const DateNewestToOldestEvent());
                           },
                           zToaTap: () {
-                            context
-                                .read<UserTableBloc>()
-                                .add(const DateOldestToNewestEvent());
+                            context.read<UserTableBloc>().add(const DateOldestToNewestEvent());
                           },
                         );
                       }
@@ -312,9 +299,8 @@ class UsersPage extends StatelessWidget {
                           for (var item in _blocRole.createdBy)
                             item: _blocRole.selectedCreatedBy.contains(item),
                         };
-                        final RenderBox overlay = Overlay.of(context)
-                            .context
-                            .findRenderObject() as RenderBox;
+                        final RenderBox overlay =
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 1,
@@ -352,9 +338,8 @@ class UsersPage extends StatelessWidget {
                             item: _blocRole.selectedStatuses.contains(item),
                         };
 
-                        final RenderBox overlay = Overlay.of(context)
-                            .context
-                            .findRenderObject() as RenderBox;
+                        final RenderBox overlay =
+                            Overlay.of(context).context.findRenderObject() as RenderBox;
                         showPopUpFilterMenu(
                           position: RelativeRect.fromLTRB(
                             overlay.size.width / 0,
@@ -391,14 +376,10 @@ class UsersPage extends StatelessWidget {
                           context: context,
                           isSelected: _blocRole.currentSortOrderDate,
                           aToZTap: () {
-                            context
-                                .read<UserTableBloc>()
-                                .add(const DateNewestToOldestEvent());
+                            context.read<UserTableBloc>().add(const DateNewestToOldestEvent());
                           },
                           zToaTap: () {
-                            context
-                                .read<UserTableBloc>()
-                                .add(const DateOldestToNewestEvent());
+                            context.read<UserTableBloc>().add(const DateOldestToNewestEvent());
                           },
                         );
                       }
@@ -425,23 +406,17 @@ class UsersPage extends StatelessWidget {
                         Text(user.createdTime ?? ''),
                         Text(user.invitedBy),
                         status(
-                          status: user.isEnabled == false
-                              ? 'disabled'
-                              : user.status,
+                          status: user.isEnabled == false ? 'disabled' : user.status,
                         ),
                         changeIconStatus(
-                          status: user.isEnabled == false
-                              ? 'disabled'
-                              : user.status,
+                          status: user.isEnabled == false ? 'disabled' : user.status,
                           userId: user.uuid,
                           onTap: user.status != "invited"
                               ? () {
-                                  context.read<UserTableBloc>().add(
-                                      ChangeUserStatus(
-                                          userId: user.uuid,
-                                          newStatus: user.isEnabled == false
-                                              ? 'disabled'
-                                              : user.status));
+                                  context.read<UserTableBloc>().add(ChangeUserStatus(
+                                      userId: user.uuid,
+                                      newStatus:
+                                          user.isEnabled == false ? 'disabled' : user.status));
                                 }
                               : null,
                         ),
@@ -452,12 +427,12 @@ class UsersPage extends StatelessWidget {
                                     isActive: true,
                                     title: "Edit",
                                     onTap: () {
+                                      context.read<SpaceTreeBloc>().add(ClearCachedData());
                                       showDialog(
                                         context: context,
                                         barrierDismissible: false,
                                         builder: (BuildContext context) {
-                                          return EditUserDialog(
-                                              userId: user.uuid);
+                                          return EditUserDialog(userId: user.uuid);
                                         },
                                       ).then((v) {
                                         if (v != null) {
@@ -478,13 +453,10 @@ class UsersPage extends StatelessWidget {
                                   context: context,
                                   barrierDismissible: false,
                                   builder: (BuildContext context) {
-                                    return DeleteUserDialog(
-                                        onTapDelete: () async {
+                                    return DeleteUserDialog(onTapDelete: () async {
                                       try {
-                                        _blocRole.add(DeleteUserEvent(
-                                            user.uuid, context));
-                                        await Future.delayed(
-                                            const Duration(seconds: 2));
+                                        _blocRole.add(DeleteUserEvent(user.uuid, context));
+                                        await Future.delayed(const Duration(seconds: 2));
                                         return true;
                                       } catch (e) {
                                         return false;
@@ -514,20 +486,14 @@ class UsersPage extends StatelessWidget {
                             visiblePagesCount: 4,
                             buttonRadius: 10,
                             selectedButtonColor: ColorsManager.secondaryColor,
-                            buttonUnSelectedBorderColor:
-                                ColorsManager.grayBorder,
-                            lastPageIcon:
-                                const Icon(Icons.keyboard_double_arrow_right),
-                            firstPageIcon:
-                                const Icon(Icons.keyboard_double_arrow_left),
-                            totalPages: (_blocRole.totalUsersCount.length /
-                                    _blocRole.itemsPerPage)
-                                .ceil(),
+                            buttonUnSelectedBorderColor: ColorsManager.grayBorder,
+                            lastPageIcon: const Icon(Icons.keyboard_double_arrow_right),
+                            firstPageIcon: const Icon(Icons.keyboard_double_arrow_left),
+                            totalPages:
+                                (_blocRole.totalUsersCount.length / _blocRole.itemsPerPage).ceil(),
                             currentPage: _blocRole.currentPage,
                             onPageChanged: (int pageNumber) {
-                              context
-                                  .read<UserTableBloc>()
-                                  .add(ChangePage(pageNumber));
+                              context.read<UserTableBloc>().add(ChangePage(pageNumber));
                             },
                           ),
                         ),

lib/pages/roles_and_permission/view/roles_and_permission_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
 import 'package:syncrow_web/pages/roles_and_permission/bloc/roles_permission_bloc.dart';
 import 'package:syncrow_web/pages/roles_and_permission/bloc/roles_permission_state.dart';

lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart

@@ -0,0 +1,39 @@
+
+import 'dart:convert';
+
+class AutomationStatusUpdate {
+  final String spaceUuid;
+  final bool isEnable;
+
+  AutomationStatusUpdate({
+    required this.spaceUuid,
+    required this.isEnable,
+  });
+
+  factory AutomationStatusUpdate.fromRawJson(String str) =>
+      AutomationStatusUpdate.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory AutomationStatusUpdate.fromJson(Map<String, dynamic> json) =>
+      AutomationStatusUpdate(
+        spaceUuid: json["spaceUuid"],
+        isEnable: json["isEnable"],
+      );
+
+  Map<String, dynamic> toJson() => {
+        "spaceUuid": spaceUuid,
+        "isEnable": isEnable,
+      };
+
+  factory AutomationStatusUpdate.fromMap(Map<String, dynamic> map) =>
+      AutomationStatusUpdate(
+        spaceUuid: map["spaceUuid"],
+        isEnable: map["isEnable"],
+      );
+
+  Map<String, dynamic> toMap() => {
+        "spaceUuid": spaceUuid,
+        "isEnable": isEnable,
+      };
+}

lib/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart

@@ -0,0 +1,51 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_state.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/services/space_mana_api.dart';
+
+class CreateRoutineBloc extends Bloc<CreateRoutineEvent, CreateRoutineState> {
+  CreateRoutineBloc() : super(const CreateRoutineInitial()) {
+    on<SpaceOnlyWithDevicesEvent>(_fetchSpaceOnlyWithDevices);
+    on<SaveCommunityIdAndSpaceIdEvent>(saveSpaceIdCommunityId);
+    on<ResetSelectedEvent>(resetSelected);
+  }
+
+  String selectedSpaceId = '';
+  String selectedCommunityId = '';
+
+  List<SpaceModel> spacesOnlyWithDevices = [];
+
+  Future<void> _fetchSpaceOnlyWithDevices(
+      SpaceOnlyWithDevicesEvent event, Emitter<CreateRoutineState> emit) async {
+    emit(const SpaceWithDeviceLoadingState());
+
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      spacesOnlyWithDevices = await CommunitySpaceManagementApi()
+          .getSpaceOnlyWithDevices(
+              communityId: event.communityID, projectId: projectUuid);
+
+      emit(SpaceWithDeviceLoadedState(spacesOnlyWithDevices));
+    } catch (e) {
+      emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
+    }
+  }
+
+  saveSpaceIdCommunityId(
+      SaveCommunityIdAndSpaceIdEvent event, Emitter<CreateRoutineState> emit) {
+    emit(const SpaceWithDeviceLoadingState());
+    selectedSpaceId = event.spaceID!;
+    selectedCommunityId = event.communityID!;
+    emit(const SelectedState());
+  }
+
+  resetSelected(ResetSelectedEvent event, Emitter<CreateRoutineState> emit) {
+    emit(const SpaceWithDeviceLoadingState());
+    selectedSpaceId = '';
+    selectedCommunityId = '';
+    emit(const ResetSelectedState());
+  }
+}

lib/pages/routines/bloc/create_routine_bloc/create_routine_event.dart

@@ -0,0 +1,43 @@
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+
+abstract class CreateRoutineEvent extends Equatable {
+  const CreateRoutineEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class AddToIfContainer extends CreateRoutineEvent {
+  final SpaceModel spaceModel;
+
+  const AddToIfContainer(this.spaceModel);
+
+  @override
+  List<Object?> get props => [spaceModel];
+}
+
+class SpaceOnlyWithDevicesEvent extends CreateRoutineEvent {
+  final String communityID;
+  const SpaceOnlyWithDevicesEvent(this.communityID);
+
+  @override
+  List<Object> get props => [communityID];
+}
+
+class SaveCommunityIdAndSpaceIdEvent extends CreateRoutineEvent {
+  final String? communityID;
+  final String? spaceID;
+
+  const SaveCommunityIdAndSpaceIdEvent({this.communityID, this.spaceID});
+
+  @override
+  List<Object> get props => [communityID!, spaceID!];
+}
+
+class ResetSelectedEvent extends CreateRoutineEvent {
+  const ResetSelectedEvent();
+
+  @override
+  List<Object> get props => [];
+}

lib/pages/routines/bloc/create_routine_bloc/create_routine_state.dart

@@ -0,0 +1,46 @@
+
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+
+abstract class CreateRoutineState extends Equatable {
+  const CreateRoutineState();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class CreateRoutineInitial extends CreateRoutineState {
+  const CreateRoutineInitial();
+}
+
+class SpaceWithDeviceLoadingState extends CreateRoutineState {
+  const SpaceWithDeviceLoadingState();
+}
+
+class SpaceWithDeviceLoadedState extends CreateRoutineState {
+  final List<SpaceModel> spaces;
+
+  const SpaceWithDeviceLoadedState(this.spaces);
+
+  @override
+  List<Object?> get props => [spaces];
+}
+
+class SpaceTreeErrorState extends CreateRoutineState {
+  final String errorMessage;
+
+  const SpaceTreeErrorState(this.errorMessage);
+
+  @override
+  List<Object?> get props => [errorMessage];
+}
+
+class SelectedState extends CreateRoutineState {
+  const SelectedState();
+}
+
+
+class ResetSelectedState extends CreateRoutineState {
+  const ResetSelectedState();
+}
+

lib/pages/routines/bloc/routine_bloc/routine_bloc.dart

@@ -3,24 +3,30 @@ import 'dart:async';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_automation_model.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_scene_model.dart';
 import 'package:syncrow_web/pages/routines/models/delay/delay_fucntions.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/routine_details_model.dart';
 import 'package:syncrow_web/pages/routines/models/routine_model.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 import 'package:syncrow_web/services/routines_api.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';
 import 'package:uuid/uuid.dart';
 
 part 'routine_event.dart';
 part 'routine_state.dart';
 
-String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-String communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
+// String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+// String communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
 
 class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   RoutineBloc() : super(const RoutineState()) {
@@ -48,17 +54,22 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     on<TriggerSwitchTabsEvent>(_triggerSwitchTabsEvent);
     on<CreateNewRoutineViewEvent>(_createNewRoutineViewEvent);
     on<ResetErrorMessage>(_resetErrorMessage);
+    on<SceneTrigger>(_onSceneTrigger);
+    on<UpdateAutomationStatus>(_onUpdateAutomationStatus);
   }
+  String selectedSpaceId = '';
+  String selectedCommunityId = '';
 
   FutureOr<void> _triggerSwitchTabsEvent(
     TriggerSwitchTabsEvent event,
     Emitter<RoutineState> emit,
   ) {
-    emit(state.copyWith(routineTab: event.isRoutineTab, createRoutineView: false));
+    emit(state.copyWith(
+        routineTab: event.isRoutineTab, createRoutineView: false));
     add(ResetRoutineState());
     if (event.isRoutineTab) {
-      add(LoadScenes(spaceId, communityId));
-      add(LoadAutomation(spaceId));
+      add(const LoadScenes());
+      add(const LoadAutomation());
     }
   }
 
@@ -80,8 +91,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     final updatedIfItems = List<Map<String, dynamic>>.from(state.ifItems);
 
     // Find the index of the item in teh current itemsList
-    int index =
-        updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index = updatedIfItems.indexWhere(
+        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       updatedIfItems[index] = event.item;
@@ -90,18 +101,21 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
 
     if (event.isTabToRun) {
-      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
+      emit(state.copyWith(
+          ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
     } else {
-      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
+      emit(state.copyWith(
+          ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
     }
   }
 
-  void _onAddToThenContainer(AddToThenContainer event, Emitter<RoutineState> emit) {
+  void _onAddToThenContainer(
+      AddToThenContainer event, Emitter<RoutineState> emit) {
     final currentItems = List<Map<String, dynamic>>.from(state.thenItems);
 
     // Find the index of the item in teh current itemsList
-    int index =
-        currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index = currentItems.indexWhere(
+        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       currentItems[index] = event.item;
@@ -112,22 +126,26 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(thenItems: currentItems));
   }
 
-  void _onAddFunctionsToRoutine(AddFunctionToRoutine event, Emitter<RoutineState> emit) {
+  void _onAddFunctionsToRoutine(
+      AddFunctionToRoutine event, Emitter<RoutineState> emit) {
     try {
       if (event.functions.isEmpty) return;
 
-      List<DeviceFunctionData> selectedFunction = List<DeviceFunctionData>.from(event.functions);
+      List<DeviceFunctionData> selectedFunction =
+          List<DeviceFunctionData>.from(event.functions);
 
       Map<String, List<DeviceFunctionData>> currentSelectedFunctions =
           Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
       if (currentSelectedFunctions.containsKey(event.uniqueCustomId)) {
         List<DeviceFunctionData> currentFunctions =
-            List<DeviceFunctionData>.from(currentSelectedFunctions[event.uniqueCustomId] ?? []);
+            List<DeviceFunctionData>.from(
+                currentSelectedFunctions[event.uniqueCustomId] ?? []);
 
         List<String> functionCode = [];
         for (int i = 0; i < selectedFunction.length; i++) {
           for (int j = 0; j < currentFunctions.length; j++) {
-            if (selectedFunction[i].functionCode == currentFunctions[j].functionCode) {
+            if (selectedFunction[i].functionCode ==
+                currentFunctions[j].functionCode) {
               currentFunctions[j] = selectedFunction[i];
               if (!functionCode.contains(currentFunctions[j].functionCode)) {
                 functionCode.add(currentFunctions[j].functionCode);
@@ -137,13 +155,15 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
 
         for (int i = 0; i < functionCode.length; i++) {
-          selectedFunction.removeWhere((code) => code.functionCode == functionCode[i]);
+          selectedFunction
+              .removeWhere((code) => code.functionCode == functionCode[i]);
         }
 
-        currentSelectedFunctions[event.uniqueCustomId] = List.from(currentFunctions)
-          ..addAll(selectedFunction);
+        currentSelectedFunctions[event.uniqueCustomId] =
+            List.from(currentFunctions)..addAll(selectedFunction);
       } else {
-        currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
+        currentSelectedFunctions[event.uniqueCustomId] =
+            List.from(event.functions);
       }
 
       emit(state.copyWith(selectedFunctions: currentSelectedFunctions));
@@ -152,18 +172,32 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(LoadScenes event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadScenes(
+      LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
-
+    List<ScenesModel> scenes = [];
     try {
-      spaceId = event.spaceId;
-      communityId = event.communityId;
-
-      List<ScenesModel> scenes = [];
-
-      if (communityId.isNotEmpty && spaceId.isNotEmpty) {
-        scenes = await SceneApi.getScenes(event.spaceId, event.communityId);
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var createRoutineBloc = context.read<CreateRoutineBloc>();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      if (createRoutineBloc.selectedSpaceId == '' &&
+          createRoutineBloc.selectedCommunityId == '') {
+        var spaceBloc = context.read<SpaceTreeBloc>();
+        for (var communityId in spaceBloc.state.selectedCommunities) {
+          List<String> spacesList =
+              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+          for (var spaceId in spacesList) {
+            scenes.addAll(
+                await SceneApi.getScenes(spaceId, communityId, projectUuid));
+          }
+        }
+      } else {
+        scenes.addAll(await SceneApi.getScenes(
+            createRoutineBloc.selectedSpaceId,
+            createRoutineBloc.selectedCommunityId,
+            projectUuid));
       }
+
       emit(state.copyWith(
         scenes: scenes,
         isLoading: false,
@@ -174,18 +208,36 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           loadScenesErrorMessage: 'Failed to load scenes',
           errorMessage: '',
           loadAutomationErrorMessage: '',
-          scenes: []));
+          scenes: scenes));
     }
   }
 
-  Future<void> _onLoadAutomation(LoadAutomation event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadAutomation(
+      LoadAutomation event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
+    List<ScenesModel> automations = [];
+    final projectId = await ProjectManager.getProjectUUID() ?? '';
 
+    BuildContext context = NavigationService.navigatorKey.currentContext!;
+    var createRoutineBloc = context.read<CreateRoutineBloc>();
     try {
-      spaceId = event.spaceId;
-      List<ScenesModel> automations = [];
-      if (spaceId.isNotEmpty) {
-        automations = await SceneApi.getAutomation(event.spaceId);
+  
+      if (createRoutineBloc.selectedSpaceId == '' &&
+          createRoutineBloc.selectedCommunityId == '') {
+        var spaceBloc = context.read<SpaceTreeBloc>();
+        for (var communityId in spaceBloc.state.selectedCommunities) {
+          List<String> spacesList =
+              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+          for (var spaceId in spacesList) {
+            automations.addAll(
+                await SceneApi.getAutomation(spaceId, communityId, projectId));
+          }
+        }
+      } else {
+        automations.addAll(await SceneApi.getAutomation(
+            createRoutineBloc.selectedSpaceId,
+            createRoutineBloc.selectedCommunityId,
+            projectId));
       }
       emit(state.copyWith(
         automations: automations,
@@ -197,18 +249,20 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           loadAutomationErrorMessage: 'Failed to load automations',
           errorMessage: '',
           loadScenesErrorMessage: '',
-          automations: []));
+          automations: automations));
     }
   }
 
-  FutureOr<void> _onSearchRoutines(SearchRoutines event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onSearchRoutines(
+      SearchRoutines event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     await Future.delayed(const Duration(seconds: 1));
     emit(state.copyWith(isLoading: false, errorMessage: null));
     emit(state.copyWith(searchText: event.query));
   }
 
-  FutureOr<void> _onAddSelectedIcon(AddSelectedIcon event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onAddSelectedIcon(
+      AddSelectedIcon event, Emitter<RoutineState> emit) {
     emit(state.copyWith(selectedIcon: event.icon));
   }
 
@@ -222,7 +276,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return actions.last['deviceId'] == 'delay';
   }
 
-  Future<void> _onCreateScene(CreateSceneEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateScene(
+      CreateSceneEvent event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -235,7 +290,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -280,8 +336,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         });
       }).toList();
 
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var createRoutineBloc = context.read<CreateRoutineBloc>();
+
       final createSceneModel = CreateSceneModel(
-        spaceUuid: spaceId,
+        spaceUuid: createRoutineBloc.selectedSpaceId,
         iconId: state.selectedIcon ?? '',
         showInDevice: true,
         sceneName: state.routineName ?? '',
@@ -292,8 +351,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final result = await SceneApi.createScene(createSceneModel);
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadScenes(spaceId, communityId));
-        add(LoadAutomation(spaceId));
+        add(const LoadScenes());
+        add(const LoadAutomation());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -308,8 +367,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateAutomation(
+      CreateAutomationEvent event, Emitter<RoutineState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
           errorMessage: 'Automation name is required',
@@ -329,7 +390,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         CustomSnackBar.redSnackBar('Cannot have delay as the last action');
@@ -404,9 +466,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           );
         });
       }).toList();
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var createRoutineBloc = context.read<CreateRoutineBloc>();
 
       final createAutomationModel = CreateAutomationModel(
-        spaceUuid: spaceId,
+        spaceUuid: createRoutineBloc.selectedSpaceId,
         automationName: state.routineName ?? '',
         decisionExpr: state.selectedAutomationOperator,
         effectiveTime: EffectiveTime(
@@ -418,11 +482,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result = await SceneApi.createAutomation(createAutomationModel);
+      final result =
+          await SceneApi.createAutomation(createAutomationModel, projectUuid);
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
-        add(LoadScenes(spaceId, communityId));
+        add(const LoadAutomation());
+        add(const LoadScenes());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -439,17 +504,21 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onRemoveDragCard(RemoveDragCard event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onRemoveDragCard(
+      RemoveDragCard event, Emitter<RoutineState> emit) {
     if (event.isFromThen) {
       final thenItems = List<Map<String, dynamic>>.from(state.thenItems);
-      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions =
+          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       thenItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
-      emit(state.copyWith(thenItems: thenItems, selectedFunctions: selectedFunctions));
+      emit(state.copyWith(
+          thenItems: thenItems, selectedFunctions: selectedFunctions));
     } else {
       final ifItems = List<Map<String, dynamic>>.from(state.ifItems);
-      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions =
+          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       ifItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
@@ -460,7 +529,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             isAutomation: false,
             isTabToRun: false));
       } else {
-        emit(state.copyWith(ifItems: ifItems, selectedFunctions: selectedFunctions));
+        emit(state.copyWith(
+            ifItems: ifItems, selectedFunctions: selectedFunctions));
       }
     }
   }
@@ -472,18 +542,23 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     ));
   }
 
-  FutureOr<void> _onEffectiveTimeEvent(EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onEffectiveTimeEvent(
+      EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
     emit(state.copyWith(effectiveTime: event.effectiveTime));
   }
 
-  FutureOr<void> _onSetRoutineName(SetRoutineName event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onSetRoutineName(
+      SetRoutineName event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
       routineName: event.name,
     ));
   }
 
-  (List<Map<String, dynamic>>, List<Map<String, dynamic>>, Map<String, List<DeviceFunctionData>>)
-      _createCardData(
+  (
+    List<Map<String, dynamic>>,
+    List<Map<String, dynamic>>,
+    Map<String, List<DeviceFunctionData>>
+  ) _createCardData(
     List<RoutineAction> actions,
     List<RoutineCondition>? conditions,
     Map<String, List<DeviceFunctionData>> currentFunctions,
@@ -516,7 +591,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
                 'deviceId': condition.entityId,
                 'title': matchingDevice.name ?? condition.entityId,
                 'productType': condition.entityType,
-                'imagePath': matchingDevice.getDefaultIcon(condition.entityType),
+                'imagePath':
+                    matchingDevice.getDefaultIcon(condition.entityType),
               };
 
               final functions = matchingDevice.functions;
@@ -552,8 +628,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final cardData = {
         'entityId': action.entityId,
         'uniqueCustomId': const Uuid().v4(),
-        'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-        'title': action.actionExecutor == 'delay' ? 'Delay' : (matchingDevice.name ?? 'Device'),
+        'deviceId':
+            action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+        'title': action.actionExecutor == 'delay'
+            ? 'Delay'
+            : (matchingDevice.name ?? 'Device'),
         'productType': action.productType,
         'imagePath': matchingDevice.getDefaultIcon(action.productType),
       };
@@ -596,7 +675,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return (thenItems, ifItems, currentFunctions);
   }
 
-  Future<void> _onGetSceneDetails(GetSceneDetails event, Emitter<RoutineState> emit) async {
+  Future<void> _onGetSceneDetails(
+      GetSceneDetails event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(
         isLoading: true,
@@ -644,10 +724,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         if (!deviceCards.containsKey(deviceId)) {
           deviceCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
-                ? const Uuid().v4()
-                : action.entityId,
+            'deviceId':
+                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'uniqueCustomId':
+                action.type == 'automation' || action.actionExecutor == 'delay'
+                    ? const Uuid().v4()
+                    : action.entityId,
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
                 : action.type == 'automation'
@@ -682,7 +764,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             ),
           );
           // emit(state.copyWith(automationActionExecutor: action.actionExecutor));
-        } else if (action.executorProperty != null && action.actionExecutor != 'delay') {
+        } else if (action.executorProperty != null &&
+            action.actionExecutor != 'delay') {
           if (!updatedFunctions.containsKey(uniqueCustomId)) {
             updatedFunctions[uniqueCustomId] = [];
           }
@@ -754,7 +837,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onResetRoutineState(ResetRoutineState event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onResetRoutineState(
+      ResetRoutineState event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
         ifItems: [],
         thenItems: [],
@@ -777,18 +861,36 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         isUpdate: false,
         createRoutineView: false));
   }
-
-  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) {
+  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) async {
     try {
-      emit(state.copyWith(isLoading: true));
-      if (state.isTabToRun) {
-        SceneApi.deleteScene(unitUuid: spaceId, sceneId: state.sceneId ?? '');
-      } else {
-        SceneApi.deleteAutomation(unitUuid: spaceId, automationId: state.automationId ?? '');
-      }
+      final projectId = await ProjectManager.getProjectUUID() ?? '';
 
-      add(LoadScenes(spaceId, communityId));
-      add(LoadAutomation(spaceId));
+      emit(state.copyWith(isLoading: true));
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+      if (state.isTabToRun) {
+        await SceneApi.deleteScene(
+            unitUuid: spaceBloc.state.selectedSpaces[0], sceneId: state.sceneId ?? '');
+      } else {
+        await SceneApi.deleteAutomation(
+            unitUuid: spaceBloc.state.selectedSpaces[0],
+            automationId: state.automationId ?? '',
+            projectId: projectId);
+      }
+      // var createRoutineBloc = context.read<CreateRoutineBloc>();
+      // if (state.isTabToRun) {
+      //   await SceneApi.deleteScene(
+      //       unitUuid: createRoutineBloc.selectedSpaceId,
+      //       sceneId: state.sceneId ?? '');
+      // } else {
+      //   await SceneApi.deleteAutomation(
+      //       projectId: projectId,
+      //       unitUuid: createRoutineBloc.selectedSpaceId,
+      //       automationId: state.automationId ?? '');
+      // }
+
+      add(const LoadScenes());
+      add(const LoadAutomation());
       add(ResetRoutineState());
       emit(state.copyWith(isLoading: false, createRoutineView: false));
     } catch (e) {
@@ -798,7 +900,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       ));
     }
   }
-
+ 
   // FutureOr<void> _deleteAutomation(DeleteAutomation event, Emitter<RoutineState> emit) {
   //   try {
   //     emit(state.copyWith(isLoading: true));
@@ -813,10 +915,32 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   //   }
   // }
 
-  FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _fetchDevices(
+      FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
-      final devices = await DevicesManagementApi().fetchDevices('', '');
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      List<AllDevicesModel> devices = [];
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var createRoutineBloc = context.read<CreateRoutineBloc>();
+      var spaceBloc = context.read<SpaceTreeBloc>();
+
+      if (createRoutineBloc.selectedSpaceId == '' &&
+          createRoutineBloc.selectedCommunityId == '') {
+        for (var communityId in spaceBloc.state.selectedCommunities) {
+          List<String> spacesList =
+              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+          for (var spaceId in spacesList) {
+            devices.addAll(await DevicesManagementApi()
+                .fetchDevices(communityId, spaceId, projectUuid));
+          }
+        }
+      } else {
+        devices.addAll(await DevicesManagementApi().fetchDevices(
+            createRoutineBloc.selectedCommunityId,
+            createRoutineBloc.selectedSpaceId,
+            projectUuid));
+      }
 
       emit(state.copyWith(isLoading: false, devices: devices));
     } catch (e) {
@@ -824,7 +948,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateScene(UpdateScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateScene(
+      UpdateScene event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -838,7 +963,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -891,11 +1017,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result = await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
+      final result =
+          await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadScenes(spaceId, communityId));
-        add(LoadAutomation(spaceId));
+        add(const LoadScenes());
+        add(const LoadAutomation());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -910,7 +1037,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateAutomation(UpdateAutomation event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateAutomation(
+      UpdateAutomation event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -1005,8 +1133,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         });
       }).toList();
 
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<CreateRoutineBloc>();
+
       final createAutomationModel = CreateAutomationModel(
-        spaceUuid: spaceId,
+        spaceUuid: spaceBloc.selectedSpaceId,
         automationName: state.routineName ?? '',
         decisionExpr: state.selectedAutomationOperator,
         effectiveTime: EffectiveTime(
@@ -1017,14 +1148,14 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         conditions: conditions,
         actions: actions,
       );
-
-      final result =
-          await SceneApi.updateAutomation(createAutomationModel, state.automationId ?? '');
+      final projectId = await ProjectManager.getProjectUUID() ?? '';
+      final result = await SceneApi.updateAutomation(
+          createAutomationModel, state.automationId ?? '', projectId);
 
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation(spaceId));
-        add(LoadScenes(spaceId, communityId));
+        add(LoadAutomation());
+        add(LoadScenes());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -1042,6 +1173,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   Future<void> _onGetAutomationDetails(
       GetAutomationDetails event, Emitter<RoutineState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
       emit(state.copyWith(
         isLoading: true,
         isUpdate: true,
@@ -1052,7 +1184,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         thenItems: [],
       ));
 
-      final automationDetails = await SceneApi.getAutomationDetails(event.automationId);
+      final automationDetails =
+          await SceneApi.getAutomationDetails(event.automationId, projectUuid);
 
       final Map<String, Map<String, dynamic>> deviceIfCards = {};
       final Map<String, Map<String, dynamic>> deviceThenCards = {};
@@ -1120,13 +1253,15 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           ),
         );
 
-        final deviceId =
-            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;
+        final deviceId = action.actionExecutor == 'delay'
+            ? '${action.entityId}_delay'
+            : action.entityId;
 
         if (!deviceThenCards.containsKey(deviceId)) {
           deviceThenCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'deviceId':
+                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
             'uniqueCustomId': const Uuid().v4(),
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
@@ -1157,7 +1292,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           updatedFunctions[uniqueCustomId] = [];
         }
 
-        if (action.executorProperty != null && action.actionExecutor != 'delay') {
+        if (action.executorProperty != null &&
+            action.actionExecutor != 'delay') {
           final functions = matchingDevice.functions;
           final functionCode = action.executorProperty!.functionCode;
           for (var function in functions) {
@@ -1199,10 +1335,14 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
       }
 
-      final ifItems = deviceIfCards.values.where((card) => card['type'] == 'condition').toList();
+      final ifItems = deviceIfCards.values
+          .where((card) => card['type'] == 'condition')
+          .toList();
       final thenItems = deviceThenCards.values
           .where((card) =>
-              card['type'] == 'action' || card['type'] == 'automation' || card['type'] == 'scene')
+              card['type'] == 'action' ||
+              card['type'] == 'automation' ||
+              card['type'] == 'scene')
           .toList();
 
       emit(state.copyWith(
@@ -1223,4 +1363,77 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       ));
     }
   }
+
+  Future<void> _onSceneTrigger(
+      SceneTrigger event, Emitter<RoutineState> emit) async {
+    emit(state.copyWith(loadingSceneId: event.sceneId));
+
+    try {
+      final success = await SceneApi.triggerScene(event.sceneId!);
+
+      if (success) {
+        emit(state.copyWith(
+          loadingSceneId: null,
+          // Add success state if needed
+        ));
+        // Optional: Add delay to show success feedback
+        await Future.delayed(const Duration(milliseconds: 500));
+      } else {
+        emit(state.copyWith(
+          loadingSceneId: null,
+          errorMessage: 'Trigger failed',
+        ));
+      }
+    } catch (e) {
+      emit(state.copyWith(
+        loadingSceneId: null,
+        errorMessage: 'Trigger error: ${e.toString()}',
+      ));
+    }
+  }
+
+  Future<void> _onUpdateAutomationStatus(
+      UpdateAutomationStatus event, Emitter<RoutineState> emit) async {
+    // Create a new set safely
+    final currentLoadingIds = state.loadingAutomationIds;
+    final newLoadingIds = {...currentLoadingIds!}..add(event.automationId);
+
+    emit(state.copyWith(loadingAutomationIds: newLoadingIds));
+
+    try {
+      final projectId = await ProjectManager.getProjectUUID() ?? '';
+      final success = await SceneApi.updateAutomationStatus(
+          event.automationId, event.automationStatusUpdate, projectId);
+
+      if (success) {
+        final updatedAutomations = await SceneApi.getAutomationByUnitId(
+            event.automationStatusUpdate.spaceUuid,
+            event.communityId,
+            projectId);
+
+        // Remove from loading set safely
+        final updatedLoadingIds = {...state.loadingAutomationIds!}
+          ..remove(event.automationId);
+
+        emit(state.copyWith(
+          automations: updatedAutomations,
+          loadingAutomationIds: updatedLoadingIds,
+        ));
+      } else {
+        final updatedLoadingIds = {...state.loadingAutomationIds!}
+          ..remove(event.automationId);
+        emit(state.copyWith(
+          loadingAutomationIds: updatedLoadingIds,
+          errorMessage: 'Update failed',
+        ));
+      }
+    } catch (e) {
+      final updatedLoadingIds = {...state.loadingAutomationIds!}
+        ..remove(event.automationId);
+      emit(state.copyWith(
+        loadingAutomationIds: updatedLoadingIds,
+        errorMessage: 'Update error: ${e.toString()}',
+      ));
+    }
+  }
 }

lib/pages/routines/bloc/routine_bloc/routine_event.dart

@@ -27,22 +27,24 @@ class AddToThenContainer extends RoutineEvent {
 }
 
 class LoadScenes extends RoutineEvent {
-  final String spaceId;
-  final String communityId;
+  // final String spaceId;
+  // final String communityId;
+  // final BuildContext context;
 
-  const LoadScenes(this.spaceId, this.communityId);
+  const LoadScenes();
 
   @override
-  List<Object> get props => [spaceId, communityId];
+  List<Object> get props => [];
 }
 
 class LoadAutomation extends RoutineEvent {
-  final String spaceId;
+  // final String spaceId;
+  // final BuildContext context;
 
-  const LoadAutomation(this.spaceId);
+  const LoadAutomation();
 
   @override
-  List<Object> get props => [spaceId];
+  List<Object> get props => [];
 }
 
 class AddFunctionToRoutine extends RoutineEvent {
@@ -208,3 +210,28 @@ class ResetRoutineState extends RoutineEvent {}
 class ClearFunctions extends RoutineEvent {}
 
 class ResetErrorMessage extends RoutineEvent {}
+
+
+
+
+class SceneTrigger extends RoutineEvent {
+  final String? sceneId;
+  final String? name;
+
+  const SceneTrigger({this.sceneId, this.name});
+
+  @override
+  List<Object> get props => [sceneId!,name!];
+}
+
+//updateAutomationStatus
+class UpdateAutomationStatus extends RoutineEvent {
+  final String automationId;
+  final AutomationStatusUpdate automationStatusUpdate;
+  final String communityId;
+
+  const UpdateAutomationStatus({required this.automationStatusUpdate, required this.automationId, required this.communityId});
+
+  @override
+  List<Object> get props => [automationStatusUpdate];
+}

lib/pages/routines/bloc/routine_bloc/routine_state.dart

@@ -1,6 +1,7 @@
 part of 'routine_bloc.dart';
 
 class RoutineState extends Equatable {
+  final String? loadingSceneId;
   final List<Map<String, dynamic>> ifItems;
   final List<Map<String, dynamic>> thenItems;
   final List<Map<String, String>> availableCards;
@@ -25,6 +26,7 @@ class RoutineState extends Equatable {
   // final String? automationActionExecutor;
   final bool routineTab;
   final bool createRoutineView;
+  final Set<String>? loadingAutomationIds; // Track loading automations
 
   const RoutineState(
       {this.ifItems = const [],
@@ -47,12 +49,16 @@ class RoutineState extends Equatable {
       this.sceneId,
       this.automationId,
       this.isUpdate,
+      this.loadingAutomationIds = const <String>{}, // Initialize with empty set
+      this.loadingSceneId,
       this.devices = const [],
       //  this.automationActionExecutor,
       this.routineTab = false,
       this.createRoutineView = false});
 
   RoutineState copyWith({
+    String? loadingSceneId,
+    Set<String>? loadingAutomationIds,
     List<Map<String, dynamic>>? ifItems,
     List<Map<String, dynamic>>? thenItems,
     List<ScenesModel>? scenes,
@@ -79,6 +85,8 @@ class RoutineState extends Equatable {
     bool? createRoutineView,
   }) {
     return RoutineState(
+        loadingSceneId: loadingSceneId,
+        loadingAutomationIds: loadingAutomationIds ?? this.loadingAutomationIds,
         ifItems: ifItems ?? this.ifItems,
         thenItems: thenItems ?? this.thenItems,
         scenes: scenes ?? this.scenes,
@@ -109,6 +117,7 @@ class RoutineState extends Equatable {
 
   @override
   List<Object?> get props => [
+        loadingAutomationIds,
         ifItems,
         thenItems,
         scenes,
@@ -134,3 +143,38 @@ class RoutineState extends Equatable {
         createRoutineView
       ];
 }
+
+class SceneInitial extends RoutineState {}
+
+class SceneLoading extends RoutineState {}
+
+class SceneLoaded extends RoutineState {
+  final List<ScenesModel>? scenesOrAutomation;
+  const SceneLoaded({this.scenesOrAutomation});
+  @override
+  List<Object?> get props => [
+        scenesOrAutomation,
+      ];
+}
+
+class SceneError extends RoutineState {
+  final String message;
+
+  const SceneError({required this.message});
+
+  @override
+  List<Object> get props => [message];
+}
+
+class SceneTriggerSuccess extends RoutineState {
+  final String sceneName;
+
+  const SceneTriggerSuccess(this.sceneName);
+
+  @override
+  List<Object> get props => [sceneName];
+}
+
+class UpdateAutomationStatusLoading extends RoutineState {
+  const UpdateAutomationStatusLoading();
+}

lib/pages/routines/create_new_routines/commu_dropdown.dart

@@ -0,0 +1,162 @@
+import 'package:dropdown_button2/dropdown_button2.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class CommunityDropdown extends StatelessWidget {
+  final String? selectedValue;
+  final Function(String?) onChanged;
+  final TextEditingController _searchController = TextEditingController();
+
+  CommunityDropdown({
+    Key? key,
+    required this.selectedValue,
+    required this.onChanged,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(10.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            "Community",
+            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  fontWeight: FontWeight.w400,
+                  fontSize: 13,
+                  color: ColorsManager.blackColor,
+                ),
+          ),
+          const SizedBox(height: 8),
+          BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
+            builder: (context, state) {
+              return SizedBox(
+                  child: Container(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(10),
+                ),
+                child: DropdownButton2<String>(
+                  underline: SizedBox(),
+                  value: selectedValue,
+                  items: state.communityList.map((community) {
+                    return DropdownMenuItem<String>(
+                      value: community.uuid,
+                      child: Text(
+                        '  ${community.name}',
+                        overflow: TextOverflow.ellipsis,
+                        maxLines: 1,
+                      ),
+                    );
+                  }).toList(),
+                  onChanged: onChanged,
+                  style: TextStyle(color: Colors.black),
+                  hint: Padding(
+                    padding: EdgeInsets.only(left: 10),
+                    child: Text(
+                      "  Please Select",
+                      style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                            color: ColorsManager.textGray,
+                          ),
+                    ),
+                  ),
+                  customButton: Container(
+                    height: 45,
+                    decoration: BoxDecoration(
+                      border:
+                          Border.all(color: ColorsManager.textGray, width: 1.0),
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Expanded(
+                          flex: 5,
+                          child: Text(
+                            selectedValue != null
+                                ? "  ${state.communityList.firstWhere((element) => element.uuid == selectedValue).name}"
+                                : '  Please Select',
+                            style:
+                                Theme.of(context).textTheme.bodySmall!.copyWith(
+                                      color: selectedValue != null
+                                          ? Colors.black
+                                          : ColorsManager.textGray,
+                                    ),
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                        ),
+                        Expanded(
+                          child: Container(
+                            decoration: BoxDecoration(
+                              color: Colors.grey[100],
+                              borderRadius: const BorderRadius.only(
+                                topRight: Radius.circular(10),
+                                bottomRight: Radius.circular(10),
+                              ),
+                            ),
+                            height: 45,
+                            child: const Icon(
+                              Icons.keyboard_arrow_down,
+                              color: ColorsManager.textGray,
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  dropdownStyleData: DropdownStyleData(
+                    maxHeight: MediaQuery.of(context).size.height * 0.4,
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                  ),
+                  dropdownSearchData: DropdownSearchData(
+                    searchController: _searchController,
+                    searchInnerWidgetHeight: 50,
+                    searchInnerWidget: Container(
+                      height: 50,
+                      padding: const EdgeInsets.symmetric(
+                          horizontal: 8, vertical: 4),
+                      child: TextFormField(
+                        style: const TextStyle(color: Colors.black),
+                        controller: _searchController,
+                        decoration: InputDecoration(
+                          isDense: true,
+                          contentPadding: const EdgeInsets.symmetric(
+                            horizontal: 10,
+                            vertical: 12,
+                          ),
+                          hintText: 'Search for community...',
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                        ),
+                      ),
+                    ),
+                    searchMatchFn: (item, searchValue) {
+                      final communityName =
+                          (item.child as Text).data?.toLowerCase() ?? '';
+                      return communityName
+                          .contains(searchValue.toLowerCase().trim());
+                    },
+                  ),
+                  onMenuStateChange: (isOpen) {
+                    if (!isOpen) {
+                      _searchController.clear();
+                    }
+                  },
+                  menuItemStyleData: const MenuItemStyleData(
+                    height: 40,
+                  ),
+                ),
+              ));
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/routines/create_new_routines/create_new_routines.dart

@@ -0,0 +1,154 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_state.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/create_new_routines/commu_dropdown.dart';
+import 'package:syncrow_web/pages/routines/create_new_routines/space_dropdown.dart';
+
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class CreateNewRoutinesDialog extends StatefulWidget {
+  const CreateNewRoutinesDialog({Key? key}) : super(key: key);
+
+  @override
+  State<CreateNewRoutinesDialog> createState() =>
+      _CreateNewRoutinesDialogState();
+}
+
+class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
+  String? _selectedCommunity;
+  String? _selectedSpace;
+  void _fetchSpaces(String communityId) {
+    context
+        .read<CreateRoutineBloc>()
+        .add(SpaceOnlyWithDevicesEvent(communityId));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<CreateRoutineBloc, CreateRoutineState>(
+      builder: (context, state) {
+        final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
+        final spaces = _bloc.spacesOnlyWithDevices;
+        final isLoading = state is SpaceWithDeviceLoadingState;
+
+        String spaceHint = 'Select a community first';
+
+        if (_selectedCommunity != null) {
+          if (isLoading) {
+            spaceHint = 'Loading spaces...';
+          } else if (spaces.isEmpty) {
+            spaceHint = 'No spaces available';
+          } else {
+            spaceHint = 'Select Space';
+          }
+        }
+
+        return AlertDialog(
+          backgroundColor: Colors.white,
+          insetPadding: EdgeInsets.zero,
+          contentPadding: EdgeInsets.zero,
+          shape:
+              RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+          title: Text(
+            'Create New Routines',
+            textAlign: TextAlign.center,
+            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  color: ColorsManager.primaryColor,
+                ),
+          ),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const Divider(),
+              Padding(
+                padding: const EdgeInsets.only(left: 15, right: 15),
+                child: CommunityDropdown(
+                  selectedValue: _selectedCommunity,
+                  onChanged: (String? newValue) {
+                    setState(() {
+                      _selectedCommunity = newValue;
+                      _selectedSpace = null;
+                    });
+                    if (newValue != null) {
+                      _fetchSpaces(newValue);
+                    }
+                  },
+                ),
+              ),
+              const SizedBox(height: 5),
+              Padding(
+                padding: const EdgeInsets.only(left: 15, right: 15),
+                child: SpaceDropdown(
+                  hintMessage: spaceHint,
+                  spaces: spaces,
+                  selectedValue: _selectedSpace,
+                  onChanged: (String? newValue) {
+                    setState(() {
+                      _selectedSpace = newValue;
+                    });
+                  },
+                ),
+              ),
+              const Divider(),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceAround,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      left: 20,
+                      right: 20,
+                    ),
+                    child: TextButton(
+                      onPressed: () {
+                        Navigator.of(context).pop();
+                      },
+                      child: Text(
+                        'Cancel',
+                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                              fontWeight: FontWeight.w400,
+                              fontSize: 14,
+                              color: ColorsManager.blackColor,
+                            ),
+                      ),
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      left: 20,
+                      right: 20,
+                    ),
+                    child: TextButton(
+                      onPressed:
+                          _selectedCommunity != null && _selectedSpace != null
+                              ? () {
+                                  Navigator.of(context).pop({
+                                    'community': _selectedCommunity,
+                                    'space': _selectedSpace,
+                                  });
+                                }
+                              : null,
+                      child: Text(
+                        'Next',
+                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                              fontWeight: FontWeight.w400,
+                              fontSize: 14,
+                              color: _selectedCommunity != null &&
+                                      _selectedSpace != null
+                                  ? ColorsManager.blueColor
+                                  : Colors.blue.shade100,
+                            ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+              SizedBox(height: 10),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}

lib/pages/routines/create_new_routines/space_dropdown.dart

@@ -0,0 +1,147 @@
+import 'package:dropdown_button2/dropdown_button2.dart';
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+
+class SpaceDropdown extends StatelessWidget {
+  final List<SpaceModel> spaces;
+  final String? selectedValue;
+  final Function(String?)? onChanged;
+  final String hintMessage;
+
+  const SpaceDropdown({
+    Key? key,
+    required this.spaces,
+    required this.selectedValue,
+    required this.onChanged,
+    required this.hintMessage,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(10.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            "Space",
+            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  fontWeight: FontWeight.w400,
+                  fontSize: 13,
+                  color: ColorsManager.blackColor,
+                ),
+          ),
+          const SizedBox(height: 8),
+          SizedBox(
+            child: Container(
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(10),
+              ),
+              child: DropdownButton2<String>(
+                underline: const SizedBox(),
+                value: selectedValue,
+                items: spaces.map((space) {
+                  return DropdownMenuItem<String>(
+                    value: space.uuid,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      children: [
+                        Text(
+                          '   ${space.name}',
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                    fontSize: 12,
+                                    color: ColorsManager.blackColor,
+                                  ),
+                        ),
+                        Text(
+                          '   ${space.lastThreeParents}',
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                    fontSize: 12,
+                                  ),
+                        ),
+                      ],
+                    ),
+                  );
+                }).toList(),
+                onChanged: onChanged,
+                style: TextStyle(color: Colors.black),
+                hint: Padding(
+                  padding: const EdgeInsets.only(left: 10),
+                  child: Text(
+                    hintMessage,
+                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                          color: ColorsManager.textGray,
+                        ),
+                  ),
+                ),
+                customButton: Container(
+                  height: 45,
+                  decoration: BoxDecoration(
+                    border:
+                        Border.all(color: ColorsManager.textGray, width: 1.0),
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Expanded(
+                        flex: 5,
+                        child: Padding(
+                          padding: const EdgeInsets.only(left: 10),
+                          child: Text(
+                            selectedValue != null
+                                ? spaces
+                                    .firstWhere((e) => e.uuid == selectedValue)
+                                    .name
+                                : hintMessage,
+                            style:
+                                Theme.of(context).textTheme.bodySmall!.copyWith(
+                                      color: selectedValue != null
+                                          ? Colors.black
+                                          : ColorsManager.textGray,
+                                    ),
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                        ),
+                      ),
+                      Expanded(
+                        child: Container(
+                          decoration: BoxDecoration(
+                            color: Colors.grey[200],
+                            borderRadius: const BorderRadius.only(
+                              topRight: Radius.circular(10),
+                              bottomRight: Radius.circular(10),
+                            ),
+                          ),
+                          height: 45,
+                          child: const Icon(
+                            Icons.keyboard_arrow_down,
+                            color: ColorsManager.textGray,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                dropdownStyleData: DropdownStyleData(
+                  maxHeight: MediaQuery.of(context).size.height * 0.4,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                ),
+                menuItemStyleData: const MenuItemStyleData(
+                  height: 60,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart

@@ -41,6 +41,11 @@ class DeviceDialogHelper {
     final deviceSelectedFunctions =
         routineBloc.state.selectedFunctions[data['uniqueCustomId']] ?? [];
 
+    if (removeComparetors) {
+      //remove the current temp function in the 'if container'
+      functions.removeAt(3);
+    }
+
     switch (productType) {
       case 'AC':
         return ACHelper.showACFunctionsDialog(context, functions, data['device'],

lib/pages/routines/models/ac/ac_function.dart

@@ -151,3 +151,32 @@ class ChildLockFunction extends ACFunction {
         ),
       ];
 }
+
+class CurrentTempFunction extends ACFunction {
+  final int min;
+  final int max;
+  final int step;
+
+  CurrentTempFunction({required super.deviceId, required super.deviceName})
+      : min = -100,
+        max = 990,
+        step = 1,
+        super(
+          code: 'temp_current',
+          operationName: 'Current Temperature',
+          icon: Assets.currentTemp,
+        );
+
+  @override
+  List<ACOperationalValue> getOperationalValues() {
+    List<ACOperationalValue> values = [];
+    for (int temp = min; temp <= max; temp += step) {
+      values.add(ACOperationalValue(
+        icon: Assets.currentTemp,
+        description: "${temp / 10}°C",
+        value: temp,
+      ));
+    }
+    return values;
+  }
+}

lib/pages/routines/models/routine_model.dart

@@ -9,6 +9,9 @@ class ScenesModel {
   final String status;
   final String type;
   final String? icon;
+  final String spaceName;
+  final String spaceId;
+  final String communityId;
 
   ScenesModel({
     required this.id,
@@ -16,6 +19,9 @@ class ScenesModel {
     required this.name,
     required this.status,
     required this.type,
+    required this.spaceName,
+    required this.spaceId,
+    required this.communityId,
     this.icon,
   });
 
@@ -41,6 +47,9 @@ class ScenesModel {
       name: json["name"] ?? '',
       status: json["status"] ?? '',
       type: json["type"] ?? '',
+      spaceName: json["spaceName"] ?? '',
+      spaceId: json["spaceId"] ?? '',
+      communityId: json["communityId"] ?? '',
       icon:
           isAutomation == true ? Assets.automation : (json["icon"] as String?),
     );
@@ -52,5 +61,8 @@ class ScenesModel {
         "name": name,
         "status": status,
         "type": type,
+        "spaceName": spaceName,
+        "spaceId": spaceId,
+        "communityId": communityId,
       };
 }

lib/pages/routines/view/routines_view.dart

@@ -1,13 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/create_new_routines/create_new_routines.dart';
 import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart';
 import 'package:syncrow_web/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart';
 import 'package:syncrow_web/pages/routines/widgets/main_routine_view/routine_view_card.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/snack_bar.dart';
 
 class RoutinesView extends StatefulWidget {
   const RoutinesView({super.key});
@@ -17,10 +18,21 @@ class RoutinesView extends StatefulWidget {
 }
 
 class _RoutinesViewState extends State<RoutinesView> {
-  @override
-  void initState() {
-    super.initState();
-    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+  void _handleRoutineCreation(BuildContext context) async {
+    final result = await showDialog<Map<String, dynamic>>(
+      context: context,
+      builder: (context) => const CreateNewRoutinesDialog(),
+    );
+
+    if (result == null) return;
+    final communityId = result['community'];
+    final spaceId = result['space'];
+    final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
+    final routineBloc = context.read<RoutineBloc>();
+    _bloc.add(SaveCommunityIdAndSpaceIdEvent(
+        communityID: communityId, spaceID: spaceId));
+    await Future.delayed(const Duration(seconds: 1));
+    routineBloc.add(const CreateNewRoutineViewEvent(createRoutineView: true));
   }
 
   @override
@@ -30,59 +42,57 @@ class _RoutinesViewState extends State<RoutinesView> {
         if (state.createRoutineView) {
           return const CreateNewRoutineView();
         }
+
         return Row(
           children: [
             Expanded(
-                child: SpaceTreeView(
-              onSelect: () {},
-            )),
+              child: SpaceTreeView(
+                onSelect: () => context.read<RoutineBloc>()
+                  ..add(const LoadScenes())
+                  ..add(const LoadAutomation()),
+              ),
+            ),
             Expanded(
               flex: 4,
-              child: ListView(children: [
-                Container(
-                  padding: const EdgeInsets.all(16),
-                  height: MediaQuery.sizeOf(context).height,
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    children: [
-                      Text(
-                        "Create New Routines",
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                              color: ColorsManager.grayColor,
-                              fontWeight: FontWeight.bold,
-                            ),
-                      ),
-                      const SizedBox(
-                        height: 10,
-                      ),
-                      RoutineViewCard(
-                        onTap: () {
-                          if (context.read<SpaceTreeBloc>().selectedCommunityId.isNotEmpty &&
-                              context.read<SpaceTreeBloc>().selectedSpaceId.isNotEmpty) {
-                            context.read<RoutineBloc>().add(
-                                  (ResetRoutineState()),
-                                );
-                            BlocProvider.of<RoutineBloc>(context).add(
-                              const CreateNewRoutineViewEvent(createRoutineView: true),
-                            );
-                          } else {
-                            CustomSnackBar.redSnackBar('Please select a space');
-                          }
-                        },
-                        icon: Icons.add,
-                        textString: '',
-                      ),
-                      const SizedBox(
-                        height: 15,
-                      ),
-                      const Expanded(child: FetchRoutineScenesAutomation()),
-                    ],
+              child: ListView(
+                children: [
+                  Container(
+                    padding: const EdgeInsets.all(16),
+                    height: MediaQuery.sizeOf(context).height,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          "Create New Routines",
+                          style:
+                              Theme.of(context).textTheme.titleLarge?.copyWith(
+                                    color: ColorsManager.grayColor,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                        ),
+                        const SizedBox(height: 10),
+                        RoutineViewCard(
+                          isLoading: false,
+                          onChanged: (v) {},
+                          status: '',
+                          spaceId: '',
+                          automationId: '',
+                          communityId: '',
+                          sceneId: '',
+                          cardType: '',
+                          spaceName: '',
+                          onTap: () => _handleRoutineCreation(context),
+                          icon: Icons.add,
+                          textString: '',
+                        ),
+                        const SizedBox(height: 15),
+                        const Expanded(child: FetchRoutineScenesAutomation()),
+                      ],
+                    ),
                   ),
-                ),
-              ]),
-            ),
+                ],
+              ),
+            )
           ],
         );
       },

lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/main_routine_view/routine_view_card.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -12,7 +12,8 @@ class FetchRoutineScenesAutomation extends StatefulWidget {
   const FetchRoutineScenesAutomation({super.key});
 
   @override
-  State<FetchRoutineScenesAutomation> createState() => _FetchRoutineScenesState();
+  State<FetchRoutineScenesAutomation> createState() =>
+      _FetchRoutineScenesState();
 }
 
 class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
@@ -20,10 +21,6 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
   @override
   void initState() {
     super.initState();
-    context.read<RoutineBloc>()
-      ..add(LoadScenes(context.read<SpaceTreeBloc>().selectedSpaceId,
-          context.read<SpaceTreeBloc>().selectedCommunityId))
-      ..add(LoadAutomation(context.read<SpaceTreeBloc>().selectedSpaceId));
   }
 
   @override
@@ -49,46 +46,70 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                     ),
                     const SizedBox(height: 10),
                     if (state.scenes.isEmpty)
-                      Text(
-                        "No scenes found",
-                        style: context.textTheme.bodyMedium?.copyWith(
-                          color: ColorsManager.grayColor,
+                      Expanded(
+                        child: Text(
+                          "No scenes found",
+                          style: context.textTheme.bodyMedium?.copyWith(
+                            color: ColorsManager.grayColor,
+                          ),
                         ),
                       ),
                     if (state.scenes.isNotEmpty)
                       ConstrainedBox(
                         constraints: BoxConstraints(
-                            maxHeight: isSmallScreenSize(context) ? 160 : 170,
-                            maxWidth: MediaQuery.sizeOf(context).width * 0.7),
+                            maxHeight: isSmallScreenSize(context) ? 190 : 200,
+                            maxWidth: MediaQuery.sizeOf(context).width * 0.8),
                         child: ListView.builder(
-                          scrollDirection: Axis.horizontal,
-                          itemCount: state.scenes.length,
-                          itemBuilder: (context, index) => Padding(
-                            padding: EdgeInsets.only(
-                              right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                            ),
-                            child: RoutineViewCard(
-                              onTap: () {
-                                BlocProvider.of<RoutineBloc>(context).add(
-                                  const CreateNewRoutineViewEvent(createRoutineView: true),
-                                );
-                                context.read<RoutineBloc>().add(
-                                      GetSceneDetails(
-                                        sceneId: state.scenes[index].id,
-                                        isTabToRun: true,
-                                        isUpdate: true,
-                                      ),
+                            scrollDirection: Axis.horizontal,
+                            itemCount: state.scenes.length,
+                            itemBuilder: (context, index) {
+                              final scene = state.scenes[index];
+                              final isLoading =
+                                  state.loadingSceneId == scene.id;
+
+                              return Padding(
+                                padding: EdgeInsets.only(
+                                  right: isSmallScreenSize(context) ? 4.0 : 8.0,
+                                ),
+                                child: RoutineViewCard(
+                                  isLoading: isLoading,
+                                  sceneOnTap: () {
+                                    context.read<RoutineBloc>().add(
+                                        SceneTrigger(
+                                            sceneId: scene.id,
+                                            name: scene.name));
+                                  },
+                                  status: state.scenes[index].status,
+                                  communityId:
+                                      state.scenes[index].communityId ?? '',
+                                  spaceId: state.scenes[index].spaceId,
+                                  sceneId: state.scenes[index].sceneTuyaId!,
+                                  automationId: state.scenes[index].id,
+                                  cardType: 'scenes',
+                                  spaceName: state.scenes[index].spaceName,
+                                  onTap: () {
+                                    BlocProvider.of<RoutineBloc>(context).add(
+                                      const CreateNewRoutineViewEvent(
+                                          createRoutineView: true),
                                     );
-                              },
-                              textString: state.scenes[index].name,
-                              icon: state.scenes[index].icon ?? Assets.logoHorizontal,
-                              isFromScenes: true,
-                              iconInBytes: state.scenes[index].iconInBytes,
-                            ),
-                          ),
-                        ),
+                                    context.read<RoutineBloc>().add(
+                                          GetSceneDetails(
+                                            sceneId: state.scenes[index].id,
+                                            isTabToRun: true,
+                                            isUpdate: true,
+                                          ),
+                                        );
+                                  },
+                                  textString: state.scenes[index].name,
+                                  icon: state.scenes[index].icon ??
+                                      Assets.logoHorizontal,
+                                  isFromScenes: true,
+                                  iconInBytes: state.scenes[index].iconInBytes,
+                                ),
+                              );
+                            }),
                       ),
-                    const SizedBox(height: 15),
+                    const SizedBox(height: 10),
                     Text(
                       "Automations",
                       style: Theme.of(context).textTheme.titleLarge?.copyWith(
@@ -96,43 +117,77 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                             fontWeight: FontWeight.bold,
                           ),
                     ),
-                    const SizedBox(height: 10),
+                    const SizedBox(height: 5),
                     if (state.automations.isEmpty)
-                      Text(
-                        "No automations found",
-                        style: context.textTheme.bodyMedium?.copyWith(
-                          color: ColorsManager.grayColor,
+                      Expanded(
+                        child: Text(
+                          "No automations found",
+                          style: context.textTheme.bodyMedium?.copyWith(
+                            color: ColorsManager.grayColor,
+                          ),
                         ),
                       ),
                     if (state.automations.isNotEmpty)
                       ConstrainedBox(
                         constraints: BoxConstraints(
-                            maxHeight: isSmallScreenSize(context) ? 160 : 170,
+                            maxHeight: isSmallScreenSize(context) ? 185 : 192,
                             maxWidth: MediaQuery.sizeOf(context).width * 0.7),
                         child: ListView.builder(
-                          scrollDirection: Axis.horizontal,
-                          itemCount: state.automations.length,
-                          itemBuilder: (context, index) => Padding(
-                            padding: EdgeInsets.only(
-                              right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                            ),
-                            child: RoutineViewCard(
-                              onTap: () {
-                                BlocProvider.of<RoutineBloc>(context).add(
-                                  const CreateNewRoutineViewEvent(createRoutineView: true),
-                                );
-                                context.read<RoutineBloc>().add(
-                                      GetAutomationDetails(
-                                          automationId: state.automations[index].id,
-                                          isAutomation: true,
-                                          isUpdate: true),
+                            scrollDirection: Axis.horizontal,
+                            itemCount: state.automations.length,
+                            itemBuilder: (context, index) {
+                              final isLoading = state.automations!
+                                  .contains(state.automations[index].id);
+
+                              return Padding(
+                                padding: EdgeInsets.only(
+                                  right: isSmallScreenSize(context) ? 4.0 : 8.0,
+                                ),
+                                child: RoutineViewCard(
+                                  isLoading: isLoading,
+                                  onChanged: (v) {
+                                    // BlocProvider.of<RoutineBloc>(context)
+                                    context.read<RoutineBloc>().add(
+                                          UpdateAutomationStatus(
+                                            automationId:
+                                                state.automations[index].id,
+                                            automationStatusUpdate:
+                                                AutomationStatusUpdate(
+                                                    spaceUuid: state
+                                                        .automations[index]
+                                                        .spaceId,
+                                                    isEnable: v),
+                                            communityId: state
+                                                .automations[index].communityId,
+                                          ),
+                                        );
+                                  },
+                                  status: state.automations[index].status,
+                                  communityId: '',
+                                  spaceId: state.automations[index].spaceId,
+                                  sceneId: '',
+                                  automationId: state.automations[index].id,
+                                  cardType: 'automations',
+                                  spaceName: state.scenes[index].spaceName,
+                                  onTap: () {
+                                    BlocProvider.of<RoutineBloc>(context).add(
+                                      const CreateNewRoutineViewEvent(
+                                          createRoutineView: true),
                                     );
-                              },
-                              textString: state.automations[index].name,
-                              icon: state.automations[index].icon ?? Assets.automation,
-                            ),
-                          ),
-                        ),
+                                    context.read<RoutineBloc>().add(
+                                          GetAutomationDetails(
+                                              automationId:
+                                                  state.automations[index].id,
+                                              isAutomation: true,
+                                              isUpdate: true),
+                                        );
+                                  },
+                                  textString: state.automations[index].name,
+                                  icon: state.automations[index].icon ??
+                                      Assets.automation,
+                                ),
+                              );
+                            }),
                       ),
                   ],
                 ),

lib/pages/routines/widgets/main_routine_view/routine_view_card.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -6,37 +8,78 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
+class RoutineViewCard extends StatefulWidget with HelperResponsiveLayout {
   const RoutineViewCard({
     super.key,
     required this.onTap,
+    this.sceneOnTap,
     required this.icon,
     required this.textString,
+    required this.spaceName,
+    required this.cardType,
     this.isFromScenes,
     this.iconInBytes,
+    required this.sceneId,
+    required this.communityId,
+    required this.spaceId,
+    required this.automationId,
+    required this.status,
+    this.onChanged,
+    required this.isLoading,
   });
 
   final Function() onTap;
+  final Function()? sceneOnTap;
+
   final dynamic icon;
   final String textString;
+  final String spaceName;
+  final String cardType;
+  final String sceneId;
+  final String spaceId;
+  final String status;
+  final bool isLoading;
+
+  final void Function(bool)? onChanged;
+  final String automationId;
+  final String communityId;
+
   final bool? isFromScenes;
   final Uint8List? iconInBytes;
 
+  @override
+  State<RoutineViewCard> createState() => _RoutineViewCardState();
+}
+
+class _RoutineViewCardState extends State<RoutineViewCard> {
+  bool _showTemporaryCheck = false;
+
+  void _handleSceneTap() {
+    if (!_showTemporaryCheck) {
+      setState(() => _showTemporaryCheck = true);
+      widget.sceneOnTap?.call();
+      Timer(const Duration(seconds: 3), () {
+        if (mounted) setState(() => _showTemporaryCheck = false);
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    final double cardWidth = isSmallScreenSize(context)
+    // Use widget.<mixinMethod> instead of just <mixinMethod>
+    final double cardWidth = widget.isSmallScreenSize(context)
         ? 120
-        : isMediumScreenSize(context)
+        : widget.isMediumScreenSize(context)
             ? 135
             : 150;
 
-    final double cardHeight = isSmallScreenSize(context) ? 160 : 170;
+    final double cardHeight = widget.isSmallScreenSize(context) ? 190 : 200;
 
-    final double iconSize = isSmallScreenSize(context)
-        ? 50
-        : isMediumScreenSize(context)
-            ? 60
-            : 70;
+    final double iconSize = widget.isSmallScreenSize(context)
+        ? 70
+        : widget.isMediumScreenSize(context)
+            ? 80
+            : 90;
 
     return ConstrainedBox(
       constraints: BoxConstraints(
@@ -50,69 +93,147 @@ class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
         ),
         color: ColorsManager.whiteColors,
         child: InkWell(
-          onTap: onTap,
           borderRadius: BorderRadius.circular(10),
           child: Padding(
             padding: const EdgeInsets.all(8.0),
             child: Column(
               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
               children: [
-                Center(
-                  child: Container(
-                    decoration: BoxDecoration(
-                      color: ColorsManager.graysColor,
-                      borderRadius: BorderRadius.circular(120),
-                      border: Border.all(
-                        color: ColorsManager.greyColor,
-                        width: 2.0,
-                      ),
-                    ),
-                    height: iconSize,
-                    width: iconSize,
-                    child: (isFromScenes ?? false)
-                        ? (iconInBytes != null && iconInBytes?.isNotEmpty == true)
-                            ? Image.memory(
-                                iconInBytes!,
-                                height: iconSize,
-                                width: iconSize,
+                widget.cardType != ''
+                    ? Row(
+                        mainAxisAlignment: MainAxisAlignment.end,
+                        children: [
+                          if (widget.isFromScenes ?? false)
+                            InkWell(
+                              onTap: _handleSceneTap,
+                              child: SvgPicture.asset(
+                                _showTemporaryCheck
+                                    ? Assets.scenesPlayIconCheck
+                                    : Assets.scenesPlayIcon,
                                 fit: BoxFit.contain,
-                                errorBuilder: (context, error, stackTrace) => Image.asset(
-                                  Assets.logo,
-                                  height: iconSize,
-                                  width: iconSize,
-                                  fit: BoxFit.contain,
-                                ),
-                              )
-                            : Image.asset(
-                                Assets.logo,
-                                height: iconSize,
-                                width: iconSize,
-                                fit: BoxFit.contain,
-                              )
-                        : (icon is String && icon.endsWith('.svg'))
-                            ? SvgPicture.asset(
-                                icon,
-                                fit: BoxFit.contain,
-                              )
-                            : Icon(
-                                icon,
-                                color: ColorsManager.dialogBlueTitle,
-                                size: isSmallScreenSize(context) ? 30 : 40,
                               ),
-                  ),
-                ),
-                const SizedBox(height: 8),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 3),
-                  child: Text(
-                    textString,
-                    textAlign: TextAlign.center,
-                    overflow: TextOverflow.ellipsis,
-                    maxLines: 2,
-                    style: context.textTheme.bodySmall?.copyWith(
-                      color: ColorsManager.blackColor,
-                      fontSize: isSmallScreenSize(context) ? 10 : 12,
-                    ),
+                            )
+                          else if (widget.isLoading)
+                            const SizedBox(
+                              width: 49,
+                              height: 20,
+                              child: Center(
+                                child: SizedBox(
+                                  width: 16,
+                                  height: 16,
+                                  child:
+                                      CircularProgressIndicator(strokeWidth: 2),
+                                ),
+                              ),
+                            )
+                          else
+                            CupertinoSwitch(
+                              activeColor: ColorsManager.primaryColor,
+                              value: widget.status == 'enable',
+                              onChanged: widget.onChanged,
+                            )
+                        ],
+                      )
+                    : const SizedBox(),
+                InkWell(
+                  onTap: widget.onTap,
+                  child: Column(
+                    children: [
+                      Center(
+                        child: Container(
+                          decoration: BoxDecoration(
+                            color: ColorsManager.graysColor,
+                            borderRadius: BorderRadius.circular(120),
+                            border: Border.all(
+                              color: ColorsManager.greyColor,
+                              width: 2.0,
+                            ),
+                          ),
+                          height: iconSize,
+                          width: iconSize,
+                          child: (widget.isFromScenes ?? false)
+                              ? (widget.iconInBytes != null &&
+                                      widget.iconInBytes?.isNotEmpty == true)
+                                  ? Image.memory(
+                                      widget.iconInBytes!,
+                                      height: iconSize,
+                                      width: iconSize,
+                                      fit: BoxFit.contain,
+                                      errorBuilder:
+                                          (context, error, stackTrace) =>
+                                              Image.asset(
+                                        Assets.logo,
+                                        height: iconSize,
+                                        width: iconSize,
+                                        fit: BoxFit.contain,
+                                      ),
+                                    )
+                                  : Image.asset(
+                                      Assets.logo,
+                                      height: iconSize,
+                                      width: iconSize,
+                                      fit: BoxFit.contain,
+                                    )
+                              : (widget.icon is String &&
+                                      widget.icon.endsWith('.svg'))
+                                  ? SvgPicture.asset(
+                                      widget.icon,
+                                      fit: BoxFit.contain,
+                                    )
+                                  : Icon(
+                                      widget.icon,
+                                      color: ColorsManager.dialogBlueTitle,
+                                      size: widget.isSmallScreenSize(context)
+                                          ? 30
+                                          : 40,
+                                    ),
+                        ),
+                      ),
+                      const SizedBox(height: 8),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 3),
+                        child: Column(
+                          children: [
+                            Text(
+                              widget.textString,
+                              textAlign: TextAlign.center,
+                              overflow: TextOverflow.ellipsis,
+                              maxLines: 2,
+                              style: context.textTheme.bodySmall?.copyWith(
+                                color: ColorsManager.blackColor,
+                                fontSize:
+                                    widget.isSmallScreenSize(context) ? 10 : 12,
+                              ),
+                            ),
+                            if (widget.spaceName != '')
+                              Row(
+                                crossAxisAlignment: CrossAxisAlignment.center,
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  SvgPicture.asset(
+                                    Assets.spaceLocationIcon,
+                                    fit: BoxFit.contain,
+                                  ),
+                                  Text(
+                                    widget.spaceName,
+                                    textAlign: TextAlign.center,
+                                    overflow: TextOverflow.ellipsis,
+                                    maxLines: 2,
+                                    style:
+                                        context.textTheme.bodySmall?.copyWith(
+                                      color: ColorsManager.blackColor,
+                                      fontSize:
+                                          widget.isSmallScreenSize(context)
+                                              ? 10
+                                              : 12,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                          ],
+                        ),
+                      ),
+                    ],
                   ),
                 ),
               ],

lib/pages/routines/widgets/routine_devices.dart

@@ -4,9 +4,20 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
 
-class RoutineDevices extends StatelessWidget {
+class RoutineDevices extends StatefulWidget {
   const RoutineDevices({super.key});
 
+  @override
+  State<RoutineDevices> createState() => _RoutineDevicesState();
+}
+
+class _RoutineDevicesState extends State<RoutineDevices> {
+  @override
+  void initState() {
+    super.initState();
+    context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(

lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart

@@ -329,8 +329,8 @@ class ACHelper {
   ) {
     return Slider(
       value: initialValue is int ? initialValue.toDouble() : 200.0,
-      min: 200,
-      max: 300,
+      min: selectCode == 'temp_current' ? -100 : 200,
+      max: selectCode == 'temp_current' ? 900 : 300,
       divisions: 10,
       label: '${((initialValue ?? 160) / 10).toInt()}°C',
       onChanged: (value) {

lib/pages/routines/widgets/scenes_and_automations.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class ScenesAndAutomations extends StatefulWidget {
@@ -19,9 +18,8 @@ class _ScenesAndAutomationsState extends State<ScenesAndAutomations> {
   void initState() {
     super.initState();
     context.read<RoutineBloc>()
-      ..add(LoadScenes(context.read<SpaceTreeBloc>().selectedSpaceId,
-          context.read<SpaceTreeBloc>().selectedCommunityId))
-      ..add(LoadAutomation(context.read<SpaceTreeBloc>().selectedSpaceId));
+      ..add(const LoadScenes())
+      ..add(const LoadAutomation());
   }
 
   @override

lib/pages/space_tree/bloc/space_tree_bloc.dart

@@ -1,4 +1,5 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
@@ -6,9 +7,6 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 import 'package:syncrow_web/services/space_mana_api.dart';
 
 class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
-  String selectedCommunityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
-  String selectedSpaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-
   SpaceTreeBloc() : super(const SpaceTreeState()) {
     on<InitialEvent>(_fetchSpaces);
     on<OnCommunityExpanded>(_onCommunityExpanded);
@@ -16,37 +14,74 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     on<OnCommunitySelected>(_onCommunitySelected);
     on<OnSpaceSelected>(_onSpaceSelected);
     on<SearchQueryEvent>(_onSearch);
+    on<ClearAllData>(_clearAllData);
+    on<ClearCachedData>(_clearCachedData);
+    on<OnCommunityAdded>(_onCommunityAdded);
+    on<OnCommunityUpdated>(_onCommunityUpdate);
+  }
+
+  void _onCommunityUpdate(
+    OnCommunityUpdated event,
+    Emitter<SpaceTreeState> emit,
+  ) async {
+    emit(SpaceTreeLoadingState());
+
+    try {
+      final updatedCommunity = event.updatedCommunity;
+      final updatedCommunities = List<CommunityModel>.from(state.communityList);
+
+      final index =
+          updatedCommunities.indexWhere((community) => community.uuid == updatedCommunity.uuid);
+
+      if (index != -1) {
+        updatedCommunities[index] = updatedCommunity;
+        emit(state.copyWith(communitiesList: updatedCommunities));
+      } else {
+        emit(SpaceTreeErrorState('Community not found in the list.'));
+      }
+    } catch (e) {
+      emit(SpaceTreeErrorState('Error updating community: $e'));
+    }
   }
 
   _fetchSpaces(InitialEvent event, Emitter<SpaceTreeState> emit) async {
     emit(SpaceTreeLoadingState());
     try {
-      List<CommunityModel> communities = await CommunitySpaceManagementApi().fetchCommunities();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      List<CommunityModel> updatedCommunities = await Future.wait(
-        communities.map((community) async {
-          List<SpaceModel> spaces =
-              await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid);
+      List<CommunityModel> communities =
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid, includeSpaces: true);
 
-          return CommunityModel(
-            uuid: community.uuid,
-            createdAt: community.createdAt,
-            updatedAt: community.updatedAt,
-            name: community.name,
-            description: community.description,
-            spaces: spaces,
-            region: community.region,
-          );
-        }).toList(),
-      );
+      // List<CommunityModel> updatedCommunities = await Future.wait(
+      //   communities.map((community) async {
+      // List<SpaceModel> spaces =
+      //     await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid, projectUuid);
 
-      emit(state.copyWith(
-          communitiesList: updatedCommunities, expandedCommunity: [], expandedSpaces: []));
+      //     return CommunityModel(
+      //       uuid: community.uuid,
+      //       createdAt: community.createdAt,
+      //       updatedAt: community.updatedAt,
+      //       name: community.name,
+      //       description: community.description,
+      //       spaces: spaces,
+      //       region: community.region,
+      //     );
+      //   }).toList(),
+      // );
+
+      emit(state.copyWith(communitiesList: communities, expandedCommunity: [], expandedSpaces: []));
     } catch (e) {
       emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
     }
   }
 
+  void _onCommunityAdded(OnCommunityAdded event, Emitter<SpaceTreeState> emit) async {
+    final updatedCommunities = List<CommunityModel>.from(state.communityList);
+    updatedCommunities.add(event.newCommunity);
+
+    emit(state.copyWith(communitiesList: updatedCommunities));
+  }
+
   _onCommunityExpanded(OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
     try {
       List<String> updatedExpandedCommunityList = List.from(state.expandedCommunities);
@@ -88,6 +123,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
       List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
       Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
+      List<String> selectedSpacesInCommunity = communityAndSpaces[event.communityId] ?? [];
 
       List<String> childrenIds = _getAllChildIds(event.children);
 
@@ -95,14 +131,16 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         // Select the community and all its children
         updatedSelectedCommunities.add(event.communityId);
         updatedSelectedSpaces.addAll(childrenIds);
+        selectedSpacesInCommunity.addAll(childrenIds);
       } else {
         // Unselect the community and all its children
         updatedSelectedCommunities.remove(event.communityId);
         updatedSelectedSpaces.removeWhere(childrenIds.contains);
         updatedSoldChecks.removeWhere(childrenIds.contains);
+        selectedSpacesInCommunity.removeWhere(childrenIds.contains);
       }
 
-      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
+      communityAndSpaces[event.communityId] = selectedSpacesInCommunity;
 
       emit(state.copyWith(
           selectedCommunities: updatedSelectedCommunities,
@@ -122,6 +160,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
       Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
 
+      List<String> selectedSpacesInCommunity = communityAndSpaces[event.communityModel.uuid] ?? [];
+
       List<String> childrenIds = _getAllChildIds(event.children);
       bool isChildSelected = false;
 
@@ -135,12 +175,15 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           !updatedSoldChecks.contains(event.spaceId)) {
         // First click: Select the space and all its children
         updatedSelectedSpaces.add(event.spaceId);
-        updatedSelectedCommunities.add(event.communityId);
+        updatedSelectedCommunities.add(event.communityModel.uuid);
+        selectedSpacesInCommunity.add(event.spaceId);
+
         if (childrenIds.isNotEmpty) {
           updatedSelectedSpaces.addAll(childrenIds);
+          selectedSpacesInCommunity.addAll(childrenIds);
         }
 
-        List<String> spaces = _getThePathToChild(event.communityId, event.spaceId);
+        List<String> spaces = _getThePathToChild(event.communityModel.uuid, event.spaceId);
         for (String space in spaces) {
           if (!updatedSelectedSpaces.contains(space) && !updatedSoldChecks.contains(space)) {
             updatedSoldChecks.add(space);
@@ -150,31 +193,45 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           childrenIds.isNotEmpty &&
           isChildSelected) {
         // Second click: Unselect space but keep children
+        selectedSpacesInCommunity.remove(event.spaceId);
         updatedSelectedSpaces.remove(event.spaceId);
         updatedSoldChecks.add(event.spaceId);
       } else {
         // Third click: Unselect space and all its children
+        selectedSpacesInCommunity.remove(event.spaceId);
         updatedSelectedSpaces.remove(event.spaceId);
         if (childrenIds.isNotEmpty) {
           updatedSelectedSpaces.removeWhere(childrenIds.contains);
           updatedSoldChecks.removeWhere(childrenIds.contains);
+          selectedSpacesInCommunity.removeWhere(childrenIds.contains);
         }
         updatedSoldChecks.remove(event.spaceId);
 
-        List<String> parents = _getThePathToChild(event.communityId, event.spaceId);
-        if (!_parentSelected(parents, updatedSelectedSpaces)) {
+        List<String> parents =
+            _getThePathToChild(event.communityModel.uuid, event.spaceId).toSet().toList();
+
+        if (updatedSelectedSpaces.isEmpty) {
           updatedSoldChecks.removeWhere(parents.contains);
-        }
-        if (!_anySpacesSelectedInCommunity(
-            event.communityId, updatedSelectedSpaces, updatedSoldChecks)) {
-          updatedSelectedCommunities.remove(event.communityId);
+          updatedSelectedCommunities.remove(event.communityModel.uuid);
+        } else {
+          // Check if any parent has selected children
+          for (String space in parents) {
+            if (!_noChildrenSelected(event.communityModel, space, updatedSelectedSpaces, parents)) {
+              updatedSoldChecks.remove(space);
+            }
+          }
+
+          if (!_anySpacesSelectedInCommunity(
+              event.communityModel, updatedSelectedSpaces, updatedSoldChecks)) {
+            updatedSelectedCommunities.remove(event.communityModel.uuid);
+          }
         }
       }
 
-      communityAndSpaces[event.communityId] = updatedSelectedSpaces;
+      communityAndSpaces[event.communityModel.uuid] = selectedSpacesInCommunity;
 
       emit(state.copyWith(
-          selectedCommunities: updatedSelectedCommunities,
+          selectedCommunities: updatedSelectedCommunities.toSet().toList(),
           selectedSpaces: updatedSelectedSpaces,
           soldCheck: updatedSoldChecks,
           selectedCommunityAndSpaces: communityAndSpaces));
@@ -184,12 +241,24 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _parentSelected(List<String> parents, List<String> selectedSpaces) {
-    for (String space in parents) {
-      if (selectedSpaces.contains(space)) {
-        return true;
+  _noChildrenSelected(
+      CommunityModel community, String spaceId, List<String> selectedSpaces, List<String> parents) {
+    if (selectedSpaces.contains(spaceId)) {
+      return true;
+    }
+
+    List<SpaceModel> children = _getAllChildSpaces(community.spaces);
+    for (var child in children) {
+      if (spaceId == child.uuid) {
+        List<String> ids = _getAllChildIds(child.children);
+        for (var id in ids) {
+          if (selectedSpaces.contains(id)) {
+            return true;
+          }
+        }
       }
     }
+
     return false;
   }
 
@@ -209,7 +278,45 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       }).toList();
 
       emit(state.copyWith(
-          filteredCommunity: filteredCommunity, isSearching: event.searchQuery.isNotEmpty));
+          filteredCommunity: filteredCommunity,
+          isSearching: event.searchQuery.isNotEmpty,
+          searchQuery: event.searchQuery));
+    } catch (e) {
+      emit(const SpaceTreeErrorState('Something went wrong'));
+    }
+  }
+
+  _clearAllData(ClearAllData event, Emitter<SpaceTreeState> emit) async {
+    try {
+      emit(state.copyWith(
+          communitiesList: [],
+          filteredCommunity: [],
+          isSearching: false,
+          soldCheck: [],
+          selectedSpaces: [],
+          selectedCommunities: [],
+          selectedCommunityAndSpaces: {},
+          searchQuery: '',
+          expandedSpaces: [],
+          expandedCommunity: []));
+    } catch (e) {
+      emit(const SpaceTreeErrorState('Something went wrong'));
+    }
+  }
+
+  _clearCachedData(ClearCachedData event, Emitter<SpaceTreeState> emit) async {
+    try {
+      emit(state.copyWith(
+          communitiesList: state.communityList,
+          filteredCommunity: [],
+          isSearching: false,
+          soldCheck: [],
+          selectedSpaces: [],
+          selectedCommunities: [],
+          selectedCommunityAndSpaces: {},
+          searchQuery: '',
+          expandedSpaces: [],
+          expandedCommunity: []));
     } catch (e) {
       emit(const SpaceTreeErrorState('Something went wrong'));
     }
@@ -230,21 +337,26 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       ids.add(child.uuid!);
       ids.addAll(_getAllChildIds(child.children));
     }
-    return ids;
+    return ids.toSet().toList();
+  }
+
+  List<SpaceModel> _getAllChildSpaces(List<SpaceModel> spaces) {
+    List<SpaceModel> children = [];
+    for (var child in spaces) {
+      children.add(child);
+      children.addAll(_getAllChildSpaces(child.children));
+    }
+    return children;
   }
 
   bool _anySpacesSelectedInCommunity(
-      String communityId, List<String> selectedSpaces, List<String> partialCheckedList) {
+      CommunityModel community, List<String> selectedSpaces, List<String> partialCheckedList) {
     bool result = false;
-    for (var community in state.communityList) {
-      if (community.uuid == communityId) {
-        List<String> ids = _getAllChildIds(community.spaces);
-        for (var id in ids) {
-          result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
-          if (result) {
-            return result;
-          }
-        }
+    List<String> ids = _getAllChildIds(community.spaces);
+    for (var id in ids) {
+      result = selectedSpaces.contains(id) || partialCheckedList.contains(id);
+      if (result) {
+        return result;
       }
     }
     return result;
@@ -288,4 +400,9 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     ids.removeLast();
     return [];
   }
+
+  @override
+  Future<void> close() async {
+    super.close();
+  }
 }

lib/pages/space_tree/bloc/space_tree_event.dart

@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 
 class SpaceTreeEvent extends Equatable {
@@ -49,14 +50,14 @@ class OnSpaceExpanded extends SpaceTreeEvent {
 }
 
 class OnSpaceSelected extends SpaceTreeEvent {
-  final String communityId;
   final String spaceId;
   final List<SpaceModel> children;
+  final CommunityModel communityModel;
 
-  const OnSpaceSelected(this.communityId, this.spaceId, this.children);
+  const OnSpaceSelected(this.communityModel, this.spaceId, this.children);
 
   @override
-  List<Object> get props => [communityId, spaceId, children];
+  List<Object> get props => [communityModel, spaceId, children];
 }
 
 class SearchQueryEvent extends SpaceTreeEvent {
@@ -67,3 +68,24 @@ class SearchQueryEvent extends SpaceTreeEvent {
   @override
   List<Object> get props => [searchQuery];
 }
+
+class OnCommunityAdded extends SpaceTreeEvent {
+  final CommunityModel newCommunity;
+  const OnCommunityAdded(this.newCommunity);
+
+  @override
+  List<Object> get props => [newCommunity];
+}
+
+class OnCommunityUpdated extends SpaceTreeEvent {
+  final CommunityModel updatedCommunity;
+  const OnCommunityUpdated(this.updatedCommunity);
+
+  @override
+  List<Object> get props => [updatedCommunity];
+}
+
+
+class ClearAllData extends SpaceTreeEvent {}
+
+class ClearCachedData extends SpaceTreeEvent {}

lib/pages/space_tree/bloc/space_tree_state.dart

@@ -11,6 +11,7 @@ class SpaceTreeState extends Equatable {
   final List<String> selectedSpaces;
   final List<String> soldCheck;
   final bool isSearching;
+  final String searchQuery;
 
   const SpaceTreeState(
       {this.communityList = const [],
@@ -21,7 +22,8 @@ class SpaceTreeState extends Equatable {
       this.selectedSpaces = const [],
       this.soldCheck = const [],
       this.isSearching = false,
-      this.selectedCommunityAndSpaces = const {}});
+      this.selectedCommunityAndSpaces = const {},
+      this.searchQuery = ''});
 
   SpaceTreeState copyWith(
       {List<CommunityModel>? communitiesList,
@@ -32,7 +34,8 @@ class SpaceTreeState extends Equatable {
       List<String>? selectedSpaces,
       List<String>? soldCheck,
       bool? isSearching,
-      Map<String, List<String>>? selectedCommunityAndSpaces}) {
+      Map<String, List<String>>? selectedCommunityAndSpaces,
+      String? searchQuery}) {
     return SpaceTreeState(
         communityList: communitiesList ?? this.communityList,
         filteredCommunity: filteredCommunity ?? this.filteredCommunity,
@@ -42,7 +45,8 @@ class SpaceTreeState extends Equatable {
         selectedSpaces: selectedSpaces ?? this.selectedSpaces,
         soldCheck: soldCheck ?? this.soldCheck,
         isSearching: isSearching ?? this.isSearching,
-        selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces);
+        selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces,
+        searchQuery: searchQuery ?? this.searchQuery);
   }
 
   @override
@@ -55,7 +59,8 @@ class SpaceTreeState extends Equatable {
         selectedSpaces,
         soldCheck,
         isSearching,
-        selectedCommunityAndSpaces
+        selectedCommunityAndSpaces,
+        searchQuery
       ];
 }
 

lib/pages/space_tree/view/custom_expansion.dart

@@ -83,7 +83,7 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
         ),
         if (isExpanded && children != null && children!.isNotEmpty)
           Padding(
-            padding: const EdgeInsets.only(left: 48.0),
+            padding: const EdgeInsets.only(left: 24.0),
             child: Column(
               children: children ?? [],
             ),

lib/pages/space_tree/view/space_tree_view.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/common/widgets/search_bar.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
@@ -8,11 +9,14 @@ import 'package:syncrow_web/pages/space_tree/view/custom_expansion.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
 
 class SpaceTreeView extends StatefulWidget {
+  final bool? isSide;
   final Function onSelect;
-  const SpaceTreeView({required this.onSelect, super.key});
+  const SpaceTreeView({required this.onSelect, this.isSide, super.key});
 
   @override
   State<SpaceTreeView> createState() => _SpaceTreeViewState();
@@ -33,16 +37,61 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
       List<CommunityModel> list = state.isSearching ? state.filteredCommunity : state.communityList;
       return Container(
         height: MediaQuery.sizeOf(context).height,
-        decoration: subSectionContainerDecoration,
+        decoration: widget.isSide == true
+            ? subSectionContainerDecoration.copyWith(color: ColorsManager.whiteColors)
+            : const BoxDecoration(color: ColorsManager.whiteColors),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
             : Column(
                 children: [
-                  CustomSearchBar(
-                    onSearchChanged: (query) {
-                      context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
-                    },
-                  ),
+                  widget.isSide == true
+                      ? Container(
+                          decoration: const BoxDecoration(
+                            color: ColorsManager.circleRolesBackground,
+                            borderRadius: BorderRadius.only(
+                                topRight: Radius.circular(20), topLeft: Radius.circular(20)),
+                          ),
+                          child: Padding(
+                            padding: const EdgeInsets.all(8.0),
+                            child: Row(
+                              children: [
+                                Expanded(
+                                  child: Container(
+                                    decoration: BoxDecoration(
+                                        borderRadius: const BorderRadius.all(Radius.circular(20)),
+                                        border: Border.all(color: ColorsManager.grayBorder)),
+                                    child: TextFormField(
+                                      style: const TextStyle(color: Colors.black),
+                                      onChanged: (value) {
+                                        context.read<SpaceTreeBloc>().add(SearchQueryEvent(value));
+                                      },
+                                      decoration: textBoxDecoration(radios: 20)!.copyWith(
+                                        fillColor: Colors.white,
+                                        suffixIcon: Padding(
+                                          padding: const EdgeInsets.only(right: 16),
+                                          child: SvgPicture.asset(
+                                            Assets.textFieldSearch,
+                                            width: 24,
+                                            height: 24,
+                                          ),
+                                        ),
+                                        hintStyle: context.textTheme.bodyMedium?.copyWith(
+                                            fontWeight: FontWeight.w400,
+                                            fontSize: 12,
+                                            color: ColorsManager.textGray),
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            ),
+                          ),
+                        )
+                      : CustomSearchBar(
+                          onSearchChanged: (query) {
+                            context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
+                          },
+                        ),
                   const SizedBox(height: 16),
                   Expanded(
                     child: ListView(
@@ -99,8 +148,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                                       state.expandedSpaces.contains(space.uuid),
                                                   onItemSelected: () {
                                                     context.read<SpaceTreeBloc>().add(
-                                                        OnSpaceSelected(community.uuid,
-                                                            space.uuid ?? '', space.children));
+                                                        OnSpaceSelected(community, space.uuid ?? '',
+                                                            space.children));
                                                     widget.onSelect();
                                                   },
                                                   onExpansionChanged: () {
@@ -113,7 +162,7 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                                           state.soldCheck.contains(space.uuid),
                                                   isSoldCheck: state.soldCheck.contains(space.uuid),
                                                   children: _buildNestedSpaces(
-                                                      context, state, space, community.uuid),
+                                                      context, state, space, community),
                                                 );
                                               }).toList(),
                                             ),
@@ -196,7 +245,7 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   }
 
   List<Widget> _buildNestedSpaces(
-      BuildContext context, SpaceTreeState state, SpaceModel space, String communityId) {
+      BuildContext context, SpaceTreeState state, SpaceModel space, CommunityModel community) {
     return space.children.map((child) {
       return CustomExpansionTileSpaceTree(
         isSelected:
@@ -207,13 +256,13 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
         onItemSelected: () {
           context
               .read<SpaceTreeBloc>()
-              .add(OnSpaceSelected(communityId, child.uuid ?? '', child.children));
+              .add(OnSpaceSelected(community, child.uuid ?? '', child.children));
           widget.onSelect();
         },
         onExpansionChanged: () {
-          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(communityId, child.uuid ?? ''));
+          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(community.uuid, child.uuid ?? ''));
         },
-        children: _buildNestedSpaces(context, state, child, communityId),
+        children: _buildNestedSpaces(context, state, child, community),
       );
     }).toList();
   }

lib/pages/spaces_management/add_device_type/views/add_device_type_widget.dart

@@ -24,6 +24,8 @@ class AddDeviceTypeWidget extends StatelessWidget {
   final String spaceName;
   final bool isCreate;
   final Function(List<Tag>, List<SubspaceModel>?)? onSave;
+    final List<Tag> projectTags;
+
 
   const AddDeviceTypeWidget(
       {super.key,
@@ -35,7 +37,8 @@ class AddDeviceTypeWidget extends StatelessWidget {
       this.allTags,
       this.spaceTags,
       this.onSave,
-      required this.spaceName});
+      required this.spaceName,
+      required this.projectTags});
 
   @override
   Widget build(BuildContext context) {
@@ -134,7 +137,8 @@ class AddDeviceTypeWidget extends StatelessWidget {
                                       spaceName: spaceName,
                                       initialTags: initialTags,
                                       title: dialogTitle,
-                                      onSave: onSave),
+                                      onSave: onSave,
+                                      projectTags: projectTags),
                                 );
                               }
                             },

lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart

@@ -1,4 +1,9 @@
+import 'dart:async';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
@@ -13,20 +18,25 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_updat
 import 'package:syncrow_web/services/product_api.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
-import 'package:syncrow_web/utils/constants/action_enum.dart';
+import 'package:syncrow_web/utils/constants/action_enum.dart' as custom_action;
 
-class SpaceManagementBloc
-    extends Bloc<SpaceManagementEvent, SpaceManagementState> {
+class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementState> {
   final CommunitySpaceManagementApi _api;
   final ProductApi _productApi;
   final SpaceModelManagementApi _spaceModelApi;
 
   List<ProductModel>? _cachedProducts;
+  List<SpaceTemplateModel>? _cachedSpaceModels;
+  final SpaceTreeBloc _spaceTreeBloc;
+  List<Tag>? _cachedTags;
 
-  SpaceManagementBloc(this._api, this._productApi, this._spaceModelApi)
-      : super(SpaceManagementInitial()) {
+  SpaceManagementBloc(
+    this._api,
+    this._productApi,
+    this._spaceModelApi,
+    this._spaceTreeBloc,
+  ) : super(SpaceManagementInitial()) {
     on<LoadCommunityAndSpacesEvent>(_onLoadCommunityAndSpaces);
-    on<UpdateSpacePositionEvent>(_onUpdateSpacePosition);
     on<CreateCommunityEvent>(_onCreateCommunity);
     on<SelectCommunityEvent>(_onSelectCommunity);
     on<DeleteCommunityEvent>(_onCommunityDelete);
@@ -37,6 +47,110 @@ class SpaceManagementBloc
     on<NewCommunityEvent>(_onNewCommunity);
     on<BlankStateEvent>(_onBlankState);
     on<SpaceModelLoadEvent>(_onLoadSpaceModel);
+    on<UpdateSpaceModelCache>(_updateSpaceModelCache);
+    on<DeleteSpaceModelFromCache>(_deleteSpaceModelFromCache);
+  }
+
+  Future<void> _updateSpaceModelCache(
+      UpdateSpaceModelCache event, Emitter<SpaceManagementState> emit) async {
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+    List<SpaceTemplateModel> allSpaceModels = [];
+
+    bool hasNext = true;
+    int page = 1;
+
+    while (hasNext) {
+      final spaceModels = await _spaceModelApi.listSpaceModels(page: page, projectId: projectUuid);
+      if (spaceModels.isNotEmpty) {
+        allSpaceModels.addAll(spaceModels);
+        page++;
+      } else {
+        hasNext = false;
+      }
+    }
+
+    _cachedSpaceModels = allSpaceModels;
+    await fetchTags();
+
+    emit(SpaceModelLoaded(
+        communities:
+            state is SpaceManagementLoaded ? (state as SpaceManagementLoaded).communities : [],
+        products: _cachedProducts ?? [],
+        spaceModels: List.from(_cachedSpaceModels ?? []),
+        allTags: _cachedTags ?? []));
+  }
+
+  void _deleteSpaceModelFromCache(
+      DeleteSpaceModelFromCache event, Emitter<SpaceManagementState> emit) async {
+    if (_cachedSpaceModels != null) {
+      _cachedSpaceModels =
+          _cachedSpaceModels!.where((model) => model.uuid != event.deletedUuid).toList();
+    } else {
+      _cachedSpaceModels = await fetchSpaceModels();
+    }
+    await fetchTags();
+
+    emit(SpaceModelLoaded(
+        communities:
+            state is SpaceManagementLoaded ? (state as SpaceManagementLoaded).communities : [],
+        products: _cachedProducts ?? [],
+        spaceModels: List.from(_cachedSpaceModels ?? []),
+        allTags: _cachedTags ?? []));
+  }
+
+  void updateCachedSpaceModels(List<SpaceTemplateModel> updatedModels) {
+    _cachedSpaceModels = List.from(updatedModels);
+  }
+
+  void addToCachedSpaceModels(SpaceTemplateModel newModel) {
+    _cachedSpaceModels?.add(newModel);
+  }
+
+  Future<List<SpaceTemplateModel>> fetchSpaceModels() async {
+    try {
+      if (_cachedSpaceModels != null) {
+        return _cachedSpaceModels!;
+      }
+
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      List<SpaceTemplateModel> allSpaceModels = [];
+
+      bool hasNext = true;
+      int page = 1;
+
+      while (hasNext) {
+        final spaceModels =
+            await _spaceModelApi.listSpaceModels(page: page, projectId: projectUuid);
+        if (spaceModels.isNotEmpty) {
+          allSpaceModels.addAll(spaceModels);
+          page++;
+        } else {
+          hasNext = false;
+        }
+      }
+
+      _cachedSpaceModels = allSpaceModels;
+
+      return allSpaceModels;
+    } catch (e) {
+      return [];
+    }
+  }
+
+  Future<List<Tag>> fetchTags() async {
+    try {
+      if (_cachedTags != null) {
+        return _cachedTags!;
+      }
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      final allTags = await _spaceModelApi.listTags(projectId: projectUuid);
+      _cachedTags = allTags;
+      return allTags;
+    } catch (e) {
+      return [];
+    }
   }
 
   void _onUpdateCommunity(
@@ -45,28 +159,31 @@ class SpaceManagementBloc
   ) async {
     final previousState = state;
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      await fetchTags();
+
       emit(SpaceManagementLoading());
-      final success =
-          await _api.updateCommunity(event.communityUuid, event.name);
+      final success = await _api.updateCommunity(event.communityUuid, event.name, projectUuid);
       if (success) {
         if (previousState is SpaceManagementLoaded) {
-          final updatedCommunities =
-              List<CommunityModel>.from(previousState.communities);
+          final updatedCommunities = List<CommunityModel>.from(previousState.communities);
           for (var community in updatedCommunities) {
             if (community.uuid == event.communityUuid) {
               community.name = event.name;
+              _spaceTreeBloc.add(OnCommunityAdded(community));
+
               break;
             }
           }
 
-          var prevSpaceModels = await fetchSpaceModels(previousState);
+          var prevSpaceModels = await fetchSpaceModels();
 
           emit(SpaceManagementLoaded(
-            communities: updatedCommunities,
-            products: previousState.products,
-            selectedCommunity: previousState.selectedCommunity,
-            spaceModels: prevSpaceModels,
-          ));
+              communities: updatedCommunities,
+              products: previousState.products,
+              selectedCommunity: previousState.selectedCommunity,
+              spaceModels: prevSpaceModels,
+              allTags: _cachedTags ?? []));
         }
       } else {
         emit(const SpaceManagementError('Failed to update the community.'));
@@ -76,42 +193,6 @@ class SpaceManagementBloc
     }
   }
 
-  Future<List<SpaceTemplateModel>> fetchSpaceModels(
-      SpaceManagementState previousState) async {
-    try {
-      List<SpaceTemplateModel> allSpaces = [];
-      List<SpaceTemplateModel> prevSpaceModels = [];
-
-      if (previousState is SpaceManagementLoaded ||
-          previousState is BlankState) {
-        prevSpaceModels = List<SpaceTemplateModel>.from(
-          (previousState as dynamic).spaceModels ?? [],
-        );
-        allSpaces.addAll(prevSpaceModels);
-      }
-
-      if (prevSpaceModels.isEmpty) {
-        bool hasNext = true;
-        int page = 1;
-
-        while (hasNext) {
-          final spaces = await _spaceModelApi.listSpaceModels(page: page);
-          if (spaces.isNotEmpty) {
-            allSpaces.addAll(spaces);
-            page++;
-          } else {
-            hasNext = false;
-          }
-        }
-        prevSpaceModels = await _spaceModelApi.listSpaceModels(page: 1);
-      }
-
-      return allSpaces;
-    } catch (e) {
-      return [];
-    }
-  }
-
   void _onloadProducts() async {
     if (_cachedProducts == null) {
       final products = await _productApi.fetchProducts();
@@ -130,9 +211,10 @@ class SpaceManagementBloc
     }
   }
 
-  Future<List<SpaceModel>> _fetchSpacesForCommunity(
-      String communityUuid) async {
-    return await _api.getSpaceHierarchy(communityUuid);
+  Future<List<SpaceModel>> _fetchSpacesForCommunity(String communityUuid) async {
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+    return await _api.getSpaceHierarchy(communityUuid, projectUuid);
   }
 
   Future<void> _onNewCommunity(
@@ -140,62 +222,51 @@ class SpaceManagementBloc
     Emitter<SpaceManagementState> emit,
   ) async {
     try {
-      final previousState = state;
+      await fetchTags();
 
       if (event.communities.isEmpty) {
         emit(const SpaceManagementError('No communities provided.'));
         return;
       }
 
-      var prevSpaceModels = await fetchSpaceModels(previousState);
+      var prevSpaceModels = await fetchSpaceModels();
 
       emit(BlankState(
-        communities: event.communities,
-        products: _cachedProducts ?? [],
-        spaceModels: prevSpaceModels,
-      ));
+          communities: event.communities,
+          products: _cachedProducts ?? [],
+          spaceModels: prevSpaceModels,
+          allTags: _cachedTags ?? []));
     } catch (error) {
       emit(SpaceManagementError('Error loading communities: $error'));
     }
   }
 
-  Future<void> _onBlankState(
-      BlankStateEvent event, Emitter<SpaceManagementState> emit) async {
+  Future<void> _onBlankState(BlankStateEvent event, Emitter<SpaceManagementState> emit) async {
     try {
       final previousState = state;
-      var prevSpaceModels = await fetchSpaceModels(previousState);
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      var spaceBloc = event.context.read<SpaceTreeBloc>();
+      List<CommunityModel> communities = await _waitForCommunityList(spaceBloc);
+      await fetchSpaceModels();
+      await fetchTags();
 
-      if (previousState is SpaceManagementLoaded ||
-          previousState is BlankState) {
+      var prevSpaceModels = await fetchSpaceModels();
+
+      if (previousState is SpaceManagementLoaded || previousState is BlankState) {
         final prevCommunities = (previousState as dynamic).communities ?? [];
         emit(BlankState(
-          communities: List<CommunityModel>.from(prevCommunities),
-          products: _cachedProducts ?? [],
-          spaceModels: prevSpaceModels,
-        ));
+            communities: List<CommunityModel>.from(prevCommunities),
+            products: _cachedProducts ?? [],
+            spaceModels: prevSpaceModels,
+            allTags: _cachedTags ?? []));
         return;
       }
 
-      final communities = await _api.fetchCommunities();
-      final updatedCommunities =
-          await Future.wait(communities.map((community) async {
-        final spaces = await _fetchSpacesForCommunity(community.uuid);
-
-        return CommunityModel(
-          uuid: community.uuid,
-          createdAt: community.createdAt,
-          updatedAt: community.updatedAt,
-          name: community.name,
-          description: community.description,
-          spaces: spaces,
-          region: community.region,
-        );
-      }));
-
       emit(BlankState(
         spaceModels: prevSpaceModels,
-        communities: updatedCommunities,
+        communities: communities,
         products: _cachedProducts ?? [],
+        allTags: _cachedTags ?? [],
       ));
     } catch (error) {
       emit(SpaceManagementError('Error loading communities: $error'));
@@ -206,36 +277,38 @@ class SpaceManagementBloc
     LoadCommunityAndSpacesEvent event,
     Emitter<SpaceManagementState> emit,
   ) async {
-    var prevState = state;
-    emit(SpaceManagementLoading());
-    try {
-      _onloadProducts();
-      List<CommunityModel> communities = await _api.fetchCommunities();
+    var spaceBloc = event.context.read<SpaceTreeBloc>();
+    _onloadProducts();
+    await fetchTags();
+    // Wait until `communityList` is loaded
+    List<CommunityModel> communities = await _waitForCommunityList(spaceBloc);
 
-      List<CommunityModel> updatedCommunities = await Future.wait(
-        communities.map((community) async {
-          List<SpaceModel> spaces =
-              await _fetchSpacesForCommunity(community.uuid);
-          return CommunityModel(
-            uuid: community.uuid,
-            createdAt: community.createdAt,
-            updatedAt: community.updatedAt,
-            name: community.name,
-            description: community.description,
-            spaces: spaces, // New spaces list
-            region: community.region,
-          );
-        }).toList(),
-      );
+    // Fetch space models after communities are available
+    final prevSpaceModels = await fetchSpaceModels();
+    emit(SpaceManagementLoaded(
+        communities: communities,
+        products: _cachedProducts ?? [],
+        spaceModels: prevSpaceModels,
+        allTags: _cachedTags ?? []));
+  }
 
-      final prevSpaceModels = await fetchSpaceModels(prevState);
-      emit(SpaceManagementLoaded(
-          communities: updatedCommunities,
-          products: _cachedProducts ?? [],
-          spaceModels: prevSpaceModels));
-    } catch (e) {
-      emit(SpaceManagementError('Error loading communities and spaces: $e'));
+  Future<List<CommunityModel>> _waitForCommunityList(SpaceTreeBloc spaceBloc) async {
+    // Check if communityList is already populated
+    if (spaceBloc.state.communityList.isNotEmpty) {
+      return spaceBloc.state.communityList;
     }
+
+    final completer = Completer<List<CommunityModel>>();
+    final subscription = spaceBloc.stream.listen((state) {
+      if (state.communityList.isNotEmpty) {
+        completer.complete(state.communityList);
+      }
+    });
+
+    // Return the list once available, then cancel the listener
+    final communities = await completer.future;
+    await subscription.cancel();
+    return communities;
   }
 
   void _onCommunityDelete(
@@ -244,10 +317,11 @@ class SpaceManagementBloc
   ) async {
     try {
       emit(SpaceManagementLoading());
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      final success = await _api.deleteCommunity(event.communityUuid);
+      final success = await _api.deleteCommunity(event.communityUuid, projectUuid);
       if (success) {
-        add(LoadCommunityAndSpacesEvent());
+        //  add(LoadCommunityAndSpacesEvent());
       } else {
         emit(const SpaceManagementError('Failed to delete the community.'));
       }
@@ -257,11 +331,6 @@ class SpaceManagementBloc
     }
   }
 
-  void _onUpdateSpacePosition(
-    UpdateSpacePositionEvent event,
-    Emitter<SpaceManagementState> emit,
-  ) {}
-
   void _onCreateCommunity(
     CreateCommunityEvent event,
     Emitter<SpaceManagementState> emit,
@@ -270,23 +339,28 @@ class SpaceManagementBloc
     emit(SpaceManagementLoading());
 
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      await fetchTags();
       CommunityModel? newCommunity =
-          await _api.createCommunity(event.name, event.description);
-      var prevSpaceModels = await fetchSpaceModels(previousState);
+          await _api.createCommunity(event.name, event.description, projectUuid);
+      var prevSpaceModels = await fetchSpaceModels();
 
       if (newCommunity != null) {
-        if (previousState is SpaceManagementLoaded ||
-            previousState is BlankState) {
+        if (previousState is SpaceManagementLoaded || previousState is BlankState) {
           final prevCommunities = List<CommunityModel>.from(
             (previousState as dynamic).communities,
           );
           final updatedCommunities = prevCommunities..add(newCommunity);
+          _spaceTreeBloc.add(OnCommunityAdded(newCommunity));
+
           emit(SpaceManagementLoaded(
-              spaceModels: prevSpaceModels,
-              communities: updatedCommunities,
-              products: _cachedProducts ?? [],
-              selectedCommunity: newCommunity,
-              selectedSpace: null));
+            spaceModels: prevSpaceModels,
+            communities: updatedCommunities,
+            products: _cachedProducts ?? [],
+            selectedCommunity: newCommunity,
+            selectedSpace: null,
+            allTags: _cachedTags ?? [],
+          ));
         }
       } else {
         emit(const SpaceManagementError('Error creating community'));
@@ -326,11 +400,12 @@ class SpaceManagementBloc
     required Emitter<SpaceManagementState> emit,
     CommunityModel? selectedCommunity,
     SpaceModel? selectedSpace,
-  }) {
+  }) async {
     final previousState = state;
     emit(SpaceManagementLoading());
 
     try {
+      await fetchTags();
       if (previousState is SpaceManagementLoaded ||
           previousState is BlankState ||
           previousState is SpaceModelLoaded) {
@@ -346,7 +421,8 @@ class SpaceManagementBloc
             products: _cachedProducts ?? [],
             selectedCommunity: selectedCommunity,
             selectedSpace: selectedSpace,
-            spaceModels: spaceModels));
+            spaceModels: spaceModels,
+            allTags: _cachedTags ?? []));
       }
     } catch (e) {
       emit(SpaceManagementError('Error updating state: $e'));
@@ -362,7 +438,7 @@ class SpaceManagementBloc
 
     try {
       final updatedSpaces =
-          await saveSpacesHierarchically(event.spaces, event.communityUuid);
+          await saveSpacesHierarchically(event.context, event.spaces, event.communityUuid);
 
       final allSpaces = await _fetchSpacesForCommunity(event.communityUuid);
 
@@ -375,8 +451,6 @@ class SpaceManagementBloc
           event.communityUuid,
           emit,
         );
-      } else {
-        add(LoadCommunityAndSpacesEvent());
       }
     } catch (e) {
       emit(SpaceManagementError('Error saving spaces: $e'));
@@ -393,27 +467,36 @@ class SpaceManagementBloc
     String communityUuid,
     Emitter<SpaceManagementState> emit,
   ) async {
-    var prevSpaceModels = await fetchSpaceModels(previousState);
-
+    var prevSpaceModels = await fetchSpaceModels();
+    await fetchTags();
     final communities = List<CommunityModel>.from(previousState.communities);
 
     for (var community in communities) {
       if (community.uuid == communityUuid) {
         community.spaces = allSpaces;
+        _spaceTreeBloc.add(InitialEvent());
+
         emit(SpaceManagementLoaded(
             communities: communities,
             products: _cachedProducts ?? [],
             selectedCommunity: community,
             selectedSpace: null,
-            spaceModels: prevSpaceModels));
+            spaceModels: prevSpaceModels,
+            allTags: _cachedTags ?? []));
         return;
       }
     }
   }
 
   Future<List<SpaceModel>> saveSpacesHierarchically(
-      List<SpaceModel> spaces, String communityUuid) async {
+      BuildContext context, List<SpaceModel> spaces, String communityUuid) async {
     final orderedSpaces = flattenHierarchy(spaces);
+    final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+    var spaceBloc = context.read<SpaceTreeBloc>();
+    List<CommunityModel> communities = spaceBloc.state.communityList;
+    CommunityModel? selectedCommunity = communities.firstWhere(
+      (community) => community.uuid == communityUuid,
+    );
 
     final parentsToDelete = orderedSpaces.where((space) =>
         space.status == SpaceStatus.deleted &&
@@ -422,7 +505,7 @@ class SpaceManagementBloc
     for (var parent in parentsToDelete) {
       try {
         if (parent.uuid != null) {
-          await _api.deleteSpace(communityUuid, parent.uuid!);
+          await _api.deleteSpace(communityUuid, parent.uuid!, projectUuid);
         }
       } catch (e) {
         rethrow;
@@ -435,7 +518,13 @@ class SpaceManagementBloc
         if (space.uuid != null && space.uuid!.isNotEmpty) {
           List<TagModelUpdate> tagUpdates = [];
 
-          final prevSpace = await _api.getSpace(communityUuid, space.uuid!);
+          List<SpaceModel> matchedSpaces =
+              findMatchingSpaces(selectedCommunity.spaces, space.uuid!);
+
+          if (matchedSpaces.isEmpty) continue;
+
+          final prevSpace = matchedSpaces[0];
+
           final List<UpdateSubspaceTemplateModel> subspaceUpdates = [];
           final List<SubspaceModel>? prevSubspaces = prevSpace?.subspaces;
           final List<SubspaceModel>? newSubspaces = space.subspaces;
@@ -445,17 +534,17 @@ class SpaceManagementBloc
           if (prevSubspaces != null || newSubspaces != null) {
             if (prevSubspaces != null && newSubspaces != null) {
               for (var prevSubspace in prevSubspaces) {
-                final existsInNew = newSubspaces
-                    .any((subspace) => subspace.uuid == prevSubspace.uuid);
+                final existsInNew =
+                    newSubspaces.any((subspace) => subspace.uuid == prevSubspace.uuid);
                 if (!existsInNew) {
                   subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                      action: Action.delete, uuid: prevSubspace.uuid));
+                      action: custom_action.Action.delete, uuid: prevSubspace.uuid));
                 }
               }
             } else if (prevSubspaces != null && newSubspaces == null) {
               for (var prevSubspace in prevSubspaces) {
                 subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                    action: Action.delete, uuid: prevSubspace.uuid));
+                    action: custom_action.Action.delete, uuid: prevSubspace.uuid));
               }
             }
 
@@ -468,14 +557,14 @@ class SpaceManagementBloc
                   if (newSubspace.tags != null) {
                     for (var tag in newSubspace.tags!) {
                       tagUpdates.add(TagModelUpdate(
-                          action: Action.add,
-                          uuid: tag.uuid == '' ? null : tag.uuid,
+                          action: custom_action.Action.add,
+                          newTagUuid: tag.uuid == '' ? null : tag.uuid,
                           tag: tag.tag,
                           productUuid: tag.product?.uuid));
                     }
                   }
                   subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                      action: Action.add,
+                      action: custom_action.Action.add,
                       subspaceName: newSubspace.subspaceName,
                       tags: tagUpdates));
                 }
@@ -483,9 +572,7 @@ class SpaceManagementBloc
             }
 
             if (prevSubspaces != null && newSubspaces != null) {
-              final newSubspaceMap = {
-                for (var subspace in newSubspaces) subspace.uuid: subspace
-              };
+              final newSubspaceMap = {for (var subspace in newSubspaces) subspace.uuid: subspace};
 
               for (var prevSubspace in prevSubspaces) {
                 final newSubspace = newSubspaceMap[prevSubspace.uuid];
@@ -494,7 +581,7 @@ class SpaceManagementBloc
                   final List<TagModelUpdate> tagSubspaceUpdates =
                       processTagUpdates(prevSubspace.tags, newSubspace.tags);
                   subspaceUpdates.add(UpdateSubspaceTemplateModel(
-                      action: Action.update,
+                      action: custom_action.Action.update,
                       uuid: newSubspace.uuid,
                       subspaceName: newSubspace.subspaceName,
                       tags: tagSubspaceUpdates));
@@ -504,17 +591,18 @@ class SpaceManagementBloc
           }
 
           final response = await _api.updateSpace(
-            communityId: communityUuid,
-            spaceId: space.uuid!,
-            name: space.name,
-            parentId: space.parent?.uuid,
-            isPrivate: space.isPrivate,
-            position: space.position,
-            icon: space.icon,
-            subspaces: subspaceUpdates,
-            tags: tagUpdates,
-            direction: space.incomingConnection?.direction,
-          );
+              communityId: communityUuid,
+              spaceId: space.uuid!,
+              name: space.name,
+              parentId: space.parent?.uuid,
+              isPrivate: space.isPrivate,
+              position: space.position,
+              icon: space.icon,
+              subspaces: subspaceUpdates,
+              tags: tagUpdates,
+              direction: space.incomingConnection?.direction,
+              spaceModelUuid: space.spaceModel?.uuid,
+              projectId: projectUuid);
         } else {
           // Call create if the space does not have a UUID
           final List<CreateTagBodyModel> tagBodyModels = space.tags != null
@@ -522,10 +610,8 @@ class SpaceManagementBloc
               : [];
 
           final createSubspaceBodyModels = space.subspaces?.map((subspace) {
-                final tagBodyModels = subspace.tags
-                        ?.map((tag) => tag.toCreateTagBodyModel())
-                        .toList() ??
-                    [];
+                final tagBodyModels =
+                    subspace.tags?.map((tag) => tag.toCreateTagBodyModel()).toList() ?? [];
                 return CreateSubspaceModel()
                   ..subspaceName = subspace.subspaceName
                   ..tags = tagBodyModels;
@@ -533,17 +619,17 @@ class SpaceManagementBloc
               [];
 
           final response = await _api.createSpace(
-            communityId: communityUuid,
-            name: space.name,
-            parentId: space.parent?.uuid,
-            isPrivate: space.isPrivate,
-            position: space.position,
-            icon: space.icon,
-            direction: space.incomingConnection?.direction,
-            spaceModelUuid: space.spaceModel?.uuid,
-            tags: tagBodyModels,
-            subspaces: createSubspaceBodyModels,
-          );
+              communityId: communityUuid,
+              name: space.name,
+              parentId: space.parent?.uuid,
+              isPrivate: space.isPrivate,
+              position: space.position,
+              icon: space.icon,
+              direction: space.incomingConnection?.direction,
+              spaceModelUuid: space.spaceModel?.uuid,
+              tags: tagBodyModels,
+              subspaces: createSubspaceBodyModels,
+              projectId: projectUuid);
           space.uuid = response?.uuid;
         }
       } catch (e) {
@@ -578,36 +664,22 @@ class SpaceManagementBloc
     return result.toList(); // Convert back to a list
   }
 
-  void _onLoadSpaceModel(
-      SpaceModelLoadEvent event, Emitter<SpaceManagementState> emit) async {
+  void _onLoadSpaceModel(SpaceModelLoadEvent event, Emitter<SpaceManagementState> emit) async {
     emit(SpaceManagementLoading());
+
     try {
-      var prevState = state;
+      await fetchTags();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      var spaceBloc = event.context.read<SpaceTreeBloc>();
+      List<CommunityModel> communities = spaceBloc.state.communityList;
 
-      List<CommunityModel> communities = await _api.fetchCommunities();
-
-      List<CommunityModel> updatedCommunities = await Future.wait(
-        communities.map((community) async {
-          List<SpaceModel> spaces =
-              await _fetchSpacesForCommunity(community.uuid);
-          return CommunityModel(
-            uuid: community.uuid,
-            createdAt: community.createdAt,
-            updatedAt: community.updatedAt,
-            name: community.name,
-            description: community.description,
-            spaces: spaces, // New spaces list
-            region: community.region,
-          );
-        }).toList(),
-      );
-
-      var prevSpaceModels = await fetchSpaceModels(prevState);
+      var prevSpaceModels = await fetchSpaceModels();
 
       emit(SpaceModelLoaded(
-          communities: updatedCommunities,
+          communities: communities,
           products: _cachedProducts ?? [],
-          spaceModels: prevSpaceModels));
+          spaceModels: prevSpaceModels,
+          allTags: _cachedTags ?? []));
     } catch (e) {
       emit(SpaceManagementError('Error loading communities and spaces: $e'));
     }
@@ -623,9 +695,9 @@ class SpaceManagementBloc
     if (prevTags == null && newTags != null) {
       for (var newTag in newTags) {
         tagUpdates.add(TagModelUpdate(
-          action: Action.add,
+          action: custom_action.Action.add,
           tag: newTag.tag,
-          uuid: newTag.uuid,
+          newTagUuid: newTag.uuid,
           productUuid: newTag.product?.uuid,
         ));
       }
@@ -636,17 +708,14 @@ class SpaceManagementBloc
       // Case 1: Tags deleted
       if (prevTags != null && newTags != null) {
         for (var prevTag in prevTags) {
-          final existsInNew =
-              newTags.any((newTag) => newTag.uuid == prevTag.uuid);
+          final existsInNew = newTags.any((newTag) => newTag.uuid == prevTag.uuid);
           if (!existsInNew) {
-            tagUpdates
-                .add(TagModelUpdate(action: Action.delete, uuid: prevTag.uuid));
+            tagUpdates.add(TagModelUpdate(action: custom_action.Action.delete, uuid: prevTag.uuid));
           }
         }
       } else if (prevTags != null && newTags == null) {
         for (var prevTag in prevTags) {
-          tagUpdates
-              .add(TagModelUpdate(action: Action.delete, uuid: prevTag.uuid));
+          tagUpdates.add(TagModelUpdate(action: custom_action.Action.delete, uuid: prevTag.uuid));
         }
       }
 
@@ -659,9 +728,9 @@ class SpaceManagementBloc
           if ((newTag.uuid == null || !prevTagUuids.contains(newTag.uuid)) &&
               !processedTags.contains(newTag.tag)) {
             tagUpdates.add(TagModelUpdate(
-                action: Action.add,
+                action: custom_action.Action.add,
                 tag: newTag.tag,
-                uuid: newTag.uuid == '' ? null : newTag.uuid,
+                newTagUuid: newTag.uuid == '' ? null : newTag.uuid,
                 productUuid: newTag.product?.uuid));
             processedTags.add(newTag.tag);
           }
@@ -676,8 +745,9 @@ class SpaceManagementBloc
           final newTag = newTagMap[prevTag.uuid];
           if (newTag != null) {
             tagUpdates.add(TagModelUpdate(
-              action: Action.update,
+              action: custom_action.Action.update,
               uuid: newTag.uuid,
+              newTagUuid: newTag.uuid,
               tag: newTag.tag,
             ));
           } else {}
@@ -687,4 +757,18 @@ class SpaceManagementBloc
 
     return tagUpdates;
   }
+
+  List<SpaceModel> findMatchingSpaces(List<SpaceModel> spaces, String targetUuid) {
+    List<SpaceModel> matched = [];
+
+    for (var space in spaces) {
+      if (space.uuid == targetUuid) {
+        matched.add(space);
+      }
+      matched
+          .addAll(findMatchingSpaces(space.children, targetUuid)); // Recursively search in children
+    }
+
+    return matched;
+  }
 }

lib/pages/spaces_management/all_spaces/bloc/space_management_event.dart

@@ -1,16 +1,23 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart'; // Import for Offset
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart'; // Import for Offset
 
 abstract class SpaceManagementEvent extends Equatable {
   const SpaceManagementEvent();
 
   @override
-  List<Object> get props => [];
+  List<Object?> get props => [];
 }
 
-class LoadCommunityAndSpacesEvent extends SpaceManagementEvent {}
+class LoadCommunityAndSpacesEvent extends SpaceManagementEvent {
+  final BuildContext context;
+
+  const LoadCommunityAndSpacesEvent(this.context);
+  @override
+  List<Object?> get props => [context];
+}
 
 class DeleteCommunityEvent extends SpaceManagementEvent {
   final String communityUuid;
@@ -51,14 +58,16 @@ class CreateSpaceEvent extends SpaceManagementEvent {
 class SaveSpacesEvent extends SpaceManagementEvent {
   final List<SpaceModel> spaces;
   final String communityUuid;
+  final BuildContext context;
 
-  const SaveSpacesEvent({
+  const SaveSpacesEvent(
+    this.context, {
     required this.spaces,
     required this.communityUuid,
   });
 
   @override
-  List<Object> get props => [spaces, communityUuid];
+  List<Object> get props => [spaces, communityUuid, context];
 }
 
 class UpdateSpacePositionEvent extends SpaceManagementEvent {
@@ -74,14 +83,12 @@ class UpdateSpacePositionEvent extends SpaceManagementEvent {
 class CreateCommunityEvent extends SpaceManagementEvent {
   final String name;
   final String description;
+  final BuildContext context;
 
-  const CreateCommunityEvent({
-    required this.name,
-    required this.description,
-  });
+  const CreateCommunityEvent(this.name, this.description, this.context);
 
   @override
-  List<Object> get props => [name, description];
+  List<Object?> get props => [name, description, context];
 }
 
 class UpdateCommunityEvent extends SpaceManagementEvent {
@@ -141,7 +148,28 @@ class LoadSpaceHierarchyEvent extends SpaceManagementEvent {
   List<Object> get props => [communityId];
 }
 
+class BlankStateEvent extends SpaceManagementEvent {
+  final BuildContext context;
 
-class BlankStateEvent extends SpaceManagementEvent {}
+  const BlankStateEvent(this.context);
+  @override
+  List<Object?> get props => [context];
+}
 
-class SpaceModelLoadEvent extends SpaceManagementEvent {}
+class SpaceModelLoadEvent extends SpaceManagementEvent {
+  final BuildContext context;
+
+  const SpaceModelLoadEvent(this.context);
+  @override
+  List<Object?> get props => [context];
+}
+
+class UpdateSpaceModelCache extends SpaceManagementEvent {
+  final SpaceTemplateModel updatedModel;
+  UpdateSpaceModelCache(this.updatedModel);
+}
+
+class DeleteSpaceModelFromCache extends SpaceManagementEvent {
+  final String deletedUuid;
+  DeleteSpaceModelFromCache(this.deletedUuid);
+}

lib/pages/spaces_management/all_spaces/bloc/space_management_state.dart

@@ -2,6 +2,7 @@ import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 
 abstract class SpaceManagementState extends Equatable {
@@ -21,26 +22,25 @@ class SpaceManagementLoaded extends SpaceManagementState {
   CommunityModel? selectedCommunity;
   SpaceModel? selectedSpace;
   List<SpaceTemplateModel>? spaceModels;
+  List<Tag> allTags;
 
   SpaceManagementLoaded(
       {required this.communities,
       required this.products,
       this.selectedCommunity,
       this.selectedSpace,
-      this.spaceModels});
-}
-
-class SpaceModelManagenetLoaded extends SpaceManagementState {
-  SpaceModelManagenetLoaded();
+      this.spaceModels,
+      required this.allTags});
 }
 
 class BlankState extends SpaceManagementState {
   final List<CommunityModel> communities;
   final List<ProductModel> products;
   List<SpaceTemplateModel>? spaceModels;
+  final List<Tag> allTags;
 
   BlankState(
-      {required this.communities, required this.products, this.spaceModels});
+      {required this.communities, required this.products, this.spaceModels, required this.allTags});
 }
 
 class SpaceCreationSuccess extends SpaceManagementState {
@@ -65,13 +65,14 @@ class SpaceModelLoaded extends SpaceManagementState {
   List<SpaceTemplateModel> spaceModels;
   final List<ProductModel> products;
   final List<CommunityModel> communities;
+  final List<Tag> allTags;
 
-  SpaceModelLoaded({
-    required this.communities,
-    required this.products,
-    required this.spaceModels,
-  });
+  SpaceModelLoaded(
+      {required this.communities,
+      required this.products,
+      required this.spaceModels,
+      required this.allTags});
 
   @override
-  List<Object> get props => [communities, products, spaceModels];
+  List<Object> get props => [communities, products, spaceModels, allTags];
 }

lib/pages/spaces_management/all_spaces/model/space_model.dart

@@ -14,6 +14,7 @@ class SpaceModel {
   String? icon;
   final String? spaceTuyaUuid;
   String name;
+  String? lastThreeParents;
   final bool isPrivate;
   final String? invitationCode;
   SpaceModel? parent;
@@ -33,6 +34,7 @@ class SpaceModel {
   SpaceModel({
     this.uuid,
     String? internalId,
+    this.lastThreeParents,
     this.spaceTuyaUuid,
     required this.icon,
     required this.name,
@@ -67,6 +69,7 @@ class SpaceModel {
       internalId: internalId,
       uuid: json['uuid'] ?? '',
       name: json['spaceName'],
+      lastThreeParents: json['lastThreeParents'],
       isPrivate: json['isPrivate'] ?? false,
       invitationCode: json['invitationCode'],
       subspaces: (json['subspaces'] as List<dynamic>?)
@@ -125,6 +128,7 @@ class SpaceModel {
       'uuid': uuid ?? '',
       'spaceTuyaUuid': spaceTuyaUuid,
       'name': name,
+      'lastThreeParents': lastThreeParents,
       'isPrivate': isPrivate,
       'invitationCode': invitationCode,
       'parent': parent?.uuid,

lib/pages/spaces_management/all_spaces/model/tag.dart

@@ -25,22 +25,21 @@ class Tag extends BaseTag {
     return Tag(
       uuid: json['uuid'] ?? '',
       internalId: internalId,
-      tag: json['tag'] ?? '',
-      product: json['product'] != null
-          ? ProductModel.fromMap(json['product'])
-          : null,
+      tag: json['name'] ?? '',
+      product: json['product'] != null ? ProductModel.fromMap(json['product']) : null,
     );
   }
 
   @override
   Tag copyWith({
+    String? uuid,
     String? tag,
     ProductModel? product,
     String? location,
     String? internalId,
   }) {
     return Tag(
-      uuid: uuid,
+      uuid: uuid ?? this.uuid,
       tag: tag ?? this.tag,
       product: product ?? this.product,
       location: location ?? this.location,
@@ -60,7 +59,7 @@ class Tag extends BaseTag {
 extension TagModelExtensions on Tag {
   TagBodyModel toTagBodyModel() {
     return TagBodyModel()
-      ..uuid = uuid ?? ''
+      ..uuid = uuid
       ..tag = tag ?? ''
       ..productUuid = product?.uuid;
   }

lib/pages/spaces_management/all_spaces/view/spaces_management_page.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
@@ -29,11 +30,15 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
     return MultiBlocProvider(
       providers: [
         BlocProvider(
-          create: (_) => SpaceManagementBloc(_api, _productApi, _spaceModelApi)
-            ..add(LoadCommunityAndSpacesEvent()),
+          create: (context) => SpaceManagementBloc(
+            _api,
+            _productApi,
+            _spaceModelApi,
+            BlocProvider.of<SpaceTreeBloc>(context),
+          )..add(LoadCommunityAndSpacesEvent(this.context)),
         ),
         BlocProvider(
-          create: (_) => CenterBodyBloc(),
+          create: (context) => CenterBodyBloc(),
         ),
       ],
       child: WebScaffold(
@@ -55,6 +60,7 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
                 selectedSpace: null,
                 products: state.products,
                 shouldNavigateToSpaceModelPage: false,
+                projectTags: state.allTags,
               );
             } else if (state is SpaceManagementLoaded) {
               return LoadedSpaceView(
@@ -64,6 +70,7 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
                 products: state.products,
                 spaceModels: state.spaceModels,
                 shouldNavigateToSpaceModelPage: false,
+                projectTags: state.allTags,
               );
             } else if (state is SpaceModelLoaded) {
               return LoadedSpaceView(
@@ -71,6 +78,7 @@ class SpaceManagementPageState extends State<SpaceManagementPage> {
                 products: state.products,
                 spaceModels: state.spaceModels,
                 shouldNavigateToSpaceModelPage: true,
+                projectTags: state.allTags,
               );
             } else if (state is SpaceManagementError) {
               return Center(child: Text('Error: ${state.errorMessage}'));

lib/pages/spaces_management/all_spaces/widgets/blank_community_widget.dart

@@ -73,17 +73,14 @@ class _BlankCommunityWidgetState extends State<BlankCommunityWidget> {
       context: parentContext,
       builder: (context) => CreateCommunityDialog(
         isEditMode: false,
-        existingCommunityNames:  widget.communities.map((community) => community.name).toList(),
+        existingCommunityNames:
+            widget.communities.map((community) => community.name).toList(),
         onCreateCommunity: (String communityName, String description) {
           parentContext.read<SpaceManagementBloc>().add(
-                CreateCommunityEvent(
-                  name: communityName,
-                  description: description,
-                ),
+                CreateCommunityEvent(communityName, description, context),
               );
         },
       ),
     );
   }
-
 }

lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart

@@ -36,16 +36,17 @@ class CommunityStructureArea extends StatefulWidget {
   final List<CommunityModel> communities;
   final List<SpaceModel> spaces;
   final List<SpaceTemplateModel>? spaceModels;
+  final List<Tag> projectTags;
 
-  CommunityStructureArea({
-    this.selectedCommunity,
-    this.selectedSpace,
-    required this.communities,
-    this.products,
-    required this.spaces,
-    this.onSpaceSelected,
-    this.spaceModels,
-  });
+  CommunityStructureArea(
+      {this.selectedCommunity,
+      this.selectedSpace,
+      required this.communities,
+      this.products,
+      required this.spaces,
+      this.onSpaceSelected,
+      this.spaceModels,
+      required this.projectTags});
 
   @override
   _CommunityStructureAreaState createState() => _CommunityStructureAreaState();
@@ -64,8 +65,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
   void initState() {
     super.initState();
     spaces = widget.spaces.isNotEmpty ? flattenSpaces(widget.spaces) : [];
-    connections =
-        widget.spaces.isNotEmpty ? createConnections(widget.spaces) : [];
+    connections = widget.spaces.isNotEmpty ? createConnections(widget.spaces) : [];
     _adjustCanvasSizeForSpaces();
     _nameController = TextEditingController(
       text: widget.selectedCommunity?.name ?? '',
@@ -92,14 +92,12 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     if (oldWidget.spaces != widget.spaces) {
       setState(() {
         spaces = widget.spaces.isNotEmpty ? flattenSpaces(widget.spaces) : [];
-        connections =
-            widget.spaces.isNotEmpty ? createConnections(widget.spaces) : [];
+        connections = widget.spaces.isNotEmpty ? createConnections(widget.spaces) : [];
         _adjustCanvasSizeForSpaces();
       });
     }
 
-    if (widget.selectedSpace != oldWidget.selectedSpace &&
-        widget.selectedSpace != null) {
+    if (widget.selectedSpace != oldWidget.selectedSpace && widget.selectedSpace != null) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         _moveToSpace(widget.selectedSpace!);
       });
@@ -182,8 +180,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                                     connection, widget.selectedSpace)
                                 ? 1.0
                                 : 0.3, // Adjust opacity
-                            child: CustomPaint(
-                                painter: CurvedLinePainter([connection])),
+                            child: CustomPaint(painter: CurvedLinePainter([connection])),
                           ),
                         for (var entry in spaces.asMap().entries)
                           if (entry.value.status != SpaceStatus.deleted &&
@@ -193,15 +190,12 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                               top: entry.value.position.dy,
                               child: SpaceCardWidget(
                                 index: entry.key,
-                                onButtonTap: (int index, Offset newPosition,
-                                    String direction) {
-                                  _showCreateSpaceDialog(
-                                    screenSize,
-                                    position:
-                                        spaces[index].position + newPosition,
-                                    parentIndex: index,
-                                    direction: direction,
-                                  );
+                                onButtonTap: (int index, Offset newPosition, String direction) {
+                                  _showCreateSpaceDialog(screenSize,
+                                      position: spaces[index].position + newPosition,
+                                      parentIndex: index,
+                                      direction: direction,
+                                      projectTags: widget.projectTags);
                                 },
                                 position: entry.value.position,
                                 isHovered: entry.value.isHovered,
@@ -211,9 +205,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                                   _updateNodePosition(entry.value, newPosition);
                                 },
                                 buildSpaceContainer: (int index) {
-                                  final bool isHighlighted =
-                                      SpaceHelper.isHighlightedSpace(
-                                          spaces[index], widget.selectedSpace);
+                                  final bool isHighlighted = SpaceHelper.isHighlightedSpace(
+                                      spaces[index], widget.selectedSpace);
 
                                   return Opacity(
                                       opacity: isHighlighted ? 1.0 : 0.3,
@@ -238,7 +231,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                       onTap: () {
                         _showCreateSpaceDialog(screenSize,
                             canvasHeight: canvasHeight,
-                            canvasWidth: canvasWidth);
+                            canvasWidth: canvasWidth,
+                            projectTags: widget.projectTags);
                       },
                     ),
                   ),
@@ -292,26 +286,22 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
       int? parentIndex,
       String? direction,
       double? canvasWidth,
-      double? canvasHeight}) {
+      double? canvasHeight,
+      required List<Tag> projectTags}) {
     showDialog(
       context: context,
       builder: (BuildContext context) {
         return CreateSpaceDialog(
           products: widget.products,
           spaceModels: widget.spaceModels,
-          allTags:
-              TagHelper.getAllTagValues(widget.communities, widget.spaceModels),
+          allTags: TagHelper.getAllTagValues(widget.communities, widget.spaceModels),
           parentSpace: parentIndex != null ? spaces[parentIndex] : null,
-          onCreateSpace: (String name,
-              String icon,
-              List<SelectedProduct> selectedProducts,
-              SpaceTemplateModel? spaceModel,
-              List<SubspaceModel>? subspaces,
-              List<Tag>? tags) {
+          projectTags: projectTags,
+          onCreateSpace: (String name, String icon, List<SelectedProduct> selectedProducts,
+              SpaceTemplateModel? spaceModel, List<SubspaceModel>? subspaces, List<Tag>? tags) {
             setState(() {
               // Set the first space in the center or use passed position
-              Offset centerPosition =
-                  position ?? ConnectionHelper.getCenterPosition(screenSize);
+              Offset centerPosition = position ?? ConnectionHelper.getCenterPosition(screenSize);
               SpaceModel newSpace = SpaceModel(
                   name: name,
                   icon: icon,
@@ -356,21 +346,17 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
             spaceModels: widget.spaceModels,
             name: widget.selectedSpace!.name,
             icon: widget.selectedSpace!.icon,
-            parentSpace: SpaceHelper.findSpaceByInternalId(
-                widget.selectedSpace?.parent?.internalId, spaces),
+            projectTags: widget.projectTags,
+            parentSpace:
+                SpaceHelper.findSpaceByInternalId(widget.selectedSpace?.parent?.internalId, spaces),
             editSpace: widget.selectedSpace,
             currentSpaceModel: widget.selectedSpace?.spaceModel,
             tags: widget.selectedSpace?.tags,
             subspaces: widget.selectedSpace?.subspaces,
             isEdit: true,
-            allTags: TagHelper.getAllTagValues(
-                widget.communities, widget.spaceModels),
-            onCreateSpace: (String name,
-                String icon,
-                List<SelectedProduct> selectedProducts,
-                SpaceTemplateModel? spaceModel,
-                List<SubspaceModel>? subspaces,
-                List<Tag>? tags) {
+            allTags: TagHelper.getAllTagValues(widget.communities, widget.spaceModels),
+            onCreateSpace: (String name, String icon, List<SelectedProduct> selectedProducts,
+                SpaceTemplateModel? spaceModel, List<SubspaceModel>? subspaces, List<Tag>? tags) {
               setState(() {
                 // Update the space's properties
                 widget.selectedSpace!.name = name;
@@ -380,8 +366,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
                 widget.selectedSpace!.tags = tags;
 
                 if (widget.selectedSpace!.status != SpaceStatus.newSpace) {
-                  widget.selectedSpace!.status =
-                      SpaceStatus.modified; // Mark as modified
+                  widget.selectedSpace!.status = SpaceStatus.modified; // Mark as modified
                 }
 
                 for (var space in spaces) {
@@ -411,8 +396,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     List<SpaceModel> result = [];
 
     void flatten(SpaceModel space) {
-      if (space.status == SpaceStatus.deleted ||
-          space.status == SpaceStatus.parentDeleted) {
+      if (space.status == SpaceStatus.deleted || space.status == SpaceStatus.parentDeleted) {
         return;
       }
       result.add(space);
@@ -476,6 +460,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     String communityUuid = widget.selectedCommunity!.uuid;
 
     context.read<SpaceManagementBloc>().add(SaveSpacesEvent(
+          context,
           spaces: spacesToSave,
           communityUuid: communityUuid,
         ));
@@ -527,16 +512,13 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
   void _selectSpace(BuildContext context, SpaceModel space) {
     context.read<SpaceManagementBloc>().add(
-          SelectSpaceEvent(
-              selectedCommunity: widget.selectedCommunity,
-              selectedSpace: space),
+          SelectSpaceEvent(selectedCommunity: widget.selectedCommunity, selectedSpace: space),
         );
   }
 
   void _deselectSpace(BuildContext context) {
     context.read<SpaceManagementBloc>().add(
-          SelectSpaceEvent(
-              selectedCommunity: widget.selectedCommunity, selectedSpace: null),
+          SelectSpaceEvent(selectedCommunity: widget.selectedCommunity, selectedSpace: null),
         );
   }
 
@@ -625,19 +607,16 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     const double horizontalGap = 200.0;
     const double verticalGap = 100.0;
 
-    SpaceModel duplicateRecursive(SpaceModel original, Offset parentPosition,
-        SpaceModel? duplicatedParent) {
-      Offset newPosition =
-          Offset(parentPosition.dx + horizontalGap, original.position.dy);
+    SpaceModel duplicateRecursive(
+        SpaceModel original, Offset parentPosition, SpaceModel? duplicatedParent) {
+      Offset newPosition = Offset(parentPosition.dx + horizontalGap, original.position.dy);
 
       while (spaces.any((s) =>
-          (s.position - newPosition).distance < horizontalGap &&
-          s.status != SpaceStatus.deleted)) {
+          (s.position - newPosition).distance < horizontalGap && s.status != SpaceStatus.deleted)) {
         newPosition += Offset(horizontalGap, 0);
       }
 
-      final duplicatedName =
-          SpaceHelper.generateUniqueSpaceName(original.name, spaces);
+      final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
 
       final List<SubspaceModel>? duplicatedSubspaces;
       final List<Tag>? duplicatedTags;
@@ -681,8 +660,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
         if (original.parent != null && duplicatedParent == null) {
           final originalParent = original.parent!;
-          final duplicatedParent =
-              originalToDuplicate[originalParent] ?? originalParent;
+          final duplicatedParent = originalToDuplicate[originalParent] ?? originalParent;
 
           final parentConnection = Connection(
             startSpace: duplicatedParent,
@@ -698,8 +676,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
       final childrenWithDownDirection = original.children
           .where((child) =>
-              child.incomingConnection?.direction == "down" &&
-              child.status != SpaceStatus.deleted)
+              child.incomingConnection?.direction == "down" && child.status != SpaceStatus.deleted)
           .toList();
 
       Offset childStartPosition = childrenWithDownDirection.length == 1
@@ -707,8 +684,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           : newPosition + Offset(0, verticalGap);
 
       for (final child in original.children) {
-        final isDownDirection =
-            child.incomingConnection?.direction == "down" ?? false;
+        final isDownDirection = child.incomingConnection?.direction == "down" ?? false;
 
         if (isDownDirection && childrenWithDownDirection.length == 1) {
           childStartPosition = duplicated.position + Offset(0, verticalGap);
@@ -716,8 +692,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           childStartPosition = duplicated.position + Offset(horizontalGap, 0);
         }
 
-        final duplicatedChild =
-            duplicateRecursive(child, childStartPosition, duplicated);
+        final duplicatedChild = duplicateRecursive(child, childStartPosition, duplicated);
         duplicated.children.add(duplicatedChild);
         childStartPosition += Offset(0, verticalGap);
       }
@@ -728,8 +703,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     if (space.parent == null) {
       duplicateRecursive(space, space.position, null);
     } else {
-      final duplicatedParent =
-          originalToDuplicate[space.parent!] ?? space.parent!;
+      final duplicatedParent = originalToDuplicate[space.parent!] ?? space.parent!;
       duplicateRecursive(space, space.position, duplicatedParent);
     }
   }

lib/pages/spaces_management/all_spaces/widgets/community_tile.dart

@@ -21,15 +21,17 @@ class CommunityTile extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return CustomExpansionTile(
-      title: title,
-      initiallyExpanded: isExpanded,
-      isSelected: isSelected,
-      onExpansionChanged: (bool expanded) {
-        onExpansionChanged(title, expanded);
-      },
-      onItemSelected: onItemSelected,
-      children: children ?? [],
-    );
+    return Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: CustomExpansionTile(
+          title: title,
+          initiallyExpanded: isExpanded,
+          isSelected: isSelected,
+          onExpansionChanged: (bool expanded) {
+            onExpansionChanged(title, expanded);
+          },
+          onItemSelected: onItemSelected,
+          children: children ?? [],
+        ));
   }
 }

lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart

@@ -42,6 +42,7 @@ class CreateSpaceDialog extends StatefulWidget {
   final List<Tag>? tags;
   final List<String>? allTags;
   final SpaceTemplateModel? currentSpaceModel;
+  final List<Tag> projectTags;
 
   const CreateSpaceDialog(
       {super.key,
@@ -57,7 +58,8 @@ class CreateSpaceDialog extends StatefulWidget {
       this.spaceModels,
       this.subspaces,
       this.tags,
-      this.currentSpaceModel});
+      this.currentSpaceModel,
+      required this.projectTags});
 
   @override
   CreateSpaceDialogState createState() => CreateSpaceDialogState();
@@ -80,10 +82,8 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
     super.initState();
     selectedIcon = widget.icon ?? Assets.location;
     nameController = TextEditingController(text: widget.name ?? '');
-    selectedProducts =
-        widget.selectedProducts.isNotEmpty ? widget.selectedProducts : [];
-    isOkButtonEnabled =
-        enteredName.isNotEmpty || nameController.text.isNotEmpty;
+    selectedProducts = widget.selectedProducts.isNotEmpty ? widget.selectedProducts : [];
+    isOkButtonEnabled = enteredName.isNotEmpty || nameController.text.isNotEmpty;
     if (widget.currentSpaceModel != null) {
       subspaces = [];
       tags = [];
@@ -96,15 +96,13 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
 
   @override
   Widget build(BuildContext context) {
-    bool isSpaceModelDisabled = (tags != null && tags!.isNotEmpty ||
-        subspaces != null && subspaces!.isNotEmpty);
+    bool isSpaceModelDisabled =
+        (tags != null && tags!.isNotEmpty || subspaces != null && subspaces!.isNotEmpty);
     bool isTagsAndSubspaceModelDisabled = (selectedSpaceModel != null);
 
     final screenWidth = MediaQuery.of(context).size.width;
     return AlertDialog(
-      title: widget.isEdit
-          ? const Text('Edit Space')
-          : const Text('Create New Space'),
+      title: widget.isEdit ? const Text('Edit Space') : const Text('Create New Space'),
       backgroundColor: ColorsManager.whiteColors,
       content: SizedBox(
         width: screenWidth * 0.5,
@@ -178,7 +176,8 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                             isNameFieldInvalid = value.isEmpty;
 
                             if (!isNameFieldInvalid) {
-                              if (SpaceHelper.isNameConflict(value, widget.parentSpace, widget.editSpace)) {
+                              if (SpaceHelper.isNameConflict(
+                                  value, widget.parentSpace, widget.editSpace)) {
                                 isNameFieldExist = true;
                                 isOkButtonEnabled = false;
                               } else {
@@ -245,9 +244,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                               padding: EdgeInsets.zero,
                             ),
                             onPressed: () {
-                              isSpaceModelDisabled
-                                  ? null
-                                  : _showLinkSpaceModelDialog(context);
+                              isSpaceModelDisabled ? null : _showLinkSpaceModelDialog(context);
                             },
                             child: ButtonContentWidget(
                               svgAssets: Assets.link,
@@ -257,8 +254,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                           )
                         : Container(
                             width: screenWidth * 0.25,
-                            padding: const EdgeInsets.symmetric(
-                                vertical: 10.0, horizontal: 16.0),
+                            padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 16.0),
                             decoration: BoxDecoration(
                               color: ColorsManager.boxColor,
                               borderRadius: BorderRadius.circular(10),
@@ -273,8 +269,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                       style: Theme.of(context)
                                           .textTheme
                                           .bodyMedium!
-                                          .copyWith(
-                                              color: ColorsManager.spaceColor),
+                                          .copyWith(color: ColorsManager.spaceColor),
                                     ),
                                     backgroundColor: ColorsManager.whiteColors,
                                     shape: RoundedRectangleBorder(
@@ -302,6 +297,8 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                     ),
                                     onDeleted: () => setState(() {
                                           this.selectedSpaceModel = null;
+                                          subspaces = widget.subspaces ?? [];
+                                          tags = widget.tags ?? [];
                                         })),
                               ],
                             ),
@@ -343,8 +340,8 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                             onPressed: () async {
                               isTagsAndSubspaceModelDisabled
                                   ? null
-                                  : _showSubSpaceDialog(context, enteredName,
-                                      [], false, widget.products, subspaces);
+                                  : _showSubSpaceDialog(
+                                      context, enteredName, [], false, widget.products, subspaces);
                             },
                             child: ButtonContentWidget(
                               icon: Icons.add,
@@ -371,22 +368,16 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                   if (subspaces != null)
                                     ...subspaces!.map((subspace) {
                                       return Column(
-                                        crossAxisAlignment:
-                                            CrossAxisAlignment.start,
+                                        crossAxisAlignment: CrossAxisAlignment.start,
                                         children: [
                                           SubspaceNameDisplayWidget(
                                             text: subspace.subspaceName,
                                             validateName: (updatedName) {
-                                              bool nameExists =
-                                                  subspaces!.any((s) {
-                                                bool isSameId = s.internalId ==
-                                                    subspace.internalId;
-                                                bool isSameName = s.subspaceName
-                                                        .trim()
-                                                        .toLowerCase() ==
-                                                    updatedName
-                                                        .trim()
-                                                        .toLowerCase();
+                                              bool nameExists = subspaces!.any((s) {
+                                                bool isSameId = s.internalId == subspace.internalId;
+                                                bool isSameName =
+                                                    s.subspaceName.trim().toLowerCase() ==
+                                                        updatedName.trim().toLowerCase();
 
                                                 return !isSameId && isSameName;
                                               });
@@ -395,8 +386,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                             },
                                             onNameChanged: (updatedName) {
                                               setState(() {
-                                                subspace.subspaceName =
-                                                    updatedName;
+                                                subspace.subspaceName = updatedName;
                                               });
                                             },
                                           ),
@@ -405,8 +395,8 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                     }),
                                   EditChip(
                                     onTap: () async {
-                                      _showSubSpaceDialog(context, enteredName,
-                                          [], true, widget.products, subspaces);
+                                      _showSubSpaceDialog(context, enteredName, [], true,
+                                          widget.products, subspaces);
                                     },
                                   )
                                 ],
@@ -415,9 +405,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                           ),
                     const SizedBox(height: 10),
                     (tags?.isNotEmpty == true ||
-                            subspaces?.any((subspace) =>
-                                    subspace.tags?.isNotEmpty == true) ==
-                                true)
+                            subspaces?.any((subspace) => subspace.tags?.isNotEmpty == true) == true)
                         ? SizedBox(
                             width: screenWidth * 0.25,
                             child: Container(
@@ -437,16 +425,14 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                   // Combine tags from spaceModel and subspaces
                                   ...TagHelper.groupTags([
                                     ...?tags,
-                                    ...?subspaces?.expand(
-                                        (subspace) => subspace.tags ?? [])
+                                    ...?subspaces?.expand((subspace) => subspace.tags ?? [])
                                   ]).entries.map(
                                         (entry) => Chip(
                                           avatar: SizedBox(
                                             width: 24,
                                             height: 24,
                                             child: SvgPicture.asset(
-                                              entry.key.icon ??
-                                                  'assets/icons/gateway.svg',
+                                              entry.key.icon ?? 'assets/icons/gateway.svg',
                                               fit: BoxFit.contain,
                                             ),
                                           ),
@@ -455,15 +441,11 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                             style: Theme.of(context)
                                                 .textTheme
                                                 .bodySmall
-                                                ?.copyWith(
-                                                    color: ColorsManager
-                                                        .spaceColor),
+                                                ?.copyWith(color: ColorsManager.spaceColor),
                                           ),
-                                          backgroundColor:
-                                              ColorsManager.whiteColors,
+                                          backgroundColor: ColorsManager.whiteColors,
                                           shape: RoundedRectangleBorder(
-                                            borderRadius:
-                                                BorderRadius.circular(16),
+                                            borderRadius: BorderRadius.circular(16),
                                             side: const BorderSide(
                                               color: ColorsManager.spaceColor,
                                             ),
@@ -472,23 +454,21 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                                       ),
 
                                   EditChip(onTap: () async {
-                                    final result = await showDialog(
+                                    await showDialog(
                                       context: context,
                                       builder: (context) => AssignTagDialog(
                                         products: widget.products,
                                         subspaces: subspaces,
                                         allTags: widget.allTags,
-                                        addedProducts: TagHelper
-                                            .createInitialSelectedProductsForTags(
+                                        addedProducts:
+                                            TagHelper.createInitialSelectedProductsForTags(
                                                 tags ?? [], subspaces),
                                         title: 'Edit Device',
-                                        initialTags:
-                                            TagHelper.generateInitialForTags(
-                                                spaceTags: tags,
-                                                subspaces: subspaces),
+                                        initialTags: TagHelper.generateInitialForTags(
+                                            spaceTags: tags, subspaces: subspaces),
                                         spaceName: widget.name ?? '',
-                                        onSave:
-                                            (updatedTags, updatedSubspaces) {
+                                        projectTags: widget.projectTags,
+                                        onSave: (updatedTags, updatedSubspaces) {
                                           setState(() {
                                             tags = updatedTags;
                                             subspaces = updatedSubspaces;
@@ -547,25 +527,17 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                     });
                     return;
                   } else {
-                    String newName = enteredName.isNotEmpty
-                        ? enteredName
-                        : (widget.name ?? '');
+                    String newName = enteredName.isNotEmpty ? enteredName : (widget.name ?? '');
                     if (newName.isNotEmpty) {
-                      widget.onCreateSpace(
-                          newName,
-                          selectedIcon,
-                          selectedProducts,
-                          selectedSpaceModel,
-                          subspaces,
-                          tags);
+                      widget.onCreateSpace(newName, selectedIcon, selectedProducts,
+                          selectedSpaceModel, subspaces, tags);
                       Navigator.of(context).pop();
                     }
                   }
                 },
                 borderRadius: 10,
-                backgroundColor: isOkButtonEnabled
-                    ? ColorsManager.secondaryColor
-                    : ColorsManager.grayColor,
+                backgroundColor:
+                    isOkButtonEnabled ? ColorsManager.secondaryColor : ColorsManager.grayColor,
                 foregroundColor: ColorsManager.whiteColors,
                 child: const Text('OK'),
               ),
@@ -592,7 +564,6 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
     );
   }
 
- 
   void _showLinkSpaceModelDialog(BuildContext context) {
     showDialog(
       context: context,
@@ -613,13 +584,8 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
     );
   }
 
-  void _showSubSpaceDialog(
-      BuildContext context,
-      String name,
-      final List<Tag>? spaceTags,
-      bool isEdit,
-      List<ProductModel>? products,
-      final List<SubspaceModel>? existingSubSpaces) {
+  void _showSubSpaceDialog(BuildContext context, String name, final List<Tag>? spaceTags,
+      bool isEdit, List<ProductModel>? products, final List<SubspaceModel>? existingSubSpaces) {
     showDialog(
       context: context,
       builder: (BuildContext context) {
@@ -634,12 +600,10 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
               final List<Tag> tagsToAppendToSpace = [];
 
               if (slectedSubspaces != null) {
-                final updatedIds =
-                    slectedSubspaces.map((s) => s.internalId).toSet();
+                final updatedIds = slectedSubspaces.map((s) => s.internalId).toSet();
                 if (existingSubSpaces != null) {
-                  final deletedSubspaces = existingSubSpaces
-                      .where((s) => !updatedIds.contains(s.internalId))
-                      .toList();
+                  final deletedSubspaces =
+                      existingSubSpaces.where((s) => !updatedIds.contains(s.internalId)).toList();
                   for (var s in deletedSubspaces) {
                     if (s.tags != null) {
                       tagsToAppendToSpace.addAll(s.tags!);
@@ -659,20 +623,20 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
     );
   }
 
-  void _showTagCreateDialog(BuildContext context, String name, bool isEdit,
-      List<ProductModel>? products) {
+  void _showTagCreateDialog(
+      BuildContext context, String name, bool isEdit, List<ProductModel>? products) {
     isEdit
         ? showDialog(
             context: context,
             builder: (BuildContext context) {
               return AssignTagDialog(
                 title: 'Edit Device',
-                addedProducts: TagHelper.createInitialSelectedProductsForTags(
-                    tags, subspaces),
+                addedProducts: TagHelper.createInitialSelectedProductsForTags(tags, subspaces),
                 spaceName: name,
                 products: products,
                 subspaces: subspaces,
                 allTags: widget.allTags,
+                projectTags: widget.projectTags,
                 onSave: (selectedSpaceTags, selectedSubspaces) {
                   setState(() {
                     tags = selectedSpaceTags;
@@ -682,8 +646,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                       if (subspaces != null) {
                         for (final subspace in subspaces!) {
                           for (final selectedSubspace in selectedSubspaces) {
-                            if (subspace.subspaceName ==
-                                selectedSubspace.subspaceName) {
+                            if (subspace.subspaceName == selectedSubspace.subspaceName) {
                               subspace.tags = selectedSubspace.tags;
                             }
                           }
@@ -705,9 +668,9 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                 spaceTags: tags,
                 isCreate: true,
                 allTags: widget.allTags,
+                projectTags: widget.projectTags,
                 initialSelectedProducts:
-                    TagHelper.createInitialSelectedProductsForTags(
-                        tags, subspaces),
+                    TagHelper.createInitialSelectedProductsForTags(tags, subspaces),
                 onSave: (selectedSpaceTags, selectedSubspaces) {
                   setState(() {
                     tags = selectedSpaceTags;
@@ -717,8 +680,7 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
                       if (subspaces != null) {
                         for (final subspace in subspaces!) {
                           for (final selectedSubspace in selectedSubspaces) {
-                            if (subspace.subspaceName ==
-                                selectedSubspace.subspaceName) {
+                            if (subspace.subspaceName == selectedSubspace.subspaceName) {
                               subspace.tags = selectedSubspace.tags;
                             }
                           }

lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart

@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/gradient_canvas_border_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart';
@@ -18,16 +21,17 @@ class LoadedSpaceView extends StatefulWidget {
   final List<ProductModel>? products;
   final List<SpaceTemplateModel>? spaceModels;
   final bool shouldNavigateToSpaceModelPage;
+  final List<Tag> projectTags;
 
-  const LoadedSpaceView({
-    super.key,
-    required this.communities,
-    this.selectedCommunity,
-    this.selectedSpace,
-    this.products,
-    this.spaceModels,
-    required this.shouldNavigateToSpaceModelPage,
-  });
+  const LoadedSpaceView(
+      {super.key,
+      required this.communities,
+      this.selectedCommunity,
+      this.selectedSpace,
+      this.products,
+      this.spaceModels,
+      required this.shouldNavigateToSpaceModelPage,
+      required this.projectTags});
 
   @override
   _LoadedSpaceViewState createState() => _LoadedSpaceViewState();
@@ -39,6 +43,7 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
   @override
   void initState() {
     super.initState();
+
     _spaceModels = List.from(widget.spaceModels ?? []);
   }
 
@@ -46,6 +51,7 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
   @override
   void didUpdateWidget(covariant LoadedSpaceView oldWidget) {
     super.didUpdateWidget(oldWidget);
+
     if (widget.spaceModels != oldWidget.spaceModels) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (mounted) {
@@ -74,37 +80,45 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
     return Stack(
       clipBehavior: Clip.none,
       children: [
-        Row(
-          children: [
-            SidebarWidget(
-              communities: widget.communities,
-              selectedSpaceUuid: widget.selectedSpace?.uuid ??
-                  widget.selectedCommunity?.uuid ??
-                  '',
-            ),
-            widget.shouldNavigateToSpaceModelPage
-                ? Expanded(
+        widget.shouldNavigateToSpaceModelPage
+            ? Row(
+                children: [
+                  SizedBox(width: 300, child: SpaceTreeView(onSelect: () {})),
+                  Expanded(
                     child: BlocProvider(
                       create: (context) => SpaceModelBloc(
+                        BlocProvider.of<SpaceTreeBloc>(context),
                         api: SpaceModelManagementApi(),
-                        initialSpaceModels: _spaceModels,
+                        initialSpaceModels: widget.spaceModels ?? [],
                       ),
                       child: SpaceModelPage(
                         products: widget.products,
                         onSpaceModelsUpdated: _onSpaceModelsUpdated,
+                        projectTags: widget.projectTags,
                       ),
                     ),
-                  )
-                : CommunityStructureArea(
+                  ),
+                ],
+              )
+            : Row(
+                children: [
+                  SidebarWidget(
+                    communities: widget.communities,
+                    selectedSpaceUuid: widget.selectedSpace?.uuid ??
+                        widget.selectedCommunity?.uuid ??
+                        '',
+                  ),
+                  CommunityStructureArea(
                     selectedCommunity: widget.selectedCommunity,
                     selectedSpace: widget.selectedSpace,
                     spaces: widget.selectedCommunity?.spaces ?? [],
                     products: widget.products,
                     communities: widget.communities,
                     spaceModels: _spaceModels,
+                    projectTags: widget.projectTags,
                   ),
-          ],
-        ),
+                ],
+              ),
         const GradientCanvasBorderWidget(),
       ],
     );

lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart

@@ -205,30 +205,32 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     );
   }
 
-  Widget _buildSpaceTile(SpaceModel space, CommunityModel community) {
+  Widget _buildSpaceTile(SpaceModel space, CommunityModel community, {int depth = 1}) {
     bool isExpandedSpace = _isSpaceOrChildSelected(space);
-    return SpaceTile(
-      title: space.name,
-      key: ValueKey(space.uuid),
-      isSelected: _selectedId == space.uuid,
-      initiallyExpanded: isExpandedSpace,
-      onExpansionChanged: (bool expanded) {
-        _handleExpansionChange(space.uuid ?? '', expanded);
-      },
-      onItemSelected: () {
-        setState(() {
-          _selectedId = space.uuid;
-          _selectedSpaceUuid = space.uuid;
-        });
+    return Padding(
+        padding: EdgeInsets.only(left: depth * 16.0),
+        child: SpaceTile(
+          title: space.name,
+          key: ValueKey(space.uuid),
+          isSelected: _selectedId == space.uuid,
+          initiallyExpanded: isExpandedSpace,
+          onExpansionChanged: (bool expanded) {
+            _handleExpansionChange(space.uuid ?? '', expanded);
+          },
+          onItemSelected: () {
+            setState(() {
+              _selectedId = space.uuid;
+              _selectedSpaceUuid = space.uuid;
+            });
 
-        context.read<SpaceManagementBloc>().add(
-              SelectSpaceEvent(selectedCommunity: community, selectedSpace: space),
-            );
-      },
-      children: space.children.isNotEmpty
-          ? space.children.map((childSpace) => _buildSpaceTile(childSpace, community)).toList()
-          : [], // Recursively render child spaces if available
-    );
+            context.read<SpaceManagementBloc>().add(
+                  SelectSpaceEvent(selectedCommunity: community, selectedSpace: space),
+                );
+          },
+          children: space.children.isNotEmpty
+              ? space.children.map((childSpace) => _buildSpaceTile(childSpace, community)).toList()
+              : [], // Recursively render child spaces if available
+        ));
   }
 
   void _handleExpansionChange(String uuid, bool expanded) {}

lib/pages/spaces_management/all_spaces/widgets/space_tile_widget.dart

@@ -35,18 +35,20 @@ class _SpaceTileState extends State<SpaceTile> {
 
   @override
   Widget build(BuildContext context) {
-    return CustomExpansionTile(
-      isSelected: widget.isSelected,
-      title: widget.title,
-      initiallyExpanded: _isExpanded,
-      onItemSelected: widget.onItemSelected,
-      onExpansionChanged: (bool expanded) {
-        setState(() {
-          _isExpanded = expanded;
-        });
-        widget.onExpansionChanged(expanded);
-      },
-      children: widget.children ?? [],
-    );
+    return Padding(
+        padding: const EdgeInsets.only(left: 8.0, right: 8.0, top: 8.0),
+        child: CustomExpansionTile(
+          isSelected: widget.isSelected,
+          title: widget.title,
+          initiallyExpanded: _isExpanded,
+          onItemSelected: widget.onItemSelected,
+          onExpansionChanged: (bool expanded) {
+            setState(() {
+              _isExpanded = expanded;
+            });
+            widget.onExpansionChanged(expanded);
+          },
+          children: widget.children ?? [],
+        ));
   }
 }

lib/pages/spaces_management/assign_tag/bloc/assign_tag_bloc.dart

@@ -4,17 +4,16 @@ import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_e
 import 'package:syncrow_web/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart';
 
 class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
-  final List<String> allTags;
+  final List<Tag> projectTags;
 
-  AssignTagBloc(this.allTags) : super(AssignTagInitial()) {
+  AssignTagBloc(this.projectTags) : super(AssignTagInitial()) {
     on<InitializeTags>((event, emit) {
       final initialTags = event.initialTags ?? [];
 
       final existingTagCounts = <String, int>{};
       for (var tag in initialTags) {
         if (tag.product != null) {
-          existingTagCounts[tag.product!.uuid] =
-              (existingTagCounts[tag.product!.uuid] ?? 0) + 1;
+          existingTagCounts[tag.product!.uuid] = (existingTagCounts[tag.product!.uuid] ?? 0) + 1;
         }
       }
 
@@ -23,17 +22,14 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
       for (var selectedProduct in event.addedProducts) {
         final existingCount = existingTagCounts[selectedProduct.productId] ?? 0;
 
-        if (selectedProduct.count == 0 ||
-            selectedProduct.count <= existingCount) {
-          tags.addAll(initialTags
-              .where((tag) => tag.product?.uuid == selectedProduct.productId));
+        if (selectedProduct.count == 0 || selectedProduct.count <= existingCount) {
+          tags.addAll(initialTags.where((tag) => tag.product?.uuid == selectedProduct.productId));
           continue;
         }
 
         final missingCount = selectedProduct.count - existingCount;
 
-        tags.addAll(initialTags
-            .where((tag) => tag.product?.uuid == selectedProduct.productId));
+        tags.addAll(initialTags.where((tag) => tag.product?.uuid == selectedProduct.productId));
 
         if (missingCount > 0) {
           tags.addAll(List.generate(
@@ -47,11 +43,11 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
         }
       }
 
-      final updatedTags = _calculateAvailableTags(allTags, tags);
+      final updatedTags = _calculateAvailableTags(projectTags, tags);
 
       emit(AssignTagLoaded(
         tags: tags,
-        updatedTags: updatedTags, 
+        updatedTags: updatedTags,
         isSaveEnabled: _validateTags(tags),
         errorMessage: '',
       ));
@@ -62,9 +58,16 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
         final tags = List<Tag>.from(currentState.tags);
-        tags[event.index] = tags[event.index].copyWith(tag: event.tag);
+        if (event.index < 0 || event.index >= tags.length) return;
 
-        final updatedTags = _calculateAvailableTags(allTags, tags);
+        tags[event.index] = tags[event.index].copyWith(
+          tag: event.tag.tag,
+          uuid: event.tag.uuid,
+          product: event.tag.product,
+          internalId: event.tag.internalId,
+          location: event.tag.location,
+        );
+        final updatedTags = _calculateAvailableTags(projectTags, tags);
 
         emit(AssignTagLoaded(
           tags: tags,
@@ -82,10 +85,9 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
         final tags = List<Tag>.from(currentState.tags);
 
         // Update the location
-        tags[event.index] =
-            tags[event.index].copyWith(location: event.location);
+        tags[event.index] = tags[event.index].copyWith(location: event.location);
 
-        final updatedTags = _calculateAvailableTags(allTags, tags);
+        final updatedTags = _calculateAvailableTags(projectTags, tags);
 
         emit(AssignTagLoaded(
           tags: tags,
@@ -104,7 +106,7 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
         emit(AssignTagLoaded(
           tags: tags,
-          updatedTags: _calculateAvailableTags(allTags, tags),
+          updatedTags: _calculateAvailableTags(projectTags, tags),
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -115,11 +117,10 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
       final currentState = state;
 
       if (currentState is AssignTagLoaded && currentState.tags.isNotEmpty) {
-        final tags = List<Tag>.from(currentState.tags)
-          ..remove(event.tagToDelete);
+        final tags = List<Tag>.from(currentState.tags)..remove(event.tagToDelete);
 
         // Recalculate available tags
-        final updatedTags = _calculateAvailableTags(allTags, tags);
+        final updatedTags = _calculateAvailableTags(projectTags, tags);
 
         emit(AssignTagLoaded(
           tags: tags,
@@ -140,10 +141,8 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
 
   // Get validation error for duplicate tags
   String? _getValidationError(List<Tag> tags) {
-    final nonEmptyTags = tags
-        .map((tag) => tag.tag?.trim() ?? '')
-        .where((tag) => tag.isNotEmpty)
-        .toList();
+    final nonEmptyTags =
+        tags.map((tag) => tag.tag?.trim() ?? '').where((tag) => tag.isNotEmpty).toList();
 
     final duplicateTags = nonEmptyTags
         .fold<Map<String, int>>({}, (map, tag) {
@@ -162,14 +161,16 @@ class AssignTagBloc extends Bloc<AssignTagEvent, AssignTagState> {
     return null;
   }
 
-  List<String> _calculateAvailableTags(List<String> allTags, List<Tag> tags) {
-    final selectedTags = tags
+  List<Tag> _calculateAvailableTags(List<Tag> allTags, List<Tag> selectedTags) {
+    final selectedTagSet = selectedTags
         .where((tag) => (tag.tag?.trim().isNotEmpty ?? false))
         .map((tag) => tag.tag!.trim())
         .toSet();
 
-    final availableTags =
-        allTags.where((tag) => !selectedTags.contains(tag.trim())).toList();
+    final availableTags = allTags
+        .where((tag) => tag.tag != null && !selectedTagSet.contains(tag.tag!.trim()))
+        .toList();
+
     return availableTags;
   }
 }

lib/pages/spaces_management/assign_tag/bloc/assign_tag_event.dart

@@ -24,7 +24,7 @@ class InitializeTags extends AssignTagEvent {
 
 class UpdateTagEvent extends AssignTagEvent {
   final int index;
-  final String tag;
+  final Tag tag;
 
   const UpdateTagEvent({required this.index, required this.tag});
 

lib/pages/spaces_management/assign_tag/bloc/assign_tag_state.dart

@@ -5,7 +5,7 @@ abstract class AssignTagState extends Equatable {
   const AssignTagState();
 
   @override
-  List<Object> get props => [];
+  List<Object?> get props => [];
 }
 
 class AssignTagInitial extends AssignTagState {}
@@ -14,7 +14,7 @@ class AssignTagLoading extends AssignTagState {}
 
 class AssignTagLoaded extends AssignTagState {
   final List<Tag> tags;
-  final List<String> updatedTags; 
+  final List<Tag> updatedTags;
 
   final bool isSaveEnabled;
   final String? errorMessage;
@@ -27,8 +27,7 @@ class AssignTagLoaded extends AssignTagState {
   });
 
   @override
-  List<Object> get props =>
-      [tags, updatedTags, isSaveEnabled, errorMessage ?? ''];
+  List<Object?> get props => [tags, updatedTags, isSaveEnabled, errorMessage ?? ''];
 }
 
 class AssignTagError extends AssignTagState {
@@ -37,5 +36,5 @@ class AssignTagError extends AssignTagState {
   const AssignTagError(this.errorMessage);
 
   @override
-  List<Object> get props => [errorMessage];
+  List<Object?> get props => [errorMessage];
 }

lib/pages/spaces_management/assign_tag/views/assign_tag_dialog.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/common/dialog_dropdown.dart';
-import 'package:syncrow_web/common/dialog_textfield_dropdown.dart';
+import 'package:syncrow_web/common/tag_dialog_textfield_dropdown.dart';
 import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/spaces_management/add_device_type/views/add_device_type_widget.dart';
@@ -26,6 +26,7 @@ class AssignTagDialog extends StatelessWidget {
   final String spaceName;
   final String title;
   final Function(List<Tag>, List<SubspaceModel>?)? onSave;
+  final List<Tag> projectTags;
 
   const AssignTagDialog(
       {Key? key,
@@ -37,18 +38,17 @@ class AssignTagDialog extends StatelessWidget {
       this.allTags,
       required this.spaceName,
       required this.title,
-      this.onSave})
+      this.onSave,
+      required this.projectTags})
       : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    final List<String> locations = (subspaces ?? [])
-        .map((subspace) => subspace.subspaceName)
-        .toList()
-      ..add('Main Space');
+    final List<String> locations =
+        (subspaces ?? []).map((subspace) => subspace.subspaceName).toList()..add('Main Space');
 
     return BlocProvider(
-      create: (_) => AssignTagBloc(allTags ?? [])
+      create: (_) => AssignTagBloc(projectTags)
         ..add(InitializeTags(
           initialTags: initialTags,
           addedProducts: addedProducts,
@@ -70,8 +70,7 @@ class AssignTagDialog extends StatelessWidget {
                     ClipRRect(
                       borderRadius: BorderRadius.circular(20),
                       child: DataTable(
-                        headingRowColor: WidgetStateProperty.all(
-                            ColorsManager.dataHeaderGrey),
+                        headingRowColor: WidgetStateProperty.all(ColorsManager.dataHeaderGrey),
                         key: ValueKey(state.tags.length),
                         border: TableBorder.all(
                           color: ColorsManager.dataHeaderGrey,
@@ -80,22 +79,15 @@ class AssignTagDialog extends StatelessWidget {
                         ),
                         columns: [
                           DataColumn(
-                              label: Text('#',
-                                  style:
-                                      Theme.of(context).textTheme.bodyMedium)),
+                              label: Text('#', style: Theme.of(context).textTheme.bodyMedium)),
                           DataColumn(
-                              label: Text('Device',
-                                  style:
-                                      Theme.of(context).textTheme.bodyMedium)),
+                              label: Text('Device', style: Theme.of(context).textTheme.bodyMedium)),
                           DataColumn(
                               numeric: false,
-                              label: Text('Tag',
-                                  style:
-                                      Theme.of(context).textTheme.bodyMedium)),
+                              label: Text('Tag', style: Theme.of(context).textTheme.bodyMedium)),
                           DataColumn(
-                              label: Text('Location',
-                                  style:
-                                      Theme.of(context).textTheme.bodyMedium)),
+                              label:
+                                  Text('Location', style: Theme.of(context).textTheme.bodyMedium)),
                         ],
                         rows: state.tags.isEmpty
                             ? [
@@ -103,12 +95,8 @@ class AssignTagDialog extends StatelessWidget {
                                   DataCell(
                                     Center(
                                       child: Text('No Data Available',
-                                          style: Theme.of(context)
-                                              .textTheme
-                                              .bodyMedium
-                                              ?.copyWith(
-                                                color: ColorsManager
-                                                    .lightGrayColor,
+                                          style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                                                color: ColorsManager.lightGrayColor,
                                               )),
                                     ),
                                   ),
@@ -126,8 +114,7 @@ class AssignTagDialog extends StatelessWidget {
                                     DataCell(Text((index + 1).toString())),
                                     DataCell(
                                       Row(
-                                        mainAxisAlignment:
-                                            MainAxisAlignment.spaceBetween,
+                                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                         children: [
                                           Expanded(
                                               child: Text(
@@ -141,31 +128,25 @@ class AssignTagDialog extends StatelessWidget {
                                             decoration: BoxDecoration(
                                               shape: BoxShape.circle,
                                               border: Border.all(
-                                                color: ColorsManager
-                                                    .lightGrayColor,
+                                                color: ColorsManager.lightGrayColor,
                                                 width: 1.0,
                                               ),
                                             ),
                                             child: IconButton(
                                               icon: const Icon(
                                                 Icons.close,
-                                                color: ColorsManager
-                                                    .lightGreyColor,
+                                                color: ColorsManager.lightGreyColor,
                                                 size: 16,
                                               ),
                                               onPressed: () {
-                                                context
-                                                    .read<AssignTagBloc>()
-                                                    .add(DeleteTag(
-                                                        tagToDelete: tag,
-                                                        tags: state.tags));
+                                                context.read<AssignTagBloc>().add(
+                                                    DeleteTag(tagToDelete: tag, tags: state.tags));
 
                                                 controllers.removeAt(index);
                                               },
                                               tooltip: 'Delete Tag',
                                               padding: EdgeInsets.zero,
-                                              constraints:
-                                                  const BoxConstraints(),
+                                              constraints: const BoxConstraints(),
                                             ),
                                           ),
                                         ],
@@ -173,23 +154,20 @@ class AssignTagDialog extends StatelessWidget {
                                     ),
                                     DataCell(
                                       Container(
-                                        alignment: Alignment
-                                            .centerLeft, // Align cell content to the left
+                                        alignment:
+                                            Alignment.centerLeft, // Align cell content to the left
                                         child: SizedBox(
-                                          width: double
-                                              .infinity, // Ensure full width for dropdown
-                                          child: DialogTextfieldDropdown(
-                                            key: ValueKey(
-                                                'dropdown_${Uuid().v4()}_${index}'),
+                                          width: double.infinity,
+                                          child: TagDialogTextfieldDropdown(
+                                            key: ValueKey('dropdown_${const Uuid().v4()}_$index'),
                                             items: state.updatedTags,
-                                            initialValue: tag.tag,
+                                            product: tag.product?.uuid ?? 'Unknown',
+                                            initialValue: tag,
                                             onSelected: (value) {
-                                              controller.text = value;
-                                              context
-                                                  .read<AssignTagBloc>()
-                                                  .add(UpdateTagEvent(
+                                              controller.text = value.tag ?? '';
+                                              context.read<AssignTagBloc>().add(UpdateTagEvent(
                                                     index: index,
-                                                    tag: value.trim(),
+                                                    tag: value,
                                                   ));
                                             },
                                           ),
@@ -201,12 +179,9 @@ class AssignTagDialog extends StatelessWidget {
                                           width: double.infinity,
                                           child: DialogDropdown(
                                             items: locations,
-                                            selectedValue:
-                                                tag.location ?? 'Main Space',
+                                            selectedValue: tag.location ?? 'Main Space',
                                             onSelected: (value) {
-                                              context
-                                                  .read<AssignTagBloc>()
-                                                  .add(UpdateLocation(
+                                              context.read<AssignTagBloc>().add(UpdateLocation(
                                                     index: index,
                                                     location: value,
                                                   ));
@@ -238,13 +213,11 @@ class AssignTagDialog extends StatelessWidget {
                           label: 'Add New Device',
                           onPressed: () async {
                             final updatedTags = List<Tag>.from(state.tags);
-                            final result =
-                                TagHelper.processTags(updatedTags, subspaces);
+                            final result = TagHelper.processTags(updatedTags, subspaces);
 
-                            final processedTags =
-                                result['updatedTags'] as List<Tag>;
-                            final processedSubspaces = List<SubspaceModel>.from(
-                                result['subspaces'] as List<dynamic>);
+                            final processedTags = result['updatedTags'] as List<Tag>;
+                            final processedSubspaces =
+                                List<SubspaceModel>.from(result['subspaces'] as List<dynamic>);
 
                             Navigator.of(context).pop();
 
@@ -253,8 +226,9 @@ class AssignTagDialog extends StatelessWidget {
                               builder: (context) => AddDeviceTypeWidget(
                                 products: products,
                                 subspaces: processedSubspaces,
-                                initialSelectedProducts: TagHelper
-                                    .createInitialSelectedProductsForTags(
+                                projectTags: projectTags,
+                                initialSelectedProducts:
+                                    TagHelper.createInitialSelectedProductsForTags(
                                         processedTags, processedSubspaces),
                                 spaceName: spaceName,
                                 spaceTags: processedTags,
@@ -278,14 +252,11 @@ class AssignTagDialog extends StatelessWidget {
                         onPressed: state.isSaveEnabled
                             ? () async {
                                 final updatedTags = List<Tag>.from(state.tags);
-                                final result = TagHelper.processTags(
-                                    updatedTags, subspaces);
+                                final result = TagHelper.processTags(updatedTags, subspaces);
 
-                                final processedTags =
-                                    result['updatedTags'] as List<Tag>;
+                                final processedTags = result['updatedTags'] as List<Tag>;
                                 final processedSubspaces =
-                                    List<SubspaceModel>.from(
-                                        result['subspaces'] as List<dynamic>);
+                                    List<SubspaceModel>.from(result['subspaces'] as List<dynamic>);
                                 onSave?.call(processedTags, processedSubspaces);
                                 Navigator.of(context).pop();
                               }

lib/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_bloc.dart

@@ -1,45 +1,40 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_state.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 
-class AssignTagModelBloc
-    extends Bloc<AssignTagModelEvent, AssignTagModelState> {
-  final List<String> allTags;
+class AssignTagModelBloc extends Bloc<AssignTagModelEvent, AssignTagModelState> {
+  final List<Tag> projectTags;
 
-  AssignTagModelBloc(this.allTags) : super(AssignTagModelInitial()) {
+  AssignTagModelBloc(this.projectTags) : super(AssignTagModelInitial()) {
     on<InitializeTagModels>((event, emit) {
-      final initialTags = event.initialTags ?? [];
+      final initialTags = event.initialTags;
 
       final existingTagCounts = <String, int>{};
       for (var tag in initialTags) {
         if (tag.product != null) {
-          existingTagCounts[tag.product!.uuid] =
-              (existingTagCounts[tag.product!.uuid] ?? 0) + 1;
+          existingTagCounts[tag.product!.uuid] = (existingTagCounts[tag.product!.uuid] ?? 0) + 1;
         }
       }
 
-      final tags = <TagModel>[];
+      final tags = <Tag>[];
 
       for (var selectedProduct in event.addedProducts) {
         final existingCount = existingTagCounts[selectedProduct.productId] ?? 0;
 
-        if (selectedProduct.count == 0 ||
-            selectedProduct.count <= existingCount) {
-          tags.addAll(initialTags
-              .where((tag) => tag.product?.uuid == selectedProduct.productId));
+        if (selectedProduct.count == 0 || selectedProduct.count <= existingCount) {
+          tags.addAll(initialTags.where((tag) => tag.product?.uuid == selectedProduct.productId));
           continue;
         }
 
         final missingCount = selectedProduct.count - existingCount;
 
-        tags.addAll(initialTags
-            .where((tag) => tag.product?.uuid == selectedProduct.productId));
+        tags.addAll(initialTags.where((tag) => tag.product?.uuid == selectedProduct.productId));
 
         if (missingCount > 0) {
           tags.addAll(List.generate(
             missingCount,
-            (index) => TagModel(
+            (index) => Tag(
               tag: '',
               product: selectedProduct.product,
               location: 'Main Space',
@@ -48,7 +43,7 @@ class AssignTagModelBloc
         }
       }
 
-      final updatedTags = _calculateAvailableTags(allTags, tags);
+      final updatedTags = _calculateAvailableTags(projectTags, tags);
 
       emit(AssignTagModelLoaded(
           tags: tags,
@@ -59,11 +54,20 @@ class AssignTagModelBloc
 
     on<UpdateTag>((event, emit) {
       final currentState = state;
-      if (currentState is AssignTagModelLoaded &&
-          currentState.tags.isNotEmpty) {
-        final tags = List<TagModel>.from(currentState.tags);
-        tags[event.index] = tags[event.index].copyWith(tag: event.tag);
-        final updatedTags = _calculateAvailableTags(allTags, tags);
+      if (currentState is AssignTagModelLoaded && currentState.tags.isNotEmpty) {
+        final tags = List<Tag>.from(currentState.tags);
+
+        if (event.index < 0 || event.index >= tags.length) return;
+
+        tags[event.index] = tags[event.index].copyWith(
+          tag: event.tag.tag,
+          uuid: event.tag.uuid,
+          product: event.tag.product,
+          internalId: event.tag.internalId,
+          location: event.tag.location,
+        );
+
+        final updatedTags = _calculateAvailableTags(projectTags, tags);
 
         emit(AssignTagModelLoaded(
           tags: tags,
@@ -77,15 +81,12 @@ class AssignTagModelBloc
     on<UpdateLocation>((event, emit) {
       final currentState = state;
 
-      if (currentState is AssignTagModelLoaded &&
-          currentState.tags.isNotEmpty) {
-        final tags = List<TagModel>.from(currentState.tags);
-
+      if (currentState is AssignTagModelLoaded && currentState.tags.isNotEmpty) {
+        final tags = List<Tag>.from(currentState.tags);
         // Use copyWith for immutability
-        tags[event.index] =
-            tags[event.index].copyWith(location: event.location);
+        tags[event.index] = tags[event.index].copyWith(location: event.location);
 
-        final updatedTags = _calculateAvailableTags(allTags, tags);
+        final updatedTags = _calculateAvailableTags(projectTags, tags);
 
         emit(AssignTagModelLoaded(
           tags: tags,
@@ -99,13 +100,12 @@ class AssignTagModelBloc
     on<ValidateTagModels>((event, emit) {
       final currentState = state;
 
-      if (currentState is AssignTagModelLoaded &&
-          currentState.tags.isNotEmpty) {
-        final tags = List<TagModel>.from(currentState.tags);
+      if (currentState is AssignTagModelLoaded && currentState.tags.isNotEmpty) {
+        final tags = List<Tag>.from(currentState.tags);
 
         emit(AssignTagModelLoaded(
           tags: tags,
-          updatedTags: _calculateAvailableTags(allTags, tags),
+          updatedTags: _calculateAvailableTags(projectTags, tags),
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
@@ -115,12 +115,10 @@ class AssignTagModelBloc
     on<DeleteTagModel>((event, emit) {
       final currentState = state;
 
-      if (currentState is AssignTagModelLoaded &&
-          currentState.tags.isNotEmpty) {
-        final tags = List<TagModel>.from(currentState.tags)
-          ..remove(event.tagToDelete);
+      if (currentState is AssignTagModelLoaded && currentState.tags.isNotEmpty) {
+        final tags = List<Tag>.from(currentState.tags)..remove(event.tagToDelete);
 
-        final updatedTags = _calculateAvailableTags(allTags, tags);
+        final updatedTags = _calculateAvailableTags(projectTags, tags);
 
         emit(AssignTagModelLoaded(
           tags: tags,
@@ -128,24 +126,22 @@ class AssignTagModelBloc
           isSaveEnabled: _validateTags(tags),
           errorMessage: _getValidationError(tags),
         ));
-      } 
+      }
     });
   }
 
-  bool _validateTags(List<TagModel> tags) {
+  bool _validateTags(List<Tag> tags) {
     final uniqueTags = tags.map((tag) => tag.tag?.trim() ?? '').toSet();
     final hasEmptyTag = tags.any((tag) => (tag.tag?.trim() ?? '').isEmpty);
     final isValid = uniqueTags.length == tags.length && !hasEmptyTag;
     return isValid;
   }
 
-  String? _getValidationError(List<TagModel> tags) {
+  String? _getValidationError(List<Tag> tags) {
     // Check for duplicate tags
 
-    final nonEmptyTags = tags
-        .map((tag) => tag.tag?.trim() ?? '')
-        .where((tag) => tag.isNotEmpty)
-        .toList();
+    final nonEmptyTags =
+        tags.map((tag) => tag.tag?.trim() ?? '').where((tag) => tag.isNotEmpty).toList();
 
     final duplicateTags = nonEmptyTags
         .fold<Map<String, int>>({}, (map, tag) {
@@ -164,15 +160,16 @@ class AssignTagModelBloc
     return null;
   }
 
-  List<String> _calculateAvailableTags(
-      List<String> allTags, List<TagModel> tags) {
-    final selectedTags = tags
+  List<Tag> _calculateAvailableTags(List<Tag> allTags, List<Tag> selectedTags) {
+    final selectedTagSet = selectedTags
         .where((tag) => (tag.tag?.trim().isNotEmpty ?? false))
         .map((tag) => tag.tag!.trim())
         .toSet();
 
-    final availableTags =
-        allTags.where((tag) => !selectedTags.contains(tag.trim())).toList();
+    final availableTags = allTags
+        .where((tag) => tag.tag != null && !selectedTagSet.contains(tag.tag!.trim()))
+        .toList();
+
     return availableTags;
   }
 }

lib/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_event.dart

@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
 
 abstract class AssignTagModelEvent extends Equatable {
@@ -10,7 +10,7 @@ abstract class AssignTagModelEvent extends Equatable {
 }
 
 class InitializeTagModels extends AssignTagModelEvent {
-  final List<TagModel> initialTags;
+  final List<Tag> initialTags;
   final List<SelectedProduct> addedProducts;
 
   const InitializeTagModels({
@@ -24,7 +24,7 @@ class InitializeTagModels extends AssignTagModelEvent {
 
 class UpdateTag extends AssignTagModelEvent {
   final int index;
-  final String tag;
+  final Tag tag;
 
   const UpdateTag({required this.index, required this.tag});
 
@@ -45,8 +45,8 @@ class UpdateLocation extends AssignTagModelEvent {
 class ValidateTagModels extends AssignTagModelEvent {}
 
 class DeleteTagModel extends AssignTagModelEvent {
-  final TagModel tagToDelete;
-  final List<TagModel> tags;
+  final Tag tagToDelete;
+  final List<Tag> tags;
 
   const DeleteTagModel({required this.tagToDelete, required this.tags});
 

lib/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_state.dart

@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 
 abstract class AssignTagModelState extends Equatable {
   const AssignTagModelState();
@@ -13,11 +13,11 @@ class AssignTagModelInitial extends AssignTagModelState {}
 class AssignTagModelLoading extends AssignTagModelState {}
 
 class AssignTagModelLoaded extends AssignTagModelState {
-  final List<TagModel> tags;
+  final List<Tag> tags;
   final bool isSaveEnabled;
   final String? errorMessage;
 
-  final List<String> updatedTags;
+  final List<Tag> updatedTags;
 
   const AssignTagModelLoaded({
     required this.tags,

lib/pages/spaces_management/assign_tag_models/views/assign_tag_models_dialog.dart

@@ -1,17 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/common/dialog_dropdown.dart';
-import 'package:syncrow_web/common/dialog_textfield_dropdown.dart';
+import 'package:syncrow_web/common/tag_dialog_textfield_dropdown.dart';
 import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/selected_product_model.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/assign_tag_models/bloc/assign_tag_model_state.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/tag_model/views/add_device_type_model_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
@@ -23,8 +23,8 @@ class AssignTagModelsDialog extends StatelessWidget {
   final List<SubspaceTemplateModel>? subspaces;
   final SpaceTemplateModel? spaceModel;
 
-  final List<TagModel> initialTags;
-  final ValueChanged<List<TagModel>>? onTagsAssigned;
+  final List<Tag> initialTags;
+  final ValueChanged<List<Tag>>? onTagsAssigned;
   final List<SelectedProduct> addedProducts;
   final List<String>? allTags;
   final String spaceName;
@@ -32,6 +32,7 @@ class AssignTagModelsDialog extends StatelessWidget {
   final BuildContext? pageContext;
   final List<String>? otherSpaceModels;
   final List<SpaceTemplateModel>? allSpaceModels;
+  final List<Tag> projectTags;
 
   const AssignTagModelsDialog(
       {Key? key,
@@ -46,18 +47,17 @@ class AssignTagModelsDialog extends StatelessWidget {
       this.pageContext,
       this.otherSpaceModels,
       this.spaceModel,
-      this.allSpaceModels})
+      this.allSpaceModels,
+      required this.projectTags})
       : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    final List<String> locations = (subspaces ?? [])
-        .map((subspace) => subspace.subspaceName)
-        .toList()
-      ..add('Main Space');
+    final List<String> locations =
+        (subspaces ?? []).map((subspace) => subspace.subspaceName).toList()..add('Main Space');
 
     return BlocProvider(
-        create: (_) => AssignTagModelBloc(allTags ?? [])
+        create: (_) => AssignTagModelBloc(projectTags)
           ..add(InitializeTagModels(
             initialTags: initialTags,
             addedProducts: addedProducts,
@@ -81,8 +81,7 @@ class AssignTagModelsDialog extends StatelessWidget {
                         ClipRRect(
                           borderRadius: BorderRadius.circular(20),
                           child: DataTable(
-                            headingRowColor: WidgetStateProperty.all(
-                                ColorsManager.dataHeaderGrey),
+                            headingRowColor: WidgetStateProperty.all(ColorsManager.dataHeaderGrey),
                             key: ValueKey(state.tags.length),
                             border: TableBorder.all(
                               color: ColorsManager.dataHeaderGrey,
@@ -91,26 +90,17 @@ class AssignTagModelsDialog extends StatelessWidget {
                             ),
                             columns: [
                               DataColumn(
-                                  label: Text('#',
-                                      style: Theme.of(context)
-                                          .textTheme
-                                          .bodyMedium)),
+                                  label: Text('#', style: Theme.of(context).textTheme.bodyMedium)),
                               DataColumn(
                                   label: Text('Device',
-                                      style: Theme.of(context)
-                                          .textTheme
-                                          .bodyMedium)),
+                                      style: Theme.of(context).textTheme.bodyMedium)),
                               DataColumn(
                                   numeric: false,
-                                  label: Text('Tag',
-                                      style: Theme.of(context)
-                                          .textTheme
-                                          .bodyMedium)),
+                                  label:
+                                      Text('Tag', style: Theme.of(context).textTheme.bodyMedium)),
                               DataColumn(
                                   label: Text('Location',
-                                      style: Theme.of(context)
-                                          .textTheme
-                                          .bodyMedium)),
+                                      style: Theme.of(context).textTheme.bodyMedium)),
                             ],
                             rows: state.tags.isEmpty
                                 ? [
@@ -118,13 +108,10 @@ class AssignTagModelsDialog extends StatelessWidget {
                                       DataCell(
                                         Center(
                                           child: Text('No Devices Available',
-                                              style: Theme.of(context)
-                                                  .textTheme
-                                                  .bodyMedium
-                                                  ?.copyWith(
-                                                    color: ColorsManager
-                                                        .lightGrayColor,
-                                                  )),
+                                              style:
+                                                  Theme.of(context).textTheme.bodyMedium?.copyWith(
+                                                        color: ColorsManager.lightGrayColor,
+                                                      )),
                                         ),
                                       ),
                                       const DataCell(SizedBox()),
@@ -141,8 +128,7 @@ class AssignTagModelsDialog extends StatelessWidget {
                                         DataCell(Text((index + 1).toString())),
                                         DataCell(
                                           Row(
-                                            mainAxisAlignment:
-                                                MainAxisAlignment.spaceBetween,
+                                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                             children: [
                                               Expanded(
                                                   child: Text(
@@ -156,31 +142,25 @@ class AssignTagModelsDialog extends StatelessWidget {
                                                 decoration: BoxDecoration(
                                                   shape: BoxShape.circle,
                                                   border: Border.all(
-                                                    color: ColorsManager
-                                                        .lightGrayColor,
+                                                    color: ColorsManager.lightGrayColor,
                                                     width: 1.0,
                                                   ),
                                                 ),
                                                 child: IconButton(
                                                   icon: const Icon(
                                                     Icons.close,
-                                                    color: ColorsManager
-                                                        .lightGreyColor,
+                                                    color: ColorsManager.lightGreyColor,
                                                     size: 16,
                                                   ),
                                                   onPressed: () {
-                                                    context
-                                                        .read<
-                                                            AssignTagModelBloc>()
-                                                        .add(DeleteTagModel(
-                                                            tagToDelete: tag,
-                                                            tags: state.tags));
+                                                    context.read<AssignTagModelBloc>().add(
+                                                        DeleteTagModel(
+                                                            tagToDelete: tag, tags: state.tags));
                                                     controllers.removeAt(index);
                                                   },
                                                   tooltip: 'Delete Tag',
                                                   padding: EdgeInsets.zero,
-                                                  constraints:
-                                                      const BoxConstraints(),
+                                                  constraints: const BoxConstraints(),
                                                 ),
                                               ),
                                             ],
@@ -191,19 +171,16 @@ class AssignTagModelsDialog extends StatelessWidget {
                                             alignment: Alignment
                                                 .centerLeft, // Align cell content to the left
                                             child: SizedBox(
-                                              width: double
-                                                  .infinity, // Ensure full width for dropdown
-                                              child: DialogTextfieldDropdown(
-                                                 key: ValueKey(
-                                                'dropdown_${Uuid().v4()}_${index}'),
+                                              width: double.infinity,
+                                              child: TagDialogTextfieldDropdown(
+                                                key: ValueKey(
+                                                    'dropdown_${const Uuid().v4()}_$index'),
+                                                product: tag.product?.uuid ?? 'Unknown',
                                                 items: state.updatedTags,
-                                                initialValue: tag.tag,
+                                                initialValue: tag,
                                                 onSelected: (value) {
-                                                  controller.text = value;
-                                                  context
-                                                      .read<
-                                                          AssignTagModelBloc>()
-                                                      .add(UpdateTag(
+                                                  controller.text = value.tag ?? '';
+                                                  context.read<AssignTagModelBloc>().add(UpdateTag(
                                                         index: index,
                                                         tag: value,
                                                       ));
@@ -217,12 +194,10 @@ class AssignTagModelsDialog extends StatelessWidget {
                                               width: double.infinity,
                                               child: DialogDropdown(
                                                 items: locations,
-                                                selectedValue: tag.location ??
-                                                    'Main Space',
+                                                selectedValue: tag.location ?? 'Main Space',
                                                 onSelected: (value) {
                                                   context
-                                                      .read<
-                                                          AssignTagModelBloc>()
+                                                      .read<AssignTagModelBloc>()
                                                       .add(UpdateLocation(
                                                         index: index,
                                                         location: value,
@@ -254,17 +229,13 @@ class AssignTagModelsDialog extends StatelessWidget {
                             builder: (buttonContext) => CancelButton(
                               label: 'Add New Device',
                               onPressed: () async {
-                                final updatedTags =
-                                    List<TagModel>.from(state.tags);
+                                final updatedTags = List<Tag>.from(state.tags);
                                 final result =
-                                    TagHelper.updateSubspaceTagModels(
-                                        updatedTags, subspaces);
+                                    TagHelper.updateSubspaceTagModels(updatedTags, subspaces);
 
-                                final processedTags =
-                                    result['updatedTags'] as List<TagModel>;
-                                final processedSubspaces =
-                                    List<SubspaceTemplateModel>.from(
-                                        result['subspaces'] as List<dynamic>);
+                                final processedTags = result['updatedTags'] as List<Tag>;
+                                final processedSubspaces = List<SubspaceTemplateModel>.from(
+                                    result['subspaces'] as List<dynamic>);
 
                                 if (context.mounted) {
                                   Navigator.of(context).pop();
@@ -272,28 +243,25 @@ class AssignTagModelsDialog extends StatelessWidget {
                                   await showDialog<bool>(
                                     barrierDismissible: false,
                                     context: context,
-                                    builder: (dialogContext) =>
-                                        AddDeviceTypeModelWidget(
-                                            products: products,
-                                            subspaces: processedSubspaces,
-                                            isCreate: false,
-                                            initialSelectedProducts: TagHelper
-                                                .createInitialSelectedProducts(
-                                                    processedTags,
-                                                    processedSubspaces),
-                                            allTags: allTags,
-                                            spaceName: spaceName,
-                                            otherSpaceModels: otherSpaceModels,
-                                            spaceTagModels: processedTags,
-                                            pageContext: pageContext,
-                                            spaceModel: SpaceTemplateModel(
-                                                modelName: spaceName,
-                                                tags: updatedTags,
-                                                uuid: spaceModel?.uuid,
-                                                internalId:
-                                                    spaceModel?.internalId,
-                                                subspaceModels:
-                                                    processedSubspaces)),
+                                    builder: (dialogContext) => AddDeviceTypeModelWidget(
+                                        products: products,
+                                        subspaces: processedSubspaces,
+                                        isCreate: false,
+                                        initialSelectedProducts:
+                                            TagHelper.createInitialSelectedProducts(
+                                                processedTags, processedSubspaces),
+                                        allTags: allTags,
+                                        spaceName: spaceName,
+                                        otherSpaceModels: otherSpaceModels,
+                                        spaceTagModels: processedTags,
+                                        pageContext: pageContext,
+                                        projectTags: projectTags,
+                                        spaceModel: SpaceTemplateModel(
+                                            modelName: spaceName,
+                                            tags: updatedTags,
+                                            uuid: spaceModel?.uuid,
+                                            internalId: spaceModel?.internalId,
+                                            subspaceModels: processedSubspaces)),
                                   );
                                 }
                               },
@@ -310,22 +278,16 @@ class AssignTagModelsDialog extends StatelessWidget {
                                 : ColorsManager.whiteColorsWithOpacity,
                             onPressed: state.isSaveEnabled
                                 ? () async {
-                                    final updatedTags =
-                                        List<TagModel>.from(state.tags);
+                                    final updatedTags = List<Tag>.from(state.tags);
 
                                     final result =
-                                        TagHelper.updateSubspaceTagModels(
-                                            updatedTags, subspaces);
+                                        TagHelper.updateSubspaceTagModels(updatedTags, subspaces);
 
-                                    final processedTags =
-                                        result['updatedTags'] as List<TagModel>;
-                                    final processedSubspaces =
-                                        List<SubspaceTemplateModel>.from(
-                                            result['subspaces']
-                                                as List<dynamic>);
+                                    final processedTags = result['updatedTags'] as List<Tag>;
+                                    final processedSubspaces = List<SubspaceTemplateModel>.from(
+                                        result['subspaces'] as List<dynamic>);
 
-                                    Navigator.of(context)
-                                        .popUntil((route) => route.isFirst);
+                                    Navigator.of(context).popUntil((route) => route.isFirst);
 
                                     await showDialog(
                                       context: context,
@@ -334,16 +296,15 @@ class AssignTagModelsDialog extends StatelessWidget {
                                           products: products,
                                           allSpaceModels: allSpaceModels,
                                           allTags: allTags,
+                                          projectTags: projectTags,
                                           pageContext: pageContext,
                                           otherSpaceModels: otherSpaceModels,
                                           spaceModel: SpaceTemplateModel(
                                               modelName: spaceName,
                                               tags: processedTags,
                                               uuid: spaceModel?.uuid,
-                                              internalId:
-                                                  spaceModel?.internalId,
-                                              subspaceModels:
-                                                  processedSubspaces),
+                                              internalId: spaceModel?.internalId,
+                                              subspaceModels: processedSubspaces),
                                         );
                                       },
                                     );

lib/pages/spaces_management/helper/tag_helper.dart

@@ -7,7 +7,6 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/subspace_mo
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 
 class TagHelper {
   static Map<String, dynamic> updateTags<T>({
@@ -131,9 +130,9 @@ class TagHelper {
   }
 
   static List<String> getAvailableTagModels(
-      List<String> allTags, List<TagModel> currentTags, TagModel currentTag) {
+      List<String> allTags, List<Tag> currentTags, Tag currentTag) {
     List<String> availableTagsForTagModel =
-        TagHelper.getAvailableTags<TagModel>(
+        TagHelper.getAvailableTags<Tag>(
       allTags: allTags,
       currentTags: currentTags,
       currentTag: currentTag,
@@ -142,11 +141,11 @@ class TagHelper {
     return availableTagsForTagModel;
   }
 
-  static List<TagModel> generateInitialTags({
-    List<TagModel>? spaceTagModels,
+  static List<Tag> generateInitialTags({
+    List<Tag>? spaceTagModels,
     List<SubspaceTemplateModel>? subspaces,
   }) {
-    final List<TagModel> initialTags = [];
+    final List<Tag> initialTags = [];
 
     if (spaceTagModels != null) {
       initialTags.addAll(spaceTagModels);
@@ -212,7 +211,7 @@ class TagHelper {
   }
 
   static List<SelectedProduct> createInitialSelectedProducts(
-      List<TagModel>? tags, List<SubspaceTemplateModel>? subspaces) {
+      List<Tag>? tags, List<SubspaceTemplateModel>? subspaces) {
     final Map<ProductModel, int> productCounts = {};
 
     if (tags != null) {
@@ -282,7 +281,7 @@ class TagHelper {
   }
 
   static int? checkTagExistInSubspaceModels(
-      TagModel tag, List<dynamic>? subspaces) {
+      Tag tag, List<dynamic>? subspaces) {
     if (subspaces == null) return null;
 
     for (int i = 0; i < subspaces.length; i++) {
@@ -298,8 +297,8 @@ class TagHelper {
   }
 
   static Map<String, dynamic> updateSubspaceTagModels(
-      List<TagModel> updatedTags, List<SubspaceTemplateModel>? subspaces) {
-    final result = TagHelper.updateTags<TagModel>(
+      List<Tag> updatedTags, List<SubspaceTemplateModel>? subspaces) {
+    final result = TagHelper.updateTags<Tag>(
       updatedTags: updatedTags,
       subspaces: subspaces,
       getInternalId: (tag) => tag.internalId,
@@ -311,7 +310,7 @@ class TagHelper {
       checkTagExistInSubspace: checkTagExistInSubspaceModels,
     );
 
-    final processedTags = result['updatedTags'] as List<TagModel>;
+    final processedTags = result['updatedTags'] as List<Tag>;
     final processedSubspaces =
         List<SubspaceTemplateModel>.from(result['subspaces'] as List<dynamic>);
 

lib/pages/spaces_management/link_space_model/bloc/link_space_model_bloc.dart

@@ -1,12 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_model_event.dart';
-import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_model_state.dart';
-
-
-class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
-  SpaceModelBloc() : super(SpaceModelInitial()) {
-    on<SpaceModelSelectedEvent>((event, emit) {
-      emit(SpaceModelSelectedState(event.selectedIndex));
-    });
-  }
-}

lib/pages/spaces_management/link_space_model/bloc/link_space_model_event.dart

@@ -1,7 +0,0 @@
-abstract class SpaceModelEvent {}
-
-class SpaceModelSelectedEvent extends SpaceModelEvent {
-  final int selectedIndex;
-
-  SpaceModelSelectedEvent(this.selectedIndex);
-}

lib/pages/spaces_management/link_space_model/bloc/link_space_model_state.dart

@@ -1,9 +0,0 @@
-abstract class SpaceModelState {}
-
-class SpaceModelInitial extends SpaceModelState {}
-
-class SpaceModelSelectedState extends SpaceModelState {
-  final int selectedIndex;
-
-  SpaceModelSelectedState(this.selectedIndex);
-}

lib/pages/spaces_management/link_space_model/bloc/link_space_to_model_bloc.dart

@@ -0,0 +1,105 @@
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_to_model_event.dart';
+import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_to_model_state.dart';
+import 'package:syncrow_web/services/space_model_mang_api.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
+
+class LinkSpaceToModelBloc
+    extends Bloc<LinkSpaceToModelEvent, LinkSpaceToModelState> {
+  LinkSpaceToModelBloc() : super(SpaceModelInitial()) {
+    on<LinkSpaceModelSelectedIdsEvent>(_getSpaceIds);
+    on<LinkSpaceModelEvent>(_handleLinkSpaceModel);
+    on<ValidateSpaceModelEvent>(_validateLinkSpaceModel);
+    on<LinkSpaceModelSelectedEvent>((event, emit) {
+      emit(SpaceModelSelectedState(event.selectedIndex));
+    });
+  }
+
+  List<String> spacesListIds = [];
+  bool hasSelectedSpaces = false;
+  String validate = '';
+
+  Future<void> _getSpaceIds(LinkSpaceModelSelectedIdsEvent event,
+      Emitter<LinkSpaceToModelState> emit) async {
+    try {
+      BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var spaceBloc = context.read<SpaceTreeBloc>();
+      spacesListIds.clear(); 
+      for (var communityId in spaceBloc.state.selectedCommunities) {
+        List<String> spacesList =
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        spacesListIds.addAll(spacesList); 
+      }
+      hasSelectedSpaces =
+          spaceBloc.state.selectedCommunities.any((communityId) {
+        List<String> spacesList =
+            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        return spacesList.isNotEmpty;
+      });
+      if (hasSelectedSpaces) {
+        debugPrint("At least one space is selected.");
+      } else {
+        debugPrint("No spaces selected.");
+      }
+    } catch (e) {
+      debugPrint("Error in _getSpaceIds: $e");
+    }
+  }
+
+  Future<void> _handleLinkSpaceModel(
+    LinkSpaceModelEvent event,
+    Emitter<LinkSpaceToModelState> emit,
+  ) async {
+    emit(SpaceModelLoading());
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      await SpaceModelManagementApi().linkSpaceModel(
+          spaceModelUuid: event.selectedSpaceMode!,
+          projectId: projectUuid,
+          spaceUuids: spacesListIds,
+          isOverWrite: event.isOverWrite);
+      emit(SpaceModelLinkSuccess());
+    } on DioException catch (e) {
+      final errorMessage = _parseDioError(e);
+      emit(SpaceModelOperationFailure(errorMessage));
+    } catch (e) {
+      emit(SpaceModelOperationFailure('Unexpected error: $e'));
+    }
+  }
+
+  Future<void> _validateLinkSpaceModel(
+    ValidateSpaceModelEvent event,
+    Emitter<LinkSpaceToModelState> emit,
+  ) async {
+    emit(SpaceModelLoading());
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      await SpaceModelManagementApi().validateSpaceModel(
+        projectUuid,
+        spacesListIds,
+      );
+      emit(SpaceValidationSuccess());
+    } on DioException catch (e) {
+      final errorMessage = _parseDioError(e);
+      if (errorMessage ==
+          'Selected spaces already have linked space model / sub-spaces and devices') {
+        emit(const AlreadyHaveLinkedState());
+      } else {
+        emit(SpaceModelOperationFailure(errorMessage));
+      }
+    } catch (e) {
+      emit(SpaceModelOperationFailure('Unexpected error: $e'));
+    }
+  }
+
+  String _parseDioError(DioException e) {
+    if (e.response?.data is Map<String, dynamic>) {
+      return e.response!.data['error']['message'] ?? 'Unknown error occurred';
+    }
+    return e.message ?? 'Network request failed';
+  }
+}

lib/pages/spaces_management/link_space_model/bloc/link_space_to_model_event.dart

@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+
+abstract class LinkSpaceToModelEvent {}
+
+class LinkSpaceModelSelectedEvent extends LinkSpaceToModelEvent {
+  final int selectedIndex;
+
+  LinkSpaceModelSelectedEvent(this.selectedIndex);
+}
+
+class LinkSpaceModelSelectedIdsEvent extends LinkSpaceToModelEvent {}
+
+class LinkSpaceModelEvent extends LinkSpaceToModelEvent {
+  final String? selectedSpaceMode;
+  final bool isOverWrite;
+  LinkSpaceModelEvent({this.selectedSpaceMode, this.isOverWrite = false});
+}
+
+class ValidateSpaceModelEvent extends LinkSpaceToModelEvent {
+  BuildContext? context;
+  ValidateSpaceModelEvent({this.context});
+}

lib/pages/spaces_management/link_space_model/bloc/link_space_to_model_state.dart

@@ -0,0 +1,37 @@
+abstract class LinkSpaceToModelState {
+  const LinkSpaceToModelState();
+}
+
+class SpaceModelInitial extends LinkSpaceToModelState {}
+
+class SpaceModelLoading extends LinkSpaceToModelState {}
+class LinkSpaceModelLoading extends LinkSpaceToModelState {}
+
+
+class SpaceModelSelectedState extends LinkSpaceToModelState {
+  final int selectedIndex;
+  const SpaceModelSelectedState(this.selectedIndex);
+}
+
+class SpaceModelSelectionUpdated extends LinkSpaceToModelState {
+  final bool hasSelectedSpaces;
+  const SpaceModelSelectionUpdated(this.hasSelectedSpaces);
+}
+
+class SpaceValidationSuccess extends LinkSpaceToModelState {}
+
+class SpaceModelLinkSuccess extends LinkSpaceToModelState {}
+
+class ValidationError extends LinkSpaceToModelState {
+  final String message;
+  const ValidationError(this.message);
+}
+
+class SpaceModelOperationFailure extends LinkSpaceToModelState {
+  final String message;
+  const SpaceModelOperationFailure(this.message);
+}
+
+class AlreadyHaveLinkedState extends LinkSpaceToModelState {
+  const AlreadyHaveLinkedState();
+}

lib/pages/spaces_management/link_space_model/view/link_space_model_dialog.dart

@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_model_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_model_event.dart';
-import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_model_state.dart';
+import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_to_model_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_to_model_event.dart';
+import 'package:syncrow_web/pages/spaces_management/link_space_model/bloc/link_space_to_model_state.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/space_model_card_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
@@ -24,13 +24,13 @@ class LinkSpaceModelDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => SpaceModelBloc()
+      create: (context) => LinkSpaceToModelBloc()
         ..add(
-          SpaceModelSelectedEvent(initialSelectedIndex ?? -1),
+          LinkSpaceModelSelectedEvent(initialSelectedIndex ?? -1),
         ),
       child: Builder(
         builder: (context) {
-          final bloc = context.read<SpaceModelBloc>();
+          final bloc = context.read<LinkSpaceToModelBloc>();
           return AlertDialog(
             backgroundColor: ColorsManager.whiteColors,
             title: const Text('Link a space model'),
@@ -39,7 +39,7 @@ class LinkSpaceModelDialog extends StatelessWidget {
                     color: ColorsManager.textFieldGreyColor,
                     width: MediaQuery.of(context).size.width * 0.7,
                     height: MediaQuery.of(context).size.height * 0.6,
-                    child: BlocBuilder<SpaceModelBloc, SpaceModelState>(
+                    child: BlocBuilder<LinkSpaceToModelBloc, LinkSpaceToModelState>(
                       builder: (context, state) {
                         int selectedIndex = -1;
                         if (state is SpaceModelSelectedState) {
@@ -59,7 +59,7 @@ class LinkSpaceModelDialog extends StatelessWidget {
                             final isSelected = selectedIndex == index;
                             return GestureDetector(
                               onTap: () {
-                                bloc.add(SpaceModelSelectedEvent(index));
+                                bloc.add(LinkSpaceModelSelectedEvent(index));
                               },
                               child: Container(
                                 margin: const EdgeInsets.all(10.0),
@@ -93,7 +93,7 @@ class LinkSpaceModelDialog extends StatelessWidget {
                       label: 'Cancel',
                     ),
                     const SizedBox(width: 10),
-                    BlocBuilder<SpaceModelBloc, SpaceModelState>(
+                    BlocBuilder<LinkSpaceToModelBloc, LinkSpaceToModelState>(
                       builder: (context, state) {
                         final isEnabled = state is SpaceModelSelectedState &&
                             state.selectedIndex >= 0;

lib/pages/spaces_management/space_model/bloc/create_space_model_bloc.dart

@@ -1,10 +1,11 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/create_space_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/create_space_model_state.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';
 import 'package:syncrow_web/services/space_model_mang_api.dart';
 import 'package:syncrow_web/utils/constants/action_enum.dart';
@@ -18,6 +19,8 @@ class CreateSpaceModelBloc
   CreateSpaceModelBloc(this._api) : super(CreateSpaceModelInitial()) {
     on<CreateSpaceTemplate>((event, emit) async {
       try {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
         late SpaceTemplateModel spaceTemplate = event.spaceTemplate;
 
         final tagBodyModels =
@@ -40,7 +43,8 @@ class CreateSpaceModelBloc
             tags: tagBodyModels,
             subspaceModels: subspaceTemplateBodyModels);
 
-        final newSpaceTemplate = await _api.createSpaceModel(spaceModelBody);
+        final newSpaceTemplate =
+            await _api.createSpaceModel(spaceModelBody, projectUuid);
         spaceTemplate.uuid = newSpaceTemplate?.uuid ?? '';
 
         if (newSpaceTemplate != null) {
@@ -90,14 +94,9 @@ class CreateSpaceModelBloc
                 orElse: () => subspace,
               );
 
-              // Update the subspace's tags
-              final eventTagIds = matchingEventSubspace.tags
-                      ?.map((e) => e.internalId)
-                      .toSet() ??
-                  {};
 
               final updatedTags = [
-                ...?subspace.tags?.map<TagModel>((tag) {
+                ...?subspace.tags?.map<Tag>((tag) {
                       final matchingTag =
                           matchingEventSubspace.tags?.firstWhere(
                         (e) => e.internalId == tag.internalId,
@@ -108,14 +107,14 @@ class CreateSpaceModelBloc
                           ? tag.copyWith(tag: matchingTag?.tag)
                           : tag;
                     }) ??
-                    <TagModel>[],
+                    <Tag>[],
                 ...?matchingEventSubspace.tags?.where(
                       (e) =>
                           subspace.tags
                               ?.every((t) => t.internalId != e.internalId) ??
                           true,
                     ) ??
-                    <TagModel>[],
+                    <Tag>[],
               ];
               return subspace.copyWith(
                 subspaceName: matchingEventSubspace.subspaceName,
@@ -201,9 +200,11 @@ class CreateSpaceModelBloc
 
     on<ModifySpaceTemplate>((event, emit) async {
       try {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
         if (event.spaceTemplate.uuid != null) {
-          final prevSpaceModel =
-              await _api.getSpaceModel(event.spaceTemplate.uuid ?? '');
+          final prevSpaceModel = await _api.getSpaceModel(
+              event.spaceTemplate.uuid ?? '', projectUuid);
 
           final newSpaceModel = event.updatedSpaceTemplate;
           String? spaceModelName;
@@ -238,7 +239,7 @@ class CreateSpaceModelBloc
             }
 
             if (newSubspaces != null) {
-              for (var newSubspace in newSubspaces!) {
+              for (var newSubspace in newSubspaces) {
                 // Tag without UUID
                 if ((newSubspace.uuid == null || newSubspace.uuid!.isEmpty)) {
                   final List<TagModelUpdate> tagUpdates = [];
@@ -247,7 +248,7 @@ class CreateSpaceModelBloc
                     for (var tag in newSubspace.tags!) {
                       tagUpdates.add(TagModelUpdate(
                           action: Action.add,
-                          uuid: tag.uuid == '' ? null : tag.uuid,
+                          newTagUuid: tag.uuid == '' ? null : tag.uuid,
                           tag: tag.tag,
                           productUuid: tag.product?.uuid));
                     }
@@ -262,7 +263,7 @@ class CreateSpaceModelBloc
 
             if (prevSubspaces != null && newSubspaces != null) {
               final newSubspaceMap = {
-                for (var subspace in newSubspaces!) subspace.uuid: subspace
+                for (var subspace in newSubspaces) subspace.uuid: subspace
               };
 
               for (var prevSubspace in prevSubspaces) {
@@ -287,7 +288,7 @@ class CreateSpaceModelBloc
               subspaceModels: subspaceUpdates);
 
           final res = await _api.updateSpaceModel(
-              spaceModelBody, prevSpaceModel?.uuid ?? '');
+              spaceModelBody, prevSpaceModel?.uuid ?? '', projectUuid);
 
           if (res != null) {
             emit(CreateSpaceModelLoaded(newSpaceModel));
@@ -303,8 +304,8 @@ class CreateSpaceModelBloc
   }
 
   List<TagModelUpdate> processTagUpdates(
-    List<TagModel>? prevTags,
-    List<TagModel>? newTags,
+    List<Tag>? prevTags,
+    List<Tag>? newTags,
   ) {
     final List<TagModelUpdate> tagUpdates = [];
     final processedTags = <String?>{};
@@ -314,7 +315,7 @@ class CreateSpaceModelBloc
         tagUpdates.add(TagModelUpdate(
           action: Action.add,
           tag: newTag.tag,
-          uuid: newTag.uuid,
+          newTagUuid: newTag.uuid,
           productUuid: newTag.product?.uuid,
         ));
       }
@@ -326,7 +327,7 @@ class CreateSpaceModelBloc
       if (prevTags != null && newTags != null) {
         for (var prevTag in prevTags) {
           final existsInNew =
-              newTags!.any((newTag) => newTag.uuid == prevTag.uuid);
+              newTags.any((newTag) => newTag.uuid == prevTag.uuid);
           if (!existsInNew) {
             tagUpdates
                 .add(TagModelUpdate(action: Action.delete, uuid: prevTag.uuid));
@@ -343,14 +344,14 @@ class CreateSpaceModelBloc
       if (newTags != null) {
         final prevTagUuids = prevTags?.map((t) => t.uuid).toSet() ?? {};
 
-        for (var newTag in newTags!) {
+        for (var newTag in newTags) {
           // Tag without UUID
           if ((newTag.uuid == null || !prevTagUuids.contains(newTag.uuid)) &&
               !processedTags.contains(newTag.tag)) {
             tagUpdates.add(TagModelUpdate(
                 action: Action.add,
                 tag: newTag.tag,
-                uuid: newTag.uuid == '' ? null : newTag.uuid,
+                newTagUuid: newTag.uuid == '' ? null : newTag.uuid,
                 productUuid: newTag.product?.uuid));
             processedTags.add(newTag.tag);
           }
@@ -359,14 +360,15 @@ class CreateSpaceModelBloc
 
       // Case 3: Tags updated
       if (prevTags != null && newTags != null) {
-        final newTagMap = {for (var tag in newTags!) tag.uuid: tag};
+        final newTagMap = {for (var tag in newTags) tag.uuid: tag};
 
-        for (var prevTag in prevTags!) {
+        for (var prevTag in prevTags) {
           final newTag = newTagMap[prevTag.uuid];
           if (newTag != null) {
             tagUpdates.add(TagModelUpdate(
               action: Action.update,
-              uuid: newTag.uuid,
+              uuid: prevTag.uuid,
+              newTagUuid: newTag.uuid,
               tag: newTag.tag,
             ));
           } else {}

lib/pages/spaces_management/space_model/bloc/create_space_model_event.dart

@@ -1,7 +1,7 @@
 import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 
 abstract class CreateSpaceModelEvent extends Equatable {
   const CreateSpaceModelEvent();
@@ -49,7 +49,7 @@ class AddSubspacesToSpaceTemplate extends CreateSpaceModelEvent {
 }
 
 class AddTagsToSpaceTemplate extends CreateSpaceModelEvent {
-  final List<TagModel> tags;
+  final List<Tag> tags;
 
   AddTagsToSpaceTemplate(this.tags);
 }

lib/pages/spaces_management/space_model/bloc/space_model_bloc.dart

@@ -1,4 +1,7 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_state.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
@@ -6,27 +9,30 @@ import 'package:syncrow_web/services/space_model_mang_api.dart';
 
 class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
   final SpaceModelManagementApi api;
+  final SpaceTreeBloc _spaceTreeBloc;
 
-  SpaceModelBloc({
+  SpaceModelBloc(
+    this._spaceTreeBloc, {
     required this.api,
     required List<SpaceTemplateModel> initialSpaceModels,
   }) : super(SpaceModelLoaded(spaceModels: initialSpaceModels)) {
     on<CreateSpaceModel>(_onCreateSpaceModel);
     on<UpdateSpaceModel>(_onUpdateSpaceModel);
+    on<DeleteSpaceModel>(_onDeleteSpaceModel);
   }
 
-  Future<void> _onCreateSpaceModel(
-      CreateSpaceModel event, Emitter<SpaceModelState> emit) async {
+  Future<void> _onCreateSpaceModel(CreateSpaceModel event, Emitter<SpaceModelState> emit) async {
     final currentState = state;
+
     if (currentState is SpaceModelLoaded) {
       try {
-        final newSpaceModel =
-            await api.getSpaceModel(event.newSpaceModel.uuid ?? '');
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+        final newSpaceModel = await api.getSpaceModel(event.newSpaceModel.uuid ?? '', projectUuid);
 
         if (newSpaceModel != null) {
-          final updatedSpaceModels =
-              List<SpaceTemplateModel>.from(currentState.spaceModels)
-                ..add(newSpaceModel);
+          final updatedSpaceModels = List<SpaceTemplateModel>.from(currentState.spaceModels)
+            ..add(newSpaceModel);
           emit(SpaceModelLoaded(spaceModels: updatedSpaceModels));
         }
       } catch (e) {
@@ -35,17 +41,40 @@ class SpaceModelBloc extends Bloc<SpaceModelEvent, SpaceModelState> {
     }
   }
 
-  Future<void> _onUpdateSpaceModel(
-      UpdateSpaceModel event, Emitter<SpaceModelState> emit) async {
+  Future<void> _onUpdateSpaceModel(UpdateSpaceModel event, Emitter<SpaceModelState> emit) async {
     final currentState = state;
     if (currentState is SpaceModelLoaded) {
       try {
-        final newSpaceModel =
-            await api.getSpaceModel(event.spaceModelUuid ?? '');
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+        final newSpaceModel = await api.getSpaceModel(event.spaceModelUuid, projectUuid);
         if (newSpaceModel != null) {
           final updatedSpaceModels = currentState.spaceModels.map((model) {
             return model.uuid == event.spaceModelUuid ? newSpaceModel : model;
           }).toList();
+          _spaceTreeBloc.add(InitialEvent());
+          emit(SpaceModelLoaded(spaceModels: updatedSpaceModels));
+        }
+      } catch (e) {
+        emit(SpaceModelError(message: e.toString()));
+      }
+    }
+  }
+
+  Future<void> _onDeleteSpaceModel(DeleteSpaceModel event, Emitter<SpaceModelState> emit) async {
+    final currentState = state;
+
+    if (currentState is SpaceModelLoaded) {
+      try {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+        final deletedSuccessfully = await api.deleteSpaceModel(event.spaceModelUuid, projectUuid);
+
+        if (deletedSuccessfully) {
+          final updatedSpaceModels = currentState.spaceModels
+              .where((model) => model.uuid != event.spaceModelUuid)
+              .toList();
+          _spaceTreeBloc.add(InitialEvent());
           emit(SpaceModelLoaded(spaceModels: updatedSpaceModels));
         }
       } catch (e) {

lib/pages/spaces_management/space_model/bloc/space_model_event.dart

@@ -34,3 +34,12 @@ class UpdateSpaceModel extends SpaceModelEvent {
   @override
   List<Object?> get props => [spaceModelUuid];
 }
+
+class DeleteSpaceModel extends SpaceModelEvent {
+  final String spaceModelUuid;
+
+  DeleteSpaceModel({required this.spaceModelUuid});
+
+  @override
+  List<Object?> get props => [spaceModelUuid];
+}

lib/pages/spaces_management/space_model/models/create_space_template_body_model.dart

@@ -6,7 +6,7 @@ class TagBodyModel {
   Map<String, dynamic> toJson() {
     return {
       'uuid': uuid,
-      'tag': tag,
+      'name': tag,
       'productUuid': productUuid,
     };
   }

lib/pages/spaces_management/space_model/models/space_template_model.dart

@@ -1,6 +1,6 @@
 import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';
 import 'package:syncrow_web/utils/constants/action_enum.dart';
 import 'package:uuid/uuid.dart';
@@ -9,8 +9,9 @@ class SpaceTemplateModel extends Equatable {
   String? uuid;
   String modelName;
   List<SubspaceTemplateModel>? subspaceModels;
-  final List<TagModel>? tags;
+  final List<Tag>? tags;
   String internalId;
+  DateTime? createdAt;
 
   @override
   List<Object?> get props => [modelName, subspaceModels, tags];
@@ -21,24 +22,27 @@ class SpaceTemplateModel extends Equatable {
     required this.modelName,
     this.subspaceModels,
     this.tags,
+    this.createdAt,
   }) : internalId = internalId ?? const Uuid().v4();
-
   factory SpaceTemplateModel.fromJson(Map<String, dynamic> json) {
     final String internalId = json['internalId'] ?? const Uuid().v4();
 
     return SpaceTemplateModel(
       uuid: json['uuid'] ?? '',
+      createdAt: json['createdAt'] != null
+          ? DateTime.tryParse(json['createdAt']) 
+          : null,
       internalId: internalId,
       modelName: json['modelName'] ?? '',
       subspaceModels: (json['subspaceModels'] as List<dynamic>?)
-              ?.where((e) => e is Map<String, dynamic>) // Validate type
+              ?.where((e) => e is Map<String, dynamic>)
               .map((e) =>
                   SubspaceTemplateModel.fromJson(e as Map<String, dynamic>))
               .toList() ??
           [],
       tags: (json['tags'] as List<dynamic>?)
               ?.where((item) => item is Map<String, dynamic>) // Validate type
-              .map((item) => TagModel.fromJson(item as Map<String, dynamic>))
+              .map((item) => Tag.fromJson(item as Map<String, dynamic>))
               .toList() ??
           [],
     );
@@ -47,7 +51,7 @@ class SpaceTemplateModel extends Equatable {
     String? uuid,
     String? modelName,
     List<SubspaceTemplateModel>? subspaceModels,
-    List<TagModel>? tags,
+    List<Tag>? tags,
     String? internalId,
   }) {
     return SpaceTemplateModel(