Datasets:
rsh-raj
/
appsmith-commits

Dataset card Data Studio Files
xet
Community
hash
stringlengths
40
40
date
stringdate
2020-04-14 18:04:14
2025-03-25 16:48:49
author
stringclasses
154 values
commit_message
stringlengths
15
172
is_merge
bool
1 class
masked_commit_message
stringlengths
11
165
type
stringclasses
7 values
git_diff
stringlengths
32
8.56M
f420384deebd7199271f25d1e0d036212314fc0d
2025-03-14 19:42:37
Valera Melnikov
chore: ai agent workspace CE part (#39734)
false
ai agent workspace CE part (#39734)
chore
diff --git a/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx b/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx index 16f6de3db047..1f6abfef5d57 100644 --- a/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx +++ b/app/client/packages/design-system/ads/src/Icon/Icon.provider.tsx @@ -204,6 +204,9 @@ const RightArrowIcon2 = importRemixIcon( const RocketIcon = importRemixIcon( async () => import("remixicon-react/RocketLineIcon"), ); +const RobotIcon = importRemixIcon( + async () => import("remixicon-react/RobotLineIcon"), +); const Save2LineIcon = importRemixIcon( async () => import("remixicon-react/Save2LineIcon"), ); @@ -1130,6 +1133,28 @@ const StateInspectorIcon = importSvg( async () => import("../__assets__/icons/ads/state-inspector.svg"), ); +const BoxIcon = importSvg( + async () => import("../__assets__/icons/ads/box.svg"), +); +const ConfluenceIcon = importSvg( + async () => import("../__assets__/icons/ads/confluence.svg"), +); +const DropboxIcon = importSvg( + async () => import("../__assets__/icons/ads/dropbox.svg"), +); +const FreshdeskIcon = importSvg( + async () => import("../__assets__/icons/ads/freshdesk.svg"), +); +const IntercomIcon = importSvg( + async () => import("../__assets__/icons/ads/intercom.svg"), +); +const OnedriveIcon = importSvg( + async () => import("../__assets__/icons/ads/onedrive.svg"), +); +const SharepointIcon = importSvg( + async () => import("../__assets__/icons/ads/sharepoint.svg"), +); + const MdFileIcon = importSvg( async () => import("../__assets__/icons/ads/md-file.svg"), ); @@ -1161,6 +1186,9 @@ const TsvFileIcon = importSvg( const XlsFileIcon = importSvg( async () => import("../__assets__/icons/ads/xls-file.svg"), ); +const Robot2LineIcon = importSvg( + async () => import("../__assets__/icons/ads/robot-2-line.svg"), +); import PlayIconPNG from "../__assets__/icons/control/play-icon.png"; @@ -1529,6 +1557,8 @@ const ICON_LOOKUP = { reaction: Reaction, refresh: RefreshLineIcon, rocket: RocketIcon, + robot: RobotIcon, + "robot-2": Robot2LineIcon, save: Save2LineIcon, search: SearchIcon, setting: SettingIcon, @@ -1569,6 +1599,13 @@ const ICON_LOOKUP = { "google-drive": GoogleDriveIcon, salesforce: SalesforceIcon, "state-inspector": StateInspectorIcon, + box: BoxIcon, + confluence: ConfluenceIcon, + dropbox: DropboxIcon, + freshdesk: FreshdeskIcon, + intercom: IntercomIcon, + onedrive: OnedriveIcon, + sharepoint: SharepointIcon, }; export const IconCollection = Object.keys(ICON_LOOKUP); diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/ads/box.svg b/app/client/packages/design-system/ads/src/__assets__/icons/ads/box.svg new file mode 100644 index 000000000000..312053dd4f6b --- /dev/null +++ b/app/client/packages/design-system/ads/src/__assets__/icons/ads/box.svg @@ -0,0 +1,3 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path d="M10.4653 8.78343C10.4813 8.52259 10.4448 8.26119 10.3583 8.01533C10.2717 7.76946 10.1369 7.54436 9.96212 7.35389C9.78734 7.16342 9.5763 7.01162 9.34202 6.90785C9.10774 6.80409 8.85518 6.75056 8.59991 6.75056C8.34464 6.75056 8.09208 6.80409 7.8578 6.90785C7.62352 7.01162 7.41248 7.16342 7.2377 7.35389C7.06292 7.54436 6.9281 7.76946 6.84155 8.01533C6.755 8.26119 6.71856 8.52259 6.73448 8.78343C6.76412 9.26934 6.97356 9.7254 7.32014 10.0588C7.66672 10.3921 8.12437 10.5777 8.59991 10.5777C9.07545 10.5777 9.5331 10.3921 9.87968 10.0588C10.2263 9.7254 10.4357 9.26934 10.4653 8.78343ZM11.709 8.78343C11.6966 9.48251 11.4595 10.1579 11.0344 10.7051C10.6092 11.2523 10.0198 11.6408 9.35723 11.8104C8.69468 11.9799 7.99601 11.9212 7.36937 11.6432C6.74273 11.3652 6.22307 10.8835 5.89085 10.2726C5.56104 10.8802 5.04579 11.3605 4.424 11.6397C3.80221 11.919 3.10815 11.982 2.44809 11.8189C1.78803 11.6559 1.19835 11.2759 0.769343 10.7371C0.340333 10.1982 0.0956392 9.53031 0.0727265 8.83555H0V3.57139C0.0166056 3.41442 0.0892715 3.26926 0.204041 3.1638C0.318811 3.05833 0.467593 3 0.621812 3C0.77603 3 0.924812 3.05833 1.03958 3.1638C1.15435 3.26926 1.22702 3.41442 1.24362 3.57139V6.26676C1.60094 5.98944 2.01268 5.79463 2.45054 5.69572C2.88839 5.59682 3.34197 5.59616 3.7801 5.69379C4.21822 5.79143 4.6305 5.98504 4.98859 6.26132C5.34667 6.5376 5.64208 6.88999 5.85448 7.29427C6.17777 6.66431 6.69814 6.1636 7.33231 5.87229C7.96647 5.58098 8.67777 5.5159 9.35233 5.68749C10.0269 5.85907 10.6257 6.25739 11.053 6.81869C11.4803 7.37999 11.7112 8.07181 11.709 8.78343ZM4.97449 8.78343C4.99041 8.52259 4.95397 8.26119 4.86742 8.01533C4.78087 7.76946 4.64605 7.54436 4.47127 7.35389C4.29649 7.16342 4.08545 7.01162 3.85117 6.90785C3.61688 6.80409 3.36432 6.75056 3.10906 6.75056C2.85379 6.75056 2.60123 6.80409 2.36695 6.90785C2.13267 7.01162 1.92163 7.16342 1.74685 7.35389C1.57207 7.54436 1.43724 7.76946 1.3507 8.01533C1.26415 8.26119 1.22771 8.52259 1.24362 8.78343C1.27327 9.26934 1.48271 9.7254 1.82929 10.0588C2.17587 10.3921 2.63352 10.5777 3.10906 10.5777C3.58459 10.5777 4.04225 10.3921 4.38883 10.0588C4.73541 9.7254 4.94484 9.26934 4.97449 8.78343ZM15.8835 10.9576C15.9589 11.0692 15.9995 11.2016 15.9998 11.3373C16.001 11.4358 15.9792 11.5331 15.9362 11.6212C15.8931 11.7092 15.8302 11.7855 15.7526 11.8436C15.6446 11.924 15.5151 11.9682 15.3817 11.9702C15.2925 11.9749 15.2035 11.9586 15.1216 11.9224C15.0396 11.8863 14.9668 11.8313 14.9089 11.7617L13.5199 9.87796L12.1453 11.7617C12.0867 11.8362 12.0124 11.8962 11.9281 11.9375C11.8438 11.9787 11.7515 12.0001 11.6581 12C11.5205 11.996 11.3868 11.9521 11.2726 11.8734C11.197 11.8122 11.1361 11.734 11.0945 11.645C11.0529 11.556 11.0317 11.4584 11.0326 11.3597C11.0357 11.2267 11.0761 11.0975 11.149 10.9874L12.7271 8.78343L11.149 6.60182C11.0719 6.49388 11.031 6.36324 11.0326 6.22953C11.0334 6.13218 11.0553 6.03623 11.0968 5.94865C11.1383 5.86107 11.1984 5.78406 11.2726 5.72322C11.4047 5.62316 11.5696 5.57965 11.7325 5.60189C11.8954 5.62412 12.0434 5.71036 12.1453 5.84235L13.5199 7.71868L14.9089 5.84235C14.9562 5.77716 15.0157 5.72227 15.0839 5.6809C15.1522 5.63953 15.2278 5.61251 15.3063 5.60141C15.3849 5.59032 15.4648 5.59538 15.5414 5.61629C15.618 5.63721 15.6898 5.67356 15.7526 5.72322C15.8313 5.78366 15.8949 5.86249 15.9379 5.95314C15.9809 6.0438 16.0021 6.14366 15.9998 6.24442C16.0015 6.37357 15.9605 6.4995 15.8835 6.60182L14.298 8.78343L15.8835 11.0172V10.9576Z" fill="black"/> +</svg> diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/ads/confluence.svg b/app/client/packages/design-system/ads/src/__assets__/icons/ads/confluence.svg new file mode 100644 index 000000000000..b19669421e7e --- /dev/null +++ b/app/client/packages/design-system/ads/src/__assets__/icons/ads/confluence.svg @@ -0,0 +1,3 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5267 1.34209C10.6125 1.18815 10.7558 1.07445 10.9252 1.02585C11.0946 0.97725 11.2764 0.997709 11.4307 1.08275L14.6554 2.86015C14.7323 2.90258 14.8001 2.95979 14.8548 3.02849C14.9095 3.09719 14.9501 3.17602 14.9743 3.26046C14.9984 3.3449 15.0057 3.43328 14.9956 3.52053C14.9855 3.60777 14.9582 3.69216 14.9154 3.76885L13.8434 5.69225C13.1451 6.9476 12.0058 7.89907 10.646 8.36235L14.5908 10.5364C14.6677 10.5788 14.7355 10.636 14.7903 10.7046C14.8451 10.7733 14.8858 10.8521 14.91 10.9366C14.9342 11.021 14.9415 11.1094 14.9315 11.1967C14.9214 11.284 14.8942 11.3684 14.8514 11.4451L13.0647 14.6519C12.9788 14.8059 12.8354 14.9196 12.6658 14.9681C12.4963 15.0166 12.3144 14.9959 12.1601 14.9106L7.64666 12.4225C7.45901 12.3186 7.23786 12.2931 7.03151 12.3517C6.82516 12.4103 6.65037 12.5481 6.54531 12.7352L5.4733 14.6579C5.38749 14.8118 5.24422 14.9256 5.07481 14.9741C4.90541 15.0227 4.72365 15.0023 4.56929 14.9172L1.34457 13.1405C1.26768 13.0981 1.19993 13.0409 1.14521 12.9722C1.09049 12.9035 1.04988 12.8246 1.02572 12.7402C1.00156 12.6558 0.994323 12.5674 1.00442 12.4801C1.01452 12.3929 1.04176 12.3085 1.08457 12.2318L2.15659 10.3084C2.85488 9.05307 3.99425 8.10159 5.35396 7.63832L1.40924 5.46424C1.33229 5.42187 1.26447 5.3647 1.20969 5.29602C1.1549 5.22735 1.11423 5.14853 1.09 5.06408C1.06578 4.97964 1.05848 4.89124 1.06854 4.80397C1.07859 4.7167 1.10579 4.63227 1.14857 4.55554L2.93526 1.34876C3.02119 1.19475 3.16463 1.08107 3.33418 1.03258C3.50374 0.984103 3.6856 1.00478 3.83994 1.09009L8.354 3.57817C8.74668 3.79485 9.23935 3.65151 9.45402 3.26616L10.5274 1.34209H10.5267ZM11.3687 2.5708L10.6194 3.91485C10.3426 4.40945 9.88136 4.77447 9.33641 4.93023C8.79146 5.08598 8.20702 5.01983 7.71066 4.74622L3.77727 2.57814L2.63993 4.61955L6.56731 6.78429C8.74068 7.98233 11.4774 7.19964 12.6794 5.04289L13.4261 3.70418L11.3694 2.5708H11.3687ZM9.43335 9.21638C7.25999 8.01833 4.52328 8.80103 3.32127 10.9578L2.57459 12.2965L4.63195 13.4299L5.3813 12.0858C5.65796 11.5911 6.11918 11.2259 6.66418 11.0702C7.20918 10.9144 7.79369 10.9807 8.29 11.2544L12.2227 13.4225L13.3607 11.3811L9.43335 9.21638Z" fill="black"/> +</svg> diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/ads/dropbox.svg b/app/client/packages/design-system/ads/src/__assets__/icons/ads/dropbox.svg new file mode 100644 index 000000000000..e7324eb80327 --- /dev/null +++ b/app/client/packages/design-system/ads/src/__assets__/icons/ads/dropbox.svg @@ -0,0 +1,10 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0_6_35)"> +<path d="M15.8359 3.88317L13.3035 5.99025L15.3275 7.60738C15.389 7.6564 15.4381 7.71927 15.4707 7.79086C15.5033 7.86246 15.5185 7.94075 15.5151 8.01934C15.5116 8.09793 15.4897 8.1746 15.451 8.24309C15.4123 8.31159 15.3579 8.36996 15.2924 8.41344L13.0009 9.9389C13.0035 9.95894 13.013 9.97647 13.013 9.99701V12.4959C13.013 12.5782 12.9927 12.6592 12.9538 12.7318C12.9149 12.8043 12.8586 12.8661 12.79 12.9117L8.28531 15.9105C8.26828 15.922 8.24874 15.927 8.23071 15.936C8.21417 15.9445 8.19864 15.9531 8.18111 15.9596C8.12589 15.9815 8.06718 15.9934 8.00778 15.9946C7.94836 15.9934 7.88965 15.9816 7.83444 15.9596C7.81691 15.9531 7.80138 15.9445 7.78434 15.936C7.76631 15.927 7.74727 15.922 7.73024 15.9105L3.22551 12.9117C3.15693 12.8661 3.10069 12.8043 3.06179 12.7318C3.0229 12.6592 3.00255 12.5782 3.00258 12.4959V9.99701C3.00258 9.97647 3.0121 9.95894 3.0141 9.9389L0.723161 8.41344C0.657607 8.36996 0.603264 8.31159 0.564568 8.24309C0.525871 8.1746 0.503917 8.09793 0.500498 8.01934C0.497079 7.94075 0.512291 7.86246 0.544893 7.79086C0.577495 7.71927 0.626564 7.6564 0.688093 7.60738L2.71201 5.99025L0.179608 3.88317C0.119935 3.83332 0.0726984 3.77025 0.0416447 3.69896C0.0105911 3.62767 -0.00342526 3.55013 0.000707442 3.47249C0.00484015 3.39484 0.0270082 3.31923 0.0654533 3.25164C0.103898 3.18405 0.157563 3.12635 0.222191 3.08312L4.72692 0.0843069C4.81671 0.0243434 4.92351 -0.00493845 5.03133 0.000840931C5.13915 0.00662032 5.24221 0.0471503 5.32508 0.116369L8.00778 2.34869L10.6905 0.116369C10.7733 0.0470753 10.8764 0.0064967 10.9842 0.000716246C11.0921 -0.00506421 11.1989 0.0242649 11.2886 0.0843069L15.7929 3.08312C15.8576 3.12624 15.9114 3.18389 15.9499 3.25146C15.9885 3.31903 16.0108 3.39466 16.0149 3.47234C16.0191 3.55003 16.0051 3.62761 15.974 3.69893C15.943 3.77025 15.8957 3.83334 15.8359 3.88317ZM14.1677 7.96107L12.4854 6.61696L8.85492 9.03365L10.5372 10.3778L14.1677 7.96107ZM8.50824 14.5609L12.012 12.2283V10.5977L10.7882 11.4123C10.6996 11.471 10.5948 11.5001 10.4887 11.4955C10.3826 11.4909 10.2806 11.4528 10.1975 11.3867L8.50824 10.0371V14.5609ZM8.00778 8.39641L11.6103 5.99827L8.00778 3.60012L4.4053 5.99827L8.00778 8.39641ZM4.00352 12.2283L7.50731 14.5609V10.0371L5.81753 11.3867C5.73467 11.4532 5.63277 11.4915 5.52664 11.4961C5.42052 11.5007 5.31569 11.4713 5.22739 11.4123L4.00352 10.5977V12.2283ZM5.47837 10.3778L7.16063 9.03365L3.5301 6.61696L1.84784 7.96107L5.47837 10.3778ZM4.97139 1.12282L1.33535 3.54401L3.53661 5.37556L7.17266 2.95487L4.97139 1.12282ZM11.0442 1.12282L8.84289 2.95487L12.4789 5.37556L14.6802 3.54401L11.0442 1.12282Z" fill="black"/> +</g> +<defs> +<clipPath id="clip0_6_35"> +<rect width="16" height="16" fill="white"/> +</clipPath> +</defs> +</svg> diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/ads/freshdesk.svg b/app/client/packages/design-system/ads/src/__assets__/icons/ads/freshdesk.svg new file mode 100644 index 000000000000..2b8f656aa6b6 --- /dev/null +++ b/app/client/packages/design-system/ads/src/__assets__/icons/ads/freshdesk.svg @@ -0,0 +1,11 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0_6_5)"> +<path d="M7.97236 7.50111e-05H13.9816C14.2473 -0.00222543 14.5108 0.0484079 14.7567 0.149022C15.0026 0.249635 15.226 0.398215 15.4139 0.58609C15.6018 0.773965 15.7504 0.997375 15.851 1.24328C15.9516 1.48919 16.0022 1.75268 15.9999 2.01836V8.02739C15.9994 10.1417 15.1592 12.1693 13.6642 13.6643C12.1691 15.1593 10.1414 15.9995 8.02707 16H7.98173C6.93402 16.0012 5.89635 15.7959 4.92801 15.3959C3.95968 14.9959 3.07965 14.409 2.33823 13.6687C1.59686 12.9284 1.00874 12.0492 0.607523 11.0814C0.206304 10.1135 -0.000140664 9.07607 7.19075e-08 8.02837C7.19075e-08 3.61032 3.56353 0.046897 7.97285 0.00155327L7.97236 7.50111e-05Z" fill="black"/> +<path d="M8.53255 4.01569C7.60086 4.01569 6.70733 4.40874 6.04852 5.10837C5.38972 5.80801 5.01961 6.75691 5.01961 7.74635V10.283C5.02658 10.6097 5.15191 10.921 5.36952 11.1521C5.58712 11.3832 5.88025 11.5163 6.18791 11.5237H7.18182V8.61264H5.83959V7.79804C5.92135 6.26372 7.11659 5.06417 8.56374 5.06417C10.0109 5.06417 11.2104 6.26874 11.2879 7.79804V8.61264H9.92817V11.5237H10.8261V11.5699C10.8216 11.8728 10.7063 12.162 10.5046 12.3762C10.3028 12.5905 10.0305 12.7129 9.74527 12.7177H8.67244C8.58548 12.7177 8.48954 12.7639 8.48954 12.8567C8.49426 12.9571 8.57319 13.0465 8.67244 13.051H9.75331C10.1225 13.0485 10.4758 12.8916 10.7369 12.6144C10.9979 12.3372 11.1456 11.9619 11.148 11.5699V11.4775C11.4043 11.4154 11.633 11.2622 11.7962 11.0434C11.9595 10.8246 12.0476 10.5531 12.046 10.2739V7.79302C12.0946 5.69104 10.5256 4.01569 8.53255 4.01569Z" fill="white"/> +</g> +<defs> +<clipPath id="clip0_6_5"> +<rect width="16" height="16" fill="white"/> +</clipPath> +</defs> +</svg> diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/ads/intercom.svg b/app/client/packages/design-system/ads/src/__assets__/icons/ads/intercom.svg new file mode 100644 index 000000000000..4bd3449f9e4e --- /dev/null +++ b/app/client/packages/design-system/ads/src/__assets__/icons/ads/intercom.svg @@ -0,0 +1,10 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0_6_17)"> +<path d="M0 0V16H16V0H0ZM1.45455 1.45455H14.5455V14.5455H1.45455V1.45455ZM8.00142 2.90909C7.76997 2.90909 7.53835 3.06277 7.53835 3.36932V10.0724C7.53835 10.6855 8.46449 10.6855 8.46449 10.0724V3.36932C8.46449 3.06277 8.23288 2.90909 8.00142 2.90909ZM5.68892 3.14063C5.45747 3.14063 5.22585 3.29431 5.22585 3.60085V9.77699C5.22585 10.3901 6.15057 10.3901 6.15057 9.77699V3.60085C6.15057 3.29431 5.92038 3.14063 5.68892 3.14063ZM10.3111 3.14063C10.0796 3.14063 9.84801 3.29431 9.84801 3.60085V9.77699C9.84801 10.3901 10.7741 10.3901 10.7741 9.77699V3.60085C10.7741 3.29431 10.5425 3.14063 10.3111 3.14063ZM3.375 4.06676C3.14355 4.06676 2.91335 4.22044 2.91335 4.52699V8.68466C2.91335 9.29775 3.83807 9.29775 3.83807 8.68466V4.52699C3.83807 4.22044 3.60645 4.06676 3.375 4.06676ZM12.6236 4.06676C12.3921 4.06676 12.1605 4.22044 12.1605 4.52699V8.68466C12.1605 9.29775 13.0866 9.29775 13.0866 8.68466V4.52699C13.0866 4.22044 12.855 4.06676 12.6236 4.06676ZM12.6776 10.7628C12.5635 10.7468 12.4393 10.7766 12.3239 10.8764C10.3675 12.5455 5.71756 12.5884 3.67756 10.8764C3.21283 10.4801 2.61198 11.1832 3.0767 11.5795C5.4418 13.6043 10.6709 13.5301 12.9247 11.5795C13.2711 11.2801 13.0197 10.8106 12.6776 10.7628Z" fill="black"/> +</g> +<defs> +<clipPath id="clip0_6_17"> +<rect width="16" height="16" fill="white"/> +</clipPath> +</defs> +</svg> diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/ads/onedrive.svg b/app/client/packages/design-system/ads/src/__assets__/icons/ads/onedrive.svg new file mode 100644 index 000000000000..b55f5f93f5e4 --- /dev/null +++ b/app/client/packages/design-system/ads/src/__assets__/icons/ads/onedrive.svg @@ -0,0 +1,3 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M5.7389 2.52365C6.76058 2.03833 7.9072 1.88527 9.01936 2.08576C10.1315 2.28625 11.1539 2.83032 11.9445 3.64233C12.5996 4.31524 13.0685 5.14446 13.3101 6.04772C14.0052 6.21405 14.6382 6.59185 15.1187 7.13684C15.7346 7.83541 16.0493 8.75145 15.9937 9.68345C15.9381 10.6155 15.5167 11.4871 14.8223 12.1066C14.134 12.7205 13.2333 13.037 12.3153 12.9881H4.60097C3.48011 13.072 2.37084 12.7093 1.51295 11.9774C0.646546 11.2384 0.107507 10.1833 0.0144164 9.04445C-0.0786747 7.90558 0.281807 6.77616 1.01656 5.90464C1.66271 5.13822 2.55176 4.62646 3.52679 4.4505C4.0738 3.61906 4.83805 2.95157 5.7389 2.52365ZM8.74536 3.62371C7.95096 3.48051 7.13194 3.58983 6.40217 3.93649C5.6724 4.28315 5.06813 4.84991 4.67338 5.55798C4.54705 5.78457 4.31702 5.93317 4.05962 5.95446C3.33801 6.01414 2.66951 6.35974 2.20121 6.91521C1.7329 7.47068 1.50314 8.19054 1.56248 8.91642C1.62181 9.64229 1.96537 10.3147 2.51759 10.7858C3.0698 11.2569 3.78544 11.488 4.50705 11.4283C4.52822 11.4265 4.54945 11.4257 4.5707 11.4257H12.3371C12.3526 11.4257 12.3681 11.4261 12.3836 11.4271C12.899 11.4582 13.4054 11.2821 13.7917 10.9375C14.1779 10.593 14.4123 10.1082 14.4432 9.58988C14.4741 9.07152 14.2991 8.56204 13.9566 8.17351C13.614 7.78498 13.1321 7.54924 12.6168 7.51814C12.2528 7.49617 11.953 7.22238 11.8962 6.86003C11.7704 6.05812 11.3994 5.31555 10.8347 4.73554C10.2701 4.15554 9.53976 3.76692 8.74536 3.62371Z" fill="black"/> +</svg> diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/ads/robot-2-line.svg b/app/client/packages/design-system/ads/src/__assets__/icons/ads/robot-2-line.svg new file mode 100644 index 000000000000..b7c224276fab --- /dev/null +++ b/app/client/packages/design-system/ads/src/__assets__/icons/ads/robot-2-line.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M13.5 2C13.5 2.44425 13.3069 2.84339 13 3.11805V5H18C19.6569 5 21 6.34315 21 8V18C21 19.6569 19.6569 21 18 21H6C4.34315 21 3 19.6569 3 18V8C3 6.34315 4.34315 5 6 5H11V3.11805C10.6931 2.84339 10.5 2.44425 10.5 2C10.5 1.17157 11.1716 0.5 12 0.5C12.8284 0.5 13.5 1.17157 13.5 2ZM6 7C5.44772 7 5 7.44772 5 8V18C5 18.5523 5.44772 19 6 19H18C18.5523 19 19 18.5523 19 18V8C19 7.44772 18.5523 7 18 7H13H11H6ZM2 10H0V16H2V10ZM22 10H24V16H22V10ZM9 14.5C9.82843 14.5 10.5 13.8284 10.5 13C10.5 12.1716 9.82843 11.5 9 11.5C8.17157 11.5 7.5 12.1716 7.5 13C7.5 13.8284 8.17157 14.5 9 14.5ZM15 14.5C15.8284 14.5 16.5 13.8284 16.5 13C16.5 12.1716 15.8284 11.5 15 11.5C14.1716 11.5 13.5 12.1716 13.5 13C13.5 13.8284 14.1716 14.5 15 14.5Z"></path></svg> \ No newline at end of file diff --git a/app/client/packages/design-system/ads/src/__assets__/icons/ads/sharepoint.svg b/app/client/packages/design-system/ads/src/__assets__/icons/ads/sharepoint.svg new file mode 100644 index 000000000000..ae1fa3b15b9a --- /dev/null +++ b/app/client/packages/design-system/ads/src/__assets__/icons/ads/sharepoint.svg @@ -0,0 +1,3 @@ +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M5.29132 11.6571H1.5902C1.26424 11.6571 1 11.3843 1 11.0478V4.95226C1 4.61568 1.26424 4.34284 1.5902 4.34284H3.56724C3.81967 1.90149 5.82091 0 8.2523 0C10.6985 0 12.7095 1.92493 12.9417 4.3879C14.7146 4.9649 16 6.6752 16 8.69669C16 10.9904 14.3442 12.8848 12.1995 13.1751C11.8386 14.7936 10.435 16 8.75824 16C6.80795 16 5.22697 14.3675 5.22697 12.3537C5.22697 12.1155 5.24909 11.8826 5.29132 11.6571ZM11.5709 4.17997C11.2624 2.5785 9.89383 1.37143 8.2523 1.37143C6.5555 1.37143 5.15037 2.66106 4.90615 4.34284H7.49346C7.8194 4.34284 8.08362 4.61568 8.08362 4.95226V6.04493C8.86875 4.92872 10.1368 4.19806 11.5709 4.17997ZM8.08362 10.1873V11.0478C8.08362 11.3843 7.8194 11.6571 7.49346 11.6571H6.66034C6.59207 11.8768 6.55515 12.1108 6.55515 12.3537C6.55515 13.6101 7.54154 14.6286 8.75824 14.6286C9.9312 14.6286 10.8905 13.6816 10.9576 12.4882C10.9601 12.4438 10.9613 12.399 10.9613 12.3537C10.9613 11.0974 9.97494 10.0789 8.75824 10.0789C8.5545 10.0789 8.35819 10.1072 8.17243 10.16C8.14259 10.1685 8.11292 10.1776 8.08362 10.1873ZM12.2456 11.777C11.9778 10.0373 10.5184 8.70747 8.75824 8.70747C8.69821 8.70747 8.63844 8.70903 8.57912 8.71214L8.57903 8.69669C8.57903 6.95936 9.94298 5.55106 11.6254 5.55106C11.8153 5.55106 12.0005 5.5689 12.1797 5.60287C13.5975 5.8716 14.6718 7.15529 14.6718 8.69669C14.6718 10.2145 13.6307 11.4812 12.2456 11.777ZM3.18551 7.53536C3.27342 7.69024 3.39447 7.82235 3.53936 7.92155C3.72741 8.04919 3.9273 8.15707 4.13608 8.24375C4.39851 8.35776 4.59719 8.44965 4.73212 8.51931C4.84906 8.57627 4.9559 8.65317 5.04819 8.7467C5.12239 8.82277 5.16374 8.92645 5.16287 9.03442C5.16622 9.18958 5.08663 9.33394 4.95576 9.41019C4.76894 9.51104 4.55894 9.55703 4.34858 9.54331C4.12129 9.53966 3.89569 9.50235 3.67867 9.4325C3.46091 9.36997 3.25542 9.26866 3.0715 9.13298V9.9776C3.26391 10.0638 3.46592 10.1252 3.67293 10.1601C3.9181 10.203 4.16638 10.224 4.41503 10.2228C4.69217 10.2272 4.96821 10.1858 5.23269 10.1002C5.45755 10.0283 5.65697 9.88983 5.80614 9.70176C5.95578 9.49723 6.03165 9.24526 6.02066 8.98917C6.02861 8.78281 5.98197 8.5781 5.88574 8.39698C5.79188 8.23735 5.66262 8.10286 5.50862 8.00485C5.30525 7.87794 5.09174 7.76923 4.87041 7.67991C4.84712 7.66802 4.82298 7.65797 4.79823 7.64992C4.57335 7.55401 4.40469 7.47712 4.29224 7.41934C4.1912 7.37061 4.09972 7.30304 4.02239 7.22011C3.95692 7.14971 3.92061 7.05582 3.92119 6.95817C3.9215 6.79735 4.01426 6.65198 4.15732 6.58825C4.34261 6.49499 4.54732 6.45019 4.75336 6.45806C4.94874 6.4576 5.14345 6.48174 5.33321 6.52974C5.50809 6.57216 5.67543 6.64265 5.82906 6.73874V5.93767C5.47547 5.81883 5.10439 5.76517 4.73278 5.77919C4.45021 5.77605 4.16905 5.82101 3.90062 5.91224C3.66509 5.98903 3.45441 6.13093 3.29143 6.32256C3.13632 6.51392 3.0548 6.75749 3.06239 7.00699C3.05787 7.19113 3.10033 7.37335 3.18551 7.53536Z" fill="#1F2328"/> +</svg> diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index 606505b1cf2c..09033601d20e 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -210,7 +210,7 @@ export const PARTNER_PROGRAM_CALLOUT_LINK = () => export const NEW_APPLICATION = () => `New application`; export const APPLICATIONS = () => `Applications`; export const FIXED_APPLICATIONS = () => `Classic Applications`; -export const ANVIL_APPLICATIONS = () => `New Applications`; +export const AI_AGENTS_APPLICATIONS = () => `AI Agents`; export const USER_PROFILE_PICTURE_UPLOAD_FAILED = () => "Unable to upload display picture."; @@ -272,8 +272,6 @@ export const APPLICATION_CARD_LIST_ZERO_STATE = () => `There are no applications in this workspace.`; export const NEW_APPLICATION_CARD_LIST_ZERO_STATE = () => `There are no new applications in this workspace.`; -export const CLASSIC_APPLICATION_CARD_LIST_ZERO_STATE = () => - `There are no classic applications in this workspace.`; export const TRY_GUIDED_TOUR = () => `Try guided tour`; export const JOIN_OUR_DISCORD = () => `Join our discord`; export const WHATS_NEW = () => `What's new?`; diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx index f04d3e39e388..9604a0b79ecf 100644 --- a/app/client/src/ce/pages/Applications/index.tsx +++ b/app/client/src/ce/pages/Applications/index.tsx @@ -8,14 +8,11 @@ import { } from "ee/actions/workspaceActions"; import type { UpdateApplicationPayload } from "ee/api/ApplicationApi"; import { - ANVIL_APPLICATIONS, + AI_AGENTS_APPLICATIONS, APPLICATIONS, - CLASSIC_APPLICATION_CARD_LIST_ZERO_STATE, CREATE_A_NEW_WORKSPACE, createMessage, - FIXED_APPLICATIONS, INVITE_USERS_PLACEHOLDER, - NEW_APPLICATION_CARD_LIST_ZERO_STATE, NO_APPS_FOUND, NO_WORKSPACE_HEADING, WORKSPACES_HEADING, @@ -282,12 +279,9 @@ const TitleTag = styled(Tag)` max-width: fit-content; `; -// A static component that is a tag signifying Anvil applications -// This will be passed down to the ApplicationCardsList component -// in the titleTag prop. -const AnvilTitleTag = ( +const BetaTag = ( <TitleTag isClosable={false} onClose={() => {}}> - Anvil α + Beta </TitleTag> ); @@ -771,7 +765,7 @@ export function ApplicationsSection(props: any) { ) { createNewApplication( getNextEntityName( - isAnvilEnabled ? "AI app " : "Untitled application ", + "Untitled application ", // TODO: Fix this the next time the file is edited // eslint-disable-next-line @typescript-eslint/no-explicit-any applications.map((el: any) => el.name), @@ -902,39 +896,10 @@ export function ApplicationsSection(props: any) { <ResourceListLoader isMobile={isMobile} resources={applications} /> ) : ( <> - {isAnvilEnabled && ( // Anvil Applications list - <ApplicationCardList - applications={anvilApplications} - canInviteToWorkspace={canInviteToWorkspace} - deleteApplication={deleteApplication} - emptyStateMessage={createMessage( - NEW_APPLICATION_CARD_LIST_ZERO_STATE, - )} - enableImportExport={enableImportExport} - hasCreateNewApplicationPermission={ - hasCreateNewApplicationPermission - } - hasManageWorkspacePermissions={hasManageWorkspacePermissions} - isMobile={isMobile} - onClickAddNewButton={onClickAddNewAppButton} - title={createMessage(ANVIL_APPLICATIONS)} - titleTag={AnvilTitleTag} - updateApplicationDispatch={updateApplicationDispatch} - workspaceId={activeWorkspace.id} - /> - )} <ApplicationCardList applications={nonAnvilApplications} canInviteToWorkspace={canInviteToWorkspace} deleteApplication={deleteApplication} - emptyStateMessage={ - // We let the original message includded in the ApplicationCardList component - // show if Anvil is not enabled. If Anvil is enabled, we need to pass the message - // to make them appropriate to the context. - isAnvilEnabled - ? createMessage(CLASSIC_APPLICATION_CARD_LIST_ZERO_STATE) - : undefined - } enableImportExport={enableImportExport} hasCreateNewApplicationPermission={ hasCreateNewApplicationPermission @@ -942,15 +907,31 @@ export function ApplicationsSection(props: any) { hasManageWorkspacePermissions={hasManageWorkspacePermissions} isMobile={isMobile} onClickAddNewButton={onClickAddNewAppButton} - title={ - // The title is different based on whether Anvil is enabled or not - createMessage( - isAnvilEnabled ? FIXED_APPLICATIONS : APPLICATIONS, - ) - } + title={createMessage(APPLICATIONS)} updateApplicationDispatch={updateApplicationDispatch} workspaceId={activeWorkspace.id} /> + {isAnvilEnabled && + anvilApplications.length > 0 && ( // AI Agents list + <ApplicationCardList + applications={anvilApplications} + canInviteToWorkspace={canInviteToWorkspace} + deleteApplication={deleteApplication} + enableImportExport={enableImportExport} + hasCreateNewApplicationPermission={ + hasCreateNewApplicationPermission + } + hasManageWorkspacePermissions={ + hasManageWorkspacePermissions + } + isMobile={isMobile} + onClickAddNewButton={onClickAddNewAppButton} + title={createMessage(AI_AGENTS_APPLICATIONS)} + titleTag={BetaTag} + updateApplicationDispatch={updateApplicationDispatch} + workspaceId={activeWorkspace.id} + /> + )} <PackageCardList isMobile={isMobile} packages={packages} diff --git a/app/client/src/ce/sagas/ApplicationSagas.tsx b/app/client/src/ce/sagas/ApplicationSagas.tsx index 3eea5281824f..fb7e8745c4e2 100644 --- a/app/client/src/ce/sagas/ApplicationSagas.tsx +++ b/app/client/src/ce/sagas/ApplicationSagas.tsx @@ -113,7 +113,6 @@ import { } from "ee/selectors/selectedWorkspaceSelectors"; import equal from "fast-deep-equal"; import { getFromServerWhenNoPrefetchedResult } from "sagas/helper"; -import { getIsAnvilLayoutEnabled } from "layoutSystems/anvil/integrations/selectors"; import type { Page } from "entities/Page"; import type { ApplicationPayload } from "entities/Application"; @@ -580,17 +579,6 @@ export function* createApplicationSaga( layoutSystemType: LayoutSystemTypes.FIXED, // Note: This may be provided as an action payload in the future }; - // SPECIAL HANDLING FOR ANVIL DURING EXPERIMENTATION - // Check if Anvil is enabled for the user, If so, default to using - // Anvil as the layout system for the new app. Also, we want to hide the navbar for anvil apps - const isAnvilEnabled: boolean = yield select(getIsAnvilLayoutEnabled); - - if (isAnvilEnabled) { - request.layoutSystemType = LayoutSystemTypes.ANVIL; - request.showNavbar = false; - } - /** EO SPECIAL HANDLING FOR ANVIL DURING EXPERIMENTATION */ - const response: CreateApplicationResponse = yield call( ApplicationApi.createApplication, request, diff --git a/app/client/src/pages/Templates/TemplateContent/index.tsx b/app/client/src/pages/Templates/TemplateContent/index.tsx index cae6eb0c7d7c..2c1ec360754a 100644 --- a/app/client/src/pages/Templates/TemplateContent/index.tsx +++ b/app/client/src/pages/Templates/TemplateContent/index.tsx @@ -123,9 +123,14 @@ export function TemplateContent(props: TemplateContentProps) { const isLoading = isFetchingApplications || isFetchingTemplates; const filterWithAllowPageImport = props.filterWithAllowPageImport || false; - const templates = useSelector(getSearchedTemplateList).filter((template) => - filterWithAllowPageImport ? !!template.allowPageImport : true, - ); + const templates = useSelector(getSearchedTemplateList) + .filter((template) => + filterWithAllowPageImport ? !!template.allowPageImport : true, + ) + // We are using AI Agent template for creating ai agent app, + // so we are not showing it in the templates list. + // TODO: Once we have a new entity for ai agent, we need to remove this filter. + .filter((template) => template.title !== "AI Agent"); if (isLoading) { return <LoadingScreen text="Loading templates" />;
2b64e6546bffdb9a0db6f1c294fb39da97200563
2024-12-02 12:34:04
Rudraprasad Das
feat: git mod - shifting from yarn pkg to monolith (#37865)
false
git mod - shifting from yarn pkg to monolith (#37865)
feat
diff --git a/app/client/package.json b/app/client/package.json index f56c83dafbaa..2387afc4ee3e 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -87,6 +87,7 @@ "@react-types/shared": "^3.23.0", "@redux-saga/core": "1.1.3", "@redux-saga/types": "1.2.1", + "@reduxjs/toolkit": "^2.4.0", "@sentry/react": "^6.2.4", "@shared/ast": "workspace:^", "@shared/dsl": "workspace:^", diff --git a/app/client/packages/git/.eslintrc.json b/app/client/packages/git/.eslintrc.json deleted file mode 100644 index b6652ce70c78..000000000000 --- a/app/client/packages/git/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": ["../../.eslintrc.base.json"] -} diff --git a/app/client/packages/git/package.json b/app/client/packages/git/package.json deleted file mode 100644 index 9bfcf578a72f..000000000000 --- a/app/client/packages/git/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "@appsmith/git", - "description": "This package contains all the git related functionality for Appsmith UI", - "private": true, - "version": "1.0.0", - "main": "src/index.ts", - "scripts": { - "lint": "yarn g:lint", - "prettier": "yarn g:prettier", - "test:unit": "yarn g:jest --passWithNoTests" - }, - "dependencies": { - "@reduxjs/toolkit": "^2.3.0" - } -} diff --git a/app/client/packages/git/tsconfig.json b/app/client/packages/git/tsconfig.json deleted file mode 100644 index 752e48c03ef5..000000000000 --- a/app/client/packages/git/tsconfig.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": ["./src/**/*"] -} diff --git a/app/client/packages/git/src/actions/checkoutBranchActions.ts b/app/client/src/git/actions/checkoutBranchActions.ts similarity index 100% rename from app/client/packages/git/src/actions/checkoutBranchActions.ts rename to app/client/src/git/actions/checkoutBranchActions.ts diff --git a/app/client/packages/git/src/actions/commitActions.ts b/app/client/src/git/actions/commitActions.ts similarity index 100% rename from app/client/packages/git/src/actions/commitActions.ts rename to app/client/src/git/actions/commitActions.ts diff --git a/app/client/packages/git/src/actions/connectActions.ts b/app/client/src/git/actions/connectActions.ts similarity index 100% rename from app/client/packages/git/src/actions/connectActions.ts rename to app/client/src/git/actions/connectActions.ts diff --git a/app/client/packages/git/src/actions/createBranchActions.ts b/app/client/src/git/actions/createBranchActions.ts similarity index 100% rename from app/client/packages/git/src/actions/createBranchActions.ts rename to app/client/src/git/actions/createBranchActions.ts diff --git a/app/client/packages/git/src/actions/deleteBranchActions.ts b/app/client/src/git/actions/deleteBranchActions.ts similarity index 100% rename from app/client/packages/git/src/actions/deleteBranchActions.ts rename to app/client/src/git/actions/deleteBranchActions.ts diff --git a/app/client/packages/git/src/actions/discardActions.ts b/app/client/src/git/actions/discardActions.ts similarity index 100% rename from app/client/packages/git/src/actions/discardActions.ts rename to app/client/src/git/actions/discardActions.ts diff --git a/app/client/packages/git/src/actions/disconnectActions.ts b/app/client/src/git/actions/disconnectActions.ts similarity index 100% rename from app/client/packages/git/src/actions/disconnectActions.ts rename to app/client/src/git/actions/disconnectActions.ts diff --git a/app/client/packages/git/src/actions/fetchAutocommitProgressActions.ts b/app/client/src/git/actions/fetchAutocommitProgressActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchAutocommitProgressActions.ts rename to app/client/src/git/actions/fetchAutocommitProgressActions.ts diff --git a/app/client/packages/git/src/actions/fetchBranchesActions.ts b/app/client/src/git/actions/fetchBranchesActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchBranchesActions.ts rename to app/client/src/git/actions/fetchBranchesActions.ts diff --git a/app/client/packages/git/src/actions/fetchGlobalConfigActions.ts b/app/client/src/git/actions/fetchGlobalConfigActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchGlobalConfigActions.ts rename to app/client/src/git/actions/fetchGlobalConfigActions.ts diff --git a/app/client/packages/git/src/actions/fetchLocalConfigActions.ts b/app/client/src/git/actions/fetchLocalConfigActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchLocalConfigActions.ts rename to app/client/src/git/actions/fetchLocalConfigActions.ts diff --git a/app/client/packages/git/src/actions/fetchMergeStatusActions.ts b/app/client/src/git/actions/fetchMergeStatusActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchMergeStatusActions.ts rename to app/client/src/git/actions/fetchMergeStatusActions.ts diff --git a/app/client/packages/git/src/actions/fetchMetadataActions.ts b/app/client/src/git/actions/fetchMetadataActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchMetadataActions.ts rename to app/client/src/git/actions/fetchMetadataActions.ts diff --git a/app/client/packages/git/src/actions/fetchProtectedBranchesActions.ts b/app/client/src/git/actions/fetchProtectedBranchesActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchProtectedBranchesActions.ts rename to app/client/src/git/actions/fetchProtectedBranchesActions.ts diff --git a/app/client/packages/git/src/actions/fetchSSHKeyActions.ts b/app/client/src/git/actions/fetchSSHKeyActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchSSHKeyActions.ts rename to app/client/src/git/actions/fetchSSHKeyActions.ts diff --git a/app/client/packages/git/src/actions/fetchStatusActions.ts b/app/client/src/git/actions/fetchStatusActions.ts similarity index 100% rename from app/client/packages/git/src/actions/fetchStatusActions.ts rename to app/client/src/git/actions/fetchStatusActions.ts diff --git a/app/client/packages/git/src/actions/generateSSHKey.ts b/app/client/src/git/actions/generateSSHKey.ts similarity index 100% rename from app/client/packages/git/src/actions/generateSSHKey.ts rename to app/client/src/git/actions/generateSSHKey.ts diff --git a/app/client/packages/git/src/actions/helpers/createSingleArtifactAction.ts b/app/client/src/git/actions/helpers/createSingleArtifactAction.ts similarity index 100% rename from app/client/packages/git/src/actions/helpers/createSingleArtifactAction.ts rename to app/client/src/git/actions/helpers/createSingleArtifactAction.ts diff --git a/app/client/packages/git/src/actions/helpers/singleArtifactInitialState.ts b/app/client/src/git/actions/helpers/singleArtifactInitialState.ts similarity index 100% rename from app/client/packages/git/src/actions/helpers/singleArtifactInitialState.ts rename to app/client/src/git/actions/helpers/singleArtifactInitialState.ts diff --git a/app/client/packages/git/src/actions/mergeActions.ts b/app/client/src/git/actions/mergeActions.ts similarity index 100% rename from app/client/packages/git/src/actions/mergeActions.ts rename to app/client/src/git/actions/mergeActions.ts diff --git a/app/client/packages/git/src/actions/mountActions.ts b/app/client/src/git/actions/mountActions.ts similarity index 100% rename from app/client/packages/git/src/actions/mountActions.ts rename to app/client/src/git/actions/mountActions.ts diff --git a/app/client/packages/git/src/actions/pullActions.ts b/app/client/src/git/actions/pullActions.ts similarity index 100% rename from app/client/packages/git/src/actions/pullActions.ts rename to app/client/src/git/actions/pullActions.ts diff --git a/app/client/packages/git/src/actions/toggleAutocommitActions.ts b/app/client/src/git/actions/toggleAutocommitActions.ts similarity index 100% rename from app/client/packages/git/src/actions/toggleAutocommitActions.ts rename to app/client/src/git/actions/toggleAutocommitActions.ts diff --git a/app/client/packages/git/src/actions/triggerAutocommitActions.ts b/app/client/src/git/actions/triggerAutocommitActions.ts similarity index 100% rename from app/client/packages/git/src/actions/triggerAutocommitActions.ts rename to app/client/src/git/actions/triggerAutocommitActions.ts diff --git a/app/client/packages/git/src/actions/updateGlobalConfigActions.ts b/app/client/src/git/actions/updateGlobalConfigActions.ts similarity index 100% rename from app/client/packages/git/src/actions/updateGlobalConfigActions.ts rename to app/client/src/git/actions/updateGlobalConfigActions.ts diff --git a/app/client/packages/git/src/actions/updateLocalConfigActions.ts b/app/client/src/git/actions/updateLocalConfigActions.ts similarity index 100% rename from app/client/packages/git/src/actions/updateLocalConfigActions.ts rename to app/client/src/git/actions/updateLocalConfigActions.ts diff --git a/app/client/packages/git/src/actions/updateProtectedBranchesActions.ts b/app/client/src/git/actions/updateProtectedBranchesActions.ts similarity index 100% rename from app/client/packages/git/src/actions/updateProtectedBranchesActions.ts rename to app/client/src/git/actions/updateProtectedBranchesActions.ts diff --git a/app/client/packages/git/src/components/connect/GitTest.tsx b/app/client/src/git/components/connect/GitTest.tsx similarity index 100% rename from app/client/packages/git/src/components/connect/GitTest.tsx rename to app/client/src/git/components/connect/GitTest.tsx diff --git a/app/client/packages/git/src/enums.ts b/app/client/src/git/enums.ts similarity index 100% rename from app/client/packages/git/src/enums.ts rename to app/client/src/git/enums.ts diff --git a/app/client/packages/git/src/store/gitArtifactSlice.ts b/app/client/src/git/store/gitArtifactSlice.ts similarity index 100% rename from app/client/packages/git/src/store/gitArtifactSlice.ts rename to app/client/src/git/store/gitArtifactSlice.ts diff --git a/app/client/packages/git/src/store/index.ts b/app/client/src/git/store/index.ts similarity index 100% rename from app/client/packages/git/src/store/index.ts rename to app/client/src/git/store/index.ts diff --git a/app/client/packages/git/src/types.ts b/app/client/src/git/types.ts similarity index 100% rename from app/client/packages/git/src/types.ts rename to app/client/src/git/types.ts diff --git a/app/client/yarn.lock b/app/client/yarn.lock index 21e7ee0d476c..312a597084f5 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -91,14 +91,6 @@ __metadata: languageName: unknown linkType: soft -"@appsmith/git@workspace:packages/git": - version: 0.0.0-use.local - resolution: "@appsmith/git@workspace:packages/git" - dependencies: - "@reduxjs/toolkit": ^2.3.0 - languageName: unknown - linkType: soft - "@appsmith/utils@workspace:^, @appsmith/utils@workspace:packages/utils": version: 0.0.0-use.local resolution: "@appsmith/utils@workspace:packages/utils" @@ -7918,9 +7910,9 @@ __metadata: languageName: node linkType: hard -"@reduxjs/toolkit@npm:^2.3.0": - version: 2.3.0 - resolution: "@reduxjs/toolkit@npm:2.3.0" +"@reduxjs/toolkit@npm:^2.4.0": + version: 2.4.0 + resolution: "@reduxjs/toolkit@npm:2.4.0" dependencies: immer: ^10.0.3 redux: ^5.0.1 @@ -7934,7 +7926,7 @@ __metadata: optional: true react-redux: optional: true - checksum: 1a0d85978f99a44f7ceabec8623f46cdd2a2dc25d809dfb0d5c9cd13e2aa12cf116cffe34a4ed949169804dc6125ef9cf68143225e9527f861b597ea701e8bb5 + checksum: 49c75f488208fe8ba7834a9296b70e18480c2ac4f6a487a462157f3cb442ad3f722a67dfd975194a757910a4ccec7f9a7fcc171b76f9433de87911cffec9d4eb languageName: node linkType: hard @@ -12732,6 +12724,7 @@ __metadata: "@react-types/shared": ^3.23.0 "@redux-saga/core": 1.1.3 "@redux-saga/types": 1.2.1 + "@reduxjs/toolkit": ^2.4.0 "@sentry/react": ^6.2.4 "@sentry/webpack-plugin": ^1.18.9 "@shared/ast": "workspace:^"
086582b4b372f3718e9d178efbd342725f9ce09b
2024-05-03 13:52:34
Ankita Kinger
chore: Removing the audit log API call for JS action execution (#33151)
false
Removing the audit log API call for JS action execution (#33151)
chore
diff --git a/app/client/src/ce/sagas/JSActionSagas.ts b/app/client/src/ce/sagas/JSActionSagas.ts index a2f516011073..18a5cc7772db 100644 --- a/app/client/src/ce/sagas/JSActionSagas.ts +++ b/app/client/src/ce/sagas/JSActionSagas.ts @@ -74,11 +74,6 @@ import { handleJSEntityRedirect } from "sagas/IDESaga"; import { getIDETypeByUrl } from "@appsmith/entities/IDE/utils"; import { IDE_TYPE } from "@appsmith/entities/IDE/constants"; import { CreateNewActionKey } from "@appsmith/entities/Engine/actionHelpers"; -import type { - TriggerKind, - TriggerSource, -} from "constants/AppsmithActionConstants/ActionConstants"; -import type { TMessage } from "utils/MessageUtil"; export function* fetchJSCollectionsSaga( action: EvaluationReduxAction<FetchActionsPayload>, @@ -505,20 +500,3 @@ export function* closeJSActionTabSaga( yield call(handleJSEntityRedirect, id); yield put(closeJsActionTabSuccess({ id })); } - -export function* logJSFunctionExecution( - // eslint-disable-next-line @typescript-eslint/no-unused-vars - message: TMessage<{ - data: { - jsFnFullName: string; - isSuccess: boolean; - triggerMeta: { - source: TriggerSource; - triggerPropertyName: string | undefined; - triggerKind: TriggerKind | undefined; - }; - }[]; - }>, -) { - /* This is intentionally left blank and has a definition on EE for audit logs, since this function needs to be called in a common file. */ -} diff --git a/app/client/src/ce/workers/Evaluation/JSObject/postJSFunctionExecution.ts b/app/client/src/ce/workers/Evaluation/JSObject/postJSFunctionExecution.ts deleted file mode 100644 index 62af8de5f961..000000000000 --- a/app/client/src/ce/workers/Evaluation/JSObject/postJSFunctionExecution.ts +++ /dev/null @@ -1,16 +0,0 @@ -import TriggerEmitter, { - BatchKey, -} from "workers/Evaluation/fns/utils/TriggerEmitter"; -import type { PostProcessorArg } from "workers/Evaluation/fns/utils/jsObjectFnFactory"; - -export function postJSFunctionExecutionLog({ - executionMetaData, - isSuccess, - jsFnFullName, -}: PostProcessorArg) { - TriggerEmitter.emit(BatchKey.process_batched_fn_invoke_log, { - jsFnFullName, - isSuccess, - triggerMeta: executionMetaData.triggerMeta, - }); -} diff --git a/app/client/src/ee/workers/Evaluation/JSObject/postJSFunctionExecution.ts b/app/client/src/ee/workers/Evaluation/JSObject/postJSFunctionExecution.ts deleted file mode 100644 index 4f185e4e03e0..000000000000 --- a/app/client/src/ee/workers/Evaluation/JSObject/postJSFunctionExecution.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "ce/workers/Evaluation/JSObject/postJSFunctionExecution"; diff --git a/app/client/src/ee/workers/Evaluation/evalWorkerActions.ts b/app/client/src/ee/workers/Evaluation/evalWorkerActions.ts index 559afd7b06c1..fac11136ba6e 100644 --- a/app/client/src/ee/workers/Evaluation/evalWorkerActions.ts +++ b/app/client/src/ee/workers/Evaluation/evalWorkerActions.ts @@ -1,7 +1 @@ export * from "ce/workers/Evaluation/evalWorkerActions"; -import { MAIN_THREAD_ACTION as CE_MAIN_THREAD_ACTION } from "ce/workers/Evaluation/evalWorkerActions"; - -export const MAIN_THREAD_ACTION = { - ...CE_MAIN_THREAD_ACTION, - LOG_JS_FUNCTION_EXECUTION: "LOG_JS_FUNCTION_EXECUTION", -}; diff --git a/app/client/src/sagas/EvalWorkerActionSagas.ts b/app/client/src/sagas/EvalWorkerActionSagas.ts index 27563eac8776..4df4432cbf9a 100644 --- a/app/client/src/sagas/EvalWorkerActionSagas.ts +++ b/app/client/src/sagas/EvalWorkerActionSagas.ts @@ -24,7 +24,6 @@ import { sortJSExecutionDataByCollectionId } from "workers/Evaluation/JSObject/u import type { LintTreeSagaRequestData } from "plugins/Linting/types"; import { evalErrorHandler } from "./EvalErrorHandler"; import { getUnevaluatedDataTree } from "selectors/dataTreeSelectors"; -import { logJSFunctionExecution } from "@appsmith/sagas/JSActionSagas"; export interface UpdateDataTreeMessageData { workerResponse: EvalTreeResponseData; @@ -126,10 +125,6 @@ export function* handleEvalWorkerMessage(message: TMessage<any>) { yield call(handleStoreOperations, data); break; } - case MAIN_THREAD_ACTION.LOG_JS_FUNCTION_EXECUTION: { - yield call(logJSFunctionExecution, message); - break; - } case MAIN_THREAD_ACTION.PROCESS_BATCHED_TRIGGERS: { const batchedTriggers = data; yield all( diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts index d6ba81658f6e..9938b27e1181 100644 --- a/app/client/src/sagas/JSPaneSagas.ts +++ b/app/client/src/sagas/JSPaneSagas.ts @@ -16,7 +16,6 @@ import { import { getCurrentApplicationId, getCurrentPageId, - getCurrentPageName, getIsSavingEntity, } from "selectors/editorSelectors"; import { @@ -95,7 +94,6 @@ import { getIsServerDSLMigrationsEnabled } from "selectors/pageSelectors"; import { getJSActionPathNameToDisplay } from "@appsmith/utils/actionExecutionUtils"; import { getJsPaneDebuggerState } from "selectors/jsPaneSelectors"; import { logMainJsActionExecution } from "@appsmith/utils/analyticsHelpers"; -import { logActionExecutionForAudit } from "@appsmith/actions/auditLogsAction"; import { getFocusablePropertyPaneField } from "selectors/propertyPaneSelectors"; import { getIsSideBySideEnabled } from "selectors/ideSelectors"; import { setIdeEditorViewMode } from "actions/ideActions"; @@ -456,16 +454,6 @@ export function* handleExecuteJSFunctionSaga(data: { if (!!collection.isMainJSCollection) logMainJsActionExecution(actionId, true, collectionId, isDirty); - yield put( - logActionExecutionForAudit({ - actionName: action.name, - actionId: action.id, - collectionId: collectionId, - pageId: action.pageId, - pageName: yield select(getCurrentPageName), - }), - ); - AppsmithConsole.info({ text: createMessage(JS_EXECUTION_SUCCESS), source: { diff --git a/app/client/src/workers/Evaluation/fns/utils/TriggerEmitter.ts b/app/client/src/workers/Evaluation/fns/utils/TriggerEmitter.ts index 3d3aa62f7c60..c3f22eec28a2 100644 --- a/app/client/src/workers/Evaluation/fns/utils/TriggerEmitter.ts +++ b/app/client/src/workers/Evaluation/fns/utils/TriggerEmitter.ts @@ -4,10 +4,6 @@ import { WorkerMessenger } from "workers/Evaluation/fns/utils/Messenger"; import type { UpdatedPathsMap } from "workers/Evaluation/JSObject/JSVariableUpdates"; import { applyJSVariableUpdatesToEvalTree } from "workers/Evaluation/JSObject/JSVariableUpdates"; import ExecutionMetaData from "./ExecutionMetaData"; -import type { - TriggerKind, - TriggerSource, -} from "constants/AppsmithActionConstants/ActionConstants"; import type { UpdateActionProps } from "workers/Evaluation/handlers/updateActionData"; import { handleActionsDataUpdate } from "workers/Evaluation/handlers/updateActionData"; import { getEntityNameAndPropertyPath } from "@appsmith/workers/Evaluation/evaluationUtils"; @@ -22,7 +18,6 @@ export enum BatchKey { process_batched_triggers = "process_batched_triggers", process_batched_fn_execution = "process_batched_fn_execution", process_js_variable_updates = "process_js_variable_updates", - process_batched_fn_invoke_log = "process_batched_fn_invoke_log", } const TriggerEmitter = new EventEmitter(); @@ -167,21 +162,4 @@ TriggerEmitter.on( jsVariableUpdatesHandlerWrapper, ); -export const fnInvokeLogHandler = deferredBatchedActionHandler<{ - jsFnFullName: string; - isSuccess: boolean; - triggerMeta: { - source: TriggerSource; - triggerPropertyName: string | undefined; - triggerKind: TriggerKind | undefined; - }; -}>((data) => { - WorkerMessenger.ping({ - method: MAIN_THREAD_ACTION.LOG_JS_FUNCTION_EXECUTION, - data, - }); -}); - -TriggerEmitter.on(BatchKey.process_batched_fn_invoke_log, fnInvokeLogHandler); - export default TriggerEmitter; diff --git a/app/client/src/workers/Evaluation/fns/utils/jsObjectFnFactory.ts b/app/client/src/workers/Evaluation/fns/utils/jsObjectFnFactory.ts index 7eefb400bdbf..b579c9fe6b56 100644 --- a/app/client/src/workers/Evaluation/fns/utils/jsObjectFnFactory.ts +++ b/app/client/src/workers/Evaluation/fns/utils/jsObjectFnFactory.ts @@ -1,5 +1,4 @@ import { isPromise } from "workers/Evaluation/JSObject/utils"; -import { postJSFunctionExecutionLog } from "@appsmith/workers/Evaluation/JSObject/postJSFunctionExecution"; import TriggerEmitter, { BatchKey } from "./TriggerEmitter"; import ExecutionMetaData from "./ExecutionMetaData"; function addMetaDataToError(e: any, fnName: string, fnString: string) { @@ -42,10 +41,7 @@ function saveExecutionData({ export function jsObjectFunctionFactory<P extends ReadonlyArray<unknown>>( fn: (...args: P) => unknown, name: string, - postProcessors: PostProcessor[] = [ - saveExecutionData, - postJSFunctionExecutionLog, - ], + postProcessors: PostProcessor[] = [saveExecutionData], ) { return function (this: unknown, ...args: P) { if (!ExecutionMetaData.getExecutionMetaData().enableJSFnPostProcessors) {
8b2d2568b0795131ea426cba4bfd7107e04208c8
2023-10-10 21:42:20
Manish Kumar
feat: CE support for connection pooling (#27859)
false
CE support for connection pooling (#27859)
feat
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfig.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfig.java new file mode 100644 index 000000000000..66e84e22df25 --- /dev/null +++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfig.java @@ -0,0 +1,3 @@ +package com.appsmith.external.connectionpoolconfig.configurations; + +public interface ConnectionPoolConfig extends ConnectionPoolConfigCECompatible {} diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCE.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCE.java new file mode 100644 index 000000000000..f093a42d9627 --- /dev/null +++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCE.java @@ -0,0 +1,7 @@ +package com.appsmith.external.connectionpoolconfig.configurations; + +import reactor.core.publisher.Mono; + +public interface ConnectionPoolConfigCE { + Mono<Integer> getMaxConnectionPoolSize(); +} diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatible.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatible.java new file mode 100644 index 000000000000..12fb7a3b0f3d --- /dev/null +++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatible.java @@ -0,0 +1,3 @@ +package com.appsmith.external.connectionpoolconfig.configurations; + +public interface ConnectionPoolConfigCECompatible extends ConnectionPoolConfigCE {} diff --git a/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java b/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java index 7d9c1783950a..eec7c01a9186 100644 --- a/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java +++ b/app/server/appsmith-plugins/postgresPlugin/src/main/java/com/external/plugins/PostgresPlugin.java @@ -1,5 +1,6 @@ package com.external.plugins; +import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfig; import com.appsmith.external.constants.DataType; import com.appsmith.external.datatypes.AppsmithType; import com.appsmith.external.dtos.ExecuteActionDTO; @@ -182,9 +183,11 @@ public static class PostgresPluginExecutor implements SmartSubstitutionInterface private static final int PREPARED_STATEMENT_INDEX = 0; private final SharedConfig sharedConfig; + private final ConnectionPoolConfig connectionPoolConfig; - public PostgresPluginExecutor(SharedConfig sharedConfig) { + public PostgresPluginExecutor(SharedConfig sharedConfig, ConnectionPoolConfig connectionPoolConfig) { this.sharedConfig = sharedConfig; + this.connectionPoolConfig = connectionPoolConfig; MAX_SIZE_SUPPORTED = sharedConfig.getMaxResponseSize(); } @@ -609,9 +612,13 @@ public Mono<HikariDataSource> datasourceCreate(DatasourceConfiguration datasourc e.getMessage())); } - return Mono.fromCallable(() -> { - log.debug("Connecting to Postgres db"); - return createConnectionPool(datasourceConfiguration); + return connectionPoolConfig + .getMaxConnectionPoolSize() + .flatMap(maxPoolSize -> { + return Mono.fromCallable(() -> { + log.debug("Connecting to Postgres db"); + return createConnectionPool(datasourceConfiguration, maxPoolSize); + }); }) .subscribeOn(scheduler); } @@ -1070,7 +1077,8 @@ private static String toPostgresqlPrimitiveTypeName(DataType type) { * @param datasourceConfiguration * @return connection pool */ - private static HikariDataSource createConnectionPool(DatasourceConfiguration datasourceConfiguration) + private static HikariDataSource createConnectionPool( + DatasourceConfiguration datasourceConfiguration, Integer maximumConfigurablePoolSize) throws AppsmithPluginException { HikariConfig config = new HikariConfig(); @@ -1079,7 +1087,13 @@ private static HikariDataSource createConnectionPool(DatasourceConfiguration dat // Set SSL property com.appsmith.external.models.Connection configurationConnection = datasourceConfiguration.getConnection(); config.setMinimumIdle(MINIMUM_POOL_SIZE); - config.setMaximumPoolSize(MAXIMUM_POOL_SIZE); + + int maxPoolSize = MAXIMUM_POOL_SIZE; + if (maximumConfigurablePoolSize != null && maximumConfigurablePoolSize >= maxPoolSize) { + maxPoolSize = maximumConfigurablePoolSize; + } + + config.setMaximumPoolSize(maxPoolSize); // Set authentication properties DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication(); diff --git a/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java b/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java index f3bb5e77ecd5..9dba145e86c3 100644 --- a/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java +++ b/app/server/appsmith-plugins/postgresPlugin/src/test/java/com/external/plugins/PostgresPluginTest.java @@ -1,5 +1,6 @@ package com.external.plugins; +import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfig; import com.appsmith.external.datatypes.ClientDataType; import com.appsmith.external.dtos.ExecuteActionDTO; import com.appsmith.external.exceptions.pluginExceptions.AppsmithPluginException; @@ -77,8 +78,15 @@ public String getRemoteExecutionUrl() { } } + public class MockConnectionPoolConfig implements ConnectionPoolConfig { + @Override + public Mono<Integer> getMaxConnectionPoolSize() { + return Mono.just(5); + } + } + PostgresPlugin.PostgresPluginExecutor pluginExecutor = - new PostgresPlugin.PostgresPluginExecutor(new MockSharedConfig()); + new PostgresPlugin.PostgresPluginExecutor(new MockSharedConfig(), new MockConnectionPoolConfig()); @SuppressWarnings("rawtypes") // The type parameter for the container type is just itself and is pseudo-optional. @Container diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatibleImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatibleImpl.java new file mode 100644 index 000000000000..74ee25d6c6df --- /dev/null +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCECompatibleImpl.java @@ -0,0 +1,8 @@ +package com.appsmith.server.connectionpoolconfig.configurations; + +import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfigCECompatible; +import org.springframework.stereotype.Component; + +@Component +public class ConnectionPoolConfigCECompatibleImpl extends ConnectionPoolConfigCEImpl + implements ConnectionPoolConfigCECompatible {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCEImpl.java new file mode 100644 index 000000000000..16db95e0a83f --- /dev/null +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCEImpl.java @@ -0,0 +1,14 @@ +package com.appsmith.server.connectionpoolconfig.configurations; + +import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfigCE; +import reactor.core.publisher.Mono; + +public class ConnectionPoolConfigCEImpl implements ConnectionPoolConfigCE { + + protected static final Integer DEFAULT_MINIMUM_MAX_POOL_SIZE = 5; + + @Override + public Mono<Integer> getMaxConnectionPoolSize() { + return Mono.just(DEFAULT_MINIMUM_MAX_POOL_SIZE); + } +} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigImpl.java new file mode 100644 index 000000000000..6d646676727b --- /dev/null +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigImpl.java @@ -0,0 +1,9 @@ +package com.appsmith.server.connectionpoolconfig.configurations; + +import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfig; +import org.springframework.stereotype.Component; + +@Component +public class ConnectionPoolConfigImpl extends ConnectionPoolConfigCECompatibleImpl implements ConnectionPoolConfig { + public ConnectionPoolConfigImpl() {} +} diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCETest.java new file mode 100644 index 000000000000..f9570cead638 --- /dev/null +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/connectionpoolconfig/configurations/ConnectionPoolConfigCETest.java @@ -0,0 +1,31 @@ +package com.appsmith.server.connectionpoolconfig.configurations; + +import com.appsmith.external.connectionpoolconfig.configurations.ConnectionPoolConfig; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; + +import static org.assertj.core.api.Assertions.assertThat; + +@SpringBootTest +@ExtendWith(SpringExtension.class) +public class ConnectionPoolConfigCETest { + + @Autowired + ConnectionPoolConfig connectionPoolConfig; + + @Test + public void verifyGetMaxConnectionPoolSizeProvidesDefaultValue() { + // this is same as default + Integer connectionPoolMaxSize = 5; + + Mono<Integer> connectionPoolMaxSizeMono = connectionPoolConfig.getMaxConnectionPoolSize(); + StepVerifier.create(connectionPoolMaxSizeMono).assertNext(poolSize -> { + assertThat(poolSize).isEqualTo(connectionPoolMaxSize); + }); + } +}
1cca96c032af36d288cc82a5f2e14d213816fba3
2021-09-20 19:50:46
Aswath K
fix: Currency input text overlap (#7477)
false
Currency input text overlap (#7477)
fix
diff --git a/app/client/src/components/ads/Dropdown.tsx b/app/client/src/components/ads/Dropdown.tsx index a059958c3a9e..81d2a54a019f 100644 --- a/app/client/src/components/ads/Dropdown.tsx +++ b/app/client/src/components/ads/Dropdown.tsx @@ -106,7 +106,12 @@ const DropdownTriggerWrapper = styled.div<{ justify-content: space-between; cursor: pointer; ${(props) => - props.isOpen && !props.disabled ? "box-sizing: border-box" : null}; + props.isOpen && !props.disabled + ? ` + box-sizing: border-box; + border: 1px solid #80bdff; + ` + : null}; .${Classes.TEXT} { ${(props) => props.disabled diff --git a/app/client/src/constants/Colors.tsx b/app/client/src/constants/Colors.tsx index 383756cc5162..f753143fc01c 100644 --- a/app/client/src/constants/Colors.tsx +++ b/app/client/src/constants/Colors.tsx @@ -128,6 +128,9 @@ export const Colors = { SELECT_PLACEHOLDER: "#bfbfbf", SELECT_COLOR: "#182026", + INPUT_TEXT_DISABLED: "rgba(92, 112, 128, 0.6)", + INPUT_DISABLED: "rgba(206, 217, 224, 0.5)", + GREY_2: "#F0F0F0", GREY_3: "#EBEBEB", GREY_8: "#716E6E", diff --git a/app/client/src/widgets/InputWidget/component/CurrencyCodeDropdown.tsx b/app/client/src/widgets/InputWidget/component/CurrencyCodeDropdown.tsx index ad9487f46fbd..53ab9d6665c1 100644 --- a/app/client/src/widgets/InputWidget/component/CurrencyCodeDropdown.tsx +++ b/app/client/src/widgets/InputWidget/component/CurrencyCodeDropdown.tsx @@ -8,26 +8,27 @@ import { countryToFlag } from "./utilities"; const DropdownTriggerIconWrapper = styled.div` height: 19px; padding: 9px 5px 9px 12px; - width: 40px; height: 19px; display: flex; align-items: center; justify-content: space-between; font-size: 14px; - line-height: 19px; + line-height: 18px; letter-spacing: -0.24px; color: #090707; + > * { + margin-left: 5px; + } `; const CurrencyIconWrapper = styled.span` height: 100%; padding: 6px 4px 6px 12px; - width: 28px; position: absolute; left: 0; z-index: 16; font-size: 14px; - line-height: 19px; + line-height: 18px; letter-spacing: -0.24px; color: #090707; `; diff --git a/app/client/src/widgets/InputWidget/component/ISDCodeDropdown.tsx b/app/client/src/widgets/InputWidget/component/ISDCodeDropdown.tsx index ef6bd18a1644..62f639c7b9c3 100644 --- a/app/client/src/widgets/InputWidget/component/ISDCodeDropdown.tsx +++ b/app/client/src/widgets/InputWidget/component/ISDCodeDropdown.tsx @@ -9,13 +9,12 @@ const DropdownTriggerIconWrapper = styled.div<{ disabled?: boolean }>` padding: 9px 0px 9px 12px; width: 85px; min-width: 85px; - opacity: ${(props) => props.disabled && "0.6"}; display: flex; align-items: center; justify-content: space-between; font-size: 14px; - height: ${(props) => (props.disabled ? 32 : 19)}px; - line-height: ${(props) => (props.disabled ? 32 : 19)}px; + height: 32px; + line-height: ${(props) => (props.disabled ? 32 : 18)}px; letter-spacing: -0.24px; color: #090707; position: ${(props) => props.disabled && "absolute"}; @@ -24,6 +23,7 @@ const DropdownTriggerIconWrapper = styled.div<{ disabled?: boolean }>` pointer-events: none; } .icon-dropdown { + opacity: ${(props) => props.disabled && "0.6"}; display: flex; width: 30px; justify-content: space-between; diff --git a/app/client/src/widgets/InputWidget/component/index.tsx b/app/client/src/widgets/InputWidget/component/index.tsx index e8562e23c43f..e2ff096fb0f3 100644 --- a/app/client/src/widgets/InputWidget/component/index.tsx +++ b/app/client/src/widgets/InputWidget/component/index.tsx @@ -83,7 +83,7 @@ const InputComponentWrapper = styled((props) => ( &&&& { .currency-type-filter, .country-type-filter { - width: 40px; + width: fit-content; height: 32px; position: absolute; display: inline-block; @@ -171,6 +171,29 @@ const InputComponentWrapper = styled((props) => ( } `; +const StyledNumericInput = styled(NumericInput)` + &&&& .bp3-input-group { + display: flex; + > { + &:first-child:not(input) { + position: static; + background: ${(props) => + props.disabled ? Colors.INPUT_DISABLED : "#fff"}; + color: ${(props) => + props.disabled ? Colors.INPUT_TEXT_DISABLED : "#000"}; + border: 1px solid #e7e7e7; + border-right: 0; + } + input:not(:first-child) { + padding-left: 5px; + border-left: 0; + z-index: 16; + line-height: 16px; + } + } + } +`; + const ToolTipIcon = styled(IconWrapper)` cursor: help; margin-top: 1.5px; @@ -339,7 +362,7 @@ class InputComponent extends React.Component< ? this.props.decimalsInCurrency || 0 : 0; return ( - <NumericInput + <StyledNumericInput allowNumericCharactersOnly className={this.props.isLoading ? "bp3-skeleton" : Classes.FILL} disabled={this.props.disabled}
3c7f357df49528e61f4620a195cd8ad0830a0239
2025-02-04 15:24:53
Valera Melnikov
fix: ads slider export (#39007)
false
ads slider export (#39007)
fix
diff --git a/app/client/packages/design-system/ads/src/index.ts b/app/client/packages/design-system/ads/src/index.ts index e6e603b714a4..5e7bb32d87c5 100644 --- a/app/client/packages/design-system/ads/src/index.ts +++ b/app/client/packages/design-system/ads/src/index.ts @@ -28,6 +28,7 @@ export * from "./ScrollArea"; export * from "./SearchInput"; export * from "./SegmentedControl"; export * from "./Select"; +export * from "./Slider"; export * from "./Spinner"; export * from "./Switch"; export * from "./Tab"; diff --git a/app/client/packages/storybook/vite.config.js b/app/client/packages/storybook/vite.config.js index efe79ea4f48c..849ae4208443 100644 --- a/app/client/packages/storybook/vite.config.js +++ b/app/client/packages/storybook/vite.config.js @@ -29,4 +29,7 @@ export default defineConfig({ ], }, }, + optimizeDeps: { + exclude: ["@storybook/components"], + }, });
fb9e2e126c08809c155e8d351222a5acd7a795aa
2024-12-09 13:28:46
Sagar Khalasi
fix: Update for fix (#38035)
false
Update for fix (#38035)
fix
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts index 95a6395c3bd5..007f41758a2a 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DS_Bug26941_Spec.ts @@ -12,7 +12,7 @@ describe( it("1. Checking whether the appropriate error is displayed even after the removal of invalid chars in header key.", function () { const randomApi = `${ dataManager.dsValues[dataManager.defaultEnviorment].mockApiUrl - }123`; + }`; apiPage.CreateAndFillApi(randomApi); apiPage.RunAPI(false, 2000, { expectedPath: "response.body.data.body.data.isExecutionSuccess",
60e6ceed518ab3d3d4653fbc730b49ef7ac04e7c
2023-12-23 14:26:24
Arpit Mohan
ci: Adding logging to debug ci-test-result (#29828)
false
Adding logging to debug ci-test-result (#29828)
ci
diff --git a/.github/workflows/integration-tests-command.yml b/.github/workflows/integration-tests-command.yml index a872a161f9b5..c5c7efe575ed 100644 --- a/.github/workflows/integration-tests-command.yml +++ b/.github/workflows/integration-tests-command.yml @@ -282,23 +282,30 @@ jobs: const check = checks.check_runs.filter(c => c.name === process.env.job); if(check.length == 0) { - const head_sha = pull.head.sha; - const { data: completed_at } = await github.rest.checks.create({ - owner: context.repo.owner, - repo: context.repo.repo, - head_sha: head_sha, - name: process.env.job, - status: 'completed', - conclusion: JSON.parse(process.env.matrix_result).result, - output: { - title: "Integration tests result for ok to test", - summary: "https://github.com/" + process.env.repository + "/actions/runs/" + process.env.run_id - } - }); - - return completed_at; + try { + console.log("Going to create the check run: ci-test-result"); + const head_sha = pull.head.sha; + const { data: completed_at } = await github.rest.checks.create({ + owner: context.repo.owner, + repo: context.repo.repo, + head_sha: head_sha, + name: process.env.job, + status: 'completed', + conclusion: JSON.parse(process.env.matrix_result).result, + output: { + title: "Integration tests result for ok to test", + summary: "https://github.com/" + process.env.repository + "/actions/runs/" + process.env.run_id + } + }); + console.log({ completed_at }); + return completed_at; + } catch(e) { + console.error("Error while creating the check run: ci-test-result"); + console.error({ error: e.message }); + } } else { try { + console.log("Going to update the check run ci-test-result with id: " + check[0].id); const { data: result } = await github.rest.checks.update({ ...context.repo, check_run_id: check[0].id, @@ -312,6 +319,7 @@ jobs: console.log({ result }); return result; } catch(e) { + console.error("Error while updating the check run: ci-test-result for check_id: " + check[0].id); console.error({ error: e.message }); } } diff --git a/.github/workflows/upgrade-appsmith-tests.yml b/.github/workflows/upgrade-appsmith-tests.yml index e0628ea5f26a..f274655fb0e4 100644 --- a/.github/workflows/upgrade-appsmith-tests.yml +++ b/.github/workflows/upgrade-appsmith-tests.yml @@ -1,4 +1,4 @@ -name: Upgrde Appsmith Test Workflow +name: Upgrade Appsmith Test Workflow on: # This line enables manual triggering of this workflow.
54f680367124a3d752bb6cc59d70578bdbe928b3
2023-11-15 08:01:12
Hetu Nandu
chore: App Sidebar testing (#28479)
false
App Sidebar testing (#28479)
chore
diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithAutoLayout_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithAutoLayout_spec.ts index c457265c23da..3c5273962c4f 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithAutoLayout_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithAutoLayout_spec.ts @@ -1,12 +1,15 @@ import { agHelper, - locators, - entityExplorer, - propPane, appSettings, autoLayout, draggableWidgets, + entityExplorer, + locators, + propPane, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Validating multiple widgets in auto layout mode with App navigation settings", function () { it("1. Drag and Drop multiple widgets in auto layout mode", function () { @@ -19,13 +22,13 @@ describe("Validating multiple widgets in auto layout mode with App navigation se it("2. Change App navigation settings and valdiate the layout settings", () => { entityExplorer.SelectEntityByName("Page1", "Pages"); - agHelper.GetNClick(appSettings.locators._appSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); agHelper.GetNClick(appSettings.locators._navigationSettingsTab); agHelper.GetNClick( appSettings.locators._navigationSettings._orientationOptions._side, ); agHelper.AssertElementExist(appSettings.locators._sideNavbar); - agHelper.GetNClick(locators._canvas); + EditorNavigation.ViaSidebar(SidebarButton.Pages); agHelper.AssertElementExist(locators._widgetInCanvas("inputwidgetv2")); agHelper.AssertElementExist(locators._widgetInCanvas("inputwidgetv2"), 1); agHelper.AssertElementExist(locators._fixedLayout); diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithMultiplePages_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithMultiplePages_spec.ts index 8b3a967e8867..eca404bbac70 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithMultiplePages_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/AppNavigationWithMultiplePages_spec.ts @@ -1,18 +1,22 @@ import { agHelper, - locators, - entityExplorer, - propPane, - deployMode, appSettings, autoLayout, + deployMode, draggableWidgets, + entityExplorer, + locators, + propPane, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; + let currentUrl: string; describe("Page orientation and navigation related usecases ", function () { it("1. Change 'Orientation' to 'Side', sidebar should appear", () => { - agHelper.GetNClick(appSettings.locators._appSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); agHelper.GetNClick(appSettings.locators._navigationSettingsTab); agHelper.GetNClick( appSettings.locators._navigationSettings._orientationOptions._side, diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/NavigationSettings_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/NavigationSettings_spec.ts index fb75d971c72e..0dd3e910a617 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/NavigationSettings_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/NavigationSettings_spec.ts @@ -5,10 +5,13 @@ import { deployMode, appSettings, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Test app's navigation settings", function () { it("1. Open app settings and navigation tab should be there and when the navigation tab is selected, navigation preview should be visible", () => { - agHelper.GetNClick(appSettings.locators._appSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); agHelper.AssertElementVisibility( appSettings.locators._navigationSettingsTab, ); @@ -34,7 +37,7 @@ describe("Test app's navigation settings", function () { //Browser back is used as the Navbar is off and there wont be option to come back to editor agHelper.BrowserNavigation(-1); // Wait for the app to load - agHelper.GetNClick(appSettings.locators._appSettings, 0, true); + EditorNavigation.ViaSidebar(SidebarButton.Settings); agHelper.GetNClick(appSettings.locators._navigationSettingsTab); // Toggle show navbar back to on agHelper.GetNClick( @@ -60,7 +63,7 @@ describe("Test app's navigation settings", function () { it("4. Change 'Orientation' back to 'Top', and 'Nav style' to 'Inline', page navigation items should appear inline", () => { entityExplorer.AddNewPage(); - agHelper.GetNClick(appSettings.locators._appSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); agHelper.GetNClick(appSettings.locators._navigationSettingsTab); agHelper.GetNClick( appSettings.locators._navigationSettings._orientationOptions._top, diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/SidebarCollapse_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/SidebarCollapse_spec.ts index 128d4223b19a..02fb20f7c32d 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/SidebarCollapse_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/SidebarCollapse_spec.ts @@ -4,11 +4,14 @@ import { appSettings, locators, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Test Sidebar Collapse", function () { it("1. Sidebar collapse button should be there", () => { // First make sure that nav orientation is set to side - agHelper.GetNClick(appSettings.locators._appSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); agHelper.GetNClick(appSettings.locators._navigationSettingsTab); agHelper.GetNClick( appSettings.locators._navigationSettings._orientationOptions._side, diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/Sidebar_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/Sidebar_spec.ts index e6e0b7cb4c66..cb27d48722bd 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/Sidebar_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/Sidebar_spec.ts @@ -6,6 +6,9 @@ import { assertHelper, locators, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Test Sidebar navigation style", function () { before(() => { @@ -26,7 +29,7 @@ describe("Test Sidebar navigation style", function () { }); it("1. Change 'Orientation' to 'Side', sidebar should appear", () => { - agHelper.GetNClick(appSettings.locators._appSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); agHelper.GetNClick(appSettings.locators._navigationSettingsTab); agHelper.GetNClick( appSettings.locators._navigationSettings._orientationOptions._side, @@ -60,7 +63,7 @@ describe("Test Sidebar navigation style", function () { ); // Changing color style to theme should change navigation's background color deployMode.NavigateBacktoEditor(); - agHelper.GetNClick(appSettings.locators._appSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); agHelper.GetNClick(appSettings.locators._navigationSettingsTab); agHelper.GetNClick(appSettings.locators._colorStyleOptions._theme, 0, true); deployMode.DeployApp(); diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopInline_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopInline_spec.ts index 9ff0e9db70d0..fd23928cc1eb 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopInline_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopInline_spec.ts @@ -6,6 +6,9 @@ import { appSettings, locators, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Test Top + Inline navigation style", function () { before(() => { @@ -27,7 +30,7 @@ describe("Test Top + Inline navigation style", function () { }); it("1. Change 'Orientation' to 'Top', and 'Nav style' to 'Inline', page navigation items should appear inline", () => { - agHelper.GetNClick(appSettings.locators._appSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); agHelper.GetNClick(appSettings.locators._navigationSettingsTab); agHelper.GetNClick( appSettings.locators._navigationSettings._orientationOptions._top, @@ -101,7 +104,7 @@ describe("Test Top + Inline navigation style", function () { ); // Changing color style to theme should change navigation's background color deployMode.NavigateBacktoEditor(); - agHelper.GetNClick(appSettings.locators._appSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); agHelper.GetNClick(appSettings.locators._navigationSettingsTab); agHelper.GetNClick(appSettings.locators._colorStyleOptions._theme, 0, true); deployMode.DeployApp(); diff --git a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopStacked_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopStacked_spec.ts index 1cf689aeaada..c388017a4b92 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopStacked_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/AppNavigation/TopStacked_spec.ts @@ -6,6 +6,9 @@ import { appSettings, locators, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Test Top + Stacked navigation style", function () { before(() => { @@ -124,7 +127,7 @@ describe("Test Top + Stacked navigation style", function () { ); // Changing color style to theme should change navigation's background color deployMode.NavigateBacktoEditor(); - agHelper.GetNClick(appSettings.locators._appSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); agHelper.GetNClick(appSettings.locators._navigationSettingsTab); agHelper.GetNClick(appSettings.locators._colorStyleOptions._theme, 0, true); deployMode.DeployApp(); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts index 2dbf74a72ef8..e0532155c0df 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Bugs_AC_Spec.ts @@ -8,6 +8,9 @@ import { installer, draggableWidgets, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Autocomplete bug fixes", function () { it("1. Bug #12790 Verifies if selectedRow is in best match", function () { @@ -90,10 +93,11 @@ describe("Autocomplete bug fixes", function () { "excludeForAirgap", "7. Installed library should show up in autocomplete", function () { - entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); installer.OpenInstaller(); installer.InstallLibrary("uuidjs", "UUID"); installer.CloseInstaller(); + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.SelectEntityByName("Text1"); propPane.TypeTextIntoField("Text", "{{UUI"); agHelper.GetNAssertElementText(locators._hints, "UUID"); @@ -105,7 +109,9 @@ describe("Autocomplete bug fixes", function () { "8. No autocomplete for Removed libraries", function () { entityExplorer.RenameEntityFromExplorer("Text1Copy", "UUIDTEXT"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); installer.uninstallLibrary("uuidjs"); + EditorNavigation.ViaSidebar(SidebarButton.Pages); propPane.TypeTextIntoField("Text", "{{UUID."); agHelper.AssertElementAbsence(locators._hints); }, diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts index a320a1c4ad68..974f21de8d71 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/ApiBugs_Spec.ts @@ -17,6 +17,9 @@ import { ERROR_ACTION_EXECUTE_FAIL, createMessage, } from "../../../../support/Objects/CommonErrorMessages"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("API Bugs", function () { before(() => { @@ -60,6 +63,7 @@ describe("API Bugs", function () { action: "Delete", entityType: entityItems.Api, }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("3. Bug 18876 Ensures application does not crash when saving datasource", () => { @@ -71,7 +75,7 @@ describe("API Bugs", function () { ); apiPage.SelectPaneTab("Authentication"); cy.get(apiPage._saveAsDS).last().click({ force: true }); - cy.get(".t--close-editor").click({ force: true }); + cy.go("back"); cy.get(dataSources._datasourceModalSave).click(); // ensures app does not crash and datasource is saved. cy.contains("Edit datasource to access authentication settings").should( diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js index 81d712d999c1..5de1d4130c7e 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug14987_spec.js @@ -52,6 +52,6 @@ describe("Verify setting tab form controls not to have tooltip and tooltip (unde action: "Delete", entityType: entityItems.Query, }); - dataSources.DeleteDatasouceFromActiveTab(datasourceName, 200); + dataSources.DeleteDatasourceFromWithinDS(datasourceName, 200); }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug18035_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug18035_Spec.ts index b2b461aaface..dce568310adb 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug18035_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug18035_Spec.ts @@ -1,4 +1,7 @@ import { ObjectsRegistry } from "../../../../support/Objects/Registry"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; const dataSources = ObjectsRegistry.DataSources, agHelper = ObjectsRegistry.AggregateHelper; @@ -10,7 +13,7 @@ describe( it("1. Create gsheet datasource, click on back button, discard popup should contain save and authorize", function () { dataSources.NavigateToDSCreateNew(); dataSources.CreatePlugIn("Google Sheets"); - agHelper.GoBack(); + EditorNavigation.ViaSidebar(SidebarButton.Pages); agHelper.AssertContains( "Save & Authorize", "exist", @@ -22,7 +25,7 @@ describe( dataSources.CreatePlugIn("PostgreSQL"); // Need to add values since without that, going back won't show any popup dataSources.FillPostgresDSForm(); - agHelper.GoBack(); + EditorNavigation.ViaSidebar(SidebarButton.Pages); agHelper.AssertContains( "Save", "exist", diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug21734_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug21734_Spec.ts index 1eab4b0c889e..13ccd5a95a00 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug21734_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug21734_Spec.ts @@ -1,4 +1,7 @@ import { ObjectsRegistry } from "../../../../support/Objects/Registry"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; const dataSources = ObjectsRegistry.DataSources, agHelper = ObjectsRegistry.AggregateHelper, @@ -11,14 +14,16 @@ describe("Bug 21734: On exiting from the Datasources page without saving changes // Have to fill form since modal won't show for empty ds dataSources.FillMongoDSForm(); - ee.AddNewPage(); + agHelper.GetNClick(dataSources._addNewDataSource, 0, true); agHelper.AssertContains( "Don't save", "exist", dataSources._datasourceModalDoNotSave, ); - cy.get(dataSources._datasourceModalDoNotSave).click(); + cy.get(dataSources._datasourceModalDoNotSave).click({ force: true }); + + ee.AddNewPage(); ee.SelectEntityByName("Page1"); agHelper.AssertURL("page1"); @@ -32,13 +37,14 @@ describe("Bug 21734: On exiting from the Datasources page without saving changes // Have to fill form since modal won't show for empty ds dataSources.FillPostgresDSForm(); - ee.SelectEntityByName("Page1"); + EditorNavigation.ViaSidebar(SidebarButton.Pages); agHelper.AssertContains( "Don't save", "exist", dataSources._datasourceModalDoNotSave, ); cy.get(dataSources._datasourceModalDoNotSave).click(); + ee.SelectEntityByName("Page1"); agHelper.AssertURL("page1"); ee.SelectEntityByName("Page2"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26716_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26716_Spec.ts index 88c20a7c8033..8de0bed3920d 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26716_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug26716_Spec.ts @@ -1,5 +1,4 @@ import { - agHelper, dataSources, entityExplorer, } from "../../../../support/Objects/ObjectsCore"; @@ -23,29 +22,13 @@ describe( cy.get("@dsName").then(($dsName) => { dsName = $dsName; // Select Users - entityExplorer.SelectEntityByName(userMock, "Datasources"); - agHelper.Sleep(200); - agHelper.AssertClassExists( - dataSources._entityExplorerID(userMock), - "active", - ); + dataSources.navigateToDatasource(userMock); // Switch to Movies - entityExplorer.SelectEntityByName(movieMock, "Datasources"); - agHelper.Sleep(200); - agHelper.AssertClassExists( - dataSources._entityExplorerID(movieMock), - "active", - ); + dataSources.navigateToDatasource(movieMock); // Switch to custom DS - entityExplorer.SelectEntityByName(dsName, "Datasources"); - entityExplorer.ExpandCollapseEntity(dsName, false); - agHelper.Sleep(200); - agHelper.AssertClassExists( - dataSources._entityExplorerID(dsName), - "active", - ); + dataSources.navigateToDatasource(dsName); // Delete all datasources entityExplorer.ActionContextMenuByEntityName({ @@ -61,9 +44,9 @@ describe( action: "Delete", }); - dataSources.DeleteDatasouceFromActiveTab(userMock); - dataSources.DeleteDatasouceFromActiveTab(movieMock); - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(userMock); + dataSources.DeleteDatasourceFromWithinDS(movieMock); + dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug9334_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug9334_Spec.ts index 540d3eb044cf..9061619ecad3 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug9334_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug9334_Spec.ts @@ -7,6 +7,9 @@ import { appSettings, entityExplorer, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; let dsName: any; @@ -17,6 +20,7 @@ describe("Bug 9334: The Select widget value is sent as null when user switches b cy.get("@dsName").then(($dsName) => { dsName = $dsName; }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("1. Create dummy pages for navigating", () => { diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts index c02e3abdd2f9..acaee673da79 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DSDiscardBugs_spec.ts @@ -1,4 +1,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; let dsName: any; @@ -18,9 +21,9 @@ describe("datasource unsaved changes popup shows even without changes", function _.dataSources.SaveDatasource(); _.agHelper.Sleep(); _.dataSources.EditDatasource(); - _.agHelper.GoBack(); + _.dataSources.cancelDSEditAndAssertModalPopUp(false); _.agHelper.AssertElementVisibility(_.dataSources._activeDS); - _.dataSources.DeleteDatasouceFromActiveTab(dsName); + _.dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); @@ -42,9 +45,9 @@ describe("datasource unsaved changes popup shows even without changes", function // Even if headers, and query parameters are being initialized, we shouldnt see the popup // as those are not initialized by user _.dataSources.EditDatasource(); - _.agHelper.GoBack(); + _.dataSources.cancelDSEditAndAssertModalPopUp(false); _.agHelper.AssertElementVisibility(_.dataSources._activeDS); - _.dataSources.DeleteDatasouceFromActiveTab(dsName); + _.dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); @@ -68,7 +71,7 @@ describe("datasource unsaved changes popup shows even without changes", function // Assert that popup is visible _.dataSources.SaveDSFromDialog(false); - _.dataSources.DeleteDatasouceFromActiveTab(dsName); + _.dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); @@ -92,7 +95,7 @@ describe("datasource unsaved changes popup shows even without changes", function // Assert that popup is visible _.dataSources.cancelDSEditAndAssertModalPopUp(true, false); - _.dataSources.DeleteDatasouceFromActiveTab(dsName); + _.dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); @@ -115,7 +118,7 @@ describe("datasource unsaved changes popup shows even without changes", function // Assert that popup is visible _.dataSources.cancelDSEditAndAssertModalPopUp(false, false); - _.dataSources.DeleteDatasouceFromActiveTab(dsName); + _.dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); @@ -148,8 +151,14 @@ describe("datasource unsaved changes popup shows even without changes", function _.dataSources._host(), _.dataManager.dsValues.Staging.mongo_host, ); + _.agHelper.GetNClick( + _.dataSources._cancelEditDatasourceButton, + 0, + true, + 200, + ); - _.dataSources.DeleteDatasouceFromActiveTab(dsName); + _.dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts index 7b8e8cf46d92..2ca51d69795c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/DatasourceSchema_spec.ts @@ -5,11 +5,19 @@ import { entityExplorer, homePage, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; let guid; let dataSourceName: string; describe("Datasource form related tests", function () { before(() => { + featureFlagIntercept({ + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }); homePage.CreateNewWorkspace("FetchSchemaOnce", true); homePage.CreateAppInWorkspace("FetchSchemaOnce"); }); @@ -19,7 +27,6 @@ describe("Datasource form related tests", function () { cy.get("@guid").then((uid) => { guid = uid; dataSourceName = "Postgres " + guid; - entityExplorer.ExpandCollapseEntity("Datasources"); dataSources.NavigateToDSCreateNew(); dataSources.CreatePlugIn("PostgreSQL"); agHelper.RenameWithInPane(dataSourceName, false); @@ -42,12 +49,11 @@ describe("Datasource form related tests", function () { it("2. Verify if schema was fetched once #18448", () => { agHelper.RefreshPage(); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ExpandCollapseEntity(dataSourceName, false); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ExpandCollapseEntity(dataSourceName); + dataSources.navigateToDatasource(dataSourceName); agHelper.Sleep(1500); agHelper.VerifyCallCount(`@getDatasourceStructure`, 1); + EditorNavigation.ViaSidebar(SidebarButton.Pages); + entityExplorer.SelectEntityByName("Query1"); agHelper.ActionContextMenuWithInPane({ action: "Delete", entityType: entityItems.Query, diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts index 6234eb0e302d..bfb96f309072 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/GitBugs_Spec.ts @@ -1,4 +1,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; let repoName: any; let tempBranch: any; @@ -81,12 +84,11 @@ describe("Git Bugs", function () { _.gitSync.CreateGitBranch(`st`, true); cy.get("@gitbranchName").then((branchName) => { statusBranch = branchName; - _.agHelper.GetNClick(_.locators._appEditMenuBtn); - // cy.wait(_.locators._appEditMenu); - _.agHelper.GetNClick(_.locators._appEditMenuSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); _.agHelper.GetNClick(_.locators._appThemeSettings); _.agHelper.GetNClick(_.locators._appChangeThemeBtn, 0, true); _.agHelper.GetNClick(_.locators._appThemeCard, 2); + EditorNavigation.ViaSidebar(SidebarButton.Pages); _.agHelper.GetNClick(_.locators._publishButton); _.agHelper.WaitUntilEleAppear(_.gitSync._gitStatusChanges); _.agHelper.AssertContains( @@ -95,11 +97,10 @@ describe("Git Bugs", function () { _.gitSync._gitStatusChanges, ); _.agHelper.GetNClick(_.locators._dialogCloseButton); - _.agHelper.GetNClick(_.locators._appEditMenuBtn); - // cy.wait(_.locators._appEditMenu); - _.agHelper.GetNClick(_.locators._appEditMenuSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); _.agHelper.GetNClick(_.locators._appNavigationSettings); _.agHelper.GetNClick(_.locators._appNavigationSettingsShowTitle); + EditorNavigation.ViaSidebar(SidebarButton.Pages); _.agHelper.GetNClick(_.locators._publishButton); _.agHelper.WaitUntilEleAppear(_.gitSync._gitStatusChanges); _.agHelper.AssertContains( @@ -116,10 +117,10 @@ describe("Git Bugs", function () { _.gitSync.CreateGitBranch(`b24946`, true); cy.get("@gitbranchName").then((branchName) => { statusBranch = branchName; - _.agHelper.GetNClick(_.locators._appEditMenuBtn); - _.agHelper.GetNClick(_.locators._appEditMenuSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); _.agHelper.GetNClick(_.locators._appNavigationSettings); _.agHelper.GetNClick(_.locators._appNavigationSettingsShowTitle); + EditorNavigation.ViaSidebar(SidebarButton.Pages); _.agHelper.GetNClick(_.locators._publishButton); _.agHelper.WaitUntilEleAppear(_.gitSync._gitStatusChanges); _.agHelper.GetNClick(_.gitSync._discardChanges); @@ -146,7 +147,7 @@ describe("Git Bugs", function () { it("7. Bug 24920: Not able to discard app settings changes for the first time in git connected app ", function () { _.gitSync.SwitchGitBranch("master", false, true); // add navigation settings changes - _.agHelper.GetNClick(_.appSettings.locators._appSettings); + EditorNavigation.ViaSidebar(SidebarButton.Settings); _.agHelper.GetNClick(_.appSettings.locators._navigationSettingsTab); _.agHelper.GetNClick( _.appSettings.locators._navigationSettings._orientationOptions._side, diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts index 57c3edc84511..75eb985c64a5 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Moment_Spec.ts @@ -121,7 +121,6 @@ describe("Bug #14299 - The data from the query does not show up on the widget", agHelper.WaitUntilAllToastsDisappear(); deployMode.DeployApp(locators._widgetInDeployed("tablewidget"), false); deployMode.NavigateBacktoEditor(); - entityExplorer.ExpandCollapseEntity("Datasources"); dataSources.DeleteDatasourceFromWithinDS(dsName, 200); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Debugger/Query_pane_navigation.ts b/app/client/cypress/e2e/Regression/ClientSide/Debugger/Query_pane_navigation.ts index d2fddc1e9a1a..134cb5934aa4 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Debugger/Query_pane_navigation.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Debugger/Query_pane_navigation.ts @@ -8,6 +8,9 @@ import { entityItems, debuggerHelper, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("excludeForAirgap", "Query pane navigation", () => { let ds1Name: string; @@ -27,6 +30,7 @@ describe("excludeForAirgap", "Query pane navigation", () => { cy.get("@dsName").then(($dsName) => { ds2Name = $dsName as unknown as string; }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("1. Switching between S3 query and firestore query from the debugger", () => { @@ -46,6 +50,7 @@ describe("excludeForAirgap", "Query pane navigation", () => { cy.get("@dsName").then(($dsName) => { ds2Name = $dsName as unknown as string; }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.CreateNewDsQuery(ds2Name); agHelper.UpdateCodeInput( ".t--actionConfiguration\\.formData\\.limitDocuments\\.data", @@ -77,7 +82,7 @@ describe("excludeForAirgap", "Query pane navigation", () => { entityType: entityItems.Query, }); - dataSources.DeleteDSFromEntityExplorer(ds1Name); - dataSources.DeleteDSFromEntityExplorer(ds2Name); + dataSources.DeleteDatasourceFromWithinDS(ds1Name); + dataSources.DeleteDatasourceFromWithinDS(ds2Name); }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js index 230c7d22ddfc..e2e1afb5f54c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/API_Pane_spec.js @@ -24,18 +24,9 @@ describe("Entity explorer API pane related testcases", function () { locator._visibleTextSpan("No query/JS to display"), ); agHelper.AssertElementVisibility(locator._visibleTextSpan("New query/JS")); - - ee.ExpandCollapseEntity("Datasources"); - agHelper.AssertElementVisibility( - locator._visibleTextSpan("No datasource to display"), - ); - agHelper.AssertElementVisibility( - locator._visibleTextSpan("New datasource"), - ); }); it("2. Move to page / edit API name /properties validation", function () { - cy.NavigateToAPI_Panel(); cy.CreateAPI("FirstAPI"); cy.enterDatasourceAndPath(testdata.baseUrl, testdata.methods); cy.SaveAndRunAPI(); diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js index 58b3dc1991a9..57adfde6c8d5 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/CopyQuery_RenameDatasource_spec.js @@ -28,7 +28,6 @@ describe("Entity explorer tests related to copy query", function () { cy.get("@saveDatasource").then((httpResponse) => { datasourceName = httpResponse.response.body.data.name; - cy.CheckAndUnfoldEntityItem("Datasources"); cy.NavigateToActiveDSQueryPane(datasourceName); }); @@ -83,37 +82,4 @@ describe("Entity explorer tests related to copy query", function () { expect($lis.eq(4)).to.contain("{{Query1.clear()}}"); }); }); - - it("3. Rename datasource in explorer, Delete query and try to Delete datasource", function () { - entityExplorer.SelectEntityByName("Page1"); - cy.generateUUID().then((uid) => { - updatedName = uid; - cy.log("complete uid :" + updatedName); - updatedName = uid.replace(/-/g, "_").slice(1, 15); - cy.log("sliced id :" + updatedName); - entityExplorer.ExpandCollapseEntity("Queries/JS"); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.RenameEntityFromExplorer(datasourceName, updatedName); - //cy.EditEntityNameByDoubleClick(datasourceName, updatedName); - cy.wait(1000); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: updatedName, - action: "Delete", - toAssertAction: false, - }); - cy.wait(1000); - //This is check to make sure if a datasource is active 409 - cy.wait("@deleteDatasource").should( - "have.nested.property", - "response.body.responseMeta.status", - 409, - ); - }); - entityExplorer.SelectEntityByName("Query1", "Queries/JS"); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: "Query1", - action: "Delete", - entityType: entityItems.Query, - }); - }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Datasource_Structure_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Datasource_Structure_spec.js deleted file mode 100644 index 1b4607bf2af8..000000000000 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Datasource_Structure_spec.js +++ /dev/null @@ -1,125 +0,0 @@ -const explorer = require("../../../../locators/explorerlocators.json"); -const queryLocators = require("../../../../locators/QueryEditor.json"); -const apiwidget = require("../../../../locators/apiWidgetslocator.json"); -import { - entityExplorer, - dataSources, -} from "../../../../support/Objects/ObjectsCore"; - -describe("Entity explorer datasource structure", function () { - let datasourceName; - - beforeEach(() => { - //cy.ClearSearch(); - cy.startRoutesForDatasource(); - cy.createPostgresDatasource(); - cy.get("@saveDatasource").then((httpResponse) => { - datasourceName = httpResponse.response.body.data.name; - }); - }); - - it("1. Entity explorer datasource structure", function () { - cy.NavigateToActiveDSQueryPane(datasourceName); - cy.wait("@createNewApi").should( - "have.nested.property", - "response.body.responseMeta.status", - 201, - ); - - cy.get(apiwidget.apiTxt) - .clear() - .type("MyQuery", { force: true }) - .should("have.value", "MyQuery") - .blur(); - cy.WaitAutoSave(); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: datasourceName, - action: "Refresh", - }); - cy.wait(2000); //for the tables to open - cy.wait("@getDatasourceStructure").should( - "have.nested.property", - "response.body.responseMeta.status", - 200, - ); - - // cy.get(explorer.datasourceStructure) - // .first() - // .find(explorer.collapse) - // .click(); - // cy.get(explorer.datasourceColumn) - // .first() - // .click(); - // cy.get(".bp3-popover-content").should("be.visible"); - - cy.get(explorer.templateMenuIcon).first().click({ force: true }); - // assert suggested tag is present - cy.get(".t--structure-template-menu-popover").last().contains("Suggested"); - cy.get(".t--structure-template-menu-popover") - .last() - .contains("Select") - .click({ force: true }); - cy.wait("@createNewApi").should( - "have.nested.property", - "response.body.responseMeta.status", - 201, - ); - - cy.deleteQueryUsingContext(); - entityExplorer.ExpandCollapseEntity("Queries/JS"); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: "MyQuery", - }); - cy.deleteDatasource(datasourceName); - }); - - it("2. Refresh datasource structure", function () { - cy.NavigateToActiveDSQueryPane(datasourceName); - - //cy.GlobalSearchEntity(datasourceName); - // cy.get(`.t--entity.datasource:contains(${datasourceName})`) - // .find(explorer.collapse) - // .as("datasourceEntityCollapse"); - // cy.wait("@getDatasourceStructure").should( - // "have.nested.property", - // "response.body.responseMeta.status", - // 200, - // ); - //cy.get(commonlocators.entityExplorersearch).clear({ force: true }); - - const tableName = Math.random() - .toString(36) - .replace(/[^a-z]+/g, ""); - dataSources.EnterQuery(`CREATE TABLE public.${tableName} ( ID int );`); - cy.onlyQueryRun(); - cy.wait("@postExecute").then(({ response }) => { - expect(response.body.data.request.requestParams.Query.value).to.contain( - tableName, - ); - }); - - //cy.wait(8000) - // cy.GlobalSearchEntity(datasourceName); - // cy.get("@datasourceEntityCollapse") - // .first() - // .click(); - // cy.xpath(explorer.datsourceEntityPopover) - // .last() - // .click({ force: true }); - dataSources.AssertTableInVirtuosoList( - datasourceName, - `public.${tableName}`, - ); - - cy.typeValueNValidate(`DROP TABLE public.${tableName}`); - cy.runQuery(); - dataSources.AssertTableInVirtuosoList( - datasourceName, - `public.${tableName}`, - false, - ); - cy.deleteQueryUsingContext(); - cy.deleteDatasource(datasourceName); - }); -}); diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Entity_Naming_conflict_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Entity_Naming_conflict_spec.js index fed347138661..8807fe46853f 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Entity_Naming_conflict_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Entity_Naming_conflict_spec.js @@ -11,8 +11,6 @@ describe("Tab widget test", function () { it("1. Rename API with table widget name validation test", function () { cy.log("Login Successful"); - cy.NavigateToAPI_Panel(); - cy.log("Navigation to API Panel screen successful"); cy.CreateApiAndValidateUniqueEntityName(apiName); cy.get(apiwidget.apiTxt) .clear() diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Long_Name_Tooltip_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Long_Name_Tooltip_spec.js index 0d539be0b6b6..597c07311adf 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Long_Name_Tooltip_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Long_Name_Tooltip_spec.js @@ -9,7 +9,6 @@ const tooltTipQuery = `.rc-tooltip.ads-v2-tooltip:not(.rc-tooltip-hidden) > .rc- describe("Entity Explorer showing tooltips on long names", function () { it("1. Expect tooltip on long names only", function () { // create an API with a short name - cy.NavigateToAPI_Panel(); cy.CreateAPI(shortName); ee.ExpandCollapseEntity("Queries/JS", true); // assert that a tooltip does not show up during hover @@ -19,7 +18,6 @@ describe("Entity Explorer showing tooltips on long names", function () { cy.get("body").realHover({ position: "topLeft" }); // create another API with a long name - cy.NavigateToAPI_Panel(); cy.CreateAPI(longName); // assert that a tooltip does show up during hover diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pages_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pages_spec.js index 2b56f720cc99..17f0972a58ed 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pages_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pages_spec.js @@ -8,7 +8,6 @@ describe("Pages", function () { let apiName = "someApi"; it("1. Clone page & check tooltip for long name", function () { - //cy.NavigateToAPI_Panel(); _.apiPage.CreateApi(apiName); _.entityExplorer.SelectEntityByName("Page1", "Pages"); _.entityExplorer.ClonePage("Page1"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pin_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pin_spec.js deleted file mode 100644 index 3269a1703346..000000000000 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Pin_spec.js +++ /dev/null @@ -1,147 +0,0 @@ -import { - agHelper, - entityExplorer, - locators, - draggableWidgets, - installer, - homePage, -} from "../../../../support/Objects/ObjectsCore"; - -const ExplorerMenu = { - ADD_PAGE: "ADD_PAGE", - ENTITY: "ENTITY", - ADD_LIBRARY: "ADD_LIBRARY", - ADD_QUERY_JS: "ADD_QUERY_JS", -}; - -const OpenExplorerMenu = (menu) => { - switch (menu) { - case ExplorerMenu.ADD_PAGE: - agHelper.GetNClick(locators._newPage); - cy.get(locators._canvas).trigger("mousemove", 500, 400, { - force: true, - }); - break; - case ExplorerMenu.ENTITY: - cy.xpath(entityExplorer._contextMenu("Page1")) - .last() - .click({ force: true }); - cy.get(locators._canvas).trigger("mousemove", 500, 400, { - force: true, - }); - break; - case ExplorerMenu.ADD_QUERY_JS: - cy.get(locators._createNew).last().click({ force: true }); - cy.get(locators._canvas).trigger("mousemove", 500, 300, { - force: true, - }); - break; - case ExplorerMenu.ADD_LIBRARY: - installer.OpenInstaller(true); - cy.get(locators._canvas).trigger("mousemove", 500, 100, { - force: true, - }); - break; - default: - } -}; - -describe("Entity explorer tests related to pinning and unpinning", function () { - before(() => { - agHelper.AddDsl("displayWidgetDsl"); - }); - - it("1. checks entity explorer visibility on unpin", function () { - cy.wait(5000); - cy.get(".t--entity-explorer").should("be.visible"); - cy.get(".t--pin-entity-explorer").click(); - cy.wait(5000); - cy.get("[data-testid=widgets-editor]").click({ force: true }); - cy.wait(3000); - cy.get(".t--entity-explorer").should("not.be.visible"); - //checks entity explorer visibility on pin - cy.get(".t--pin-entity-explorer").click(); - cy.get(".t--entity-explorer").should("be.visible"); - }); - - it("2. Widgets visibility in widget pane", function () { - entityExplorer.NavigateToSwitcher("Widgets"); - agHelper.ScrollTo(locators._widgetPane, "bottom"); - agHelper.AssertElementVisibility( - locators._widgetPageIcon(draggableWidgets.VIDEO), - ); - entityExplorer.PinUnpinEntityExplorer(true); - agHelper.AssertElementVisibility( - locators._widgetPageIcon(draggableWidgets.VIDEO), - ); - entityExplorer.PinUnpinEntityExplorer(false); - entityExplorer.NavigateToSwitcher("Explorer"); - }); - - it( - "excludeForAirgap", - "3. Unpinned explorer is to be open when any context menu is open or when an entity name is being edited", - function () { - agHelper.AssertElementVisibility(entityExplorer._entityExplorer); - entityExplorer.PinUnpinEntityExplorer(true); - const menu = Object.keys(ExplorerMenu); - - Cypress._.times(menu.length, (index) => { - OpenExplorerMenu(menu[index]); - agHelper.Sleep(); - cy.get("[data-testid=sidebar-active]").should("exist"); - }); - - // when an entity is being edited - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: "Page1", - action: "Edit name", - }); - cy.get(locators._canvas).trigger("mousemove", 500, 400); - agHelper.AssertElementVisibility(entityExplorer._entityExplorer); - entityExplorer.PinUnpinEntityExplorer(false); - }, - ); - - it( - "airgap", - "4. Unpinned explorer is to be open when any context menu is open or when an entity name is being edited", - function () { - agHelper.AssertElementVisibility(entityExplorer._entityExplorer); - entityExplorer.PinUnpinEntityExplorer(true); - // We cannot add libraries on airgap - const menu = Object.keys(ExplorerMenu).filter( - (menu) => menu !== ExplorerMenu.ADD_LIBRARY, - ); - - Cypress._.times(menu.length, (index) => { - OpenExplorerMenu(menu[index]); - agHelper.Sleep(); - cy.get("[data-testid=sidebar-active]").should("exist"); - }); - - // when an entity is being edited - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: "Page1", - action: "Edit name", - }); - cy.get(locators._canvas).trigger("mousemove", 500, 400); - agHelper.AssertElementVisibility(entityExplorer._entityExplorer); - entityExplorer.PinUnpinEntityExplorer(false); - }, - ); - - it("5. Explorer should be visible by default on a new application", function () { - agHelper.AssertElementVisibility(entityExplorer._entityExplorer); - entityExplorer.PinUnpinEntityExplorer(true); - agHelper.GetElement(locators._canvas).trigger("mousemove", 500, 100, { - force: true, - }); - agHelper - .GetElement(entityExplorer._entityExplorer) - .should("not.be.visible"); - homePage.NavigateToHome(); - homePage.CreateNewApplication(); - agHelper.AssertElementVisibility(entityExplorer._entityExplorer); - }); -}); diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js index 75eb1ea5e6c0..feae6abf2ad7 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Query_Datasource_spec.js @@ -1,6 +1,8 @@ /// <reference types="Cypress" /> -const datasource = require("../../../../locators/DatasourcesEditor.json"); +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; const apiwidget = require("../../../../locators/apiWidgetslocator.json"); const commonlocators = require("../../../../locators/commonlocators.json"); @@ -52,26 +54,14 @@ describe("Entity explorer tests related to query and datasource", function () { cy.testSaveDatasource(); cy.NavigateToActiveDSQueryPane(datasourceName); - /* eslint-disable */ - cy.wait(2000); - cy.NavigateToQueryEditor(); - cy.CheckAndUnfoldEntityItem("Datasources"); - cy.contains(".t--entity-name", datasourceName).click(); - - cy.get(".t--edit-datasource-name").click(); - cy.get(".t--edit-datasource-name input") - .clear() - .type(`${datasourceName}new`, { force: true }) - .blur(); - - cy.contains(commonlocators.entityName, `${datasourceName}new`); + dataSources.navigateToDatasource(datasourceName); + agHelper.RenameWithInPane(`${datasourceName}new`, false); + cy.contains(dataSources._datasourceCard, `${datasourceName}new`); // reverting the name - cy.get(".t--edit-datasource-name").click(); - cy.get(".t--edit-datasource-name input") - .clear() - .type(`${datasourceName}`, { force: true }) - .blur(); + agHelper.RenameWithInPane(datasourceName, false); + + EditorNavigation.ViaSidebar(SidebarButton.Pages); // going to the query create page cy.CheckAndUnfoldEntityItem("Queries/JS"); @@ -122,6 +112,6 @@ describe("Entity explorer tests related to query and datasource", function () { action: "Delete", entityType: entityItems.Query, }); - dataSources.DeleteDatasouceFromActiveTab(datasourceName); + dataSources.DeleteDatasourceFromWithinDS(datasourceName); }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Scrolling_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Scrolling_Spec.ts index f2daf9a419d3..e39b464d9e51 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Scrolling_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Scrolling_Spec.ts @@ -3,7 +3,6 @@ import { dataSources, draggableWidgets, entityExplorer, - entityItems, locators, } from "../../../../support/Objects/ObjectsCore"; let mockDBNameUsers: string, mockDBNameMovies: string; @@ -13,6 +12,12 @@ describe("Entity explorer context menu should hide on scrolling", function () { "excludeForAirgap", "1. Bug #15474 - Entity explorer menu must close on scroll", function () { + entityExplorer.DragDropWidgetNVerify(draggableWidgets.MODAL); + agHelper.GetNClick(locators._closeModal, 0, true, 0); + entityExplorer.DragDropWidgetNVerify(draggableWidgets.MODAL); + agHelper.GetNClick(locators._closeModal, 0, true, 0); + entityExplorer.DragDropWidgetNVerify(draggableWidgets.MODAL); + agHelper.GetNClick(locators._closeModal, 0, true, 0); entityExplorer.DragDropWidgetNVerify(draggableWidgets.MODAL); agHelper.GetNClick(locators._closeModal, 0, true, 0); entityExplorer.DragDropWidgetNVerify(draggableWidgets.MODAL); @@ -22,27 +27,31 @@ describe("Entity explorer context menu should hide on scrolling", function () { entityExplorer.ExpandCollapseEntity("Modal1"); entityExplorer.ExpandCollapseEntity("Modal2"); entityExplorer.ExpandCollapseEntity("Modal3"); + entityExplorer.ExpandCollapseEntity("Modal4"); + entityExplorer.ExpandCollapseEntity("Modal5"); + entityExplorer.ExpandCollapseEntity("Modal6"); // Setup to make the explorer scrollable entityExplorer.ExpandCollapseEntity("Queries/JS"); - entityExplorer.ExpandCollapseEntity("Datasources"); - agHelper.ContainsNClick("Libraries"); dataSources.CreateMockDB("Users").then(($createdMockUsers) => { cy.log("Users DB created is " + $createdMockUsers); mockDBNameUsers = $createdMockUsers; dataSources.CreateQueryAfterDSSaved(); - dataSources.AssertTableInVirtuosoList(mockDBNameUsers, "public.users"); + entityExplorer.CreateNewDsQuery(mockDBNameUsers); + entityExplorer.CreateNewDsQuery(mockDBNameUsers); + entityExplorer.CreateNewDsQuery(mockDBNameUsers); dataSources.CreateMockDB("Movies").then(($createdMockMovies) => { cy.log("Movies DB created is " + $createdMockMovies); mockDBNameMovies = $createdMockMovies; dataSources.CreateQueryAfterDSSaved(); - - dataSources.AssertTableInVirtuosoList(mockDBNameMovies, "movies"); + entityExplorer.CreateNewDsQuery(mockDBNameMovies); + entityExplorer.CreateNewDsQuery(mockDBNameMovies); + entityExplorer.CreateNewDsQuery(mockDBNameMovies); agHelper.GetNClick(locators._createNew); agHelper.AssertElementVisibility(entityExplorer._adsPopup); - agHelper.ScrollTo(entityExplorer._entityExplorerWrapper, "bottom"); + agHelper.ScrollTo(entityExplorer._entityExplorerWrapper, "top"); agHelper.AssertElementAbsence(entityExplorer._adsPopup); }); }); @@ -53,6 +62,12 @@ describe("Entity explorer context menu should hide on scrolling", function () { "airgap", "1. Bug #15474 - Entity explorer menu must close on scroll - airgap", function () { + entityExplorer.DragDropWidgetNVerify(draggableWidgets.MODAL); + agHelper.GetNClick(locators._closeModal, 0, true, 0); + entityExplorer.DragDropWidgetNVerify(draggableWidgets.MODAL); + agHelper.GetNClick(locators._closeModal, 0, true, 0); + entityExplorer.DragDropWidgetNVerify(draggableWidgets.MODAL); + agHelper.GetNClick(locators._closeModal, 0, true, 0); entityExplorer.DragDropWidgetNVerify(draggableWidgets.MODAL); agHelper.GetNClick(locators._closeModal, 0, true, 0); entityExplorer.DragDropWidgetNVerify(draggableWidgets.MODAL); @@ -62,51 +77,34 @@ describe("Entity explorer context menu should hide on scrolling", function () { entityExplorer.ExpandCollapseEntity("Modal1"); entityExplorer.ExpandCollapseEntity("Modal2"); entityExplorer.ExpandCollapseEntity("Modal3"); + entityExplorer.ExpandCollapseEntity("Modal4"); + entityExplorer.ExpandCollapseEntity("Modal5"); + entityExplorer.ExpandCollapseEntity("Modal6"); // Setup to make the explorer scrollable entityExplorer.ExpandCollapseEntity("Queries/JS"); - entityExplorer.ExpandCollapseEntity("Datasources"); - agHelper.ContainsNClick("Libraries"); dataSources.CreateDataSource("Postgres"); cy.get("@dsName").then(($createdMockUsers: any) => { mockDBNameUsers = $createdMockUsers; dataSources.CreateQueryAfterDSSaved(); - - dataSources.AssertTableInVirtuosoList(mockDBNameUsers, "public.users"); + entityExplorer.CreateNewDsQuery(mockDBNameUsers); + entityExplorer.CreateNewDsQuery(mockDBNameUsers); + entityExplorer.CreateNewDsQuery(mockDBNameUsers); dataSources.CreateDataSource("Mongo"); cy.get("@dsName").then(($createdMockMovies: any) => { mockDBNameMovies = $createdMockMovies; dataSources.CreateQueryAfterDSSaved(); - - dataSources.AssertTableInVirtuosoList( - mockDBNameMovies, - "listingAndReviews", - ); + entityExplorer.CreateNewDsQuery(mockDBNameMovies); + entityExplorer.CreateNewDsQuery(mockDBNameMovies); + entityExplorer.CreateNewDsQuery(mockDBNameMovies); agHelper.GetNClick(locators._createNew); agHelper.AssertElementVisibility(entityExplorer._adsPopup); - agHelper.ScrollTo(entityExplorer._entityExplorerWrapper, "bottom"); + agHelper.ScrollTo(entityExplorer._entityExplorerWrapper, "top"); agHelper.AssertElementAbsence(entityExplorer._adsPopup); }); }); }, ); - - after(() => { - //clean up - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: "Query1", - action: "Delete", - entityType: entityItems.Query, - }); - - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: "Query2", - action: "Delete", - entityType: entityItems.Query, - }); - dataSources.DeleteDatasouceFromActiveTab(mockDBNameMovies); //Since sometimes after Queries are deleted, ds is no more visible in EE tree - dataSources.DeleteDatasouceFromActiveTab(mockDBNameUsers); - }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js index dd6490b6f0ec..2451d218f0e3 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitSyncedApps_spec.js @@ -121,8 +121,6 @@ describe("Git sync apps", function () { cy.get(`.t--entity-item:contains(${newPage})`).click(); cy.wait(1000); // create a get api call - cy.NavigateToAPI_Panel(); - cy.wait(2000); cy.CreateAPI("get_data"); // creating get request using echo cy.get(apiwidget.resourceUrl) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js index 4a82a357c0df..14c6f346b804 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitWithJSLibrary/GitwithCustomJSLibrary_spec.js @@ -7,6 +7,9 @@ import { gitSync, installer, } from "../../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../../support/Pages/EditorNavigation"; const mainBranch = "master"; const tempBranch = "feat/tempBranch"; @@ -28,25 +31,24 @@ describe("excludeForAirgap", "Tests JS Library with Git", () => { }); it("1. Install JS Library and commit changes, create branch and verify JS library changes are present on new branch ", () => { - entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); installer.OpenInstaller(); installer.InstallLibrary("uuidjs", "UUID"); gitSync.CommitAndPush(); // create new branch gitSync.CreateGitBranch(tempBranch, true); // verify js library changes are present - entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); installer.AssertLibraryinExplorer("uuidjs"); }); it("2. Discard custom js library changes, verify changes are discarded also verify it deosnt show uncommitted changes", () => { - entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); installer.uninstallLibrary("uuidjs"); - installer.assertUnInstall("uuidjs"); // discard js library uninstallation cy.gitDiscardChanges(); // verify js library is present - entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); installer.AssertLibraryinExplorer("uuidjs"); // verify no uncommitted changes are there agHelper.AssertElementExist(gitSync._bottomBarPull); @@ -66,7 +68,7 @@ describe("excludeForAirgap", "Tests JS Library with Git", () => { it("3. Merge custom js lib changes from child branch to master, verify changes are merged", () => { cy.switchGitBranch(tempBranch); agHelper.AssertElementExist(gitSync._bottomBarPull); - entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); installer.OpenInstaller(); installer.InstallLibrary("jspdf", "jspdf"); //cy.commitAndPush(); @@ -84,7 +86,7 @@ describe("excludeForAirgap", "Tests JS Library with Git", () => { // verify custom js library is present in master branch cy.switchGitBranch(mainBranch); agHelper.AssertElementExist(gitSync._bottomBarPull); - entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); installer.AssertLibraryinExplorer("jspdf"); }); after(() => { diff --git a/app/client/cypress/e2e/Regression/ClientSide/IDE/MaintainContext&Focus_spec.js b/app/client/cypress/e2e/Regression/ClientSide/IDE/MaintainContext&Focus_spec.js index ce72d9ea7e54..0180575047e8 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/IDE/MaintainContext&Focus_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/IDE/MaintainContext&Focus_spec.js @@ -7,6 +7,9 @@ import { homePage, locators, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; const apiwidget = require("../../../../locators/apiWidgetslocator.json"); const queryLocators = require("../../../../locators/QueryEditor.json"); @@ -183,16 +186,16 @@ describe("MaintainContext&Focus", function () { }); it("4. Datasource edit mode has to be maintained", () => { - entityExplorer.SelectEntityByName("Appsmith", "Datasources"); + dataSources.navigateToDatasource("Appsmith"); dataSources.EditDatasource(); - agHelper.GoBack(); - entityExplorer.SelectEntityByName("Github", "Datasources"); + dataSources.navigateToDatasource("Github"); dataSources.AssertDSEditViewMode("View"); - entityExplorer.SelectEntityByName("Appsmith", "Datasources"); + dataSources.navigateToDatasource("Appsmith"); dataSources.AssertDSEditViewMode("Edit"); }); it("5. Maintain focus of form control inputs", () => { + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.SelectEntityByName("SQL_Query"); dataSources.ToggleUsePreparedStatement(false); entityExplorer.SelectEntityByName("S3_Query"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts index b86b9bf19e81..01bad285479e 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/JSLibrary/Library_spec.ts @@ -1,9 +1,12 @@ import HomePage from "../../../../locators/HomePage"; import * as _ from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("excludeForAirgap", "Tests JS Libraries", () => { it("1. Validates Library install/uninstall", () => { - _.entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); _.installer.OpenInstaller(); _.installer.InstallLibrary("uuidjs", "UUID"); _.installer.uninstallLibrary("uuidjs"); @@ -11,16 +14,17 @@ describe("excludeForAirgap", "Tests JS Libraries", () => { }); it("2. Installs the library against a unique namespace when there is a collision with the existing entity", () => { + EditorNavigation.ViaSidebar(SidebarButton.Pages); _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TABLE, 200, 200); _.entityExplorer.NavigateToSwitcher("Explorer"); _.entityExplorer.RenameEntityFromExplorer("Table1", "jsonwebtoken"); - _.entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); _.installer.OpenInstaller(); _.installer.InstallLibrary("jsonwebtoken", "jsonwebtoken_1", true); }); it("3. Checks jspdf library", () => { - _.entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); _.installer.OpenInstaller(); _.installer.InstallLibrary("jspdf", "jspdf"); _.jsEditor.CreateJSObject( @@ -46,7 +50,7 @@ describe("excludeForAirgap", "Tests JS Libraries", () => { }); it("4. ESM build should pass installation, uninstallation and reinstallation", () => { - _.entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); _.installer.OpenInstaller(); _.installer.InstallLibraryViaURL( "https://cdn.jsdelivr.net/npm/[email protected]/+esm", @@ -67,7 +71,7 @@ describe("excludeForAirgap", "Tests JS Libraries", () => { it("5. Shows list of recommended libraries", () => { const recommendedLibraryNames = ["jsonwebtoken", "jspdf", "bcryptjs"]; - _.entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); _.installer.OpenInstaller(); for (const recommendedLib of recommendedLibraryNames) { cy.contains(recommendedLib); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts index ed608f9636d6..bf05b53bd854 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Linting/BasicLint_spec.ts @@ -11,6 +11,9 @@ import { entityItems, dataManager, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; const successMessage = "Successful Trigger"; const errorMessage = "Unsuccessful Trigger"; @@ -60,6 +63,7 @@ describe("Linting", () => { cy.get("@dsName").then(($dsName) => { dsName = $dsName as unknown as string; }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("1. TC 1927 - Shows correct lint error when Api is deleted or created", () => { @@ -342,22 +346,23 @@ describe("Linting", () => { }); agHelper.AssertElementExist(locators._lintErrorElement); - entityExplorer.ExpandCollapseEntity("Libraries"); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); // install the library installer.OpenInstaller(); installer.InstallLibrary("uuidjs", "UUID"); installer.CloseInstaller(); + entityExplorer.SelectEntityByName("JSObject3"); agHelper.AssertElementAbsence(locators._lintErrorElement); - + EditorNavigation.ViaSidebar(SidebarButton.Libraries); installer.uninstallLibrary("uuidjs"); - + entityExplorer.SelectEntityByName("JSObject3"); agHelper.AssertElementExist(locators._lintErrorElement); - agHelper.Sleep(2000); + agHelper.RefreshPage(); + EditorNavigation.ViaSidebar(SidebarButton.Libraries); installer.OpenInstaller(); installer.InstallLibrary("uuidjs", "UUID"); installer.CloseInstaller(); - homePage.NavigateToHome(); homePage.CreateNewApplication(); diff --git a/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/AutoFillWidgets_Basic_2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/AutoFillWidgets_Basic_2_spec.js index c477e015f26c..2248c0369e09 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/AutoFillWidgets_Basic_2_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/AutoFillWidgets_Basic_2_spec.js @@ -25,7 +25,7 @@ describe("Validating Mobile Views for Auto Fill Widgets", function () { cy.dragAndDropToCanvas("codescannerwidget", { x: 100, y: 200 }); cy.dragAndDropToCanvas("listwidgetv2", { x: 620, y: 820 }); cy.dragAndDropToCanvas("tablewidgetv2", { x: 620, y: 820 }); - cy.dragAndDropToCanvas("tabswidget", { x: 770, y: 770 }); + cy.dragAndDropToCanvas("tabswidget", { x: 670, y: 770 }); cy.wait(2000); _.deployMode.DeployApp(); cy.wait(2000); diff --git a/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/AutoFillWidgets_Basic_spec.js b/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/AutoFillWidgets_Basic_spec.js index 1c073c1045ad..fd6b44bbfd31 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/AutoFillWidgets_Basic_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/AutoFillWidgets_Basic_spec.js @@ -42,9 +42,9 @@ describe("Validating Mobile Views for Auto Fill Widgets", function () { cy.dragAndDropToCanvas("currencyinputwidget", { x: 110, y: 210 }); cy.dragAndDropToCanvas("audiowidget", { x: 250, y: 300 }); cy.dragAndDropToCanvas("selectwidget", { x: 560, y: 560 }); - cy.dragAndDropToCanvas("checkboxwidget", { x: 770, y: 770 }); - cy.dragAndDropToCanvas("radiogroupwidget", { x: 770, y: 770 }); - cy.dragAndDropToCanvas("datepickerwidget2", { x: 770, y: 970 }); + cy.dragAndDropToCanvas("checkboxwidget", { x: 670, y: 770 }); + cy.dragAndDropToCanvas("radiogroupwidget", { x: 670, y: 770 }); + cy.dragAndDropToCanvas("datepickerwidget2", { x: 670, y: 970 }); cy.dragAndDropToCanvas("phoneinputwidget", { x: 660, y: 810 }); cy.dragAndDropToCanvas("categorysliderwidget", { x: 620, y: 810 }); cy.wait(5000); diff --git a/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/Snipping_mode_Basic_test.js b/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/Snipping_mode_Basic_test.js index 38f34eacedea..ccaa3a517dcc 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/Snipping_mode_Basic_test.js +++ b/app/client/cypress/e2e/Regression/ClientSide/MobileResponsiveTests/Snipping_mode_Basic_test.js @@ -1,5 +1,8 @@ import * as _ from "../../../../support/Objects/ObjectsCore"; import { Widgets } from "../../../../support/Pages/DataSources"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; let datasourceName; @@ -9,12 +12,10 @@ describe("Add widget - Postgress DataSource", function () { cy.get("@dsName").then(($dsName) => { datasourceName = $dsName; }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("1. Validate Snipping with query and table widget on canvas", () => { - cy.get(".t--close-editor span:contains('Back')").click({ force: true }); - cy.get(".t--back-button span:contains('Back')").click({ force: true }); - _.autoLayout.ConvertToAutoLayoutAndVerify(false); cy.NavigateToActiveDSQueryPane(datasourceName); _.dataSources.EnterQuery("select * from public.configs"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Onboarding/FirstTimeUserOnboarding_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Onboarding/FirstTimeUserOnboarding_spec.js index 8e290495ac69..5ca32ff7d73c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Onboarding/FirstTimeUserOnboarding_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Onboarding/FirstTimeUserOnboarding_spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; + const OnboardingLocator = require("../../../../locators/FirstTimeUserOnboarding.json"); import { agHelper, @@ -23,6 +27,7 @@ describe("FirstTimeUserOnboarding", function () { cy.get(OnboardingLocator.introModal).should("be.visible"); cy.get(OnboardingLocator.checklistDatasourceBtn).click(); cy.get(OnboardingLocator.introModal).should("not.exist"); + EditorNavigation.ViaSidebar(SidebarButton.Pages); cy.get(".t--entity-name:contains(Page1)") .trigger("mouseover") .click({ force: true }); @@ -36,7 +41,7 @@ describe("FirstTimeUserOnboarding", function () { agHelper.GetNAssertContains(OnboardingLocator.checklistStatus, "0 of 5"); agHelper.AssertElementExist(OnboardingLocator.checklistDatasourceBtn); agHelper.GetNClick(OnboardingLocator.checklistDatasourceBtn); - agHelper.AssertElementVisibility(OnboardingLocator.datasourcePage); + agHelper.AssertElementVisibility(dataSources._newDatasourceContainer); agHelper.GetNClick(OnboardingLocator.datasourceMock); @@ -48,6 +53,7 @@ describe("FirstTimeUserOnboarding", function () { .realHover() .should("have.css", "cursor", "auto"); agHelper.GetNClick(OnboardingLocator.checklistActionBtn); + dataSources.navigateToDatasource("Movies"); agHelper.GetNClick(OnboardingLocator.createQuery); agHelper.Sleep(); @@ -117,7 +123,7 @@ describe("FirstTimeUserOnboarding", function () { .should("have.css", "cursor", "pointer"); cy.get(OnboardingLocator.checklistDatasourceBtn).click(); - cy.get(OnboardingLocator.datasourcePage).should("be.visible"); + cy.get(dataSources._newDatasourceContainer).should("be.visible"); cy.get(datasource.MongoDB).click(); dataSources.FillMongoDSForm(); cy.generateUUID().then((uid) => { diff --git a/app/client/cypress/e2e/Regression/ClientSide/Onboarding/GuidedTour_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Onboarding/GuidedTour_spec.js index c5951f4c58d0..640c9d31d693 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Onboarding/GuidedTour_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Onboarding/GuidedTour_spec.js @@ -39,7 +39,7 @@ describe("excludeForAirgap", "Guided Tour", function () { dataSources.RunQuery(); cy.get(guidedTourLocators.successButton).click(); // Step 2: Select table widget - entityExplorer.SelectEntityByName("CustomersTable"); + cy.get(".t--entity-name").contains("CustomersTable").click({ force: true }); // Step 3: Add binding to the tableData property propPane.UpdatePropertyFieldValue( @@ -106,7 +106,7 @@ describe("excludeForAirgap", "Guided Tour", function () { cy.get(guidedTourLocators.successButton).click(); // Step 6: Drag and drop a widget cy.dragAndDropToCanvas("buttonwidget", { - x: 800, + x: 845, y: 750, }); cy.get(guidedTourLocators.successButton).click(); diff --git a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/PropertyControl_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/PropertyControl_spec.ts index cc7c0eb1c9ce..208f07e299fe 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/PropertyControl_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/PropertyControl_spec.ts @@ -9,6 +9,9 @@ import { import { expandLoadMoreOptions, OneClickBinding } from "./spec_utility"; import oneClickBindingLocator from "../../../../locators/OneClickBindingLocator"; import onboardingLocator from "../../../../locators/FirstTimeUserOnboarding.json"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; const oneClickBinding = new OneClickBinding(); @@ -67,9 +70,9 @@ describe("excludeForAirgap", "One click binding control", () => { oneClickBindingLocator.otherActionSelector("Connect new datasource"), ); - agHelper.AssertElementExist(onboardingLocator.datasourcePage); + agHelper.AssertElementExist(dataSources._newDatasourceContainer); - agHelper.GetNClick(onboardingLocator.datasourceBackBtn); + EditorNavigation.ViaSidebar(SidebarButton.Pages); agHelper.GetNClick(oneClickBindingLocator.datasourceDropdownSelector); @@ -121,7 +124,7 @@ describe("excludeForAirgap", "One click binding control", () => { dataSources.SaveDatasource(); - entityExplorer.NavigateToSwitcher("Widgets"); + EditorNavigation.ViaSidebar(SidebarButton.Pages); agHelper.GetNClick(oneClickBindingLocator.datasourceDropdownSelector); @@ -149,15 +152,13 @@ describe("excludeForAirgap", "One click binding control", () => { dataSources.SaveDatasource(); - entityExplorer.NavigateToSwitcher("Widgets"); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); propPane.MoveToTab("Style"); propPane.MoveToTab("Content"); - entityExplorer.NavigateToSwitcher("Explorer"); - [1, 2, 3, 4, 5].forEach(() => { apiPage.CreateAndFillApi("http://www.example.com"); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/SelectWidget/mongoDB_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/SelectWidget/mongoDB_spec.ts index 966380d01daf..5407cf08691c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/SelectWidget/mongoDB_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/SelectWidget/mongoDB_spec.ts @@ -11,6 +11,9 @@ import { import formWidgetsPage from "../../../../../locators/FormWidgets.json"; import widgetsPage from "../../../../../locators/Widgets.json"; import commonlocators from "../../../../../locators/commonlocators.json"; +import EditorNavigation, { + SidebarButton, +} from "../../../../../support/Pages/EditorNavigation"; const oneClickBinding = new OneClickBinding(); @@ -23,6 +26,7 @@ describe("Table widget one click binding feature", () => { dataSources.CreateDataSource("Mongo"); cy.get("@dsName").then((dsName) => { + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.NavigateToSwitcher("Widgets"); entityExplorer.SelectEntityByName("Select1", "Widgets"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/mongoDB_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/mongoDB_spec.ts index 4dc20458c072..16f5c150397b 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/mongoDB_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/mongoDB_spec.ts @@ -8,6 +8,9 @@ import { assertHelper, } from "../../../../../support/Objects/ObjectsCore"; import { OneClickBinding } from "../spec_utility"; +import EditorNavigation, { + SidebarButton, +} from "../../../../../support/Pages/EditorNavigation"; const oneClickBinding = new OneClickBinding(); @@ -23,6 +26,7 @@ describe("one click binding mongodb datasource", function () { dataSources.CreateDataSource("Mongo"); cy.get("@dsName").then((dsName) => { + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.SelectEntityByName("Table1", "Widgets"); oneClickBinding.ChooseAndAssertForm(`${dsName}`, dsName, "netflix", { diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts index 5fbd3852f01f..b26b0f5746e2 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/EntityBottomBar_spec.ts @@ -66,15 +66,7 @@ describe("Entity bottom bar", () => { _.debuggerHelper.AssertClosed(); //Verify if bottom bar opens on clicking debugger icon in datasource page. _.debuggerHelper.ClickDebuggerIcon(); - _.debuggerHelper.AssertOpen(PageType.DataSources); - //Verify if selected tab is errors in tab title. - _.debuggerHelper.AssertSelectedTab("Errors"); - //Verify if bottom bar is closed on clicking close icon in datasource page. - _.debuggerHelper.CloseBottomBar(); _.debuggerHelper.AssertClosed(); - //Verify if bottom bar opens on clicking debugger icon in datasource page. - _.debuggerHelper.ClickDebuggerIcon(); - _.debuggerHelper.AssertOpen(PageType.DataSources); }); it("excludeForAirgap", "5. Query bottom bar should be collapsable", () => { @@ -107,7 +99,7 @@ describe("Entity bottom bar", () => { _.debuggerHelper.AssertSelectedTab("Response"); // clean up _.dataSources.DeleteQuery("Query1"); - _.dataSources.DeleteDatasouceFromActiveTab(dbName); + _.dataSources.DeleteDatasourceFromWithinDS(dbName); }); }); @@ -138,7 +130,7 @@ describe("Entity bottom bar", () => { // clean up _.dataSources.DeleteQuery("Query1"); cy.get("@dsName").then(($dsName) => { - _.dataSources.DeleteDatasouceFromActiveTab($dsName as any); + _.dataSources.DeleteDatasourceFromWithinDS($dsName as any); }); }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/GlobalSearch_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/GlobalSearch_spec.js index a175f5506aa1..29cc1c01255a 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/GlobalSearch_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/GlobalSearch_spec.js @@ -1,4 +1,8 @@ /* eslint-disable cypress/no-unnecessary-waiting */ +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; + const commonlocators = require("../../../../locators/commonlocators.json"); const dsl = require("../../../../fixtures/MultipleWidgetDsl.json"); const globalSearchLocators = require("../../../../locators/GlobalSearch.json"); @@ -49,7 +53,6 @@ describe("GlobalSearch", function () { }); it("3. navigatesToApi", () => { - cy.NavigateToAPI_Panel(); cy.CreateAPI("SomeApi"); cy.get(commonlocators.globalSearchTrigger).click({ force: true }); @@ -136,6 +139,7 @@ describe("GlobalSearch", function () { }); it("7. Api actions should have API as prefix", () => { + EditorNavigation.ViaSidebar(SidebarButton.Pages); cy.get(globalSearchLocators.createNew).click({ force: true }); cy.get(globalSearchLocators.blankDatasource).first().click({ force: true }); cy.get(datasourceHomeLocators.createAuthApiDatasource).click(); @@ -148,6 +152,7 @@ describe("GlobalSearch", function () { cy.fillAuthenticatedAPIForm(); cy.saveDatasource(); + EditorNavigation.ViaSidebar(SidebarButton.Pages); cy.get(globalSearchLocators.createNew).click({ force: true }); cy.get(".ads-v2-menu__menu-item span:contains('omnibarApiDatasource')") .first() diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js index 33f286819de2..d9537bcd80af 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js @@ -49,8 +49,6 @@ describe("Undo/Redo functionality", function () { }); it("2. Checks undo/redo for Api pane", function () { - cy.NavigateToAPI_Panel(); - cy.log("Navigation to API Panel screen successful"); cy.CreateAPI("FirstAPI"); cy.get(`${apiwidget.resourceUrl} .CodeMirror-placeholder`).should( "have.text", diff --git a/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts index 95ef1bdfeaa8..627dc4e7a347 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Refactoring/Refactoring_spec.ts @@ -9,6 +9,9 @@ import { propPane, dataManager, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Validate JS Object Refactoring does not affect the comments & variables", () => { let dsName: any; @@ -41,6 +44,7 @@ describe("Validate JS Object Refactoring does not affect the comments & variable dataSources.CreateDataSource("MySql", true, false); cy.get("@dsName").then(($dsName) => { dsName = $dsName; + EditorNavigation.ViaSidebar(SidebarButton.Pages); //Selecting paintings table from MySQL DS //Initialize new JSObject with custom code diff --git a/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/GeneralSettings_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/GeneralSettings_spec.ts index 10427aa2d286..0f7bc8f5aabf 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/GeneralSettings_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/GeneralSettings_spec.ts @@ -12,7 +12,11 @@ describe("General Settings", () => { it("1. App name change updates URL", () => { _.appSettings.OpenAppSettings(); _.appSettings.GoToGeneralSettings(); - _.generalSettings.UpdateAppNameAndVerifyUrl(true, guid); + _.generalSettings.UpdateAppNameAndVerifyUrl({ + reset: true, + newAppName: guid, + restOfUrl: "/settings", + }); _.homePage.GetAppName().then((appName) => { _.deployMode.DeployApp(); _.appSettings.CheckUrl(appName as string, "Page1", undefined, false); @@ -28,7 +32,12 @@ describe("General Settings", () => { //App name allows special and accented character _.appSettings.OpenAppSettings(); _.appSettings.GoToGeneralSettings(); - _.generalSettings.UpdateAppNameAndVerifyUrl(true, guid + "!@#œ™¡", guid); + _.generalSettings.UpdateAppNameAndVerifyUrl({ + reset: true, + newAppName: guid + "!@#œ™¡", + verifyAppNameAs: guid, + restOfUrl: "/settings", + }); _.appSettings.ClosePane(); //Veirfy App name doesn't allow empty diff --git a/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/PageSettings_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/PageSettings_spec.ts index acde3460f831..8ea7e1a71a95 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/PageSettings_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/SettingsPane/PageSettings_spec.ts @@ -4,7 +4,12 @@ describe("Page Settings", () => { it("1. Page name change updates URL", () => { _.appSettings.OpenAppSettings(); _.appSettings.GoToPageSettings("Page1"); - _.pageSettings.UpdatePageNameAndVerifyUrl("Page2", undefined, false); + _.pageSettings.UpdatePageNameAndVerifyUrl({ + newPageName: "Page2", + verifyPageNameAs: undefined, + reset: false, + restOfUrl: "/settings", + }); _.homePage.GetAppName().then((appName) => { _.deployMode.DeployApp(); _.appSettings.CheckUrl(appName as string, "Page2", undefined, false); @@ -16,7 +21,7 @@ describe("Page Settings", () => { it("2. Custom slug change updates URL", () => { _.appSettings.OpenAppSettings(); _.appSettings.GoToPageSettings("Page2"); - _.pageSettings.UpdateCustomSlugAndVerifyUrl("custom"); + _.pageSettings.UpdateCustomSlugAndVerifyUrl("custom", "/settings"); _.homePage.GetAppName().then((appName) => { _.deployMode.DeployApp(); _.appSettings.CheckUrl(appName as string, "Page2", "custom", false); @@ -46,7 +51,11 @@ describe("Page Settings", () => { // Page name allows accented character _.appSettings.OpenAppSettings(); _.appSettings.GoToPageSettings("Page3"); - _.pageSettings.UpdatePageNameAndVerifyUrl("Page3œßð", "Page3"); + _.pageSettings.UpdatePageNameAndVerifyUrl({ + newPageName: "Page3œßð", + verifyPageNameAs: "Page3", + restOfUrl: "/settings", + }); _.appSettings.ClosePane(); //Page name doesn't allow special character diff --git a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js index af4b55b06452..a205f4501c0e 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/VisualTests/DatasourcePageLayout_spec.js @@ -1,4 +1,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Visual tests for datasources", () => { // for any changes in UI, update the screenshot in snapshot folder, to do so: @@ -13,10 +16,8 @@ describe("Visual tests for datasources", () => { const newWorkspaceName = interception.response.body.data.name; cy.CreateAppForWorkspace(newWorkspaceName, newWorkspaceName); }); - _.dataSources.NavigateToActiveTab(); - cy.get(".t--integrationsHomePage").matchImageSnapshot( - "emptydatasourcepage", - ); + EditorNavigation.ViaSidebar(SidebarButton.Data); + cy.get(".t--data-blank-state").matchImageSnapshot("emptydatasourcepage"); }); /* cy.NavigateToDatasourceEditor(); cy.wait(2000); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_onClickAction_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_onClickAction_spec.js index 82175f03a3d2..744651d94b04 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_onClickAction_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button_onClickAction_spec.js @@ -38,7 +38,6 @@ describe("Button Widget Functionality", function () { //creating an api and calling it from the onClickAction of the button widget. // Creating the api propPane.ClearActionField("onClick"); - cy.NavigateToAPI_Panel(); cy.CreateAPI("buttonApi"); cy.log("Creation of buttonApi Action successful"); cy.enterDatasourceAndPath( diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup_withQuery_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup_withQuery_spec.js index 3a5b0f421d16..891ab4fa426e 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup_withQuery_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckboxGroup_withQuery_spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../../support/Pages/EditorNavigation"; + const publish = require("../../../../../locators/publishWidgetspage.json"); const explorer = require("../../../../../locators/explorerlocators.json"); import * as _ from "../../../../../support/Objects/ObjectsCore"; @@ -9,6 +13,7 @@ describe("Checkbox Group Widget Functionality", function () { cy.get("@dsName").then(($dsName) => { dsName = $dsName; }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("1. Check checkbox group with dynamic query", function () { diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/DropDownWidget_value_reset_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/DropDownWidget_value_reset_spec.js index 8e590993041c..a74cd3f9eba0 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/DropDownWidget_value_reset_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/DropDownWidget_value_reset_spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../../support/Pages/EditorNavigation"; + const commonlocators = require("../../../../../locators/commonlocators.json"); import * as _ from "../../../../../support/Objects/ObjectsCore"; @@ -15,7 +19,8 @@ describe("Dropdown Widget Check value does not reset on navigation", function () cy.wait(200); //Navigate - cy.NavigateToAPI_Panel(); + EditorNavigation.ViaSidebar(SidebarButton.Data); + EditorNavigation.ViaSidebar(SidebarButton.Pages); //Again navigate back to the widget _.entityExplorer.SelectEntityByName("Select3"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js index f06d14b4064d..11b4ca738654 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Dropdown/Dropdown_onOptionChange_spec.js @@ -42,7 +42,6 @@ describe("Dropdown Widget", function () { it("2. Dropdown-Call-Api Validation", function () { //creating an api and calling it from the onOptionChangeAction of the Dropdown widget. // Creating the api - cy.NavigateToAPI_Panel(); cy.CreateAPI("dropdownApi"); cy.log("Creation of buttonApi Action successful"); cy.enterDatasourceAndPath( diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicServerSideData_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicServerSideData_spec.js index b1c74122b078..967f8b845533 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicServerSideData_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_BasicServerSideData_spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../../support/Pages/EditorNavigation"; + const publishLocators = require("../../../../../locators/publishWidgetspage.json"); const datasource = require("../../../../../locators/DatasourcesEditor.json"); const queryLocators = require("../../../../../locators/QueryEditor.json"); @@ -328,17 +332,10 @@ describe("List widget v2 - Basic server side data tests", () => { // Click on sample(mock) user database. cy.get(datasource.mockUserDatabase).click(); - _.dataSources.NavigateToActiveTab(); + EditorNavigation.ViaSidebar(SidebarButton.Data); // Choose the first data source which consists of users keyword & Click on the "New query +"" button - cy.get(`${datasource.datasourceCard}`) - .filter(":contains('Users')") - .first() - .within(() => { - cy.get(`${datasource.createQuery}`).click({ - force: true, - }); - }); + _.dataSources.CreateQueryFromActiveTab("Users"); // Click the editing field cy.get(".t--action-name-edit-field").click({ @@ -379,7 +376,7 @@ describe("List widget v2 - Basic server side data tests", () => { ); it( "airgap", - "6. no of items rendered should be equal to page size - airgap", + "7. no of items rendered should be equal to page size - airgap", () => { _.dataSources.CreateDataSource("Postgres"); cy.wait(1000); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_onItemClick_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_onItemClick_spec.js index 4cd81f10c6f9..4bf2176a1994 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_onItemClick_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_onItemClick_spec.js @@ -82,7 +82,7 @@ describe("List widget v2 onItemClick", () => { entityExplorer.DragDropWidgetNVerify( draggableWidgets.INPUT_V2, - 250, + 150, 50, draggableWidgets.CONTAINER, ); @@ -94,7 +94,7 @@ describe("List widget v2 onItemClick", () => { entityExplorer.DragDropWidgetNVerify( draggableWidgets.SELECT, - 250, + 150, 50, draggableWidgets.CONTAINER, ); @@ -107,7 +107,7 @@ describe("List widget v2 onItemClick", () => { entityExplorer.DragDropWidgetNVerify( draggableWidgets.BUTTON, - 250, + 150, 50, draggableWidgets.CONTAINER, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect3_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect3_spec.js index 4ce7f7921dfe..498cbc74b9a3 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect3_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Multiselect/MultiSelect3_spec.js @@ -29,7 +29,7 @@ describe("Dropdown Widget Functionality", function () { .find(widgetLocators.menuButton) .then(($menuButton) => { const outerWidth = Cypress.$($menuButton).outerWidth(); - expect(parseInt(outerWidth)).to.equal(147); + expect(parseInt(outerWidth)).to.equal(137); }); cy.get(formWidgetsPage.menuButtonWidget) .find(widgetLocators.menuButton) @@ -41,7 +41,7 @@ describe("Dropdown Widget Functionality", function () { cy.get(".menu-button-popover") .invoke("outerWidth") .then((width) => { - expect(parseInt(width)).to.equal(147); + expect(parseInt(width)).to.equal(137); }); // MultiSelect diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts index 80ec9740b3c7..6872422d1477 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Radio/Radio2_spec.ts @@ -252,7 +252,7 @@ describe("Radio Widget test cases", function () { agHelper.AssertCSS( widgetLocators.radioWidgetLabelContainer, "width", - "59.765625px", + "55.859375px", ); agHelper.GetNClick(widgetLocators.selectWidgetWidthPlusBtn); agHelper.GetNClick(widgetLocators.selectWidgetWidthPlusBtn); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts index a589a0374a27..1802411e876e 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Select/Select2_Spec.ts @@ -44,7 +44,7 @@ describe("Select widget tests", function () { agHelper.AssertCSS( widgetLocators.selectWidgetLabelContainer, "width", - "59.765625px", + "55.859375px", ); agHelper.GetNClick(widgetLocators.selectWidgetWidthPlusBtn); agHelper.GetNClick(widgetLocators.selectWidgetWidthPlusBtn); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_2_spec.ts index 797b3b9e2ed5..4cf7031850ec 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_2_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TreeSelect/Tree_Select_2_spec.ts @@ -160,10 +160,6 @@ describe("Tree Select widget Tests", function () { // Execute the query let postgresDatasourceName: any; dataSources.StartDataSourceRoutes(); - agHelper - .GetElement(locators._newDataSourceBtn) - .last() - .click({ force: true }); dataSources.NavigateToDSCreateNew(); dataSources.CreatePlugIn("PostgreSQL"); agHelper.GenerateUUID(); @@ -300,7 +296,7 @@ describe("Tree Select widget Tests", function () { propPane.UpdatePropertyFieldValue( "srcDoc", `<div id="target"></div> - + <script> window.addEventListener('message', (event) => { const tgt = document.querySelector("#target") diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetSelection_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetSelection_spec.js index 927181fedbe7..d12701b6b650 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetSelection_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/WidgetSelection_spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; + const dsl = require("../../../../fixtures/widgetSelection.json"); import * as _ from "../../../../support/Objects/ObjectsCore"; @@ -52,10 +56,11 @@ describe("Widget Selection", function () { // Switch to the Explorer Pane _.entityExplorer.NavigateToSwitcher("Explorer"); // Click to create a New Data Source - cy.get(".t--entity-add-btn").eq(3).click(); + _.dataSources.NavigateToDSCreateNew(); // Hit CTRL +A cy.get("body").type("{ctrl}{a}"); // Switch to the Canvas + EditorNavigation.ViaSidebar(SidebarButton.Pages); _.entityExplorer.NavigateToSwitcher("Widgets"); // Widgets should not be selected cy.get(".t--multi-selection-box").should("not.exist"); diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js index 016730d1702c..9522ad8c346c 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_All_Verb_spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; + const testdata = require("../../../../fixtures/testdata.json"); const apiwidget = require("../../../../locators/apiWidgetslocator.json"); @@ -14,6 +18,7 @@ describe("API Panel Test Functionality", function () { action: "Delete", entityType: entityItems.Api, }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("1. PUT Action test API feature", function () { diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_ContextMenu_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_ContextMenu_spec.js index 90a54970eee0..0751b8a2efc7 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_ContextMenu_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_ContextMenu_spec.js @@ -9,7 +9,6 @@ import { describe("API Panel Test Functionality ", function () { it("1. Test API copy/Move/delete feature", function () { cy.Createpage("SecondPage"); - cy.NavigateToAPI_Panel(); cy.CreateAPI("FirstAPI"); cy.enterDatasourceAndPath(testdata.baseUrl, "{{ '/random' }}"); cy.assertPageSave(); diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_DefaultContentType_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_DefaultContentType_spec.js index acfc15160413..379d09842cdf 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_DefaultContentType_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_DefaultContentType_spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; + const testdata = require("../../../../fixtures/testdata.json"); const apiwidget = require("../../../../locators/apiWidgetslocator.json"); import appPage from "../../../../locators/CMSApplocators"; @@ -5,7 +9,6 @@ import apiEditor from "../../../../locators/ApiEditor"; describe("API Panel request body", function () { it("1. Check whether the default content-type changes on changing method types and remains unchanged on switching to GET", function () { - cy.NavigateToAPI_Panel(); cy.CreateAPI("FirstAPI"); // Checking for default Body type to be NONE @@ -51,7 +54,7 @@ describe("API Panel request body", function () { }); it("2. Bug 14624 - Verifying the content-type none is not added", function () { - cy.NavigateToAPI_Panel(); + EditorNavigation.ViaSidebar(SidebarButton.Pages); cy.CreateAPI("FirstAPI"); // Checking for default Body type to be NONE diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js index 6191400a6290..fdcd186613ae 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Edit_spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; + const testdata = require("../../../../fixtures/testdata.json"); const apiwidget = require("../../../../locators/apiWidgetslocator.json"); @@ -14,8 +18,6 @@ describe("API Panel Test Functionality", function () { it("1. Test Search API fetaure", function () { cy.log("Login Successful"); - cy.NavigateToAPI_Panel(); - cy.log("Navigation to API Panel screen successful"); cy.CreateAPI("FirstAPI"); cy.get(".CodeMirror-placeholder") .first() @@ -36,12 +38,11 @@ describe("API Panel Test Functionality", function () { action: "Delete", entityType: entityItems.Api, }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.AssertEntityAbsenceInExplorer("SecondAPI"); }); it("2. Should update loading state after cancellation of confirmation for run query", function () { - cy.NavigateToAPI_Panel(); - cy.log("Navigation to API Panel screen successful"); cy.CreateAPI("FirstAPI"); cy.get(".CodeMirror-placeholder") .first() @@ -56,7 +57,6 @@ describe("API Panel Test Functionality", function () { }); it("3. Should not crash on key delete", function () { - cy.NavigateToAPI_Panel(); cy.CreateAPI("CrashTestAPI"); cy.SelectAction(testdata.postAction); cy.get(apiwidget.headerKey) @@ -71,7 +71,6 @@ describe("API Panel Test Functionality", function () { }); it("4. Should correctly parse query params", function () { - cy.NavigateToAPI_Panel(); cy.CreateAPI("APIWithQueryParams"); cy.enterDatasourceAndPath(testdata.baseUrl, testdata.methodWithQueryParam); cy.ValidateQueryParams({ @@ -81,7 +80,6 @@ describe("API Panel Test Functionality", function () { }); it("5. Shows evaluated value pane when url field is focused", function () { - cy.NavigateToAPI_Panel(); cy.CreateAPI("TestAPI"); cy.get(".CodeMirror textarea") .first() diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_MultiPart_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_MultiPart_Spec.ts index 6f2a92bd8330..befd8f7094d3 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_MultiPart_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_MultiPart_Spec.ts @@ -1,14 +1,17 @@ import { agHelper, - jsEditor, - propPane, - deployMode, apiPage, - entityItems, + assertHelper, + deployMode, entityExplorer, + entityItems, + jsEditor, locators, - assertHelper, + propPane, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Validate API request body panel", () => { beforeEach(() => { @@ -33,6 +36,7 @@ describe("Validate API request body panel", () => { action: "Delete", entityType: entityItems.Api, }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("2. Checks whether No body error message is shown when None API body content type is selected", function () { @@ -44,6 +48,7 @@ describe("Validate API request body panel", () => { action: "Delete", entityType: entityItems.Api, }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("3. Checks whether header content type is being changed when FORM_URLENCODED API body content type is selected", function () { @@ -64,6 +69,7 @@ describe("Validate API request body panel", () => { action: "Delete", entityType: entityItems.Api, }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("4. Checks whether header content type is being changed when MULTIPART_FORM_DATA API body content type is selected", function () { @@ -84,6 +90,7 @@ describe("Validate API request body panel", () => { action: "Delete", entityType: entityItems.Api, }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("5. Checks whether content type 'FORM_URLENCODED' is preserved when user selects None API body content type", function () { @@ -96,6 +103,7 @@ describe("Validate API request body panel", () => { action: "Delete", entityType: entityItems.Api, }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("6. Checks whether content type 'MULTIPART_FORM_DATA' is preserved when user selects None API body content type", function () { @@ -108,6 +116,7 @@ describe("Validate API request body panel", () => { action: "Delete", entityType: entityItems.Api, }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("7. Checks MultiPart form data for a File Type upload + Bug 12476", () => { diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Mustache_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Mustache_spec.js index c45a280a3b8c..8744e99141d9 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Mustache_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Mustache_spec.js @@ -14,8 +14,6 @@ describe("Moustache test Functionality", function () { entityExplorer.SelectEntityByName("TestTextBox", "Aditya"); cy.widgetText("Api", widgetsPage.textWidget, widgetsPage.textInputval); cy.testCodeMirror(testdata.methods); - cy.NavigateToAPI_Panel(); - cy.log("Navigation to API Panel screen successful"); cy.CreateAPI("TestAPINew"); cy.log("Creation of API Action successful"); cy.enterDatasourceAndPath(testdata.baseUrl, testdata.moustacheMethod); diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Response_View_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Response_View_spec.js index e4dada9aeafa..afb6b9a8cc55 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Response_View_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Response_View_spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; + const testdata = require("../../../../fixtures/testdata.json"); import { agHelper, apiPage } from "../../../../support/Objects/ObjectsCore"; import apiEditor from "../../../../locators/ApiEditor"; @@ -7,8 +11,6 @@ const testUrl1 = describe("Bug 14666: Api Response Test Functionality ", function () { it("1. Test table loading when data is in array format", function () { cy.log("Login Successful"); - cy.NavigateToAPI_Panel(); - cy.log("Navigation to API Panel screen successful"); apiPage.CreateAndFillApi(testUrl1, "TableTestAPI"); agHelper.AssertAutoSave(); apiPage.RunAPI(); @@ -17,9 +19,7 @@ describe("Bug 14666: Api Response Test Functionality ", function () { }); it("2. Test table loading when data is not in array format", function () { - cy.log("Login Successful"); - cy.NavigateToAPI_Panel(); - cy.log("Navigation to API Panel screen successful"); + EditorNavigation.ViaSidebar(SidebarButton.Pages); apiPage.CreateAndFillApi( testdata.baseUrl + testdata.echoMethod, "TableTestAPI", diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js index 82bc3cff09d6..3f161f4159a3 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Search_spec.js @@ -4,6 +4,9 @@ import { apiPage, entityItems, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; let APIName; const testUrl1 = @@ -16,12 +19,11 @@ const testUrl3 = describe("API Panel Test Functionality ", function () { it("1. Test Search API fetaure", function () { cy.log("Login Successful"); - cy.NavigateToAPI_Panel(); - cy.log("Navigation to API Panel screen successful"); cy.generateUUID().then((uid) => { + EditorNavigation.ViaSidebar(SidebarButton.Pages); cy.CreateAPI(`FirstAPI_${uid}`); cy.log("Creation of FirstAPI Action successful"); - cy.NavigateToAPI_Panel(); + EditorNavigation.ViaSidebar(SidebarButton.Pages); cy.CreateAPI(`SecondAPI_${uid}`); cy.CheckAndUnfoldEntityItem("Queries/JS"); cy.log("Creation of SecondAPI Action successful"); @@ -54,7 +56,6 @@ describe("API Panel Test Functionality ", function () { cy.checkIfApiPaneIsVisible(); }); it("3. Bug 14242: Appsmith crash when create an API pointing to Github hosted json", function () { - cy.NavigateToAPI_Panel(); cy.generateUUID().then((uid) => { APIName = uid; cy.CreateAPI(APIName); diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Styles_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Styles_spec.js index bcd14ba07a07..83fddcef1415 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Styles_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_Styles_spec.js @@ -8,6 +8,9 @@ import { entityExplorer, apiPage, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Validate API Panel CSS Styles", function () { const backgroundColorGray200 = "rgb(227, 232, 239)"; @@ -63,6 +66,7 @@ describe("Validate API Panel CSS Styles", function () { //Create two datasource for testing binding prompt background-color cy.createNewAuthApiDatasource(appName1); cy.createNewAuthApiDatasource(appName2); + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.ExpandCollapseEntity("Queries/JS"); cy.get(commonLocators.entityName).contains("test_styles").click(); //Click on API search editor @@ -80,12 +84,12 @@ describe("Validate API Panel CSS Styles", function () { .should("have.css", "background-color", hover); //Delete created test API cy.DeleteAPI(); + EditorNavigation.ViaSidebar(SidebarButton.Pages); cy.wait(2000); cy.get(commonLocators.entityName) .contains("test_styles") .should("not.exist"); //Delete two datasources - entityExplorer.ExpandCollapseEntity("Datasources"); cy.deleteDatasource(appName1); cy.deleteDatasource(appName2); }); diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/CurlImportFlow_spec.js b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/CurlImportFlow_spec.js index b7b87a7bcf7a..0a6c36ef438e 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/CurlImportFlow_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/CurlImportFlow_spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; + const apiwidget = require("../../../../locators/apiWidgetslocator.json"); const globalSearchLocators = require("../../../../locators/GlobalSearch.json"); import ApiEditor from "../../../../locators/ApiEditor"; @@ -13,7 +17,6 @@ import { describe("Test curl import flow", function () { it("1. Test curl import flow Run and Delete", function () { localStorage.setItem("ApiPaneV2", "ApiPaneV2"); - cy.NavigateToApiEditor(); dataSources.NavigateToDSCreateNew(); cy.get(ApiEditor.curlImage).click({ force: true }); cy.get("textarea").type( diff --git a/app/client/cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts index 1572ef281aed..92cd2b13af72 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts @@ -208,12 +208,7 @@ describe("Validate Elasticsearch DS", () => { action: "Delete", entityType: entityItems.Query, }); - entityExplorer.SelectEntityByName(dsName, "Datasources"); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Delete", - entityType: entityItems.Datasource, - }); + dataSources.DeleteDatasourceFromWithinDS(dsName); //dataSources.StopNDeleteContainer(containerName); }); }); diff --git a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Firestore_Basic_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Firestore_Basic_Spec.ts index c05bc0065b79..095fc277c3a3 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Firestore_Basic_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Firestore_Basic_Spec.ts @@ -353,7 +353,7 @@ describe("Validate Firestore DS", () => { action: "Delete", entityType: entityItems.Query, }); - dataSources.DeleteDatasouceFromActiveTab(dsName, 409); + dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //commenting below since after query delete, we run into risk of not seeing the datasource in EntityExplorer // entityExplorer.SelectEntityByName(dsName, "Datasources"); // entityExplorer.ActionContextMenuByEntityName({ diff --git a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts index ae79c8e4f034..fd4dec58eb9d 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts @@ -13,6 +13,10 @@ import { jsEditor, } from "../../../../support/Objects/ObjectsCore"; import { Widgets } from "../../../../support/Pages/DataSources"; +import datasource from "../../../../locators/DatasourcesEditor.json"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Validate Oracle DS", () => { let dataSourceName: string, guid: any, query: string, selectQuery: string; @@ -108,7 +112,8 @@ describe("Validate Oracle DS", () => { dataSources.AssertDataSourceInfo(["Host address", "Port", "Service Name"]); agHelper.ClickButton("Edit"); //Navigate to Edit page & check if DS edit is opened dataSources.ValidateNSelectDropdown("SSL mode", "Disable"); - agHelper.GoBack(); //Do not edit anythin, go back to active ds list, ensure no modal is opened + EditorNavigation.ViaSidebar(SidebarButton.Pages); + EditorNavigation.ViaSidebar(SidebarButton.Data); dataSources.AssertDSInActiveList(dataSourceName); }); @@ -172,8 +177,6 @@ describe("Validate Oracle DS", () => { dataSources.EnterQuery(query); dataSources.RunQuery(); - dataSources.AssertTableInVirtuosoList(dataSourceName, guid.toUpperCase()); - query = `INSERT INTO ${guid} ( aircraft_id, aircraft_type, @@ -195,7 +198,11 @@ describe("Validate Oracle DS", () => { TO_DATE('2020-01-15', 'YYYY-MM-DD'), TO_DATE('{{DatePicker1.formattedDate}}', 'YYYY-MM-DD'), 'This aircraft is used for domestic flights.')`; - entityExplorer.ActionTemplateMenuByEntityName(guid.toUpperCase(), "Select"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dataSourceName, + guid.toUpperCase(), + "Select", + ); dataSources.RunQuery(); agHelper .GetText(dataSources._noRecordFound) diff --git a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Redis_Basic_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Redis_Basic_Spec.ts index ef15f2d9a8d0..18d174dd7735 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Redis_Basic_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Redis_Basic_Spec.ts @@ -97,7 +97,7 @@ describe("Validate Redis DS", () => { action: "Delete", entityType: entityItems.Query, }); - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); //commenting below since after query delete, we run into risk of not seeing the datasource in EntityExplorer // entityExplorer.SelectEntityByName(dsName, "Datasources"); // entityExplorer.ActionContextMenuByEntityName({ diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MongoURI_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MongoURI_Spec.ts index f79b8aa17089..d939799e04ca 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MongoURI_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MongoURI_Spec.ts @@ -10,6 +10,9 @@ import { draggableWidgets, } from "../../../../support/Objects/ObjectsCore"; import { Widgets } from "../../../../support/Pages/DataSources"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe("Validate Mongo URI CRUD with JSON Form", () => { let dsName: any; @@ -23,6 +26,7 @@ describe("Validate Mongo URI CRUD with JSON Form", () => { agHelper.RenameWithInPane(dsName, false); dataSources.FillMongoDatasourceFormWithURI(); dataSources.TestSaveDatasource(); + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.AddNewPage("Generate page with data"); agHelper.GetNClick(dataSources._selectDatasourceDropdown); agHelper.GetNClickByContains(dataSources._dropdownOption, dsName); @@ -41,7 +45,7 @@ describe("Validate Mongo URI CRUD with JSON Form", () => { table.WaitUntilTableLoad(); //Should not be able to delete ds until app is published again //coz if app is published & shared then deleting ds may cause issue, So! - dataSources.DeleteDatasouceFromActiveTab(dsName as string, 409); + dataSources.DeleteDatasourceFromWithinDS(dsName as string, 409); }); }); diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Mongo_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Mongo_Spec.ts index ebcadedae67f..6a40e2ef0e60 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Mongo_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Mongo_Spec.ts @@ -25,7 +25,7 @@ describe("Validate Mongo CRUD with JSON Form", () => { it("1. Create DS & then Add new Page and generate CRUD template using created datasource", () => { appSettings.OpenPaneAndChangeTheme("Water Lily"); - dataSources.CreateDataSource("Mongo"); + dataSources.CreateDataSource("Mongo", true, false); cy.get("@dsName").then(($dsName: any) => { dsName = $dsName; entityExplorer.AddNewPage(); @@ -57,7 +57,7 @@ describe("Validate Mongo CRUD with JSON Form", () => { //coz if app is published & shared then deleting ds may cause issue, So! cy.get("@dsName").then(($dsName) => { dsName = $dsName; - dataSources.DeleteDatasouceFromActiveTab(dsName as string, 409); + dataSources.DeleteDatasourceFromWithinDS(dsName as string, 409); }); // deployMode.DeployApp(); @@ -80,7 +80,7 @@ describe("Validate Mongo CRUD with JSON Form", () => { }); deployMode.DeployApp(); deployMode.NavigateBacktoEditor(); - dataSources.DeleteDatasouceFromActiveTab(dsName as string, 200); + dataSources.DeleteDatasourceFromWithinDS(dsName as string, 200); }); //Update, delete, Add goes here diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL1_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL1_Spec.ts index 7d6c04f82651..a23cb8e2f2d3 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL1_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL1_Spec.ts @@ -10,10 +10,19 @@ import { table, assertHelper, } from "../../../../support/Objects/ObjectsCore"; -// import { INTERCEPT } from "../../../../fixtures/variables"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; let dsName: any; describe("Validate MySQL Generate CRUD with JSON Form", () => { + before(() => { + featureFlagIntercept({ + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }); + }); // beforeEach(function() { // if (INTERCEPT.MYSQL) { // cy.log("MySQL DB is not found. Using intercept"); @@ -25,6 +34,7 @@ describe("Validate MySQL Generate CRUD with JSON Form", () => { dataSources.CreateDataSource("MySql"); cy.get("@dsName").then(($dsName) => { dsName = $dsName; + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.AddNewPage(); entityExplorer.AddNewPage("Generate page with data"); agHelper.GetNClick(dataSources._selectDatasourceDropdown); @@ -54,7 +64,7 @@ describe("Validate MySQL Generate CRUD with JSON Form", () => { //coz if app is published & shared then deleting ds may cause issue, So! cy.get("@dsName").then(($dsName) => { dsName = $dsName; - dataSources.DeleteDatasouceFromActiveTab(dsName as string, 409); + dataSources.DeleteDatasourceFromWithinDS(dsName as string, 409); agHelper.WaitUntilAllToastsDisappear(); }); deployMode.DeployApp(locators._emptyPageTxt); @@ -62,7 +72,7 @@ describe("Validate MySQL Generate CRUD with JSON Form", () => { deployMode.NavigateBacktoEditor(); cy.get("@dsName").then(($dsName) => { dsName = $dsName; - dataSources.DeleteDatasouceFromActiveTab(dsName as string, 200); + dataSources.DeleteDatasourceFromWithinDS(dsName as string, 200); }); agHelper.WaitUntilAllToastsDisappear(); }); @@ -153,12 +163,12 @@ describe("Validate MySQL Generate CRUD with JSON Form", () => { //agHelper.VerifyEvaluatedValue(tableCreateQuery); //failing sometimes! dataSources.RunQueryNVerifyResponseViews(); + dataSources.AssertTableInVirtuosoList(dsName, "productlines"); + agHelper.ActionContextMenuWithInPane({ action: "Delete", entityType: entityItems.Query, }); - - dataSources.AssertTableInVirtuosoList(dsName, "productlines"); }); it("5. Verify Generate CRUD for the new table & Verify Deploy mode for table - Productlines", () => { @@ -272,18 +282,11 @@ describe("Validate MySQL Generate CRUD with JSON Form", () => { //agHelper.VerifyEvaluatedValue(tableCreateQuery); dataSources.RunQueryNVerifyResponseViews(); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ExpandCollapseEntity(dsName); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Refresh", - }); - agHelper.AssertElementAbsence( - entityExplorer._entityNameInExplorer("Stores"), - ); + dataSources.AssertTableInVirtuosoList(dsName, "Stores", false); }); it("10. Verify application does not break when user runs the query with wrong table name", function () { + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.SelectEntityByName("DropProductlines", "Queries/JS"); dataSources.RunQuery({ toValidateResponse: false }); cy.wait("@postExecute").then(({ response }) => { diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL2_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL2_Spec.ts index 098948720ac4..8af6b3cf6403 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL2_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/MySQL2_Spec.ts @@ -1,4 +1,6 @@ // import { INTERCEPT } from "../../../../fixtures/variables"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; + let dsName: any, newStoreSecret: any; import { @@ -64,12 +66,12 @@ describe("Validate MySQL Generate CRUD with JSON Form", () => { //agHelper.VerifyEvaluatedValue(tableCreateQuery); dataSources.RunQueryNVerifyResponseViews(); + dataSources.AssertTableInVirtuosoList(dsName, "Stores"); + agHelper.ActionContextMenuWithInPane({ action: "Delete", entityType: entityItems.Query, }); - - dataSources.AssertTableInVirtuosoList(dsName, "Stores"); }); it("2. Validate Select record from Postgress datasource & verify query response", () => { @@ -359,19 +361,12 @@ describe("Validate MySQL Generate CRUD with JSON Form", () => { //agHelper.VerifyEvaluatedValue(tableCreateQuery); dataSources.RunQueryNVerifyResponseViews(); + dataSources.AssertTableInVirtuosoList(dsName, "Stores", false); + agHelper.ActionContextMenuWithInPane({ action: "Delete", entityType: entityItems.Query, }); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ExpandCollapseEntity(dsName); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Refresh", - }); - agHelper.AssertElementAbsence( - entityExplorer._entityNameInExplorer("Stores"), - ); }); after( diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres1_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres1_Spec.ts index b0dab2fac1ec..8a94f6215334 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres1_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres1_Spec.ts @@ -10,6 +10,9 @@ import { entityItems, assertHelper, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; let dsName: any; @@ -18,6 +21,7 @@ describe("Postgres Generate CRUD with JSON Form", () => { dataSources.CreateDataSource("Postgres"); cy.get("@dsName").then(($dsName) => { dsName = $dsName; + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.AddNewPage(); entityExplorer.AddNewPage("Generate page with data"); agHelper.GetNClick(dataSources._selectDatasourceDropdown); @@ -49,7 +53,7 @@ describe("Postgres Generate CRUD with JSON Form", () => { //coz if app is published & shared then deleting ds may cause issue, So! cy.get("@dsName").then(($dsName) => { dsName = $dsName; - dataSources.DeleteDatasouceFromActiveTab(dsName as string, 409); + dataSources.DeleteDatasourceFromWithinDS(dsName as string, 409); agHelper.WaitUntilAllToastsDisappear(); }); deployMode.DeployApp(locators._emptyPageTxt); @@ -57,7 +61,7 @@ describe("Postgres Generate CRUD with JSON Form", () => { deployMode.NavigateBacktoEditor(); cy.get("@dsName").then(($dsName) => { dsName = $dsName; - dataSources.DeleteDatasouceFromActiveTab(dsName as string, 200); + dataSources.DeleteDatasourceFromWithinDS(dsName as string, 200); }); }); diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres2_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres2_Spec.ts index 32b811d832fb..9cd4bc72bf53 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres2_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/Postgres2_Spec.ts @@ -57,11 +57,14 @@ describe("Validate Postgres Generate CRUD with JSON Form", () => { //agHelper.VerifyEvaluatedValue(tableCreateQuery); //failing sometimes! dataSources.RunQueryNVerifyResponseViews(); - dataSources.AssertTableInVirtuosoList(dsName, "public.vessels"); }); it("2. Validate Select record from Postgress datasource & verify query response", () => { - entityExplorer.ActionTemplateMenuByEntityName("public.vessels", "Select"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "public.vessels", + "Select", + ); dataSources.RunQueryNVerifyResponseViews(10); dataSources.AssertQueryTableResponse(0, "371681"); dataSources.AssertQueryTableResponse(6, "Passenger"); diff --git a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js index 080aa8256070..d32e26050768 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/GenerateCRUD/S3_Spec.js @@ -73,21 +73,6 @@ describe("Generate New CRUD Page Inside from entity explorer", function () { }); it("2. Generate CRUD page from datasource ACTIVE section", function () { - // cy.NavigateToQueryEditor(); - // cy.get(pages.integrationActiveTab) - // .should("be.visible") - // .click({ force: true }); - // cy.wait(1000); - - // cy.get(datasourceEditor.datasourceCard) - // .contains(datasourceName) - // .scrollIntoView() - // .should("be.visible") - // .closest(datasourceEditor.datasourceCard) - // .within(() => { - // cy.get(datasourceEditor.datasourceCardGeneratePageBtn).click(); - // }); - cy.NavigateToDSGeneratePage(datasourceName); // fetch bucket diff --git a/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/Basic_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/Basic_Spec.ts index 51bfcd829e17..51b2f2df60eb 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/Basic_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/Basic_Spec.ts @@ -9,11 +9,22 @@ import { entityItems, } from "../../../../support/Objects/ObjectsCore"; import inputData from "../../../../support/Objects/mySqlData"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; let dsName: any, query: string; describe("MySQL Datatype tests", function () { before("Load dsl, Change theme, Create Mysql DS", () => { + featureFlagIntercept( + { + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }, + false, + ); agHelper.AddDsl("Datatypes/mySQLdsl"); appSettings.OpenPaneAndChangeTheme("Moon"); @@ -21,6 +32,7 @@ describe("MySQL Datatype tests", function () { cy.get("@dsName").then(($dsName) => { dsName = $dsName; }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("1. Creating mysqlDTs table & queries", () => { @@ -31,10 +43,9 @@ describe("MySQL Datatype tests", function () { dataSources.CreateQueryFromOverlay(dsName, query, "createTable"); //Creating query from EE overlay dataSources.RunQuery(); - dataSources.AssertTableInVirtuosoList(dsName, inputData.tableName); - //Creating SELECT query - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, inputData.tableName, "Select", ); @@ -46,7 +57,8 @@ describe("MySQL Datatype tests", function () { //Other queries query = inputData.query.insertRecord; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, inputData.tableName, "Insert", ); @@ -54,7 +66,8 @@ describe("MySQL Datatype tests", function () { dataSources.EnterQuery(query); query = inputData.query.dropTable; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, inputData.tableName, "Delete", ); @@ -127,17 +140,7 @@ describe("MySQL Datatype tests", function () { dataSources.RunQuery(); dataSources.AssertQueryTableResponse(0, "0"); //Success response for dropped table! entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ExpandCollapseEntity(dsName); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Refresh", - }); - agHelper.AssertElementAbsence( - entityExplorer._entityNameInExplorer(inputData.tableName), - ); - entityExplorer.ExpandCollapseEntity(dsName, false); - entityExplorer.ExpandCollapseEntity("Datasources", false); + dataSources.AssertTableInVirtuosoList(dsName, inputData.tableName, false); //DS deletion dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists diff --git a/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/False_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/False_Spec.ts index 455b4729a22c..56c4f91ce952 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/False_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/MySQL_Datatypes/False_Spec.ts @@ -5,11 +5,16 @@ import { dataSources, } from "../../../../support/Objects/ObjectsCore"; import inputData from "../../../../support/Objects/mySqlData"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; let dsName: any, query: string; describe("MySQL Datatype tests", function () { before("Create Mysql DS & Create mysqlDTs table", function () { + featureFlagIntercept({ + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }); dataSources.CreateDataSource("MySql"); cy.get("@dsName").then(($dsName) => { dsName = $dsName; @@ -18,14 +23,13 @@ describe("MySQL Datatype tests", function () { query = inputData.query.createTable; dataSources.CreateQueryAfterDSSaved(query, "createTable"); //Creating query from EE overlay dataSources.RunQuery(); - - dataSources.AssertTableInVirtuosoList(dsName, inputData.tableName); }); }); //Insert false values to each column and check for the error status of the request. it("1. False Cases & Long Integer as query param", () => { - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, inputData.tableName, "Insert", ); diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad1_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad1_Spec.ts index 6616af78e85d..2590c8ba86d6 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad1_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JSOnLoad1_Spec.ts @@ -10,6 +10,9 @@ import { entityItems, assertHelper, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; let dsName: any, jsName: any; describe("JSObjects OnLoad Actions tests", function () { @@ -20,6 +23,7 @@ describe("JSObjects OnLoad Actions tests", function () { cy.get("@dsName").then(($dsName) => { dsName = $dsName; }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }); it("1. Tc 54, 55 - Verify User enables only 'Before Function calling' & OnPage Load is Automatically enable after mapping done on JSOBject", function () { diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JsOnLoad3_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JsOnLoad3_Spec.ts index be966ba7cf95..dff424abcc91 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JsOnLoad3_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/JsOnLoad3_Spec.ts @@ -10,6 +10,9 @@ import { apiPage, dataSources, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; let dsName: any, jsName: any; @@ -31,6 +34,7 @@ describe("JSObjects OnLoad Actions tests", function () { dsName = $dsName; }); cy.fixture("datasources").then((datasourceFormData: any) => { + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.ExpandCollapseEntity("Queries/JS"); apiPage.CreateAndFillApi( "https://api.forismatic.com/api/1.0/?method=getQuote&lang=en&format=json", diff --git a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/PostgresConnections_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/PostgresConnections_spec.ts index eb3f8eb80b8c..dc48a9273913 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/PostgresConnections_spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/OnLoadTests/PostgresConnections_spec.ts @@ -57,7 +57,7 @@ describe("Test Postgres number of connections on page load + Bug 11572, Bug 1120 dsName_2 = $dsName; //Create 10 queries - for (let i = 1; i <= 10; i++) { + for (let i = 1; i <= 8; i++) { dataSources.NavigateFromActiveDS(dsName_2, true); agHelper.RenameWithInPane("Query_" + i); const userCreateQuery = `select table_name from information_schema.tables where table_schema='public' and table_type='BASE TABLE';`; @@ -67,7 +67,7 @@ describe("Test Postgres number of connections on page load + Bug 11572, Bug 1120 }); it("3. Bind queries to select widget", () => { - for (let i = 1; i < 10; i++) { + for (let i = 1; i < 8; i++) { entityExplorer.DragDropWidgetNVerify( "selectwidget", i * 1.5 * 50 + 100, @@ -163,7 +163,7 @@ describe("Test Postgres number of connections on page load + Bug 11572, Bug 1120 entityType: entityItems.Query, }); - for (let i = 1; i <= 10; i++) { + for (let i = 1; i <= 8; i++) { entityExplorer.ActionContextMenuByEntityName({ entityNameinLeftSidebar: "Query_" + i, action: "Delete", diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Array_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Array_Spec.ts index 35b5d1121b78..ace142a9ec5d 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Array_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Array_Spec.ts @@ -9,16 +9,25 @@ import { entityItems, assertHelper, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; describe("Array Datatype tests", function () { let dsName: any, query: string; before("Create DS, Add DS & setting theme", () => { + featureFlagIntercept({ + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }); dataSources.CreateDataSource("Postgres"); cy.get("@dsName").then(($dsName) => { dsName = $dsName; }); agHelper.AddDsl("Datatypes/ArrayDTdsl"); + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.NavigateToSwitcher("Widgets"); appSettings.OpenPaneAndChangeThemeColors(-31, -27); }); @@ -30,10 +39,9 @@ describe("Array Datatype tests", function () { agHelper.RenameWithInPane("createTable"); dataSources.RunQuery(); - dataSources.AssertTableInVirtuosoList(dsName, "public.arraytypes"); - //Creating SELECT query - arraytypes + Bug 14493 - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.arraytypes", "Select", ); @@ -65,7 +73,6 @@ describe("Array Datatype tests", function () { dataSources.CreateQueryFromOverlay(dsName, query, "dropTable"); //Creating query from EE overlay entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity(dsName, false); }); it("2. Inserting record - arraytypes", () => { @@ -519,17 +526,7 @@ describe("Array Datatype tests", function () { dataSources.RunQuery(); dataSources.AssertQueryTableResponse(0, "0"); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ExpandCollapseEntity(dsName); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Refresh", - }); - agHelper.AssertElementAbsence( - entityExplorer._entityNameInExplorer("public.arraytypes"), - ); - entityExplorer.ExpandCollapseEntity(dsName, false); - entityExplorer.ExpandCollapseEntity("Datasources", false); + dataSources.AssertTableInVirtuosoList(dsName, "public.arraytypes", false); }); after( @@ -537,6 +534,7 @@ describe("Array Datatype tests", function () { () => { //Verify Deletion of all created queries dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.ExpandCollapseEntity("Queries/JS"); entityExplorer.DeleteAllQueriesForDB(dsName); //Ds Deletion @@ -544,6 +542,7 @@ describe("Array Datatype tests", function () { deployMode.NavigateBacktoEditor(); entityExplorer.ExpandCollapseEntity("Queries/JS"); dataSources.DeleteDatasourceFromWithinDS(dsName, 200); + EditorNavigation.ViaSidebar(SidebarButton.Pages); }, ); }); diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Binary_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Binary_Spec.ts index a654fb3035c9..edf2a4934076 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Binary_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Binary_Spec.ts @@ -9,11 +9,16 @@ import { table, assertHelper, } from "../../../../support/Objects/ObjectsCore"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; describe("Binary Datatype tests", function () { let dsName: any, query: string, imageNameToUpload: string; before("Create DS, Importing App & setting theme", () => { + featureFlagIntercept({ + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }); agHelper.AddDsl("Datatypes/BinaryDTdsl"); appSettings.OpenPaneAndChangeThemeColors(7, -9); dataSources.CreateDataSource("Postgres"); @@ -27,11 +32,10 @@ describe("Binary Datatype tests", function () { dataSources.CreateQueryAfterDSSaved(query, "createTable"); dataSources.RunQuery(); - dataSources.AssertTableInVirtuosoList(dsName, "public.binarytype"); - //Creating SELECT query - binarytype + Bug 14493 query = `SELECT binarytype.serialid, binarytype.imagename, encode(binarytype.existingimage, 'escape') as "OldImage", encode(binarytype.newimage, 'escape') as "NewImage" from public."binarytype";`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.binarytype", "Select", ); @@ -66,7 +70,6 @@ describe("Binary Datatype tests", function () { dataSources.SetQueryTimeout(30000); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity(dsName, false); entityExplorer.SelectEntityByName("Page1"); deployMode.DeployApp(); table.WaitForTableEmpty(); //asserting table is empty before inserting! @@ -394,8 +397,6 @@ describe("Binary Datatype tests", function () { // agHelper.AssertElementAbsence( // entityExplorer._entityNameInExplorer("public.binarytype"), // ); - // entityExplorer.ExpandCollapseEntity(dsName, false); - // entityExplorer.ExpandCollapseEntity("Datasources", false); // //Delete all queries // dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/BooleanEnum_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/BooleanEnum_Spec.ts index 06e7fcd656bb..380b22067ba8 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/BooleanEnum_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/BooleanEnum_Spec.ts @@ -9,11 +9,16 @@ import { entityItems, assertHelper, } from "../../../../support/Objects/ObjectsCore"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; describe("Boolean & Enum Datatype tests", function () { let dsName: any, query: string; before("Create Postgress DS, Add dsl, Appply theme", () => { + featureFlagIntercept({ + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }); agHelper.AddDsl("Datatypes/BooleanEnumDTdsl"); appSettings.OpenPaneAndChangeThemeColors(-18, -20); dataSources.CreateDataSource("Postgres"); @@ -31,10 +36,9 @@ describe("Boolean & Enum Datatype tests", function () { dataSources.CreateQueryFromOverlay(dsName, query, "createTable"); dataSources.RunQuery(); - dataSources.AssertTableInVirtuosoList(dsName, "public.boolenumtypes"); - //Select query: - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.boolenumtypes", "Select", ); @@ -67,7 +71,6 @@ describe("Boolean & Enum Datatype tests", function () { dataSources.CreateQueryFromOverlay(dsName, query, "dropEnum"); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity(dsName, false); }); it("2. Inserting record - boolenumtypes", () => { @@ -230,17 +233,6 @@ describe("Boolean & Enum Datatype tests", function () { expect($cellData).to.eq("0"); //Success response for dropped table! }); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ExpandCollapseEntity(dsName); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Refresh", - }); - agHelper.AssertElementAbsence( - entityExplorer._entityNameInExplorer("public.boolenumtypes"), - ); - entityExplorer.ExpandCollapseEntity(dsName, false); - entityExplorer.ExpandCollapseEntity("Datasources", false); //Delete queries dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since all queries exists diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Character_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Character_Spec.ts index 7288f28cf1db..bbdbbdba27c0 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Character_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Character_Spec.ts @@ -8,11 +8,16 @@ import { table, assertHelper, } from "../../../../support/Objects/ObjectsCore"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; describe("Character Datatype tests", function () { let dsName: any, query: string; before("Create Postgress DS", () => { + featureFlagIntercept({ + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }); agHelper.AddDsl("Datatypes/CharacterDTdsl"); appSettings.OpenPaneAndChangeTheme("Pacific"); dataSources.CreateDataSource("Postgres"); @@ -28,12 +33,15 @@ describe("Character Datatype tests", function () { agHelper.RenameWithInPane("createTable"); agHelper.FocusElement(locators._codeMirrorTextArea); dataSources.RunQuery(); - dataSources.AssertTableInVirtuosoList(dsName, "public.chartypes"); }); it("2. Creating SELECT query - chartypes + Bug 14493", () => { query = `SELECT *, char_length("AsMany") as "AsMany-Len", char_length("Unlimited") as "Unlimited-Len" FROM public."chartypes" as charT LIMIT 10;`; - entityExplorer.ActionTemplateMenuByEntityName("public.chartypes", "Select"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "public.chartypes", + "Select", + ); dataSources.RunQuery(); agHelper .GetText(dataSources._noRecordFound) @@ -47,7 +55,11 @@ describe("Character Datatype tests", function () { it("3. Creating all queries - chartypes", () => { query = `INSERT INTO public."chartypes" ("One(1)", "AsMany", "Limited(4)", "Unlimited") VALUES ({{Insertone.text}}, {{Insertasmany.text}}, {{Insertlimited.text}}::varchar(4), {{Insertunlimited.text}});`; - entityExplorer.ActionTemplateMenuByEntityName("public.chartypes", "Insert"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "public.chartypes", + "Insert", + ); dataSources.EnterQuery(query); agHelper.RenameWithInPane("insertRecord"); @@ -57,27 +69,42 @@ describe("Character Datatype tests", function () { "Limited(4)" = {{Updatelimited.text}}::varchar(4), "Unlimited" = {{Updateunlimited.text}} WHERE serialid = {{Table1.selectedRow.serialid}};`; - entityExplorer.ActionTemplateMenuByEntityName("public.chartypes", "Update"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "public.chartypes", + "Update", + ); dataSources.EnterQuery(query); agHelper.RenameWithInPane("updateRecord"); query = `DELETE FROM public."chartypes"`; - entityExplorer.ActionTemplateMenuByEntityName("public.chartypes", "Delete"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "public.chartypes", + "Delete", + ); dataSources.EnterQuery(query); agHelper.RenameWithInPane("deleteAllRecords"); query = `drop table public."chartypes"`; - entityExplorer.ActionTemplateMenuByEntityName("public.chartypes", "Delete"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "public.chartypes", + "Delete", + ); dataSources.EnterQuery(query); agHelper.RenameWithInPane("dropTable"); query = `DELETE FROM public."chartypes" WHERE serialId = {{Table1.selectedRow.serialid}};`; - entityExplorer.ActionTemplateMenuByEntityName("public.chartypes", "Delete"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "public.chartypes", + "Delete", + ); dataSources.EnterQuery(query); agHelper.RenameWithInPane("deleteRecord"); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity(dsName, false); }); it("4. Inserting record (null values) - chartypes", () => { @@ -336,17 +363,7 @@ describe("Character Datatype tests", function () { expect($cellData).to.eq("0"); //Success response for dropped table! }); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ExpandCollapseEntity(dsName); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Refresh", - }); - agHelper.AssertElementAbsence( - entityExplorer._entityNameInExplorer("public.chartypes"), - ); - entityExplorer.ExpandCollapseEntity(dsName, false); - entityExplorer.ExpandCollapseEntity("Datasources", false); + dataSources.AssertTableInVirtuosoList(dsName, "public.chartypes", false); }); it("15. Verify Deletion of the datasource after all created queries are deleted", () => { diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/DateTime_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/DateTime_Spec.ts index 5fd7bdfb42c0..42c4a4602355 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/DateTime_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/DateTime_Spec.ts @@ -9,11 +9,16 @@ import { assertHelper, entityItems, } from "../../../../support/Objects/ObjectsCore"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; describe("DateTime Datatype tests", function () { let dsName: any, query: string; before("Create Postgress DS", () => { + featureFlagIntercept({ + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }); agHelper.AddDsl("Datatypes/DateTimeDTdsl"); appSettings.OpenPaneAndChangeThemeColors(22, 32); dataSources.CreateDataSource("Postgres"); @@ -31,7 +36,6 @@ describe("DateTime Datatype tests", function () { agHelper.RenameWithInPane("createTable"); agHelper.FocusElement(locators._codeMirrorTextArea); dataSources.RunQuery(); - dataSources.AssertTableInVirtuosoList(dsName, "public.datetimetypes"); }); it("2. Creating SELECT query - datetimetypes + Bug 14493", () => { @@ -41,7 +45,8 @@ describe("DateTime Datatype tests", function () { TO_CHAR (datetimeT.ts, 'MONTH') ||' / ' || TO_CHAR(datetimeT.dater, 'Month') as "MONTH/Month", TO_CHAR (datetimeT.dater, 'D') ||' / ' || TO_CHAR(datetimeT.dater, 'day') as "Day of the wentityExplorer.k/WentityExplorer.kday", TO_CHAR (datetimeT.dater, 'W') as "WentityExplorer.k of Month" FROM public."datetimetypes" as datetimeT;`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.datetimetypes", "Select", ); @@ -56,7 +61,8 @@ describe("DateTime Datatype tests", function () { it("3. Creating all queries - datetimetypes", () => { query = `INSERT INTO public."datetimetypes" (ts, tstz, dater, timer, intervaler) VALUES('{{Insertts.text}}', '{{Inserttstz.text}}', '{{Insertdater.text}}', '{{Inserttimer.text}}', '{{Insertintervaler.text}}');`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.datetimetypes", "Insert", ); @@ -67,7 +73,8 @@ describe("DateTime Datatype tests", function () { query = `UPDATE public."datetimetypes" SET "ts" = '{{Updatets.text}}', "tstz" = '{{Updatetstz.text}}', "dater" = '{{Updatedater.text}}', "timer" = '{{Updatetimer.text}}', "intervaler" = '{{Updateintervaler.text}}' WHERE serialid = {{Table1.selectedRow.serialid}};`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.datetimetypes", "Update", ); @@ -76,7 +83,8 @@ describe("DateTime Datatype tests", function () { dataSources.ToggleUsePreparedStatement(false); query = `DELETE FROM public."datetimetypes"`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.datetimetypes", "Delete", ); @@ -84,7 +92,8 @@ describe("DateTime Datatype tests", function () { agHelper.RenameWithInPane("deleteAllRecords"); query = `drop table public."datetimetypes"`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.datetimetypes", "Delete", ); @@ -93,7 +102,8 @@ describe("DateTime Datatype tests", function () { query = `DELETE FROM public."datetimetypes" WHERE serialId = {{Table1.selectedRow.serialid}};`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.datetimetypes", "Delete", ); @@ -107,7 +117,8 @@ describe("DateTime Datatype tests", function () { justify_days(INTERVAL '30 days'), justify_hours(INTERVAL '24 hours'), EXTRACT (MINUTE FROM INTERVAL '5 hours 21 minutes');`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.datetimetypes", "Select", ); @@ -133,7 +144,6 @@ describe("DateTime Datatype tests", function () { entityType: entityItems.Query, }); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity(dsName, false); }); it("5. Inserting record - datetimetypes", () => { @@ -316,17 +326,11 @@ describe("DateTime Datatype tests", function () { expect($cellData).to.eq("0"); //Success response for dropped table! }); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ExpandCollapseEntity(dsName); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Refresh", - }); - agHelper.AssertElementAbsence( - entityExplorer._entityNameInExplorer("public.datetimetypes"), + dataSources.AssertTableInVirtuosoList( + dsName, + "public.datetimetypes", + false, ); - entityExplorer.ExpandCollapseEntity(dsName, false); - entityExplorer.ExpandCollapseEntity("Datasources", false); }); it("12. Verify Deletion of the datasource after all created queries are deleted", () => { diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Json_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Json_Spec.ts index 3d1097217d63..86d7de13e798 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Json_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Json_Spec.ts @@ -9,15 +9,24 @@ import { locators, assertHelper, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; describe("Json & JsonB Datatype tests", function () { let dsName: any, query: string; before("Importing App & setting theme", () => { + featureFlagIntercept({ + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }); dataSources.CreateDataSource("Postgres"); cy.get("@dsName").then(($dsName) => { dsName = $dsName; }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); agHelper.AddDsl("Datatypes/JsonDTdsl"); entityExplorer.NavigateToSwitcher("Widgets"); @@ -40,11 +49,14 @@ describe("Json & JsonB Datatype tests", function () { dataSources.EnterQuery(query); agHelper.RenameWithInPane("createTable"); dataSources.RunQuery(); - dataSources.AssertTableInVirtuosoList(dsName, "public.jsonbooks"); }); it("2. Creating SELECT query - jsonbooks + Bug 14493", () => { - entityExplorer.ActionTemplateMenuByEntityName("public.jsonbooks", "Select"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "public.jsonbooks", + "Select", + ); agHelper.RenameWithInPane("selectRecords"); dataSources.RunQuery(); agHelper @@ -81,7 +93,6 @@ describe("Json & JsonB Datatype tests", function () { agHelper.RenameWithInPane("dropTable"); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity(dsName, false); }); it("4. Inserting record - jsonbooks", () => { @@ -314,8 +325,6 @@ describe("Json & JsonB Datatype tests", function () { }); entityExplorer.ExpandCollapseEntity("Queries/JS", false); dataSources.AssertTableInVirtuosoList(dsName, "public.jsonbooks", false); - entityExplorer.ExpandCollapseEntity(dsName, false); - entityExplorer.ExpandCollapseEntity("Datasources", false); }); it("13. Verify Deletion of all created queries", () => { @@ -347,12 +356,11 @@ describe("Json & JsonB Datatype tests", function () { dataSources.EnterQuery(query); agHelper.RenameWithInPane("createTable"); dataSources.RunQuery(); - - dataSources.AssertTableInVirtuosoList(dsName, "public.jsonBbooks"); }); it("16. Creating SELECT query - jsonBbooks + Bug 14493", () => { - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.jsonBbooks", "Select", ); @@ -402,7 +410,6 @@ describe("Json & JsonB Datatype tests", function () { agHelper.RenameWithInPane("dropEnum"); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity(dsName, false); }); it("18. Inserting record - jsonbooks", () => { @@ -660,8 +667,6 @@ describe("Json & JsonB Datatype tests", function () { }); entityExplorer.ExpandCollapseEntity("Queries/JS", false); dataSources.AssertTableInVirtuosoList(dsName, "public.jsonBbooks", false); - entityExplorer.ExpandCollapseEntity(dsName, false); - entityExplorer.ExpandCollapseEntity("Datasources", false); }); it("27. Verify Deletion of all created queries", () => { diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Numeric_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Numeric_Spec.ts index e78b6e9e27ca..17f42e766722 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Numeric_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/Numeric_Spec.ts @@ -8,11 +8,16 @@ import { table, assertHelper, } from "../../../../support/Objects/ObjectsCore"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; describe("Numeric Datatype tests", function () { let dsName: any, query: string; before("Create Postgress DS, set Theme", () => { + featureFlagIntercept({ + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }); agHelper.AddDsl("Datatypes/NumericDTdsl"); appSettings.OpenPaneAndChangeTheme("Moon"); @@ -29,11 +34,11 @@ describe("Numeric Datatype tests", function () { agHelper.RenameWithInPane("createTable"); agHelper.FocusElement(locators._codeMirrorTextArea); dataSources.RunQuery(); - dataSources.AssertTableInVirtuosoList(dsName, "public.numerictypes"); }); it("2. Creating SELECT query - numerictypes + Bug 14493", () => { - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.numerictypes", "Select", ); @@ -47,7 +52,8 @@ describe("Numeric Datatype tests", function () { it("3. Creating all queries - numerictypes", () => { query = `INSERT INTO public."numerictypes" ("bigintid", "decimalid", "numericid") VALUES ({{Insertbigint.text}}, {{Insertdecimal.text}}, {{Insertnumeric.text}})`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.numerictypes", "Insert", ); @@ -59,7 +65,8 @@ describe("Numeric Datatype tests", function () { "decimalid" = {{Updatedecimal.text}}, "numericid" = {{Updatenumeric.text}} WHERE serialid = {{Table1.selectedRow.serialid}};`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.numerictypes", "Update", ); @@ -67,7 +74,8 @@ describe("Numeric Datatype tests", function () { agHelper.RenameWithInPane("updateRecord"); query = `DELETE FROM public."numerictypes"`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.numerictypes", "Delete", ); @@ -75,7 +83,8 @@ describe("Numeric Datatype tests", function () { agHelper.RenameWithInPane("deleteAllRecords"); query = `drop table public."numerictypes"`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.numerictypes", "Delete", ); @@ -84,14 +93,14 @@ describe("Numeric Datatype tests", function () { query = `DELETE FROM public."numerictypes" WHERE serialId ={{Table1.selectedRow.serialid}}`; - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "public.numerictypes", "Delete", ); dataSources.EnterQuery(query); agHelper.RenameWithInPane("deleteRecord"); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity(dsName, false); }); it("4. Inserting record (+ve limit) - numerictypes + Bug 14516", () => { @@ -297,8 +306,6 @@ describe("Numeric Datatype tests", function () { }); entityExplorer.ExpandCollapseEntity("Queries/JS", false); dataSources.AssertTableInVirtuosoList(dsName, "public.numerictypes", false); - entityExplorer.ExpandCollapseEntity(dsName, false); - entityExplorer.ExpandCollapseEntity("Datasources", false); }); it("15. Verify Deletion of the datasource after all created queries are deleted", () => { diff --git a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/UUID_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/UUID_Spec.ts index 2c805d81a3b4..93c03317c031 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/UUID_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Postgres_DataTypes/UUID_Spec.ts @@ -10,15 +10,24 @@ import { entityItems, assertHelper, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; describe("UUID Datatype tests", function () { let dsName: any, query: string, imageNameToUpload: string; before("Importing App & setting theme", () => { + featureFlagIntercept({ + ab_gsheet_schema_enabled: true, + ab_mock_mongo_schema_enabled: true, + }); dataSources.CreateDataSource("Postgres"); cy.get("@dsName").then(($dsName) => { dsName = $dsName; }); + EditorNavigation.ViaSidebar(SidebarButton.Pages); agHelper.AddDsl("Datatypes/UUIDDTdsl"); entityExplorer.NavigateToSwitcher("Widgets"); @@ -40,11 +49,14 @@ describe("UUID Datatype tests", function () { dataSources.EnterQuery(query); agHelper.RenameWithInPane("createTable"); dataSources.RunQuery(); - dataSources.AssertTableInVirtuosoList(dsName, "public.uuidtype"); }); it("3. Creating SELECT query - uuidtype + Bug 14493", () => { - entityExplorer.ActionTemplateMenuByEntityName("public.uuidtype", "Select"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "public.uuidtype", + "Select", + ); dataSources.RunQuery(); agHelper .GetText(dataSources._noRecordFound) @@ -79,7 +91,6 @@ describe("UUID Datatype tests", function () { agHelper.RenameWithInPane("deleteRecord"); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity(dsName, false); }); it("5. Inserting record - uuidtype", () => { @@ -370,17 +381,7 @@ describe("UUID Datatype tests", function () { expect($cellData).to.eq("0"); //Success response for dropped table! }); entityExplorer.ExpandCollapseEntity("Queries/JS", false); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ExpandCollapseEntity(dsName); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Refresh", - }); - agHelper.AssertElementAbsence( - entityExplorer._entityNameInExplorer("public.uuidtype"), - ); - entityExplorer.ExpandCollapseEntity(dsName, false); - entityExplorer.ExpandCollapseEntity("Datasources", false); + dataSources.AssertTableInVirtuosoList(dsName, "public.uuidtype", false); }); it("15. Verify Deletion of all created queries", () => { diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/DSDocs_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/DSDocs_Spec.ts index d14f44e466d5..3fa03bb37744 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/DSDocs_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/DSDocs_Spec.ts @@ -144,8 +144,7 @@ describe("Check datasource doc links", function () { action: "Delete", entityType: entityItems.Query, }); - entityExplorer.ExpandCollapseEntity("Datasources"); - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); // entityExplorer.ActionContextMenuByEntityName({ // entityNameinLeftSidebar: dsName, // action: "Delete", diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts index ca04e767d32a..5440d79dfb5e 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/GoogleSheets_spec.ts @@ -4,6 +4,9 @@ import { locators, agHelper, } from "../../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; describe( "excludeForAirgap", @@ -44,7 +47,7 @@ describe( ); agHelper.GetNClick(locators._visibleTextSpan("Don't save")); agHelper.Sleep(); - agHelper.GoBack(); + EditorNavigation.ViaSidebar(SidebarButton.Pages); agHelper.Sleep(); }); }, diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo1_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo1_spec.ts index 8ecc44977291..f76471392f87 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo1_spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo1_spec.ts @@ -307,16 +307,19 @@ describe("Validate Mongo Query Pane Validations", () => { 7, ); }); + agHelper.ActionContextMenuWithInPane({ action: "Delete", entityType: entityItems.Query, }); - - dataSources.AssertTableInVirtuosoList(dsName, "AuthorNAwards"); }); it("3. Validate 'Find' record from new collection & verify query response", () => { - entityExplorer.ActionTemplateMenuByEntityName("AuthorNAwards", "Find"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "AuthorNAwards", + "Find", + ); dataSources.ValidateNSelectDropdown("Commands", "Find document(s)"); dataSources.RunQueryNVerifyResponseViews(1, false); agHelper.ActionContextMenuWithInPane({ @@ -326,7 +329,8 @@ describe("Validate Mongo Query Pane Validations", () => { }); it("4. Validate 'Find by ID' record from new collection & verify query response", () => { - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, "AuthorNAwards", "Find by id", ); @@ -397,7 +401,11 @@ describe("Validate Mongo Query Pane Validations", () => { ] }]`; - entityExplorer.ActionTemplateMenuByEntityName("AuthorNAwards", "Insert"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "AuthorNAwards", + "Insert", + ); dataSources.ValidateNSelectDropdown("Commands", "Insert document(s)"); agHelper.EnterValue(insertauthorNAwards, { propFieldName: "", @@ -419,7 +427,11 @@ describe("Validate Mongo Query Pane Validations", () => { }); it("6. Validate 'Update' record from new collection & verify query response - Record not present - All Matching Document", () => { - entityExplorer.ActionTemplateMenuByEntityName("AuthorNAwards", "Update"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "AuthorNAwards", + "Update", + ); dataSources.ValidateNSelectDropdown("Commands", "Update document(s)"); agHelper.EnterValue(`{"_id": 3}`, { propFieldName: "", @@ -448,7 +460,11 @@ describe("Validate Mongo Query Pane Validations", () => { }); it("7. Validate 'Update' record from new collection & verify query response - Record present - All Matching Document", () => { - entityExplorer.ActionTemplateMenuByEntityName("AuthorNAwards", "Update"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "AuthorNAwards", + "Update", + ); dataSources.ValidateNSelectDropdown("Commands", "Update document(s)"); agHelper.EnterValue( `{ @@ -487,7 +503,11 @@ describe("Validate Mongo Query Pane Validations", () => { }); it("8. Validate 'Update' record from new collection & verify query response - Record present - Single document", () => { - entityExplorer.ActionTemplateMenuByEntityName("AuthorNAwards", "Update"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "AuthorNAwards", + "Update", + ); dataSources.ValidateNSelectDropdown("Commands", "Update document(s)"); agHelper.EnterValue(`{"_id": 4}`, { propFieldName: "", @@ -521,7 +541,11 @@ describe("Validate Mongo Query Pane Validations", () => { }); it("9. Validate 'Delete' record from new collection & verify query response - Record not present - Single document", () => { - entityExplorer.ActionTemplateMenuByEntityName("AuthorNAwards", "Delete"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "AuthorNAwards", + "Delete", + ); dataSources.ValidateNSelectDropdown("Commands", "Delete document(s)"); agHelper.EnterValue(`{ "_id": ObjectId("51df07b094c6acd67e492f43") }`, { propFieldName: "", @@ -544,7 +568,11 @@ describe("Validate Mongo Query Pane Validations", () => { }); it("10. Validate 'Delete' record from new collection & verify query response - Record present - Single document", () => { - entityExplorer.ActionTemplateMenuByEntityName("AuthorNAwards", "Delete"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "AuthorNAwards", + "Delete", + ); dataSources.ValidateNSelectDropdown("Commands", "Delete document(s)"); agHelper.EnterValue(`{ "_id": ObjectId("51df07b094c6acd67e492f41") }`, { propFieldName: "", @@ -569,7 +597,11 @@ describe("Validate Mongo Query Pane Validations", () => { }); it("11. Validate 'Delete' record from new collection & verify query response - Record present - All Matching Document", () => { - entityExplorer.ActionTemplateMenuByEntityName("AuthorNAwards", "Delete"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "AuthorNAwards", + "Delete", + ); dataSources.ValidateNSelectDropdown("Commands", "Delete document(s)"); agHelper.EnterValue(`{ "awards.award": "Rosing Prize" }`, { propFieldName: "", @@ -596,7 +628,11 @@ describe("Validate Mongo Query Pane Validations", () => { }); it("12. Validate 'Count' record from new collection & verify query response", () => { - entityExplorer.ActionTemplateMenuByEntityName("AuthorNAwards", "Count"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "AuthorNAwards", + "Count", + ); dataSources.ValidateNSelectDropdown("Commands", "Count"); dataSources.RunQuery(); cy.get("@postExecute").then((resObj: any) => { @@ -611,7 +647,11 @@ describe("Validate Mongo Query Pane Validations", () => { }); it("13. Validate 'Distinct' record from new collection & verify query response", () => { - entityExplorer.ActionTemplateMenuByEntityName("AuthorNAwards", "Distinct"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "AuthorNAwards", + "Distinct", + ); dataSources.ValidateNSelectDropdown("Commands", "Distinct"); agHelper.EnterValue(`{ "awards.award": "National Medal of Technology" }`, { propFieldName: "", @@ -637,7 +677,11 @@ describe("Validate Mongo Query Pane Validations", () => { }); it("14. Validate 'Aggregate' record from new collection & verify query response", () => { - entityExplorer.ActionTemplateMenuByEntityName("AuthorNAwards", "Aggregate"); + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "AuthorNAwards", + "Aggregate", + ); dataSources.ValidateNSelectDropdown("Commands", "Aggregate"); dataSources.RunQueryNVerifyResponseViews(7, false); agHelper.ActionContextMenuWithInPane({ @@ -684,11 +728,12 @@ describe("Validate Mongo Query Pane Validations", () => { //agHelper.VerifyEvaluatedValue(tableCreateQuery); dataSources.RunQuery(); + dataSources.AssertTableInVirtuosoList(dsName, "AuthorNAwards", false); + agHelper.ActionContextMenuWithInPane({ action: "Delete", entityType: entityItems.Query, }); - dataSources.AssertTableInVirtuosoList(dsName, "AuthorNAwards", false); }); it("18. Verify application does not break when user runs the query with wrong collection name", function () { @@ -783,10 +828,14 @@ describe("Validate Mongo Query Pane Validations", () => { action: "Delete", entityType: entityItems.Query, }); - //Execute a find query on this collection to see if dates are fetched properly - dataSources.AssertTableInVirtuosoList(dsName, "BirthNDeath"); + dataSources.navigateToDatasource(dsName); - entityExplorer.ActionTemplateMenuByEntityName("BirthNDeath", "Find"); + //Execute a find query on this collection to see if dates are fetched properly + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, + "BirthNDeath", + "Find", + ); dataSources.ValidateNSelectDropdown("Commands", "Find document(s)"); dataSources.RunQueryNVerifyResponseViews(4, false); agHelper.ActionContextMenuWithInPane({ diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo_Spec.js index db662156bbe9..1e87d8295c28 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo_Spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Mongo_Spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; + const queryLocators = require("../../../../locators/QueryEditor.json"); const generatePage = require("../../../../locators/GeneratePage.json"); const formControls = require("../../../../locators/FormControl.json"); @@ -11,6 +15,7 @@ import { assertHelper, locators, } from "../../../../support/Objects/ObjectsCore"; +import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; let datasourceName; @@ -28,9 +33,9 @@ describe("Validate Mongo query commands", function () { before("Creates a new Mongo datasource", function () { dataSources.CreateDataSource("Mongo"); - dataSources.CreateQueryAfterDSSaved(); cy.get("@dsName").then(($dsName) => { datasourceName = $dsName; + dataSources.CreateQueryAfterDSSaved(); }); }); @@ -275,8 +280,7 @@ describe("Validate Mongo query commands", function () { }); it("7. Validate Deletion of the Newly Created Page", () => { - cy.NavigateToQueryEditor(); - dataSources.DeleteDatasouceFromActiveTab(datasourceName, 409); + dataSources.DeleteDatasourceFromWithinDS(datasourceName, 409); entityExplorer.ActionContextMenuByEntityName({ entityNameinLeftSidebar: "ListingAndReviews", action: "Delete", @@ -287,8 +291,12 @@ describe("Validate Mongo query commands", function () { it("8. Bug 7399: Validate Form based & Raw command based templates", function () { let id; - dataSources.AssertTableInVirtuosoList(datasourceName, "listingAndReviews"); - entityExplorer.ActionTemplateMenuByEntityName("listingAndReviews", "Find"); + dataSources.createQueryWithDatasourceSchemaTemplate( + datasourceName, + "listingAndReviews", + "Find", + ); + entityExplorer.SelectEntityByName("Query1"); cy.get(`${formControls.mongoCollection} .rc-select-selection-item`) .then(($field) => { @@ -364,8 +372,7 @@ describe("Validate Mongo query commands", function () { }); it("9. Delete the datasource after NewPage deletion is success", () => { - cy.NavigateToQueryEditor(); - dataSources.DeleteDatasouceFromActiveTab(datasourceName, [200, 409]); + dataSources.DeleteDatasourceFromWithinDS(datasourceName, [200, 409]); }); it("10. Bug 6375: Cyclic Dependency error occurs and the app crashes when the user generate table and chart from mongo query", function () { @@ -422,19 +429,7 @@ describe("Validate Mongo query commands", function () { dataSources.RunQuery(); dataSources.CheckResponseRecordsCount(3); - cy.get("@dSName").then((dbName) => { - //cy.CheckAndUnfoldEntityItem("Datasources"); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dbName, - action: "Refresh", - entityType: entityItems.Datasource, - }); - // cy.get(`.t--entity.datasource:contains(${dbName})`) - // .find(explorer.collapse) - // .first() - // .click(); - }); - cy.xpath("//div[text()='NonAsciiTest']").should("exist"); + dataSources.AssertTableInVirtuosoList(datasourceName, "NonAsciiTest"); //Verifying Suggested Widgets functionality cy.get(queryLocators.suggestedTableWidget).click().wait(1000); @@ -563,15 +558,14 @@ describe("Validate Mongo query commands", function () { cy.typeValueNValidate('{"drop": "NonAsciiTest"}', formControls.rawBody); cy.wait(1000); //Waiting a bit before runing the command dataSources.RunQuery({ waitTimeInterval: 2000 }); - entityExplorer.ExpandCollapseEntity("Datasources"); - cy.get("@dSName").then((dbName) => { - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dbName, - action: "Refresh", - entityType: entityItems.Datasource, - }); + dataSources.AssertTableInVirtuosoList( + datasourceName, + "NonAsciiTest", + false, + ); + agHelper.ActionContextMenuWithInPane({ + action: "Delete", + entityType: entityItems.Query, }); - cy.xpath("//div[text()='NonAsciiTest']").should("not.exist"); //validating drop is successful! - cy.deleteQueryUsingContext(); }); }); diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Postgres_Spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Postgres_Spec.js index fcfb673a40e4..80c449e7d09c 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Postgres_Spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/Postgres_Spec.js @@ -1,3 +1,7 @@ +import EditorNavigation, { + SidebarButton, +} from "../../../../support/Pages/EditorNavigation"; + const queryLocators = require("../../../../locators/QueryEditor.json"); const generatePage = require("../../../../locators/GeneratePage.json"); const commonlocators = require("../../../../locators/commonlocators.json"); @@ -26,6 +30,7 @@ describe("Validate CRUD queries for Postgres along with UI flow verifications", }); it("2. Create & runs existing table data with dynamic binding and deletes the query", () => { + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.NavigateToSwitcher("Widgets"); cy.dragAndDropToCanvas("tablewidgetv2", { x: 100, y: 100 }); cy.NavigateToActiveDSQueryPane(datasourceName); @@ -270,8 +275,7 @@ describe("Validate CRUD queries for Postgres along with UI flow verifications", }); it("9. Validate Deletion of the Newly Created Page", () => { - cy.NavigateToQueryEditor(); - dataSources.DeleteDatasouceFromActiveTab(datasourceName, 409); + dataSources.DeleteDatasourceFromWithinDS(datasourceName, 409); entityExplorer.ActionContextMenuByEntityName({ entityNameinLeftSidebar: "Public.users_crud", action: "Delete", @@ -285,12 +289,12 @@ describe("Validate CRUD queries for Postgres along with UI flow verifications", dataSources.NavigateFromActiveDS(datasourceName, true); dataSources.EnterQuery(deleteTblQuery); dataSources.RunQuery(); - entityExplorer.ExpandCollapseEntity("Datasources"); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: datasourceName, - action: "Refresh", - }); - cy.xpath("//div[text()='public.users_crud']").should("not.exist"); //validating drop is successful! + // TODO use the schema on the query itself to check + dataSources.AssertTableInVirtuosoList( + datasourceName, + "public.users_crud", + false, + ); cy.deleteQueryUsingContext(); }); @@ -320,7 +324,6 @@ describe("Validate CRUD queries for Postgres along with UI flow verifications", }); it("13. Deletes the datasource", () => { - cy.NavigateToQueryEditor(); - dataSources.DeleteDatasouceFromActiveTab(datasourceName, [200, 409]); + dataSources.DeleteDatasourceFromWithinDS(datasourceName, [200, 409]); }); }); diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js index fa4001575d52..0aca3b0f30f8 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_1_spec.js @@ -77,13 +77,9 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications", }); cy.wait(2000); - dataSources.AssertTableInVirtuosoList( + dataSources.createQueryWithDatasourceSchemaTemplate( datasourceName, "assets-test--appsmith", - ); - - entityExplorer.ActionTemplateMenuByEntityName( - "assets-test--appsmith", "List files", ); @@ -512,7 +508,6 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications", }); it("7. Validate Deletion of the Newly Created Page", () => { - cy.NavigateToQueryEditor(); dataSources.DeleteDatasourceFromWithinDS(datasourceName, 409); entityExplorer.ActionContextMenuByEntityName({ entityNameinLeftSidebar: "Assets-test.appsmith.com", @@ -522,6 +517,6 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications", }); after("Deletes the datasource", () => { - dataSources.DeleteDatasouceFromActiveTab(datasourceName, [200, 409]); + dataSources.DeleteDatasourceFromWithinDS(datasourceName, [200, 409]); }); }); diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts index ca9f57b29515..66b72f85cdf6 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/S3_2_spec.ts @@ -460,7 +460,7 @@ describe("Validate CRUD queries for Amazon S3 along with UI flow verifications", }); after("Deletes the datasource", () => { - dataSources.DeleteDatasouceFromActiveTab(datasourceName, 409); //since crud page is still active + dataSources.DeleteDatasourceFromWithinDS(datasourceName, 409); //since crud page is still active }); function DeleteS3FileFromUI( diff --git a/app/client/cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts b/app/client/cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts index 5c246b3d13d1..5838c5dd4d92 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts +++ b/app/client/cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts @@ -391,10 +391,10 @@ describe("excludeForAirgap", "Validate Airtable Ds", () => { action: "Delete", entityType: entityItems.Query, }); - dataSources.DeleteDatasouceFromActiveTab(dsName, 409); //Since page was deployed in testcase #2 + dataSources.DeleteDatasourceFromWithinDS(dsName, 409); //Since page was deployed in testcase #2 deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE)); table.WaitForTableEmpty("v2"); deployMode.NavigateBacktoEditor(); - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); diff --git a/app/client/cypress/e2e/Sanity/Datasources/ArangoDataSourceStub_spec.js b/app/client/cypress/e2e/Sanity/Datasources/ArangoDataSourceStub_spec.js index 321ab0c34863..589f26f49e9d 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/ArangoDataSourceStub_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/ArangoDataSourceStub_spec.js @@ -11,7 +11,7 @@ describe("Arango datasource test cases", function () { fixture: "testAction.json", }).as("testDatasource"); cy.testSaveDatasource(false); - dataSources.DeleteDatasouceFromActiveTab("ArangoWithnoTrailing"); + dataSources.DeleteDatasourceFromWithinDS("ArangoWithnoTrailing"); }); it("2. Create with trailing white spaces in host address and database name, test, save then delete a Arango datasource", function () { diff --git a/app/client/cypress/e2e/Sanity/Datasources/Arango_Basic_Spec.ts b/app/client/cypress/e2e/Sanity/Datasources/Arango_Basic_Spec.ts index 66eb812064bf..836f24bb6ea6 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/Arango_Basic_Spec.ts +++ b/app/client/cypress/e2e/Sanity/Datasources/Arango_Basic_Spec.ts @@ -49,7 +49,6 @@ describe("Validate Arango & CURL Import Datasources", () => { action: "Delete", entityType: entityItems.Api, }); - dataSources.AssertTableInVirtuosoList(dsName, collectionName); //Add data into this newly created collection let curlDataAdd = @@ -131,19 +130,14 @@ describe("Validate Arango & CURL Import Datasources", () => { action: "Delete", entityType: entityItems.Api, }); - entityExplorer.ExpandCollapseEntity(dsName); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Refresh", - }); //needed for the added data to reflect in template queries }); it("2. Run Select, Create, Update, Delete & few more queries on the created collection + Widget Binding", () => { entityExplorer.DragDropWidgetNVerify(draggableWidgets.INPUT_V2); propPane.UpdatePropertyFieldValue("Default value", "Brazil"); - entityExplorer.NavigateToSwitcher("Explorer"); - //Select's own query - entityExplorer.ActionTemplateMenuByEntityName( + //Create a select query + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, `${collectionName}`, "Select", ); @@ -167,7 +161,8 @@ describe("Validate Arango & CURL Import Datasources", () => { dataSources.AssertQueryTableResponse(0, "Japan"); //Insert a new place - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, `${collectionName}`, "Create", ); @@ -221,7 +216,8 @@ describe("Validate Arango & CURL Import Datasources", () => { dataSources.AssertQueryTableResponse(7, "Iguazu Falls"); //making sure new inserted record is also considered for filtering //Update Japan to Australia - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, `${collectionName}`, "Update", ); @@ -248,27 +244,38 @@ describe("Validate Arango & CURL Import Datasources", () => { dataSources.EnterQuery(query); dataSources.RunQueryNVerifyResponseViews(); - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, `${collectionName}`, "Select", ); + query = `FOR document IN ${collectionName} + FILTER document._key == "1" + RETURN document`; + dataSources.EnterQuery(query); dataSources.RunQueryNVerifyResponseViews(1); dataSources.AssertQueryTableResponse(3, "Australia"); //Delete record from collection - entityExplorer.ActionTemplateMenuByEntityName( + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, `${collectionName}`, "Delete", ); + query = `REMOVE "1" in ${collectionName}`; + dataSources.EnterQuery(query); dataSources.RunQueryNVerifyResponseViews(1); //Removing Australia //Verify no records return for the deleted key query = `FOR document IN ${collectionName} - RETURN { country: document.country }`; - entityExplorer.ActionTemplateMenuByEntityName( + FILTER document._key == "1" + RETURN document`; + dataSources.createQueryWithDatasourceSchemaTemplate( + dsName, `${collectionName}`, "Select", ); + dataSources.EnterQuery(query); dataSources.RunQuery(); agHelper .GetText(dataSources._noRecordFound) @@ -329,14 +336,8 @@ describe("Validate Arango & CURL Import Datasources", () => { entityType: entityItems.Api, }); //Deleting api created - entityExplorer.ExpandCollapseEntity(dsName); - entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Refresh", - }); //needed for the deletion of ds to reflect - agHelper.AssertElementVisibility(dataSources._noSchemaAvailable(dsName)); //Deleting datasource finally - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); dataSources.StopNDeleteContainer(containerName); }); diff --git a/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiDatasource_spec.js b/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiDatasource_spec.js index eb6a21c3dcff..b6be485dbc69 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiDatasource_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/AuthenticatedApiDatasource_spec.js @@ -26,7 +26,7 @@ describe("Authenticated API Datasource", function () { cy.get(".t--save-datasource").click({ force: true }); cy.contains(URL + "/users"); agHelper.WaitUntilAllToastsDisappear(); - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); }); it("3. Bug: 14181 -Make sure the datasource view mode page does not contain labels with no value.", function () { @@ -38,7 +38,7 @@ describe("Authenticated API Datasource", function () { cy.contains(headers).should("not.exist"); cy.contains(queryParams).should("not.exist"); agHelper.WaitUntilAllToastsDisappear(); - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); }); it("4. Bug: 18051 - Save and Authorise should return to datasource page in view mode and not new datasource page", () => { @@ -55,7 +55,7 @@ describe("Authenticated API Datasource", function () { ); agHelper.RefreshPage(); agHelper.AssertElementVisibility(dataSources._editButton); - dataSources.DeleteDatasouceFromActiveTab("TED_OAuth" + uid); + dataSources.DeleteDatasourceFromWithinDS("TED_OAuth" + uid); }); }); }); diff --git a/app/client/cypress/e2e/Sanity/Datasources/DSAutosaveImprovements_spec.ts b/app/client/cypress/e2e/Sanity/Datasources/DSAutosaveImprovements_spec.ts index 93afa4b225b3..64aae68c9343 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/DSAutosaveImprovements_spec.ts +++ b/app/client/cypress/e2e/Sanity/Datasources/DSAutosaveImprovements_spec.ts @@ -1,4 +1,7 @@ import { ObjectsRegistry } from "../../../support/Objects/Registry"; +import EditorNavigation, { + SidebarButton, +} from "../../../support/Pages/EditorNavigation"; const agHelper = ObjectsRegistry.AggregateHelper, dataSources = ObjectsRegistry.DataSources; @@ -15,7 +18,7 @@ describe("Datasource Autosave Improvements Tests", function () { dataSources.SaveDSFromDialog(false); // assert that datasource is not saved and cant be seen in active ds list - dataSources.NavigateToActiveTab(); + EditorNavigation.ViaSidebar(SidebarButton.Data); agHelper.AssertContains(dsName, "not.exist", dataSources._datasourceCard); }); }); @@ -33,11 +36,11 @@ describe("Datasource Autosave Improvements Tests", function () { dataSources.SaveDSFromDialog(true); // assert that datasource is saved and can be seen in active ds list - dataSources.NavigateToActiveTab(); + EditorNavigation.ViaSidebar(SidebarButton.Data); agHelper.AssertContains(dsName, "exist", dataSources._datasourceCard); // delete datasource - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); @@ -64,7 +67,7 @@ describe("Datasource Autosave Improvements Tests", function () { // delete datasource cy.get("@dsName").then(($dsName) => { dsName = $dsName; - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); }); diff --git a/app/client/cypress/e2e/Sanity/Datasources/DatasourceForm_spec.js b/app/client/cypress/e2e/Sanity/Datasources/DatasourceForm_spec.js index 748ce6f3a3e0..996386f63461 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/DatasourceForm_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/DatasourceForm_spec.js @@ -9,8 +9,6 @@ import { describe("Datasource form related tests", function () { it("1. Check whether the number of key value pairs is equal to number of delete buttons", function () { - cy.NavigateToAPI_Panel(); - apiPage.CreateAndFillApi(testdata.baseUrl + testdata.methods); cy.get(".t--store-as-datasource").click(); @@ -28,7 +26,7 @@ describe("Datasource form related tests", function () { cy.get(".t--save-datasource").should("not.be.disabled"); dataSources.SaveDSFromDialog(); //Check if saved api as a datasource does not fail on cloning", function () { - cy.NavigateToAPI_Panel(); + entityExplorer.ExpandCollapseEntity("Queries/JS"); entityExplorer.ActionContextMenuByEntityName({ entityNameinLeftSidebar: "Api1", diff --git a/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts b/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts index cfe41eae8f46..661e9b96a904 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts +++ b/app/client/cypress/e2e/Sanity/Datasources/GraphQL_spec.ts @@ -248,7 +248,7 @@ describe("GraphQL Datasource Implementation", function () { RunNValidateGraphQL(); }); cy.get("@dsName").then(($dsName: any) => { - dataSources.DeleteDatasouceFromActiveTab($dsName); + dataSources.DeleteDatasourceFromWithinDS($dsName); }); }); diff --git a/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts b/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts index 7cd4ac49dcb3..4e408536dfd4 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts +++ b/app/client/cypress/e2e/Sanity/Datasources/MockDBs_Spec.ts @@ -7,6 +7,9 @@ import { } from "../../../support/Objects/ObjectsCore"; let dsName: any; import formControls from "../../../locators/FormControl.json"; +import EditorNavigation, { + SidebarButton, +} from "../../../support/Pages/EditorNavigation"; describe( "excludeForAirgap", @@ -27,20 +30,20 @@ describe( ); dataSources.RunQueryNVerifyResponseViews(5); //minimum 5 rows are expected - dataSources.NavigateToActiveTab(); - agHelper - .GetText(dataSources._queriesOnPageText(mockDBName)) + EditorNavigation.ViaSidebar(SidebarButton.Data); + dataSources + .getDatasourceListItemDescription(mockDBName) .then(($queryCount) => - expect($queryCount).to.eq("1 query on this page"), + expect($queryCount).to.eq("1 queries in this app"), ); entityExplorer.CreateNewDsQuery(mockDBName); dataSources.RunQueryNVerifyResponseViews(10, true); - dataSources.NavigateToActiveTab(); - agHelper - .GetText(dataSources._queriesOnPageText(mockDBName)) + EditorNavigation.ViaSidebar(SidebarButton.Data); + dataSources + .getDatasourceListItemDescription(mockDBName) .then(($queryCount) => - expect($queryCount).to.eq("2 queries on this page"), + expect($queryCount).to.eq("2 queries in this app"), ); }); }); @@ -62,27 +65,28 @@ describe( agHelper.Sleep(2000); //for movies collection to load & populate in dropdown dataSources.ValidateNSelectDropdown("Collection", "movies"); dataSources.RunQueryNVerifyResponseViews(1, false); - dataSources.NavigateToActiveTab(); - agHelper - .GetText(dataSources._queriesOnPageText(mockDBName)) + EditorNavigation.ViaSidebar(SidebarButton.Data); + dataSources + .getDatasourceListItemDescription(mockDBName) .then(($queryCount) => - expect($queryCount).to.eq("1 query on this page"), + expect($queryCount).to.eq("1 queries in this app"), ); entityExplorer.CreateNewDsQuery(mockDBName); dataSources.ValidateNSelectDropdown("Commands", "Find document(s)"); dataSources.ValidateNSelectDropdown("Collection", "movies"); dataSources.RunQueryNVerifyResponseViews(1, false); - dataSources.NavigateToActiveTab(); - agHelper - .GetText(dataSources._queriesOnPageText(mockDBName)) + EditorNavigation.ViaSidebar(SidebarButton.Data); + dataSources + .getDatasourceListItemDescription(mockDBName) .then(($queryCount) => - expect($queryCount).to.eq("2 queries on this page"), + expect($queryCount).to.eq("2 queries in this app"), ); }); }); afterEach(() => { + EditorNavigation.ViaSidebar(SidebarButton.Pages); entityExplorer.ExpandCollapseEntity("Queries/JS"); entityExplorer.ActionContextMenuByEntityName({ entityNameinLeftSidebar: "Query1", @@ -94,15 +98,13 @@ describe( action: "Delete", entityType: entityItems.Query, }); - dataSources.NavigateToActiveTab(); - agHelper - .GetText(dataSources._queriesOnPageText(dsName)) + EditorNavigation.ViaSidebar(SidebarButton.Data); + dataSources + .getDatasourceListItemDescription(dsName) .then(($queryCount) => - expect($queryCount).to.eq( - "No query in this application is using this datasource", - ), + expect($queryCount).to.eq("No queries in this app"), ); - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); }); }, ); diff --git a/app/client/cypress/e2e/Sanity/Datasources/MongoDatasourceURI_spec.ts b/app/client/cypress/e2e/Sanity/Datasources/MongoDatasourceURI_spec.ts index ffba267a9b49..afa3d45d542c 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/MongoDatasourceURI_spec.ts +++ b/app/client/cypress/e2e/Sanity/Datasources/MongoDatasourceURI_spec.ts @@ -21,7 +21,7 @@ describe("Create, test, save then delete a mongo datasource using URI", function dataSources.FillMongoDatasourceFormWithURI(); dataSources.TestSaveDatasource(true); - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); @@ -37,7 +37,7 @@ describe("Create, test, save then delete a mongo datasource using URI", function dataSources.FillMongoDSForm(dataManager.defaultEnviorment, true); dataSources.TestSaveDatasource(); - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); }); }); }); diff --git a/app/client/cypress/e2e/Sanity/Datasources/MsSQLDataSourceStub_spec.js b/app/client/cypress/e2e/Sanity/Datasources/MsSQLDataSourceStub_spec.js index b7428835e62e..4ca6eea02535 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/MsSQLDataSourceStub_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/MsSQLDataSourceStub_spec.js @@ -15,7 +15,7 @@ describe("MsSQL datasource test cases", function () { fixture: "testAction.json", }).as("testDatasource"); cy.testSaveDatasource(false); - dataSources.DeleteDatasouceFromActiveTab(datasourceName); + dataSources.DeleteDatasourceFromWithinDS(datasourceName); }); }); diff --git a/app/client/cypress/e2e/Sanity/Datasources/MsSQL_Basic_Spec.ts b/app/client/cypress/e2e/Sanity/Datasources/MsSQL_Basic_Spec.ts index a92e6694c51f..044e6787f380 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/MsSQL_Basic_Spec.ts +++ b/app/client/cypress/e2e/Sanity/Datasources/MsSQL_Basic_Spec.ts @@ -309,7 +309,7 @@ describe("Validate MsSQL connection & basic querying with UI flows", () => { //Should not be able to delete ds until app is published again //coz if app is published & shared then deleting ds may cause issue, So! - dataSources.DeleteDatasouceFromActiveTab(dsName, 409); + dataSources.DeleteDatasourceFromWithinDS(dsName, 409); agHelper.WaitUntilAllToastsDisappear(); deployMode.DeployApp(locators._emptyPageTxt); agHelper.Sleep(3000); diff --git a/app/client/cypress/e2e/Sanity/Datasources/MySQLDataSourceStub_spec.js b/app/client/cypress/e2e/Sanity/Datasources/MySQLDataSourceStub_spec.js index 0251b7e58e46..46076aa092bf 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/MySQLDataSourceStub_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/MySQLDataSourceStub_spec.js @@ -14,7 +14,7 @@ describe("MySQL datasource test cases", function () { fixture: "testAction.json", }).as("testDatasource"); cy.testSaveDatasource(false); - dataSources.DeleteDatasouceFromActiveTab(datasourceName); + dataSources.DeleteDatasourceFromWithinDS(datasourceName); }); }); diff --git a/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js b/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js index 4b3c948634f2..92e43df80338 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/MySQLNoiseTest_spec.js @@ -34,8 +34,6 @@ describe("MySQL noise test", function () { ); cy.WaitAutoSave(); cy.runQuery(); - cy.NavigateToAPI_Panel(); - cy.log("Navigation to API Panel screen successful"); // API for killing mySQL session cy.CreateAPI("killSession"); cy.enterDatasourceAndPath( diff --git a/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js b/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js index a4febb7d6e13..cbbb8c216e92 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/MySQL_spec.js @@ -16,7 +16,7 @@ describe("MySQL datasource test cases", function () { datasourceName = `MySQL MOCKDS ${UUID}`; cy.renameDatasource(datasourceName); cy.testSaveDatasource(); - dataSources.DeleteDatasouceFromActiveTab(datasourceName); + dataSources.DeleteDatasourceFromWithinDS(datasourceName); }); }); diff --git a/app/client/cypress/e2e/Sanity/Datasources/Port_Number_Placeholder_Spec.ts b/app/client/cypress/e2e/Sanity/Datasources/Port_Number_Placeholder_Spec.ts index 2b2256d35571..a7525aa5962b 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/Port_Number_Placeholder_Spec.ts +++ b/app/client/cypress/e2e/Sanity/Datasources/Port_Number_Placeholder_Spec.ts @@ -12,7 +12,6 @@ describe("Test placeholder value for port number for all datasources - tests #24 "placeholder", expectedPlaceholderValue, ); - agHelper.GoBack(); // Oracle dataSources.NavigateToDSCreateNew(); @@ -24,7 +23,6 @@ describe("Test placeholder value for port number for all datasources - tests #24 "placeholder", expectedPlaceholderValue, ); - agHelper.GoBack(); // SMTP dataSources.NavigateToDSCreateNew(); @@ -36,7 +34,6 @@ describe("Test placeholder value for port number for all datasources - tests #24 "placeholder", expectedPlaceholderValue, ); - agHelper.GoBack(); // MySQL dataSources.NavigateToDSCreateNew(); @@ -48,7 +45,6 @@ describe("Test placeholder value for port number for all datasources - tests #24 "placeholder", expectedPlaceholderValue, ); - agHelper.GoBack(); // Postgres dataSources.NavigateToDSCreateNew(); @@ -60,7 +56,6 @@ describe("Test placeholder value for port number for all datasources - tests #24 "placeholder", expectedPlaceholderValue, ); - agHelper.GoBack(); // MongoDB dataSources.NavigateToDSCreateNew(); @@ -72,7 +67,6 @@ describe("Test placeholder value for port number for all datasources - tests #24 "placeholder", expectedPlaceholderValue, ); - agHelper.GoBack(); // Elasticsearch dataSources.NavigateToDSCreateNew(); @@ -84,7 +78,6 @@ describe("Test placeholder value for port number for all datasources - tests #24 "placeholder", expectedPlaceholderValue, ); - agHelper.GoBack(); // Redis dataSources.NavigateToDSCreateNew(); @@ -96,7 +89,6 @@ describe("Test placeholder value for port number for all datasources - tests #24 "placeholder", expectedPlaceholderValue, ); - agHelper.GoBack(); // Redshift dataSources.NavigateToDSCreateNew(); @@ -108,7 +100,6 @@ describe("Test placeholder value for port number for all datasources - tests #24 "placeholder", expectedPlaceholderValue, ); - agHelper.GoBack(); // ArangoDB dataSources.NavigateToDSCreateNew(); @@ -120,6 +111,5 @@ describe("Test placeholder value for port number for all datasources - tests #24 "placeholder", expectedPlaceholderValue, ); - agHelper.GoBack(); }); }); diff --git a/app/client/cypress/e2e/Sanity/Datasources/PostgresDatasource_spec.js b/app/client/cypress/e2e/Sanity/Datasources/PostgresDatasource_spec.js index 719b20cab130..786919cce6f6 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/PostgresDatasource_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/PostgresDatasource_spec.js @@ -11,7 +11,7 @@ describe("Postgres datasource test cases", function () { dataSources.CreateDataSource("Postgres"); cy.get("@saveDatasource").then((httpResponse) => { datasourceName = JSON.stringify(httpResponse.response.body.data.name); - dataSources.DeleteDatasouceFromActiveTab( + dataSources.DeleteDatasourceFromWithinDS( datasourceName.replace(/['"]+/g, ""), ); }); diff --git a/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js b/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js index 276ea1405297..e7a3619ad9ae 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/RedshiftDataSourceStub_spec.js @@ -1,5 +1,6 @@ const datasource = require("../../../locators/DatasourcesEditor.json"); let datasourceName; +import { dataSources } from "../../../support/Objects/ObjectsCore"; describe("Redshift datasource test cases", function () { beforeEach(() => { @@ -36,6 +37,7 @@ describe("Redshift datasource test cases", function () { }); it("3. Create a new query from the datasource editor", function () { + dataSources.navigateToDatasource(datasourceName); cy.get(datasource.createQuery).last().click(); cy.wait("@createNewApi").should( "have.nested.property", diff --git a/app/client/cypress/e2e/Sanity/Datasources/Styles_spec.js b/app/client/cypress/e2e/Sanity/Datasources/Styles_spec.js index e1464e959a0f..ba78ca8ac52e 100644 --- a/app/client/cypress/e2e/Sanity/Datasources/Styles_spec.js +++ b/app/client/cypress/e2e/Sanity/Datasources/Styles_spec.js @@ -1,4 +1,7 @@ import { agHelper, dataSources } from "../../../support/Objects/ObjectsCore"; +import EditorNavigation, { + SidebarButton, +} from "../../../support/Pages/EditorNavigation"; let dsName; describe("excludeForAirgap", "Validate Datasource Panel Styles", function () { @@ -77,76 +80,10 @@ describe("excludeForAirgap", "Validate Datasource Panel Styles", function () { cy.datasourceIconWrapperStyle(".content-icon"); //Name cy.datasourceNameStyle(".t--createBlankApiCard .textBtn"); - //Datsource title font size should be 20px - cy.get(".sectionHeadings").should("have.css", "font-size", "20px"); - }); - - it("4. Datasource Active card styles", () => { - // Action button icon placement - dataSources.NavigateToActiveTab(); - //Icon should be placed left to the text. - cy.get(".t--create-query span"); - - //Active card wrapper - cy.get(".t--datasource") - .should("have.css", "padding", "15px") - .and("have.css", "cursor", "pointer") - .realHover() - .should("have.css", "background-color", backgroundColorGray1); - - cy.get("[data-testid=active-datasource-image]") - .should("have.css", "height", "34px") - .and("have.css", "max-width", "100%"); - - cy.get("[data-testid=active-datasource-icon-wrapper]") - .should("have.css", "background-color", backgroundColorGray2) - .and("have.css", "width", "34px") - .and("have.css", "height", "34px") - .and("have.css", "border-radius", "0px") - .and("have.css", "display", "flex") - .and("have.css", "align-items", "center"); - - //Name - cy.datasourceNameStyle("[data-testid=active-datasource-name]"); - - //Queries - cy.get("[data-testid=active-datasource-queries]") - .should("have.css", "display", "flex") - .and("have.css", "margin", "4px 0px"); - - //Buttons wrapper - cy.get(".t--datasource-name .action-wrapper") - .should("have.css", "gap", "10px") - .and("have.css", "display", "flex") - .and("have.css", "align-items", "center"); - }); - - it("5. Collapse component styles", () => { - //Collapse wrapper - cy.get("[data-testid=datasource-collapse-wrapper]") - .should("have.css", "color", backgroundColorGray700) - .and("have.css", "display", "flex") - .and("have.css", "gap", "8px") - .and("have.css", "align-items", "center"); - //Collapse icon - cy.get("[data-testid=datasource-collapse-wrapper] span") - .invoke("attr", "data-testid") - .should("eq", "datasource-collapse-icon"); - cy.get( - "[data-testid=datasource-collapse-wrapper] span[data-testid='datasource-collapse-icon'] svg", - ) - .invoke("attr", "fill") - .should("eq", "currentColor") - .then(($element) => { - const attributes = $element[0].attributes; - cy.log(attributes); - }); - // .invoke("attr", "width") - // .should("eq", "12"); }); after(() => { - dataSources.DeleteDatasouceFromActiveTab(dsName); + dataSources.DeleteDatasourceFromWithinDS(dsName); //entityExplorer.ActionContextMenuByEntityName(dsName, "Delete");//Since Users is not appearing in EntityExplorer, this has potential to fail }); }); diff --git a/app/client/cypress/fixtures/mongo_PUT_replaceLayoutWithCRUD.json b/app/client/cypress/fixtures/mongo_PUT_replaceLayoutWithCRUD.json index 109fc95876e3..3f6918e32e76 100644 --- a/app/client/cypress/fixtures/mongo_PUT_replaceLayoutWithCRUD.json +++ b/app/client/cypress/fixtures/mongo_PUT_replaceLayoutWithCRUD.json @@ -1,1317 +1 @@ -{ - "responseMeta": { - "status": 201, - "success": true - }, - "data": { - "page": { - "id": "616d7d4c9594b25adfa3e569", - "name": "Page3", - "applicationId": "6167ece2fe0e4804a2e6ce44", - "layouts": [ - { - "id": "616d7d4c9594b25adfa3e568", - "userPermissions": [], - "dsl": { - "widgetName": "MainContainer", - "backgroundColor": "none", - "rightColumn": 1280.0, - "snapColumns": 64.0, - "detachFromLayout": true, - "widgetId": "0", - "topRow": 0.0, - "bottomRow": 940.0, - "containerStyle": "none", - "snapRows": 125.0, - "parentRowSpace": 1.0, - "type": "CANVAS_WIDGET", - "canExtend": true, - "version": 41.0, - "minHeight": 860.0, - "parentColumnSpace": 1.0, - "dynamicTriggerPathList": [], - "dynamicBindingPathList": [], - "leftColumn": 0.0, - "children": [ - { - "backgroundColor": "#FFFFFF", - "widgetName": "Container1", - "rightColumn": 40.0, - "widgetId": "mvubsemxfo", - "containerStyle": "card", - "topRow": 0.0, - "bottomRow": 87.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "type": "CONTAINER_WIDGET", - "version": 1.0, - "parentId": "0", - "isLoading": false, - "parentColumnSpace": 19.75, - "leftColumn": 0.0, - "children": [ - { - "widgetName": "Canvas1", - "rightColumn": 632.0, - "detachFromLayout": true, - "widgetId": "59rw5mx0bq", - "containerStyle": "none", - "topRow": 0.0, - "bottomRow": 890.0, - "parentRowSpace": 1.0, - "isVisible": "true", - "canExtend": false, - "type": "CANVAS_WIDGET", - "version": 1.0, - "parentId": "mvubsemxfo", - "minHeight": 870.0, - "isLoading": false, - "parentColumnSpace": 1.0, - "dynamicTriggerPathList": [], - "leftColumn": 0.0, - "dynamicBindingPathList": [], - "children": [ - { - "widgetName": "data_table", - "columnOrder": [ - "customColumn1", - "_id", - "col4", - "col2", - "col3", - "col1" - ], - "dynamicPropertyPathList": [ - { - "key": "onPageChange" - } - ], - "isVisibleDownload": true, - "topRow": 10.0, - "bottomRow": 86.0, - "parentRowSpace": 10.0, - "onPageChange": "{{FindQuery.run()}}", - "type": "TABLE_WIDGET", - "defaultSelectedRow": "0", - "parentColumnSpace": 1.0, - "dynamicTriggerPathList": [ - { - "key": "onPageChange" - }, - { - "key": "primaryColumns.customColumn1.onClick" - }, - { - "key": "onSearchTextChanged" - } - ], - "dynamicBindingPathList": [ - { - "key": "primaryColumns.customColumn1.buttonLabel" - }, - { - "key": "tableData" - }, - { - "key": "primaryColumns.col1.computedValue" - }, - { - "key": "primaryColumns.col2.computedValue" - }, - { - "key": "primaryColumns.col3.computedValue" - }, - { - "key": "primaryColumns.col4.computedValue" - }, - { - "key": "primaryColumns._id.computedValue" - } - ], - "leftColumn": 0.0, - "primaryColumns": { - "customColumn1": { - "isCellVisible": true, - "isDerived": true, - "computedValue": "", - "onClick": "{{showModal('Delete_Modal')}}", - "textSize": "PARAGRAPH", - "buttonColor": "#DD4B34", - "index": 7.0, - "isVisible": true, - "label": "Delete", - "buttonLabel": "{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}", - "columnType": "button", - "horizontalAlignment": "LEFT", - "width": 150.0, - "enableFilter": true, - "enableSort": true, - "id": "customColumn1", - "isDisabled": false, - "buttonLabelColor": "#FFFFFF", - "verticalAlignment": "CENTER" - }, - "col4": { - "isCellVisible": true, - "isDerived": false, - "computedValue": "{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}", - "textSize": "PARAGRAPH", - "index": 3.0, - "isVisible": true, - "label": "col4", - "columnType": "text", - "horizontalAlignment": "LEFT", - "width": 150.0, - "enableFilter": true, - "enableSort": true, - "id": "col4", - "verticalAlignment": "CENTER" - }, - "_id": { - "isCellVisible": true, - "isDerived": false, - "computedValue": "{{data_table.sanitizedTableData.map((currentRow) => ( currentRow._id))}}", - "textSize": "PARAGRAPH", - "index": 1.0, - "isVisible": true, - "label": "_id", - "columnType": "text", - "horizontalAlignment": "LEFT", - "width": 150.0, - "enableFilter": true, - "enableSort": true, - "id": "_id", - "verticalAlignment": "CENTER" - }, - "col2": { - "isCellVisible": true, - "isDerived": false, - "computedValue": "{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}", - "textSize": "PARAGRAPH", - "index": 1.0, - "isVisible": true, - "label": "col2", - "columnType": "text", - "horizontalAlignment": "LEFT", - "width": 150.0, - "enableFilter": true, - "enableSort": true, - "id": "col2", - "verticalAlignment": "CENTER" - }, - "col3": { - "isCellVisible": true, - "isDerived": false, - "computedValue": "{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}", - "textSize": "PARAGRAPH", - "index": 2.0, - "isVisible": true, - "label": "col3", - "columnType": "text", - "horizontalAlignment": "LEFT", - "width": 150.0, - "enableFilter": true, - "enableSort": true, - "id": "col3", - "verticalAlignment": "CENTER" - }, - "col1": { - "isCellVisible": true, - "isDerived": false, - "computedValue": "{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}", - "textSize": "PARAGRAPH", - "index": 0.0, - "isVisible": true, - "label": "col1", - "columnType": "text", - "horizontalAlignment": "LEFT", - "width": 150.0, - "enableFilter": true, - "enableSort": true, - "id": "col1", - "verticalAlignment": "CENTER" - } - }, - "delimiter": ",", - "derivedColumns": { - "customColumn1": { - "isDerived": true, - "computedValue": "", - "onClick": "{{DeleteQuery.run()}}", - "textSize": "PARAGRAPH", - "buttonStyle": "#DD4B34", - "index": 7.0, - "isVisible": true, - "label": "customColumn1", - "buttonLabel": "{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}", - "columnType": "button", - "horizontalAlignment": "LEFT", - "width": 150.0, - "enableFilter": true, - "enableSort": true, - "id": "customColumn1", - "buttonLabelColor": "#FFFFFF", - "verticalAlignment": "CENTER" - } - }, - "rightColumn": 64.0, - "textSize": "PARAGRAPH", - "widgetId": "jabdu9f16g", - "isVisibleFilters": true, - "tableData": "{{FindQuery.data}}", - "isVisible": "true", - "label": "Data", - "searchKey": "", - "version": 3.0, - "parentId": "59rw5mx0bq", - "serverSidePaginationEnabled": true, - "isLoading": false, - "isVisibleCompactMode": true, - "onSearchTextChanged": "{{FindQuery.run()}}", - "horizontalAlignment": "LEFT", - "isVisibleSearch": true, - "isVisiblePagination": true, - "verticalAlignment": "CENTER", - "columnSizeMap": { - "task": 245.0, - "deliveryAddress": 170.0, - "step": 62.0, - "id": 228.0, - "status": 75.0 - } - }, - { - "isRequired": false, - "widgetName": "key_select", - "isFilterable": true, - "rightColumn": 22.0, - "dynamicPropertyPathList": [ - { - "key": "isVisible" - } - ], - "widgetId": "asmgosgxjm", - "topRow": 5.0, - "bottomRow": 9.0, - "parentRowSpace": 10.0, - "isVisible": "{{FindQuery.data.length > 0}}", - "label": "", - "type": "DROP_DOWN_WIDGET", - "version": 1.0, - "parentId": "59rw5mx0bq", - "isLoading": false, - "defaultOptionValue": "genres", - "parentColumnSpace": 18.8828125, - "dynamicTriggerPathList": [ - { - "key": "onOptionChange" - } - ], - "leftColumn": 7.0, - "dynamicBindingPathList": [ - { - "key": "isVisible" - } - ], - "options": "[\n{\n\t\"label\": \"poster_path\",\n\t\"value\": \"poster_path\"\n}, \n{\n\t\"label\": \"homepage\",\n\t\"value\": \"homepage\"\n}, \n{\n\t\"label\": \"imdb_id\",\n\t\"value\": \"imdb_id\"\n}, \n{\n\t\"label\": \"genres\",\n\t\"value\": \"genres\"\n}]", - "onOptionChange": "{{FindQuery.run()}}", - "isDisabled": false - }, - { - "widgetName": "Text15", - "rightColumn": 7.0, - "textAlign": "LEFT", - "widgetId": "l8pgl90klz", - "topRow": 5.0, - "bottomRow": 9.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "59rw5mx0bq", - "isLoading": false, - "parentColumnSpace": 19.75, - "dynamicTriggerPathList": [], - "leftColumn": 0.0, - "dynamicBindingPathList": [], - "fontSize": "PARAGRAPH", - "text": "Order By :" - }, - { - "isRequired": false, - "widgetName": "order_select", - "isFilterable": true, - "rightColumn": 30.0, - "dynamicPropertyPathList": [ - { - "key": "isVisible" - } - ], - "widgetId": "10v8a19m25", - "topRow": 5.0, - "bottomRow": 9.0, - "parentRowSpace": 10.0, - "isVisible": "{{FindQuery.data.length > 0}}", - "label": "", - "type": "DROP_DOWN_WIDGET", - "version": 1.0, - "parentId": "59rw5mx0bq", - "isLoading": false, - "defaultOptionValue": "1", - "parentColumnSpace": 19.75, - "dynamicTriggerPathList": [ - { - "key": "onOptionChange" - } - ], - "leftColumn": 22.0, - "dynamicBindingPathList": [ - { - "key": "isVisible" - } - ], - "options": "[\n {\n \"label\": \"ASC\",\n \"value\": \"1\"\n },\n {\n \"label\": \"DESC\",\n \"value\": \"-1\"\n }\n]", - "onOptionChange": "{{FindQuery.run()}}", - "isDisabled": false - }, - { - "widgetName": "Text16", - "rightColumn": 41.0, - "textAlign": "LEFT", - "widgetId": "urzv99hdc8", - "topRow": 0.0, - "bottomRow": 4.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "59rw5mx0bq", - "isLoading": false, - "parentColumnSpace": 11.78515625, - "dynamicTriggerPathList": [], - "leftColumn": 0.0, - "dynamicBindingPathList": [], - "fontSize": "HEADING1", - "text": "movies Data" - }, - { - "boxShadow": "NONE", - "widgetName": "refresh_btn", - "rightColumn": 64.0, - "onClick": "{{FindQuery.run()}}", - "iconName": "refresh", - "buttonColor": "#03B365", - "widgetId": "nj85l57r47", - "topRow": 5.0, - "bottomRow": 9.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "type": "ICON_BUTTON_WIDGET", - "version": 1.0, - "parentId": "59rw5mx0bq", - "isLoading": false, - "parentColumnSpace": 12.0703125, - "dynamicTriggerPathList": [ - { - "key": "onClick" - } - ], - "borderRadius": "CIRCLE", - "leftColumn": 60.0, - "dynamicBindingPathList": [], - "buttonVariant": "GHOST", - "isDisabled": false - }, - { - "boxShadow": "NONE", - "widgetName": "add_btn", - "rightColumn": 60.0, - "onClick": "{{showModal('Insert_Modal')}}", - "iconName": "add", - "buttonColor": "#03B365", - "widgetId": "atgojamsmw", - "topRow": 5.0, - "bottomRow": 9.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "type": "ICON_BUTTON_WIDGET", - "version": 1.0, - "parentId": "59rw5mx0bq", - "isLoading": false, - "parentColumnSpace": 12.0703125, - "dynamicTriggerPathList": [ - { - "key": "onClick" - } - ], - "borderRadius": "CIRCLE", - "leftColumn": 56.0, - "dynamicBindingPathList": [], - "buttonVariant": "GHOST", - "isDisabled": false - } - ] - } - ] - }, - { - "widgetName": "Delete_Modal", - "rightColumn": 45.0, - "detachFromLayout": true, - "widgetId": "i3whp03wf0", - "topRow": 13.0, - "bottomRow": 37.0, - "parentRowSpace": 10.0, - "canOutsideClickClose": true, - "type": "MODAL_WIDGET", - "canEscapeKeyClose": true, - "version": 2.0, - "parentId": "0", - "shouldScrollContents": false, - "isLoading": false, - "parentColumnSpace": 18.8828125, - "dynamicTriggerPathList": [], - "leftColumn": 21.0, - "dynamicBindingPathList": [], - "children": [ - { - "widgetName": "Canvas3", - "rightColumn": 453.1875, - "detachFromLayout": true, - "widgetId": "zi8fjakv8o", - "topRow": 0.0, - "bottomRow": 230.0, - "parentRowSpace": 1.0, - "isVisible": "true", - "canExtend": true, - "type": "CANVAS_WIDGET", - "version": 1.0, - "parentId": "i3whp03wf0", - "shouldScrollContents": false, - "minHeight": 240.0, - "isLoading": false, - "parentColumnSpace": 1.0, - "dynamicTriggerPathList": [], - "leftColumn": 0.0, - "dynamicBindingPathList": [], - "children": [ - { - "widgetName": "Alert_text", - "rightColumn": 41.0, - "textAlign": "LEFT", - "widgetId": "35yoxo4oec", - "topRow": 1.0, - "bottomRow": 5.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "zi8fjakv8o", - "isLoading": false, - "dynamicTriggerPathList": [], - "leftColumn": 1.0, - "dynamicBindingPathList": [], - "fontSize": "HEADING1", - "text": "Delete Row" - }, - { - "widgetName": "Button1", - "rightColumn": 46.0, - "onClick": "{{closeModal('Delete_Modal')}}", - "isDefaultClickDisabled": true, - "dynamicPropertyPathList": [], - "buttonColor": "#03B365", - "widgetId": "lryg8kw537", - "topRow": 17.0, - "bottomRow": 21.0, - "isVisible": "true", - "type": "BUTTON_WIDGET", - "version": 1.0, - "parentId": "zi8fjakv8o", - "isLoading": false, - "dynamicTriggerPathList": [ - { - "key": "onClick" - } - ], - "leftColumn": 34.0, - "dynamicBindingPathList": [], - "text": "Cancel", - "isDisabled": false - }, - { - "widgetName": "Delete_Button", - "rightColumn": 64.0, - "onClick": "{{DeleteQuery.run(() => FindQuery.run(() => closeModal('Delete_Modal')), () => {})}}", - "isDefaultClickDisabled": true, - "dynamicPropertyPathList": [ - { - "key": "onClick" - } - ], - "buttonColor": "#F22B2B", - "widgetId": "qq02lh7ust", - "topRow": 17.0, - "bottomRow": 21.0, - "isVisible": "true", - "type": "BUTTON_WIDGET", - "version": 1.0, - "parentId": "zi8fjakv8o", - "isLoading": false, - "dynamicTriggerPathList": [ - { - "key": "onClick" - } - ], - "leftColumn": 48.0, - "dynamicBindingPathList": [], - "text": "Confirm", - "isDisabled": false - }, - { - "widgetName": "Text12", - "rightColumn": 63.0, - "textAlign": "LEFT", - "widgetId": "48uac29g6e", - "topRow": 8.0, - "bottomRow": 12.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "zi8fjakv8o", - "isLoading": false, - "parentColumnSpace": 6.875, - "dynamicTriggerPathList": [], - "leftColumn": 1.0, - "dynamicBindingPathList": [], - "fontSize": "PARAGRAPH", - "text": "Are you sure you want to delete this item?" - } - ], - "isDisabled": false - } - ], - "width": 456.0, - "height": 240.0 - }, - { - "widgetName": "Insert_Modal", - "rightColumn": 41.0, - "detachFromLayout": true, - "widgetId": "vmorzie6eq", - "topRow": 16.0, - "bottomRow": 40.0, - "parentRowSpace": 10.0, - "canOutsideClickClose": true, - "type": "MODAL_WIDGET", - "canEscapeKeyClose": true, - "version": 2.0, - "parentId": "0", - "shouldScrollContents": false, - "isLoading": false, - "parentColumnSpace": 18.8828125, - "dynamicTriggerPathList": [], - "leftColumn": 17.0, - "dynamicBindingPathList": [], - "children": [ - { - "widgetName": "Canvas4", - "rightColumn": 453.1875, - "detachFromLayout": true, - "widgetId": "9rhv3ioohq", - "topRow": 0.0, - "bottomRow": 610.0, - "parentRowSpace": 1.0, - "isVisible": "true", - "canExtend": true, - "type": "CANVAS_WIDGET", - "version": 1.0, - "parentId": "vmorzie6eq", - "shouldScrollContents": false, - "minHeight": 600.0, - "isLoading": false, - "parentColumnSpace": 1.0, - "dynamicTriggerPathList": [], - "leftColumn": 0.0, - "dynamicBindingPathList": [], - "children": [ - { - "widgetName": "Form2", - "backgroundColor": "#F6F7F8", - "rightColumn": 64.0, - "widgetId": "1ruewbc4ef", - "topRow": 0.0, - "bottomRow": 58.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "type": "FORM_WIDGET", - "parentId": "9rhv3ioohq", - "isLoading": false, - "shouldScrollContents": false, - "parentColumnSpace": 8.0, - "dynamicTriggerPathList": [], - "leftColumn": 1.0, - "dynamicBindingPathList": [], - "children": [ - { - "widgetName": "Canvas5", - "rightColumn": 224.0, - "detachFromLayout": true, - "widgetId": "tp9pui0e6y", - "containerStyle": "none", - "topRow": 0.0, - "bottomRow": 570.0, - "parentRowSpace": 1.0, - "isVisible": "true", - "canExtend": false, - "type": "CANVAS_WIDGET", - "version": 1.0, - "parentId": "1ruewbc4ef", - "minHeight": 580.0, - "isLoading": false, - "parentColumnSpace": 1.0, - "dynamicTriggerPathList": [], - "leftColumn": 0.0, - "dynamicBindingPathList": [], - "children": [ - { - "resetFormOnClick": true, - "widgetName": "insert_button", - "rightColumn": 62.0, - "onClick": "{{InsertQuery.run(() => FindQuery.run(() => closeModal('Insert_Modal')))}}", - "isDefaultClickDisabled": true, - "dynamicPropertyPathList": [ - { - "key": "onClick" - } - ], - "buttonColor": "#03B365", - "widgetId": "h8vxf3oh4s", - "topRow": 51.0, - "bottomRow": 55.0, - "isVisible": "true", - "type": "FORM_BUTTON_WIDGET", - "version": 1.0, - "parentId": "tp9pui0e6y", - "isLoading": false, - "dynamicTriggerPathList": [ - { - "key": "onClick" - } - ], - "disabledWhenInvalid": true, - "leftColumn": 43.0, - "dynamicBindingPathList": [], - "googleRecaptchaKey": "", - "text": "Submit" - }, - { - "resetFormOnClick": true, - "widgetName": "reset_button", - "rightColumn": 42.0, - "onClick": "{{closeModal('Insert_Modal')}}", - "isDefaultClickDisabled": true, - "buttonColor": "#03B365", - "widgetId": "o23gs26wm5", - "topRow": 51.0, - "bottomRow": 55.0, - "isVisible": "true", - "type": "FORM_BUTTON_WIDGET", - "version": 1.0, - "parentId": "tp9pui0e6y", - "isLoading": false, - "dynamicTriggerPathList": [ - { - "key": "onClick" - } - ], - "disabledWhenInvalid": false, - "leftColumn": 29.0, - "dynamicBindingPathList": [], - "buttonVariant": "OUTLINE", - "text": "Close" - }, - { - "widgetName": "Text21", - "rightColumn": 19.0, - "textAlign": "RIGHT", - "widgetId": "cfmxebyn06", - "topRow": 5.0, - "bottomRow": 9.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "tp9pui0e6y", - "isLoading": false, - "parentColumnSpace": 7.6865234375, - "dynamicTriggerPathList": [], - "leftColumn": 3.0, - "dynamicBindingPathList": [], - "fontSize": "PARAGRAPH", - "text": "genres:" - }, - { - "isRequired": true, - "widgetName": "insert_col_input1", - "rightColumn": 62.0, - "widgetId": "h1wbbv7alb", - "topRow": 5.0, - "bottomRow": 9.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "label": "", - "type": "INPUT_WIDGET_V2", - "version": 1.0, - "parentId": "tp9pui0e6y", - "isLoading": false, - "parentColumnSpace": 7.6865234375, - "dynamicTriggerPathList": [], - "resetOnSubmit": true, - "leftColumn": 21.0, - "dynamicBindingPathList": [], - "inputType": "TEXT", - "placeholderText": "genres", - "defaultText": "", - "isDisabled": false, - "validation": "true" - }, - { - "widgetName": "Text22", - "rightColumn": 19.0, - "textAlign": "RIGHT", - "widgetId": "jsffaxrqhw", - "topRow": 12.0, - "bottomRow": 16.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "tp9pui0e6y", - "isLoading": false, - "parentColumnSpace": 7.6865234375, - "dynamicTriggerPathList": [], - "leftColumn": 2.0, - "dynamicBindingPathList": [], - "fontSize": "PARAGRAPH", - "text": "homepage:" - }, - { - "isRequired": true, - "widgetName": "insert_col_input2", - "rightColumn": 62.0, - "widgetId": "6enalyprua", - "topRow": 12.0, - "bottomRow": 16.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "label": "", - "type": "INPUT_WIDGET_V2", - "version": 1.0, - "parentId": "tp9pui0e6y", - "isLoading": false, - "parentColumnSpace": 8.0625, - "dynamicTriggerPathList": [], - "resetOnSubmit": true, - "leftColumn": 21.0, - "dynamicBindingPathList": [], - "inputType": "TEXT", - "defaultText": "", - "placeholderText": "homepage", - "isDisabled": false, - "validation": "true" - }, - { - "widgetName": "Text23", - "rightColumn": 19.0, - "textAlign": "RIGHT", - "widgetId": "btk60uozsm", - "topRow": 19.0, - "bottomRow": 23.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "tp9pui0e6y", - "isLoading": false, - "parentColumnSpace": 7.6865234375, - "dynamicTriggerPathList": [], - "leftColumn": 3.0, - "dynamicBindingPathList": [], - "fontSize": "PARAGRAPH", - "text": "imdb_id:" - }, - { - "isRequired": true, - "widgetName": "insert_col_input3", - "rightColumn": 62.0, - "widgetId": "e490gfts69", - "topRow": 19.0, - "bottomRow": 23.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "label": "", - "type": "INPUT_WIDGET_V2", - "version": 1.0, - "parentId": "tp9pui0e6y", - "isLoading": false, - "parentColumnSpace": 8.0625, - "dynamicTriggerPathList": [], - "resetOnSubmit": true, - "leftColumn": 21.0, - "dynamicBindingPathList": [], - "inputType": "TEXT", - "placeholderText": "imdb_id", - "defaultText": "", - "isDisabled": false, - "validation": "true" - }, - { - "widgetName": "Text14", - "rightColumn": 19.0, - "textAlign": "RIGHT", - "widgetId": "8fm60omwwv", - "topRow": 26.0, - "bottomRow": 30.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "tp9pui0e6y", - "isLoading": false, - "parentColumnSpace": 8.0625, - "dynamicTriggerPathList": [], - "leftColumn": 3.0, - "dynamicBindingPathList": [], - "fontSize": "PARAGRAPH", - "text": "poster_path:" - }, - { - "isRequired": true, - "widgetName": "insert_col_input4", - "rightColumn": 62.0, - "widgetId": "r55cydp0ao", - "topRow": 26.0, - "bottomRow": 30.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "label": "", - "type": "INPUT_WIDGET_V2", - "version": 1.0, - "parentId": "tp9pui0e6y", - "isLoading": false, - "parentColumnSpace": 8.0625, - "dynamicTriggerPathList": [], - "resetOnSubmit": true, - "leftColumn": 21.0, - "dynamicBindingPathList": [], - "inputType": "TEXT", - "placeholderText": "poster_path", - "defaultText": "", - "isDisabled": false, - "validation": "true" - }, - { - "widgetName": "Text13Copy", - "rightColumn": 35.0, - "textAlign": "LEFT", - "widgetId": "18x7vdv3gs", - "topRow": 0.0, - "bottomRow": 4.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "shouldScroll": false, - "parentId": "tp9pui0e6y", - "isLoading": false, - "dynamicTriggerPathList": [], - "leftColumn": 0.0, - "dynamicBindingPathList": [], - "fontSize": "HEADING1", - "text": "Insert Row" - } - ] - } - ] - } - ], - "isDisabled": false - } - ], - "width": 532.0, - "height": 600.0 - }, - { - "widgetName": "Form1", - "backgroundColor": "white", - "rightColumn": 64.0, - "dynamicPropertyPathList": [ - { - "key": "isVisible" - } - ], - "widgetId": "m7dvlazbn7", - "topRow": 0.0, - "bottomRow": 46.0, - "parentRowSpace": 10.0, - "isVisible": "{{!!data_table.selectedRow._id}}", - "type": "FORM_WIDGET", - "parentId": "0", - "isLoading": false, - "shouldScrollContents": true, - "parentColumnSpace": 18.8828125, - "dynamicTriggerPathList": [], - "leftColumn": 40.0, - "dynamicBindingPathList": [ - { - "key": "isVisible" - } - ], - "children": [ - { - "widgetName": "Canvas2", - "rightColumn": 528.71875, - "detachFromLayout": true, - "widgetId": "cicukwhp5j", - "containerStyle": "none", - "topRow": 0.0, - "bottomRow": 450.0, - "parentRowSpace": 1.0, - "isVisible": "true", - "canExtend": false, - "type": "CANVAS_WIDGET", - "version": 1.0, - "parentId": "m7dvlazbn7", - "minHeight": 460.0, - "isLoading": false, - "parentColumnSpace": 1.0, - "dynamicTriggerPathList": [], - "leftColumn": 0.0, - "dynamicBindingPathList": [], - "children": [ - { - "resetFormOnClick": false, - "widgetName": "update_button", - "rightColumn": 63.0, - "onClick": "{{UpdateQuery.run(() => FindQuery.run(), () => showAlert('Error while updating resource!','error'))}}", - "isDefaultClickDisabled": true, - "dynamicPropertyPathList": [], - "buttonColor": "#03B365", - "widgetId": "4gnygu5jew", - "topRow": 39.0, - "bottomRow": 43.0, - "isVisible": "true", - "type": "FORM_BUTTON_WIDGET", - "version": 1.0, - "parentId": "cicukwhp5j", - "isLoading": false, - "dynamicTriggerPathList": [ - { - "key": "onClick" - } - ], - "disabledWhenInvalid": true, - "leftColumn": 47.0, - "dynamicBindingPathList": [], - "text": "Update" - }, - { - "resetFormOnClick": true, - "widgetName": "reset_update_button", - "rightColumn": 46.0, - "onClick": "", - "isDefaultClickDisabled": true, - "dynamicPropertyPathList": [], - "buttonColor": "#03B365", - "widgetId": "twwgpz5wfu", - "topRow": 39.0, - "bottomRow": 43.0, - "isVisible": "true", - "type": "FORM_BUTTON_WIDGET", - "version": 1.0, - "parentId": "cicukwhp5j", - "isLoading": false, - "dynamicTriggerPathList": [ - { - "key": "onClick" - } - ], - "disabledWhenInvalid": false, - "leftColumn": 28.0, - "dynamicBindingPathList": [], - "buttonVariant": "OUTLINE", - "text": "Reset" - }, - { - "isRequired": true, - "widgetName": "update_col_1", - "rightColumn": 63.0, - "widgetId": "in8e51pg3y", - "topRow": 8.0, - "bottomRow": 12.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "label": "", - "type": "INPUT_WIDGET_V2", - "version": 1.0, - "parentId": "cicukwhp5j", - "isLoading": false, - "parentColumnSpace": 8.8963623046875, - "dynamicTriggerPathList": [], - "resetOnSubmit": true, - "leftColumn": 19.0, - "dynamicBindingPathList": [ - { - "key": "defaultText" - } - ], - "inputType": "TEXT", - "defaultText": "{{data_table.selectedRow.genres}}", - "isDisabled": false, - "validation": "true" - }, - { - "isRequired": true, - "widgetName": "update_col_2", - "rightColumn": 63.0, - "widgetId": "mlhvfasf31", - "topRow": 15.0, - "bottomRow": 19.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "label": "", - "type": "INPUT_WIDGET_V2", - "version": 1.0, - "parentId": "cicukwhp5j", - "isLoading": false, - "parentColumnSpace": 8.8963623046875, - "dynamicTriggerPathList": [], - "resetOnSubmit": true, - "leftColumn": 19.0, - "dynamicBindingPathList": [ - { - "key": "defaultText" - } - ], - "inputType": "TEXT", - "defaultText": "{{data_table.selectedRow.homepage}}", - "isDisabled": false, - "validation": "true" - }, - { - "isRequired": true, - "widgetName": "update_col_3", - "rightColumn": 63.0, - "widgetId": "0lz9vhcnr0", - "topRow": 22.0, - "bottomRow": 26.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "label": "", - "type": "INPUT_WIDGET_V2", - "version": 1.0, - "parentId": "cicukwhp5j", - "isLoading": false, - "parentColumnSpace": 8.8963623046875, - "dynamicTriggerPathList": [], - "resetOnSubmit": true, - "leftColumn": 19.0, - "dynamicBindingPathList": [ - { - "key": "defaultText" - } - ], - "inputType": "TEXT", - "defaultText": "{{data_table.selectedRow.imdb_id}}", - "isDisabled": false, - "validation": "true" - }, - { - "isRequired": true, - "widgetName": "update_col_4", - "rightColumn": 63.0, - "widgetId": "m4esf7fww5", - "topRow": 29.0, - "bottomRow": 33.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "label": "", - "type": "INPUT_WIDGET_V2", - "version": 1.0, - "parentId": "cicukwhp5j", - "isLoading": false, - "parentColumnSpace": 8.8963623046875, - "dynamicTriggerPathList": [], - "resetOnSubmit": true, - "leftColumn": 19.0, - "dynamicBindingPathList": [ - { - "key": "defaultText" - } - ], - "inputType": "TEXT", - "defaultText": "{{data_table.selectedRow.poster_path}}", - "isDisabled": false, - "validation": "true" - }, - { - "widgetName": "Text9", - "rightColumn": 63.0, - "textAlign": "LEFT", - "widgetId": "4hnz8ktmz5", - "topRow": 0.0, - "bottomRow": 6.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "cicukwhp5j", - "isLoading": false, - "parentColumnSpace": 8.8963623046875, - "dynamicTriggerPathList": [], - "leftColumn": 1.0, - "dynamicBindingPathList": [], - "fontSize": "HEADING1", - "text": "Update Selected Row" - }, - { - "widgetName": "Text17", - "rightColumn": 18.0, - "textAlign": "RIGHT", - "widgetId": "afzzc7q8af", - "topRow": 8.0, - "bottomRow": 12.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "cicukwhp5j", - "isLoading": false, - "parentColumnSpace": 7.15625, - "dynamicTriggerPathList": [], - "leftColumn": 1.0, - "dynamicBindingPathList": [], - "fontSize": "PARAGRAPH", - "text": "genres:" - }, - { - "widgetName": "Text18", - "rightColumn": 18.0, - "textAlign": "RIGHT", - "widgetId": "xqcsd2e5dj", - "topRow": 15.0, - "bottomRow": 19.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "cicukwhp5j", - "isLoading": false, - "parentColumnSpace": 7.15625, - "dynamicTriggerPathList": [], - "leftColumn": 1.0, - "dynamicBindingPathList": [], - "fontSize": "PARAGRAPH", - "text": "homepage:" - }, - { - "widgetName": "Text19", - "rightColumn": 18.0, - "textAlign": "RIGHT", - "widgetId": "l109ilp3vq", - "topRow": 22.0, - "bottomRow": 26.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "cicukwhp5j", - "isLoading": false, - "parentColumnSpace": 7.15625, - "dynamicTriggerPathList": [], - "leftColumn": 1.0, - "dynamicBindingPathList": [], - "fontSize": "PARAGRAPH", - "text": "imdb_id:" - }, - { - "widgetName": "Text20", - "rightColumn": 18.0, - "textAlign": "RIGHT", - "widgetId": "gqpwf0yng6", - "topRow": 29.0, - "bottomRow": 33.0, - "parentRowSpace": 10.0, - "isVisible": "true", - "fontStyle": "BOLD", - "type": "TEXT_WIDGET", - "textColor": "#231F20", - "version": 1.0, - "parentId": "cicukwhp5j", - "isLoading": false, - "parentColumnSpace": 7.15625, - "dynamicTriggerPathList": [], - "leftColumn": 1.0, - "dynamicBindingPathList": [], - "fontSize": "PARAGRAPH", - "text": "poster_path:" - } - ] - } - ] - } - ] - }, - "layoutOnLoadActions": [ - [ - { - "id": "616d7e429594b25adfa3e580", - "name": "FindQuery", - "pluginType": "DB", - "jsonPathKeys": [ - "key_select.selectedOptionValue", - "data_table.pageSize", - "data_table.searchText||\"\"", - "(data_table.pageNo - 1) * data_table.pageSize", - "order_select.selectedOptionValue" - ], - "timeoutInMillisecond": 10000 - } - ] - ], - "new": false - } - ], - "userPermissions": ["read:pages", "manage:pages"], - "lastUpdatedTime": 1634565699 - }, - "successMessage": "We have generated the <b>Table</b> from the <b>MongoDB datasource</b>. You can use the <b>Form</b> to modify it. Since all your data is already connected you can add more queries and modify the bindings", - "successImageUrl": "https://assets.appsmith.com/crud/working-flow-chart.png" - } -} +{"responseMeta":{"status":201,"success":true},"data":{"page":{"id":"616d7d4c9594b25adfa3e569","name":"Page3","applicationId":null,"layouts":[{"id":"616d7d4c9594b25adfa3e568","userPermissions":[],"dsl":{"widgetName":"MainContainer","backgroundColor":"none","rightColumn":1280,"snapColumns":64,"detachFromLayout":true,"widgetId":"0","topRow":0,"bottomRow":940,"containerStyle":"none","snapRows":125,"parentRowSpace":1,"type":"CANVAS_WIDGET","canExtend":true,"version":41,"minHeight":860,"parentColumnSpace":1,"dynamicTriggerPathList":[],"dynamicBindingPathList":[],"leftColumn":0,"children":[{"backgroundColor":"#FFFFFF","widgetName":"Container1","rightColumn":40,"widgetId":"mvubsemxfo","containerStyle":"card","topRow":0,"bottomRow":87,"parentRowSpace":10,"isVisible":"true","type":"CONTAINER_WIDGET","version":1,"parentId":"0","isLoading":false,"parentColumnSpace":19.75,"leftColumn":0,"children":[{"widgetName":"Canvas1","rightColumn":632,"detachFromLayout":true,"widgetId":"59rw5mx0bq","containerStyle":"none","topRow":0,"bottomRow":890,"parentRowSpace":1,"isVisible":"true","canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"mvubsemxfo","minHeight":870,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"data_table","columnOrder":["customColumn1","_id","col4","col2","col3","col1"],"dynamicPropertyPathList":[{"key":"onPageChange"}],"isVisibleDownload":true,"topRow":10,"bottomRow":86,"parentRowSpace":10,"onPageChange":"{{FindQuery.run()}}","type":"TABLE_WIDGET","defaultSelectedRow":"0","parentColumnSpace":1,"dynamicTriggerPathList":[{"key":"onPageChange"},{"key":"primaryColumns.customColumn1.onClick"},{"key":"onSearchTextChanged"}],"dynamicBindingPathList":[{"key":"primaryColumns.customColumn1.buttonLabel"},{"key":"tableData"},{"key":"primaryColumns.col1.computedValue"},{"key":"primaryColumns.col2.computedValue"},{"key":"primaryColumns.col3.computedValue"},{"key":"primaryColumns.col4.computedValue"},{"key":"primaryColumns._id.computedValue"}],"leftColumn":0,"primaryColumns":{"customColumn1":{"isCellVisible":true,"isDerived":true,"computedValue":"","onClick":"{{showModal('Delete_Modal')}}","textSize":"PARAGRAPH","buttonColor":"#DD4B34","index":7,"isVisible":true,"label":"Delete","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","isDisabled":false,"buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"},"col4":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col4))}}","textSize":"PARAGRAPH","index":3,"isVisible":true,"label":"col4","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col4","verticalAlignment":"CENTER"},"_id":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow._id))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"_id","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"_id","verticalAlignment":"CENTER"},"col2":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col2))}}","textSize":"PARAGRAPH","index":1,"isVisible":true,"label":"col2","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col2","verticalAlignment":"CENTER"},"col3":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col3))}}","textSize":"PARAGRAPH","index":2,"isVisible":true,"label":"col3","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col3","verticalAlignment":"CENTER"},"col1":{"isCellVisible":true,"isDerived":false,"computedValue":"{{data_table.sanitizedTableData.map((currentRow) => ( currentRow.col1))}}","textSize":"PARAGRAPH","index":0,"isVisible":true,"label":"col1","columnType":"text","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"col1","verticalAlignment":"CENTER"}},"delimiter":",","derivedColumns":{"customColumn1":{"isDerived":true,"computedValue":"","onClick":"{{DeleteQuery.run()}}","textSize":"PARAGRAPH","buttonStyle":"#DD4B34","index":7,"isVisible":true,"label":"customColumn1","buttonLabel":"{{data_table.sanitizedTableData.map((currentRow) => { return 'Delete'})}}","columnType":"button","horizontalAlignment":"LEFT","width":150,"enableFilter":true,"enableSort":true,"id":"customColumn1","buttonLabelColor":"#FFFFFF","verticalAlignment":"CENTER"}},"rightColumn":64,"textSize":"PARAGRAPH","widgetId":"jabdu9f16g","isVisibleFilters":true,"tableData":"{{FindQuery.data}}","isVisible":"true","label":"Data","searchKey":"","version":3,"parentId":"59rw5mx0bq","serverSidePaginationEnabled":true,"isLoading":false,"isVisibleCompactMode":true,"onSearchTextChanged":"{{FindQuery.run()}}","horizontalAlignment":"LEFT","isVisibleSearch":true,"isVisiblePagination":true,"verticalAlignment":"CENTER","columnSizeMap":{"task":245,"deliveryAddress":170,"step":62,"id":228,"status":75}},{"isRequired":false,"widgetName":"key_select","isFilterable":true,"rightColumn":22,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"asmgosgxjm","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"genres","parentColumnSpace":18.8828125,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":7,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n{\n\t\"label\": \"poster_path\",\n\t\"value\": \"poster_path\"\n}, \n{\n\t\"label\": \"homepage\",\n\t\"value\": \"homepage\"\n}, \n{\n\t\"label\": \"imdb_id\",\n\t\"value\": \"imdb_id\"\n}, \n{\n\t\"label\": \"genres\",\n\t\"value\": \"genres\"\n}]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text15","rightColumn":7,"textAlign":"LEFT","widgetId":"l8pgl90klz","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":19.75,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Order By :"},{"isRequired":false,"widgetName":"order_select","isFilterable":true,"rightColumn":30,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"10v8a19m25","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"{{FindQuery.data.length > 0}}","label":"","type":"DROP_DOWN_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"defaultOptionValue":"1","parentColumnSpace":19.75,"dynamicTriggerPathList":[{"key":"onOptionChange"}],"leftColumn":22,"dynamicBindingPathList":[{"key":"isVisible"}],"options":"[\n {\n \"label\": \"ASC\",\n \"value\": \"1\"\n },\n {\n \"label\": \"DESC\",\n \"value\": \"-1\"\n }\n]","onOptionChange":"{{FindQuery.run()}}","isDisabled":false},{"widgetName":"Text16","rightColumn":41,"textAlign":"LEFT","widgetId":"urzv99hdc8","topRow":0,"bottomRow":4,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":11.78515625,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"movies Data"},{"boxShadow":"NONE","widgetName":"refresh_btn","rightColumn":64,"onClick":"{{FindQuery.run()}}","iconName":"refresh","buttonColor":"#03B365","widgetId":"nj85l57r47","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"true","type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":60,"dynamicBindingPathList":[],"buttonVariant":"GHOST","isDisabled":false},{"boxShadow":"NONE","widgetName":"add_btn","rightColumn":60,"onClick":"{{showModal('Insert_Modal')}}","iconName":"add","buttonColor":"#03B365","widgetId":"atgojamsmw","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"true","type":"ICON_BUTTON_WIDGET","version":1,"parentId":"59rw5mx0bq","isLoading":false,"parentColumnSpace":12.0703125,"dynamicTriggerPathList":[{"key":"onClick"}],"borderRadius":"CIRCLE","leftColumn":56,"dynamicBindingPathList":[],"buttonVariant":"GHOST","isDisabled":false}]}]},{"widgetName":"Delete_Modal","rightColumn":45,"detachFromLayout":true,"widgetId":"i3whp03wf0","topRow":13,"bottomRow":37,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":21,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas3","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"zi8fjakv8o","topRow":0,"bottomRow":230,"parentRowSpace":1,"isVisible":"true","canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"i3whp03wf0","shouldScrollContents":false,"minHeight":240,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Alert_text","rightColumn":41,"textAlign":"LEFT","widgetId":"35yoxo4oec","topRow":1,"bottomRow":5,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Delete Row"},{"widgetName":"Button1","rightColumn":46,"onClick":"{{closeModal('Delete_Modal')}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"lryg8kw537","topRow":17,"bottomRow":21,"isVisible":"true","type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":34,"dynamicBindingPathList":[],"text":"Cancel","isDisabled":false},{"widgetName":"Delete_Button","rightColumn":64,"onClick":"{{DeleteQuery.run(() => FindQuery.run(() => closeModal('Delete_Modal')), () => {})}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#F22B2B","widgetId":"qq02lh7ust","topRow":17,"bottomRow":21,"isVisible":"true","type":"BUTTON_WIDGET","version":1,"parentId":"zi8fjakv8o","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"leftColumn":48,"dynamicBindingPathList":[],"text":"Confirm","isDisabled":false},{"widgetName":"Text12","rightColumn":63,"textAlign":"LEFT","widgetId":"48uac29g6e","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"zi8fjakv8o","isLoading":false,"parentColumnSpace":6.875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"Are you sure you want to delete this item?"}],"isDisabled":false}],"width":456,"height":240},{"widgetName":"Insert_Modal","rightColumn":41,"detachFromLayout":true,"widgetId":"vmorzie6eq","topRow":16,"bottomRow":40,"parentRowSpace":10,"canOutsideClickClose":true,"type":"MODAL_WIDGET","canEscapeKeyClose":true,"version":2,"parentId":"0","shouldScrollContents":false,"isLoading":false,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":17,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas4","rightColumn":453.1875,"detachFromLayout":true,"widgetId":"9rhv3ioohq","topRow":0,"bottomRow":610,"parentRowSpace":1,"isVisible":"true","canExtend":true,"type":"CANVAS_WIDGET","version":1,"parentId":"vmorzie6eq","shouldScrollContents":false,"minHeight":600,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"widgetName":"Form2","backgroundColor":"#F6F7F8","rightColumn":64,"widgetId":"1ruewbc4ef","topRow":0,"bottomRow":58,"parentRowSpace":10,"isVisible":"true","type":"FORM_WIDGET","parentId":"9rhv3ioohq","isLoading":false,"shouldScrollContents":false,"parentColumnSpace":8,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"children":[{"widgetName":"Canvas5","rightColumn":224,"detachFromLayout":true,"widgetId":"tp9pui0e6y","containerStyle":"none","topRow":0,"bottomRow":570,"parentRowSpace":1,"isVisible":"true","canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"1ruewbc4ef","minHeight":580,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":true,"widgetName":"insert_button","rightColumn":62,"onClick":"{{InsertQuery.run(() => FindQuery.run(() => closeModal('Insert_Modal')))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[{"key":"onClick"}],"buttonColor":"#03B365","widgetId":"h8vxf3oh4s","topRow":51,"bottomRow":55,"isVisible":"true","type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":43,"dynamicBindingPathList":[],"googleRecaptchaKey":"","text":"Submit"},{"resetFormOnClick":true,"widgetName":"reset_button","rightColumn":42,"onClick":"{{closeModal('Insert_Modal')}}","isDefaultClickDisabled":true,"buttonColor":"#03B365","widgetId":"o23gs26wm5","topRow":51,"bottomRow":55,"isVisible":"true","type":"FORM_BUTTON_WIDGET","version":1,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":29,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Close"},{"widgetName":"Text21","rightColumn":19,"textAlign":"RIGHT","widgetId":"cfmxebyn06","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"genres:"},{"isRequired":true,"widgetName":"insert_col_input1","rightColumn":62,"widgetId":"h1wbbv7alb","topRow":5,"bottomRow":9,"parentRowSpace":10,"isVisible":"true","label":"","type":"INPUT_WIDGET_V2","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"genres","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text22","rightColumn":19,"textAlign":"RIGHT","widgetId":"jsffaxrqhw","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":2,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"homepage:"},{"isRequired":true,"widgetName":"insert_col_input2","rightColumn":62,"widgetId":"6enalyprua","topRow":12,"bottomRow":16,"parentRowSpace":10,"isVisible":"true","label":"","type":"INPUT_WIDGET_V2","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","defaultText":"","placeholderText":"homepage","isDisabled":false,"validation":"true"},{"widgetName":"Text23","rightColumn":19,"textAlign":"RIGHT","widgetId":"btk60uozsm","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":7.6865234375,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"imdb_id:"},{"isRequired":true,"widgetName":"insert_col_input3","rightColumn":62,"widgetId":"e490gfts69","topRow":19,"bottomRow":23,"parentRowSpace":10,"isVisible":"true","label":"","type":"INPUT_WIDGET_V2","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"imdb_id","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text14","rightColumn":19,"textAlign":"RIGHT","widgetId":"8fm60omwwv","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"leftColumn":3,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"poster_path:"},{"isRequired":true,"widgetName":"insert_col_input4","rightColumn":62,"widgetId":"r55cydp0ao","topRow":26,"bottomRow":30,"parentRowSpace":10,"isVisible":"true","label":"","type":"INPUT_WIDGET_V2","version":1,"parentId":"tp9pui0e6y","isLoading":false,"parentColumnSpace":8.0625,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":21,"dynamicBindingPathList":[],"inputType":"TEXT","placeholderText":"poster_path","defaultText":"","isDisabled":false,"validation":"true"},{"widgetName":"Text13Copy","rightColumn":35,"textAlign":"LEFT","widgetId":"18x7vdv3gs","topRow":0,"bottomRow":4,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"shouldScroll":false,"parentId":"tp9pui0e6y","isLoading":false,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Insert Row"}]}]}],"isDisabled":false}],"width":532,"height":600},{"widgetName":"Form1","backgroundColor":"white","rightColumn":64,"dynamicPropertyPathList":[{"key":"isVisible"}],"widgetId":"m7dvlazbn7","topRow":0,"bottomRow":46,"parentRowSpace":10,"isVisible":"{{!!data_table.selectedRow._id}}","type":"FORM_WIDGET","parentId":"0","isLoading":false,"shouldScrollContents":true,"parentColumnSpace":18.8828125,"dynamicTriggerPathList":[],"leftColumn":40,"dynamicBindingPathList":[{"key":"isVisible"}],"children":[{"widgetName":"Canvas2","rightColumn":528.71875,"detachFromLayout":true,"widgetId":"cicukwhp5j","containerStyle":"none","topRow":0,"bottomRow":450,"parentRowSpace":1,"isVisible":"true","canExtend":false,"type":"CANVAS_WIDGET","version":1,"parentId":"m7dvlazbn7","minHeight":460,"isLoading":false,"parentColumnSpace":1,"dynamicTriggerPathList":[],"leftColumn":0,"dynamicBindingPathList":[],"children":[{"resetFormOnClick":false,"widgetName":"update_button","rightColumn":63,"onClick":"{{UpdateQuery.run(() => FindQuery.run(), () => showAlert('Error while updating resource!','error'))}}","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"4gnygu5jew","topRow":39,"bottomRow":43,"isVisible":"true","type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":true,"leftColumn":47,"dynamicBindingPathList":[],"text":"Update"},{"resetFormOnClick":true,"widgetName":"reset_update_button","rightColumn":46,"onClick":"","isDefaultClickDisabled":true,"dynamicPropertyPathList":[],"buttonColor":"#03B365","widgetId":"twwgpz5wfu","topRow":39,"bottomRow":43,"isVisible":"true","type":"FORM_BUTTON_WIDGET","version":1,"parentId":"cicukwhp5j","isLoading":false,"dynamicTriggerPathList":[{"key":"onClick"}],"disabledWhenInvalid":false,"leftColumn":28,"dynamicBindingPathList":[],"buttonVariant":"OUTLINE","text":"Reset"},{"isRequired":true,"widgetName":"update_col_1","rightColumn":63,"widgetId":"in8e51pg3y","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":"true","label":"","type":"INPUT_WIDGET_V2","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.genres}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_2","rightColumn":63,"widgetId":"mlhvfasf31","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":"true","label":"","type":"INPUT_WIDGET_V2","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.homepage}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_3","rightColumn":63,"widgetId":"0lz9vhcnr0","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":"true","label":"","type":"INPUT_WIDGET_V2","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.imdb_id}}","isDisabled":false,"validation":"true"},{"isRequired":true,"widgetName":"update_col_4","rightColumn":63,"widgetId":"m4esf7fww5","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":"true","label":"","type":"INPUT_WIDGET_V2","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"resetOnSubmit":true,"leftColumn":19,"dynamicBindingPathList":[{"key":"defaultText"}],"inputType":"TEXT","defaultText":"{{data_table.selectedRow.poster_path}}","isDisabled":false,"validation":"true"},{"widgetName":"Text9","rightColumn":63,"textAlign":"LEFT","widgetId":"4hnz8ktmz5","topRow":0,"bottomRow":6,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":8.8963623046875,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"HEADING1","text":"Update Selected Row"},{"widgetName":"Text17","rightColumn":18,"textAlign":"RIGHT","widgetId":"afzzc7q8af","topRow":8,"bottomRow":12,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"genres:"},{"widgetName":"Text18","rightColumn":18,"textAlign":"RIGHT","widgetId":"xqcsd2e5dj","topRow":15,"bottomRow":19,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"homepage:"},{"widgetName":"Text19","rightColumn":18,"textAlign":"RIGHT","widgetId":"l109ilp3vq","topRow":22,"bottomRow":26,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"imdb_id:"},{"widgetName":"Text20","rightColumn":18,"textAlign":"RIGHT","widgetId":"gqpwf0yng6","topRow":29,"bottomRow":33,"parentRowSpace":10,"isVisible":"true","fontStyle":"BOLD","type":"TEXT_WIDGET","textColor":"#231F20","version":1,"parentId":"cicukwhp5j","isLoading":false,"parentColumnSpace":7.15625,"dynamicTriggerPathList":[],"leftColumn":1,"dynamicBindingPathList":[],"fontSize":"PARAGRAPH","text":"poster_path:"}]}]}]},"layoutOnLoadActions":[[{"id":"616d7e429594b25adfa3e580","name":"FindQuery","pluginType":"DB","jsonPathKeys":["key_select.selectedOptionValue","data_table.pageSize","data_table.searchText||\"\"","(data_table.pageNo - 1) * data_table.pageSize","order_select.selectedOptionValue"],"timeoutInMillisecond":10000}]],"new":false}],"userPermissions":["read:pages","manage:pages"],"lastUpdatedTime":1634565699},"successMessage":"We have generated the <b>Table</b> from the <b>MongoDB datasource</b>. You can use the <b>Form</b> to modify it. Since all your data is already connected you can add more queries and modify the bindings","successImageUrl":"https://assets.appsmith.com/crud/working-flow-chart.png"}} \ No newline at end of file diff --git a/app/client/cypress/locators/FirstTimeUserOnboarding.json b/app/client/cypress/locators/FirstTimeUserOnboarding.json index 1f840b515a58..685154fc1bc8 100644 --- a/app/client/cypress/locators/FirstTimeUserOnboarding.json +++ b/app/client/cypress/locators/FirstTimeUserOnboarding.json @@ -7,7 +7,6 @@ "checklistWidgetBtn": "[data-testid='checklist-widget']", "checklistConnectionBtn": "[data-testid='checklist-connection']", "checklistDeployBtn": "[data-testid='checklist-deploy']", - "datasourcePage": ".t--integrationsHomePage", "datasourceMock": ".t--mock-datasource", "createQuery": ".t--create-query", "widgetSidebar": ".t--widget-sidebar", diff --git a/app/client/cypress/locators/Pages.json b/app/client/cypress/locators/Pages.json index 4d02c942b3dd..45e9d4681f07 100644 --- a/app/client/cypress/locators/Pages.json +++ b/app/client/cypress/locators/Pages.json @@ -9,7 +9,6 @@ "Menuaction": ".bp3-overlay-open>.bp3-transition-container", "Delete": ":nth-child(2) > .bp3-menu-item", "apiEditorIcon": ".t--nav-link-api-editor", - "addEntityAPI": ".datasources .t--entity-add-btn", "integrationActiveTab": "button[id$='ACTIVE']", "entityWidget": ".t--entity-name:contains('Widgets')", "entityTable": ".t--entity-name:contains('Table1')", diff --git a/app/client/cypress/locators/explorerlocators.json b/app/client/cypress/locators/explorerlocators.json index f24a3a77cb6b..3d639a62bdd1 100644 --- a/app/client/cypress/locators/explorerlocators.json +++ b/app/client/cypress/locators/explorerlocators.json @@ -3,7 +3,6 @@ "NoQueryMsg": "p:contains('No DB Queries yet.')", "NoWidgetsMsg": "p:contains('icon above to add widgets')", "AddPage": ".pages .t--entity-add-btn", - "addEntityAPI": ".datasources .t--entity-add-btn", "addEntityJSEditor": ".js_actions .t--entity-add-btn", "createQueryMenu": ".file-ops", "entityExplorer": ".t--entity-explorer", @@ -18,7 +17,6 @@ "entityQuery": ".t--entity-name:contains('Datasources')", "datasourceStructure": ".t--entity.datasourceStructure", "datasourceColumn": ".t--datasource-column", - "templateMenuIcon": ".t--template-menu-trigger", "collapse": ".t--entity-collapse-toggle", "property": ".language-appsmith-binding", "editNameField": ".editing input", @@ -27,7 +25,6 @@ "addWidget": ".widgets .t--entity-add-btn button", "closeWidgets": ".t--close-widgets-sidebar", "dropHere": "#div-dragarena-0", - "addDBQueryEntity": ".datasources .t--entity-add-btn button", "editEntity": ".t--entity-name input", "activeTab": "span:contains('Active')", "createNew": ".t--entity-add-btn.group.files button", diff --git a/app/client/cypress/snapshots/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png b/app/client/cypress/snapshots/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png index fa434d76b6e8..3251f8e9ae21 100644 Binary files a/app/client/cypress/snapshots/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png and b/app/client/cypress/snapshots/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png differ diff --git a/app/client/cypress/support/ApiCommands.js b/app/client/cypress/support/ApiCommands.js index f6b640caab8a..cde24de7f66c 100644 --- a/app/client/cypress/support/ApiCommands.js +++ b/app/client/cypress/support/ApiCommands.js @@ -50,7 +50,6 @@ Cypress.Commands.add("ResponseTextCheck", (textTocheck) => { }); Cypress.Commands.add("NavigateToAPI_Panel", () => { - cy.get(pages.addEntityAPI).last().should("be.visible").click({ force: true }); dataSources.NavigateToDSCreateNew(); cy.get("#loading").should("not.exist"); }); @@ -196,9 +195,7 @@ Cypress.Commands.add("EnterSourceDetailsWithbody", (baseUrl, v1method) => { }); Cypress.Commands.add("CreationOfUniqueAPIcheck", (apiname) => { - cy.get(pages.addEntityAPI).click(); dataSources.NavigateToDSCreateNew(); - cy.get(apiwidget.createapi).click({ force: true }); cy.wait("@createNewApi"); // cy.wait("@getUser"); @@ -273,6 +270,7 @@ Cypress.Commands.add("RenameEntity", (value, selectFirst) => { }); Cypress.Commands.add("CreateApiAndValidateUniqueEntityName", (apiname) => { + dataSources.NavigateToDSCreateNew(); cy.get(apiwidget.createapi).click({ force: true }); cy.wait("@createNewApi"); cy.get(apiwidget.resourceUrl).should("be.visible"); @@ -349,10 +347,6 @@ Cypress.Commands.add("DeleteAPI", () => { .should("eq", 200); }); -Cypress.Commands.add("NavigateToApiEditor", () => { - cy.get(explorer.addEntityAPI).click({ force: true }); -}); - Cypress.Commands.add("testCreateApiButton", () => { cy.get(ApiEditor.createBlankApiCard).click({ force: true }); cy.wait("@createNewApi"); @@ -362,7 +356,6 @@ Cypress.Commands.add("testCreateApiButton", () => { }); Cypress.Commands.add("createAndFillApi", (url, parameters) => { - cy.NavigateToApiEditor(); dataSources.NavigateToDSCreateNew(); cy.testCreateApiButton(); cy.get("@createNewApi").then((response) => { diff --git a/app/client/cypress/support/Objects/CommonLocators.ts b/app/client/cypress/support/Objects/CommonLocators.ts index 146946684900..c89551b70d1a 100644 --- a/app/client/cypress/support/Objects/CommonLocators.ts +++ b/app/client/cypress/support/Objects/CommonLocators.ts @@ -257,7 +257,6 @@ export class CommonLocators { _appLeveltooltip = (toolTip: string) => `span:contains('${toolTip}')`; _appEditMenu = "[data-testid='t--editor-menu']"; _appEditMenuBtn = "[data-testid='t--editor-menu-cta']"; - _appEditMenuSettings = "[data-testid='t--editor-menu-settings']"; _appEditExportSettings = "[data-testid='t--editor-menu-export-application']"; _appThemeSettings = "#t--theme-settings-header"; _appChangeThemeBtn = ".t--change-theme-btn"; @@ -301,7 +300,6 @@ export class CommonLocators { _buttonInDeployedMode = ".bp3-button"; _treeSelectPlaceholder = ".rc-tree-select-selection-placeholder"; _treeSelectTitle = ".rc-tree-select-tree-title"; - _newDataSourceBtn = ".datasources .t--entity-add-btn"; _callbackAddBtn = ".action-callback-add .ads-v2-button"; _checkboxInDeployedMode = "//label[contains(@class, 'bp3-checkbox')]//input"; _listText = "//span[text()='Blue']/../.."; diff --git a/app/client/cypress/support/Objects/FeatureFlags.ts b/app/client/cypress/support/Objects/FeatureFlags.ts index c002462a06c3..eb46508c0bb6 100644 --- a/app/client/cypress/support/Objects/FeatureFlags.ts +++ b/app/client/cypress/support/Objects/FeatureFlags.ts @@ -1,5 +1,5 @@ export const featureFlagIntercept = ( - flags: Record<string, boolean>, + flags: Record<string, boolean> = {}, reload = true, ) => { const response = { @@ -7,7 +7,10 @@ export const featureFlagIntercept = ( status: 200, success: true, }, - data: flags, + data: { + ...flags, + release_app_sidebar_enabled: true, + }, errorDisplay: "", }; cy.intercept("GET", "/api/v1/users/features", response); diff --git a/app/client/cypress/support/Pages/ApiPage.ts b/app/client/cypress/support/Pages/ApiPage.ts index 7f6fa59f48e8..10392142a9b1 100644 --- a/app/client/cypress/support/Pages/ApiPage.ts +++ b/app/client/cypress/support/Pages/ApiPage.ts @@ -1,4 +1,5 @@ import { ObjectsRegistry } from "../Objects/Registry"; +import EditorNavigation, { SidebarButton } from "./EditorNavigation"; type RightPaneTabs = "datasources" | "connections"; @@ -88,6 +89,7 @@ export class ApiPage { ) { if (aftDSSaved) this.agHelper.GetNClick(this._createQuery); else { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper.RemoveUIElement("EvaluatedPopUp"); this.agHelper.GetHoverNClick(this.locator._createNew); this.agHelper.GetNClick(this._blankAPI, 0, true); diff --git a/app/client/cypress/support/Pages/AppSettings/AppSettings.ts b/app/client/cypress/support/Pages/AppSettings/AppSettings.ts index c94b1813420b..c318530671b7 100644 --- a/app/client/cypress/support/Pages/AppSettings/AppSettings.ts +++ b/app/client/cypress/support/Pages/AppSettings/AppSettings.ts @@ -1,11 +1,10 @@ import { ObjectsRegistry } from "../../Objects/Registry"; +import EditorNavigation, { SidebarButton } from "../EditorNavigation"; export class AppSettings { private agHelper = ObjectsRegistry.AggregateHelper; private theme = ObjectsRegistry.ThemeSettings; public locators = { - _appSettings: ".t--app-settings-cta", - _closeSettings: "#t--close-app-settings-pane", _themeSettingsHeader: "#t--theme-settings-header", _generalSettingsHeader: "#t--general-settings-header", _embedSettingsHeader: "#t--share-embed-settings", @@ -69,11 +68,11 @@ export class AppSettings { }; public OpenAppSettings() { - this.agHelper.GetNClick(this.locators._appSettings, 0, true); + EditorNavigation.ViaSidebar(SidebarButton.Settings); } public ClosePane() { - this.agHelper.GetNClick(this.locators._closeSettings); + EditorNavigation.ViaSidebar(SidebarButton.Pages); } public GoToThemeSettings() { @@ -120,6 +119,7 @@ export class AppSettings { pageName: string, customSlug?: string, editMode = true, + restOfUrl = "", ) { appName = appName.replace(/\s+/g, "-"); this.agHelper.AssertElementAbsence(this.locators._updateStatus, 10000); @@ -129,14 +129,14 @@ export class AppSettings { expect(pathname).to.be.equal( `/app/${customSlug}-${pageId}${ editMode ? "/edit" : "" - }`.toLowerCase(), + }${restOfUrl}`.toLowerCase(), ); } else { const pageId = pathname.split("/")[3]?.split("-").pop(); expect(pathname).to.be.equal( `/app/${appName}/${pageName}-${pageId}${ editMode ? "/edit" : "" - }`.toLowerCase(), + }${restOfUrl}`.toLowerCase(), ); } }); diff --git a/app/client/cypress/support/Pages/AppSettings/GeneralSettings.ts b/app/client/cypress/support/Pages/AppSettings/GeneralSettings.ts index f8242ae734ee..f2a8aca4867a 100644 --- a/app/client/cypress/support/Pages/AppSettings/GeneralSettings.ts +++ b/app/client/cypress/support/Pages/AppSettings/GeneralSettings.ts @@ -1,5 +1,13 @@ import { ObjectsRegistry } from "../../Objects/Registry"; +interface UpdateNameAndVerifyUrlObj { + reset: boolean; + newAppName: string; + verifyAppNameAs?: string; + pageName?: string; + restOfUrl?: string; +} + export class GeneralSettings { private agHelper = ObjectsRegistry.AggregateHelper; private appSettings = ObjectsRegistry.AppSettings; @@ -11,12 +19,13 @@ export class GeneralSettings { _appIconSelector: "#t--general-settings-app-icon", }; - UpdateAppNameAndVerifyUrl( - reset: boolean, - newAppName: string, - verifyAppNameAs?: string, + UpdateAppNameAndVerifyUrl({ + newAppName, pageName = "page1", - ) { + reset, + restOfUrl = "", + verifyAppNameAs, + }: UpdateNameAndVerifyUrlObj) { const appNameToBeVerified = verifyAppNameAs ?? newAppName; this.agHelper .GetText(this.locators._appNameField, "val") @@ -28,7 +37,13 @@ export class GeneralSettings { ); this.agHelper.PressEnter(1000); this.assertHelper.AssertNetworkStatus("@updateApplication", 200); - this.appSettings.CheckUrl(appNameToBeVerified, pageName); + this.appSettings.CheckUrl( + appNameToBeVerified, + pageName, + undefined, + true, + restOfUrl, + ); if (reset) { this.agHelper.RemoveCharsNType( this.locators._appNameField, @@ -37,7 +52,13 @@ export class GeneralSettings { ); this.agHelper.PressEnter(1000); this.assertHelper.AssertNetworkStatus("@updateApplication", 200); - this.appSettings.CheckUrl(currentAppName as string, pageName); + this.appSettings.CheckUrl( + currentAppName as string, + pageName, + undefined, + true, + restOfUrl, + ); } }); } diff --git a/app/client/cypress/support/Pages/AppSettings/PageSettings.ts b/app/client/cypress/support/Pages/AppSettings/PageSettings.ts index 8264ed1e4fc9..3e3d9f504c33 100644 --- a/app/client/cypress/support/Pages/AppSettings/PageSettings.ts +++ b/app/client/cypress/support/Pages/AppSettings/PageSettings.ts @@ -1,5 +1,12 @@ import { ObjectsRegistry } from "../../Objects/Registry"; +interface UpdatePageNameAndVerifyUrlObj { + newPageName: string; + reset?: boolean; + verifyPageNameAs?: string; + restOfUrl?: string; +} + export class PageSettings { private agHelper = ObjectsRegistry.AggregateHelper; private homePage = ObjectsRegistry.HomePage; @@ -61,11 +68,12 @@ export class PageSettings { }); } - UpdatePageNameAndVerifyUrl( - newPageName: string, - verifyPageNameAs?: string, + UpdatePageNameAndVerifyUrl({ + newPageName, reset = true, - ) { + restOfUrl = "", + verifyPageNameAs, + }: UpdatePageNameAndVerifyUrlObj) { const pageNameToBeVerified = verifyPageNameAs ?? newPageName; this.agHelper .GetText(this.locators._pageNameField, "val") @@ -80,7 +88,13 @@ export class PageSettings { ); this.agHelper.PressEnter(); this.assertHelper.AssertNetworkStatus("@updatePage", 200); - this.appSettings.CheckUrl(appName as string, pageNameToBeVerified); + this.appSettings.CheckUrl( + appName as string, + pageNameToBeVerified, + undefined, + true, + restOfUrl, + ); if (reset) { this.agHelper.RemoveCharsNType( this.locators._pageNameField, @@ -92,13 +106,16 @@ export class PageSettings { this.appSettings.CheckUrl( appName as string, currentPageName as string, + undefined, + true, + restOfUrl, ); } }); }); } - UpdateCustomSlugAndVerifyUrl(customSlug: string) { + UpdateCustomSlugAndVerifyUrl(customSlug: string, restOfUrl = "") { this.agHelper .GetText(this.locators._customSlugField, "val") .then((currentCustomSlug) => { @@ -116,7 +133,13 @@ export class PageSettings { } this.agHelper.PressEnter(); this.assertHelper.AssertNetworkStatus("@updatePage", 200); - this.appSettings.CheckUrl(appName as string, "", customSlug); + this.appSettings.CheckUrl( + appName as string, + "", + customSlug, + true, + restOfUrl, + ); }); }); } diff --git a/app/client/cypress/support/Pages/AutoLayout.ts b/app/client/cypress/support/Pages/AutoLayout.ts index e2d2399a4ead..2401b85f55ef 100644 --- a/app/client/cypress/support/Pages/AutoLayout.ts +++ b/app/client/cypress/support/Pages/AutoLayout.ts @@ -1,5 +1,6 @@ import { ObjectsRegistry } from "../Objects/Registry"; import { getWidgetSelector, WIDGET } from "../../locators/WidgetLocators"; +import EditorNavigation, { SidebarButton } from "./EditorNavigation"; type FixedConversionOptions = "DESKTOP" | "MOBILE"; @@ -111,12 +112,14 @@ export class AutoLayout { } public VerifyIsAutoLayout() { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper.GetNClick(this.locators._selectionCanvas("0"), 0, true); this.agHelper.GetNAssertContains(this.autoConvertButton, "fixed layout"); this.agHelper.AssertElementExist(this.flexMainContainer); } public VerifyIsFixedLayout() { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper.GetNClick(this.locators._selectionCanvas("0"), 0, true); cy.get(this.autoConvertButton).should("contain", "auto-layout"); cy.get(this.flexMainContainer).should("not.exist"); diff --git a/app/client/cypress/support/Pages/DataSources.ts b/app/client/cypress/support/Pages/DataSources.ts index 94d9aa4fdde3..de94ac67747c 100644 --- a/app/client/cypress/support/Pages/DataSources.ts +++ b/app/client/cypress/support/Pages/DataSources.ts @@ -1,6 +1,8 @@ import { ObjectsRegistry } from "../Objects/Registry"; import { WIDGET } from "../../locators/WidgetLocators"; import { EntityItems } from "./AssertHelper"; +import EditorNavigation, { SidebarButton } from "./EditorNavigation"; +import datasource from "../../locators/DatasourcesEditor.json"; export const DataSourceKVP = { Postgres: "PostgreSQL", @@ -52,7 +54,7 @@ export class DataSources { private _dsCreateNewTab = "[data-testid=t--tab-CREATE_NEW]"; private _dsReviewSection = "[data-testid='t--ds-review-section']"; - private _addNewDataSource = ".t--entity-add-btn.datasources button"; + public _addNewDataSource = ".t--add-datasource-button"; private _createNewPlgin = (pluginName: string) => ".t--plugin-name:contains('" + pluginName + "')"; public _host = (index = "0") => @@ -79,7 +81,7 @@ export class DataSources { _reconnectDataSourceModal = "[data-testid=t--tab-RECONNECT_DATASOURCES]"; _closeDataSourceModal = ".t--reconnect-close-btn"; _dsEntityItem = "[data-guided-tour-id='explorer-entity-Datasources']"; - _activeDS = "[data-testid='active-datasource-name']"; + _activeDS = "[data-selected='true']"; _mockDatasourceName = "[data-testid=mockdatasource-name]"; _templateMenu = ".t--template-menu"; _addSuggestedExisting = "t--suggested-widget-existing"; @@ -152,8 +154,6 @@ export class DataSources { _noRecordFound = "span[data-testid='no-data-table-message']"; _usePreparedStatement = "input[name='actionConfiguration.pluginSpecifiedTemplates[0].value'][type='checkbox'], input[name='actionConfiguration.formData.preparedStatement.data'][type='checkbox']"; - _queriesOnPageText = (dsName: string) => - ".t--datasource-name:contains('" + dsName + "') .t--queries-for-DB"; _mockDB = (dbName: string) => "//span[text()='" + dbName + @@ -252,8 +252,6 @@ export class DataSources { "//p[contains(text(),'" + ddName + "')]/ancestor::div[@class='form-config-top']/following-sibling::div//div[contains(@class, 'rc-select-multiple')]"; - private _datasourceTableSchemaInQueryEditor = (schemaName: string) => - `//div[contains(@class, 'datasourceStructure-query-editor')]//div[contains(@class, 't--entity-name')][text()='${schemaName}']`; private _datasourceSchemaRefreshBtn = ".datasourceStructure-refresh"; private _datasourceStructureHeader = ".datasourceStructure-header"; _datasourceSchemaColumn = ".t--datasource-column"; @@ -285,9 +283,9 @@ export class DataSources { _graphQlDsFromRightPane = (dsName: string) => "//div/span[text() ='" + dsName + "']"; _imgFireStoreLogo = "//img[contains(@src, 'firestore.svg')]"; - private _dsVirtuosoElement = (dsName: string) => - `[data-testid='t--entity-item-${dsName}'] + div .t--schema-virtuoso-container`; + _dsVirtuosoElement = `div .t--schema-virtuoso-container`; private _dsVirtuosoList = `[data-test-id="virtuoso-item-list"]`; + private _dsSchemaContainer = `[data-testId="datasource-schema-container"]`; private _dsVirtuosoElementTable = (targetTableName: string) => `.t--entity-item[data-testid='t--entity-item-${targetTableName}']`; private _dsPageTabListItem = (buttonText: string) => @@ -297,8 +295,6 @@ export class DataSources { _dsPageTableTriggermenuTarget = (tableName: string) => `${this._dsPageTabContainerTableName(tableName)} .t--template-menu-trigger`; _gSheetQueryPlaceholder = ".CodeMirror-placeholder"; - _dsNameInExplorer = (dsName: string) => - `div.t--entity-name:contains('${dsName}')`; _dsStructurePreviewMode = ".datasourceStructure-datasource-view-mode"; public AssertDSEditViewMode(mode: AppModes) { @@ -446,21 +442,19 @@ export class DataSources { } public NavigateToDSCreateNew() { - this.entityExplorer.HoverOnEntityItem("Datasources"); + EditorNavigation.ViaSidebar(SidebarButton.Data); Cypress._.times(2, () => { this.agHelper.GetNClick(this._addNewDataSource, 0, true); this.agHelper.Sleep(); }); - this.agHelper.RemoveUIElement("Tooltip", "Add a new datasource"); - cy.get(this._newDatasourceContainer).scrollTo("bottom", { - ensureScrollable: false, - }); cy.get(this._newDatabases).should("be.visible"); } CreateMockDB(dbName: "Users" | "Movies"): Cypress.Chainable<string> { this.NavigateToDSCreateNew(); - this.agHelper.GetNClick(this._mockDB(dbName)); + cy.get(this._mockDatasourceName) + .contains(dbName, { matchCase: false }) + .click(); this.assertHelper.AssertNetworkStatus("@getMockDb"); //To return the right mock DB name return cy .get("@getMockDb") @@ -848,55 +842,13 @@ export class DataSources { this.agHelper.AssertContains("datasource updated"); } - public ShowAllDatasources() { - this.agHelper.GetElement(this.locator._body).then(($body) => { - if ($body.find(this._selectedActiveTab).length === 0) { - this.agHelper.ClickButton("Show all datasources"); - } - }); - } - - public ClickActiveTabDSContextMenu(datasourceName: string) { - this.agHelper.GetElement(this.locator._body).then(($body) => { - if ( - $body.find(this.locator._visibleTextSpan("Show all datasources", true)) - .length !== 0 - ) { - this.ShowAllDatasources(); - } else this.NavigateToActiveTab(); - }); - - cy.get(this._datasourceCard) - .contains(datasourceName) - .parents(this._datasourceCard) - .find(this._dsMenuoptions) - .scrollIntoView() - .should("be.visible") - .click(); - } - - public DeleteDatasouceFromActiveTab( - datasourceName: string, - expectedRes = 200 || 409 || [200, 409], - ) { - this.ClickActiveTabDSContextMenu(datasourceName); - this.agHelper.GetNClick(this._dsOptionMenuItem("Delete"), 0, false, 200); - this.agHelper.GetNClick(this._dsOptionMenuItem("Are you sure?")); - this.ValidateDSDeletion(expectedRes); - } - public DeleteDatasourceFromWithinDS( datasourceName: string, expectedRes: number | number[] = 200 || 409 || [200, 409], ) { - this.NavigateToActiveTab(); - cy.get(this._datasourceCard) - .contains(datasourceName) - .scrollIntoView() - .should("be.visible") - .click(); + this.navigateToDatasource(datasourceName); this.agHelper.Sleep(); //for the Datasource page to open - this.DeleteDSDirectly(expectedRes); + this.DeleteDSDirectly(expectedRes, false); } // this initiates saving via the cancel button. @@ -926,19 +878,6 @@ export class DataSources { this.ValidateDSDeletion(expectedRes); } - public DeleteDSFromEntityExplorer( - dsName: string, - expectedRes: number | number[] = 200, - ) { - this.entityExplorer.SelectEntityByName(dsName, "Datasources"); - this.entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Delete", - entityType: EntityItems.Datasource, - }); - this.ValidateDSDeletion(expectedRes); - } - public ValidateDSDeletion(expectedRes: number | number[] = 200) { this.assertHelper .AssertNetworkStatus("@deleteDatasource", expectedRes) @@ -951,15 +890,6 @@ export class DataSources { }); } - public NavigateToActiveTab() { - this.agHelper.GetElement(this.locator._body).then(($body) => { - if ($body.find(this._selectedActiveTab).length === 0) { - this.NavigateToDSCreateNew(); - this.agHelper.GetNClick(this._activeTab, 0, true); - } - }); - } - public NavigateFromActiveDS( datasourceName: string, createQuery: boolean, @@ -973,13 +903,8 @@ export class DataSources { this.AssertDSInActiveList(new RegExp("^" + datasourceName + "$")) //This regex is to exact match the datasource name .scrollIntoView() .should("be.visible") - .then(($element) => { - cy.wrap($element) - .closest(this._datasourceCard) - .within(() => { - this.agHelper.GetNClick(btnLocator, 0, true); - }); - }); + .click(); + this.agHelper.GetNClick(btnLocator, 0, true); this.agHelper.Sleep(3000); //for the CreateQuery/GeneratePage page to load createQuery && this.AssertRunButtonVisibility(); validateTableDropdown && @@ -988,11 +913,7 @@ export class DataSources { } public AssertDSInActiveList(dsName: string | RegExp) { - this.entityExplorer.NavigateToSwitcher("Explorer", 0, true); - this.entityExplorer.ExpandCollapseEntity("Datasources", false); - //this.entityExplorer.SelectEntityByName(datasourceName, "Datasources"); - //this.entityExplorer.ExpandCollapseEntity(datasourceName, false); - this.NavigateToActiveTab(); + EditorNavigation.ViaSidebar(SidebarButton.Data); return this.agHelper.GetNAssertContains(this._datasourceCard, dsName); } @@ -1000,17 +921,10 @@ export class DataSources { datasourceName: string, toNavigateToActive = true, ) { - if (toNavigateToActive) this.NavigateToActiveTab(); - cy.get(this._datasourceCard, { withinSubject: null }) - .find(this._activeDS) - .contains(new RegExp("^" + datasourceName + "$")) //This regex is to exact match the datasource name - .scrollIntoView() - .should("be.visible") - .closest(this._datasourceCard) - .scrollIntoView() - .within(() => { - this.agHelper.GetNClick(this._createQuery, 0, true); - }); + if (toNavigateToActive) EditorNavigation.ViaSidebar(SidebarButton.Data); + + this.navigateToDatasource(datasourceName); + this.agHelper.GetNClick(this._createQuery, 0, true); this.agHelper.Sleep(2000); //for the CreateQuery //this.assertHelper.AssertNetworkStatus("@createNewApi", 201);//throwing 404 in CI sometimes this.AssertRunButtonVisibility(); @@ -1042,7 +956,7 @@ export class DataSources { queryName = "", cancelEditDs = true, ) { - this.NavigateToActiveTab(); + EditorNavigation.ViaSidebar(SidebarButton.Data); cy.get(this._datasourceCard) .contains(new RegExp("^" + datasourceName + "$")) //This regex is to exact match the datasource name .scrollIntoView() @@ -1458,19 +1372,14 @@ export class DataSources { } else { this.SaveDatasource(); } - this.entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dataSourceName, - action: "Refresh", - }); + this.selectTabOnDatasourcePage("View data"); cy.wait("@getDatasourceStructure").then(() => { - cy.get(".bp3-collapse-body").contains(schema); + cy.get(this._dsSchemaContainer).contains(schema); }); } public VerifyTableSchemaOnQueryEditor(schema: string) { - this.agHelper.AssertElementVisibility( - this._datasourceTableSchemaInQueryEditor(schema), - ); + this.agHelper.AssertElementVisibility(this._dsVirtuosoElementTable(schema)); } public VerifySchemaAbsenceInQueryEditor() { @@ -1508,6 +1417,22 @@ export class DataSources { this.VerifyTableSchemaOnQueryEditor(expectedTableName); } + public createQueryWithDatasourceSchemaTemplate( + datasourceName: string, + tableName: string, + templateName: string, + ) { + this.CreateQueryFromActiveTab(datasourceName); + this.AssertTableInVirtuosoList(datasourceName, tableName); + cy.get(this._dsVirtuosoElementTable(tableName)).click(); + this.agHelper.GetNClick( + this.entityExplorer.locator._contextMenuItem(templateName), + 0, + true, + ); + this.agHelper.Sleep(500); + } + public AssertDSDialogVisibility(isVisible = true) { if (isVisible) { this.agHelper.AssertElementVisibility(this._datasourceModalDoNotSave); @@ -1540,7 +1465,7 @@ export class DataSources { // this initiates saving via the back button. public SaveDSFromDialog(save = true) { - this.agHelper.GoBack(); + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.AssertDatasourceSaveModalVisibilityAndSave(save); } @@ -1927,79 +1852,86 @@ export class DataSources { presence = true, ) { const ds_entity_name = dsName.replace(/\s/g, "_"); - this.entityExplorer.ExpandCollapseEntity("Datasources"); - cy.get(this.locator._body).then(($body: any) => { - if ($body.find(this._dsNameInExplorer(dsName)).length > 0) { - this.entityExplorer.ExpandCollapseEntity(dsName); - cy.intercept("GET", "/api/v1/datasources/*/structure?ignoreCache=*").as( - `getDatasourceStructureUpdated_${ds_entity_name}`, + cy.intercept("GET", "/api/v1/datasources/*/structure?ignoreCache=*").as( + `getDatasourceStructureUpdated_${ds_entity_name}`, + ); + this.RefreshDatasourceSchema(); + this.assertHelper + .WaitForNetworkCall(`@getDatasourceStructureUpdated_${ds_entity_name}`) + .then(async (response) => { + const tables: any[] = response?.body.data?.tables || []; + const indexOfTable = tables.findIndex( + (table) => table.name === targetTableName, ); - this.entityExplorer.ActionContextMenuByEntityName({ - entityNameinLeftSidebar: dsName, - action: "Refresh", - }); - - this.assertHelper - .WaitForNetworkCall( - `@getDatasourceStructureUpdated_${ds_entity_name}`, - ) - .then(async (response) => { - const tables: any[] = response?.body.data?.tables || []; - const indexOfTable = tables.findIndex( - (table) => table.name === targetTableName, - ); - if (presence) { - this.agHelper.Sleep(); - this.agHelper - .GetNClick(this._dsVirtuosoElement(dsName)) - .then((parentElement) => { - const heightOfParentElement = - parentElement.outerHeight() || 0; - - // Every element (tables in this scenario) in the virtual list has equal heights. Assumption: Every table element accordion is collapsed by default. - const containerElement = parentElement.find( - this._dsVirtuosoList, - ); - const elementHeight = parseInt( - containerElement - .children() - .first() - .attr("data-known-size") || "", - 10, - ); - // Total height of the parent container holding the tables in the dom normally without virtualization rendering - const totalScroll = tables.length * elementHeight; - cy.log( - JSON.stringify({ heightOfParentElement, totalScroll }), + if (presence) { + this.agHelper.Sleep(); + this.agHelper + .GetNClick(this._dsVirtuosoElement) + .then((parentElement) => { + const heightOfParentElement = parentElement.outerHeight() || 0; + + // Every element (tables in this scenario) in the virtual list has equal heights. Assumption: Every table element accordion is collapsed by default. + const containerElement = parentElement.find(this._dsVirtuosoList); + const elementHeight = parseInt( + containerElement.children().first().attr("data-known-size") || + "", + 10, + ); + // Total height of the parent container holding the tables in the dom normally without virtualization rendering + const totalScroll = tables.length * elementHeight; + cy.log(JSON.stringify({ heightOfParentElement, totalScroll })); + if (heightOfParentElement < totalScroll) { + // Index of the table present in the array of tables which will determine the presence of element inside the parent container + let offset = indexOfTable * elementHeight; + const scrollPercent = Math.max( + (offset / (totalScroll || 1)) * 100, + 0, + ); + if (scrollPercent > 0) { + this.agHelper.ScrollToXY( + this._dsVirtuosoElement, + 0, + `${scrollPercent}%`, ); - if (heightOfParentElement < totalScroll) { - // Index of the table present in the array of tables which will determine the presence of element inside the parent container - let offset = indexOfTable * elementHeight; - const scrollPercent = Math.max( - (offset / (totalScroll || 1)) * 100, - 0, - ); - if (scrollPercent > 0) { - this.agHelper.ScrollToXY( - this._dsVirtuosoElement(dsName), - 0, - `${scrollPercent}%`, - ); - } - } - this.agHelper.AssertElementVisibility( - this._dsVirtuosoElementTable(targetTableName), - ); - }); - } else { - expect(indexOfTable).to.equal(-1); - } - }); - } - }); + } + } + // To close any template pop up, click on the body + cy.get(this.locator._body).click({ force: true }); + this.agHelper.AssertElementVisibility( + this._dsVirtuosoElementTable(targetTableName), + ); + }); + } else { + this.agHelper.AssertElementAbsence( + this._dsVirtuosoElementTable(targetTableName), + ); + expect(indexOfTable).to.equal(-1); + } + }); } public selectTabOnDatasourcePage(tab: "View data" | "Configurations") { this.agHelper.GetNClick(this._dsPageTabListItem(tab)); } + + public navigateToDatasource(name: string) { + EditorNavigation.ViaSidebar(SidebarButton.Data); + cy.get(datasource.datasourceCard) + .contains(name) + .first() + .scrollIntoView() + .should("be.visible") + .click() + .parents(datasource.datasourceCard) + .should("have.attr", "data-selected", "true"); + } + + public getDatasourceListItemDescription(name: string) { + return cy + .get(datasource.datasourceCard) + .contains(name) + .parents(datasource.datasourceCard) + .find(".ads-v2-listitem__bdesc") + .invoke("text"); + } } diff --git a/app/client/cypress/support/Pages/EditorNavigation.ts b/app/client/cypress/support/Pages/EditorNavigation.ts new file mode 100644 index 000000000000..11e0e73340ee --- /dev/null +++ b/app/client/cypress/support/Pages/EditorNavigation.ts @@ -0,0 +1,20 @@ +export enum SidebarButton { + Data = "Data", + Pages = "Pages", + Libraries = "Libraries", + Settings = "Settings", +} +class EditorNavigation { + locators = { + sidebar: ".t--sidebar", + sidebarButtons: (name: SidebarButton) => `.t--sidebar-${name}`, + }; + ViaSidebar(button: SidebarButton) { + cy.get(this.locators.sidebar) + .should("be.visible") + .find(this.locators.sidebarButtons(button)) + .click({ force: true }); + } +} + +export default new EditorNavigation(); diff --git a/app/client/cypress/support/Pages/EntityExplorer.ts b/app/client/cypress/support/Pages/EntityExplorer.ts index fce511b2b796..0d4f01d572c5 100644 --- a/app/client/cypress/support/Pages/EntityExplorer.ts +++ b/app/client/cypress/support/Pages/EntityExplorer.ts @@ -1,5 +1,6 @@ import { ObjectsRegistry } from "../Objects/Registry"; import { EntityItems } from "./AssertHelper"; +import EditorNavigation, { SidebarButton } from "./EditorNavigation"; type templateActions = | "Find" @@ -94,15 +95,10 @@ export class EntityExplorer { public SelectEntityByName( entityNameinLeftSidebar: string, - section: - | "Widgets" - | "Queries/JS" - | "Datasources" - | "Pages" - | "" - | string = "", + section: "Widgets" | "Queries/JS" | "Pages" | "" | string = "", ctrlKey = false, ) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.NavigateToSwitcher("Explorer"); if (section) this.ExpandCollapseEntity(section); //to expand respective section cy.xpath(this._entityNameInExplorer(entityNameinLeftSidebar)) @@ -133,6 +129,7 @@ export class EntityExplorer { | "Generate page with data" | "Add page from template" = "New blank page", ) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper.GetNClick(this.locator._newPage); this.agHelper.GetNClick(this._newPageOptions(option)); if (option === "New blank page") { @@ -148,6 +145,7 @@ export class EntityExplorer { index = 0, force = false, ) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper .GetAttribute(this._openNavigationTab(navigationTab), "data-selected") .then(($value) => { @@ -162,6 +160,7 @@ export class EntityExplorer { } public AssertEntityPresenceInExplorer(entityNameinLeftSidebar: string) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper.AssertElementLength( this._entityNameInExplorer(entityNameinLeftSidebar), 1, @@ -169,12 +168,14 @@ export class EntityExplorer { } public AssertEntityAbsenceInExplorer(entityNameinLeftSidebar: string) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper.AssertElementAbsence( this._entityNameInExplorer(entityNameinLeftSidebar), ); } public ExpandCollapseEntity(entityName: string, expand = true, index = 0) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper.AssertElementVisibility( this._expandCollapseArrow(entityName), true, @@ -246,6 +247,7 @@ export class EntityExplorer { toAssertAction, toastToValidate = "", }: EntityActionParams) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper.Sleep(); cy.xpath(this._contextMenu(entityNameinLeftSidebar)) .scrollIntoView() @@ -266,6 +268,7 @@ export class EntityExplorer { } public DeleteWidgetFromEntityExplorer(widgetNameinLeftSidebar: string) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); cy.xpath(this._contextMenu(widgetNameinLeftSidebar)) .last() .click({ force: true }); @@ -280,6 +283,7 @@ export class EntityExplorer { } public DeleteAllQueriesForDB(dsName: string) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper.GetElement(this._allQueriesforDB(dsName)).each(($el: any) => { cy.wrap($el) .invoke("text") @@ -294,24 +298,12 @@ export class EntityExplorer { } public HoverOnEntityItem(entityNameinLeftSidebar: string) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper.ClickOutside(); //cy.get("body").trigger("mousedown"); cy.xpath(this._entityNameInExplorer(entityNameinLeftSidebar)).realHover(); } - public ActionTemplateMenuByEntityName( - entityNameinLeftSidebar: string, - action: templateActions, - ) { - this.HoverOnEntityItem(entityNameinLeftSidebar); - cy.xpath(this._templateMenuTrigger(entityNameinLeftSidebar)) - .first() - .click() - .wait(100); //for menu template to appear - this.agHelper.GetNClick(this.locator._contextMenuItem(action), 0, true); - this.agHelper.Sleep(500); - } - public SearchWidgetPane(widgetType: string) { this.NavigateToSwitcher("Widgets", 0, true); this.agHelper.Sleep(); @@ -399,6 +391,7 @@ export class EntityExplorer { } public ClonePage(pageName = "Page1") { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.SelectEntityByName(pageName, "Pages"); this.ActionContextMenuByEntityName({ entityNameinLeftSidebar: pageName, @@ -408,6 +401,7 @@ export class EntityExplorer { } public CreateNewDsQuery(dsName: string, isQuery = true) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); this.agHelper.ClickOutside(); //to close the evaluated pop-up cy.get(this.locator._createNew).last().click(); const searchText = isQuery ? dsName + " query" : dsName; @@ -449,6 +443,7 @@ export class EntityExplorer { renameVal: string, viaMenu = false, ) { + EditorNavigation.ViaSidebar(SidebarButton.Pages); if (viaMenu) this.ActionContextMenuByEntityName({ entityNameinLeftSidebar: entityName, diff --git a/app/client/cypress/support/Pages/JSEditor.ts b/app/client/cypress/support/Pages/JSEditor.ts index 1b1b785211f9..b0d52c8d139d 100644 --- a/app/client/cypress/support/Pages/JSEditor.ts +++ b/app/client/cypress/support/Pages/JSEditor.ts @@ -1,4 +1,5 @@ import { ObjectsRegistry } from "../Objects/Registry"; +import EditorNavigation, { SidebarButton } from "./EditorNavigation"; export interface ICreateJSObjectOptions { paste: boolean; @@ -128,7 +129,7 @@ export class JSEditor { //#region Page functions public NavigateToNewJSEditor() { this.agHelper.ClickOutside(); //to enable click of below! - + EditorNavigation.ViaSidebar(SidebarButton.Pages); cy.get(this.locator._createNew).last().click({ force: true }); cy.get(this._newJSobj).eq(0).click({ force: true }); diff --git a/app/client/cypress/support/Pages/LibraryInstaller.ts b/app/client/cypress/support/Pages/LibraryInstaller.ts index 809e213d87c5..6869514a79ba 100644 --- a/app/client/cypress/support/Pages/LibraryInstaller.ts +++ b/app/client/cypress/support/Pages/LibraryInstaller.ts @@ -2,8 +2,7 @@ import { ObjectsRegistry } from "../Objects/Registry"; export class LibraryInstaller { private _aggregateHelper = ObjectsRegistry.AggregateHelper; - private _installer_trigger_locator = - ".t--entity-add-btn.group.libraries button"; + private _installer_trigger_locator = ".t--install-library-button"; private _installer_close_locator = ".ads-v2-popover__body-header .ads-v2-icon"; diff --git a/app/client/cypress/support/Pages/Onboarding.ts b/app/client/cypress/support/Pages/Onboarding.ts index d0c96a4e54d5..fe853fd4c0d6 100644 --- a/app/client/cypress/support/Pages/Onboarding.ts +++ b/app/client/cypress/support/Pages/Onboarding.ts @@ -33,7 +33,7 @@ export class Onboarding { true, ); this._aggregateHelper.AssertElementVisibility( - OnboardingLocator.datasourcePage, + this._datasources._newDatasourceContainer, ); this.closeIntroModal(); this._aggregateHelper.AssertElementAbsence( @@ -57,6 +57,7 @@ export class Onboarding { .should("have.css", "cursor", "not-allowed"); cy.get(OnboardingLocator.checklistActionBtn).should("be.visible"); cy.get(OnboardingLocator.checklistActionBtn).click(); + this._datasources.navigateToDatasource("Movies"); cy.get(OnboardingLocator.createQuery).should("be.visible"); cy.get(OnboardingLocator.createQuery).click(); cy.wait(1000); diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js index 31a9025ac265..b11bc6777bbb 100644 --- a/app/client/cypress/support/commands.js +++ b/app/client/cypress/support/commands.js @@ -2,6 +2,8 @@ /* eslint-disable cypress/no-assigning-return-values */ /* This file is used to maintain comman methods across tests , refer other *.js files for adding common methods */ +import EditorNavigation, { SidebarButton } from "./Pages/EditorNavigation"; + require("cy-verify-downloads").addCustomCommand(); require("cypress-file-upload"); //require('cy-verify-downloads').addCustomCommand(); @@ -813,14 +815,6 @@ Cypress.Commands.add("importCurl", () => { ); }); -Cypress.Commands.add("NavigateToActiveTab", () => { - cy.get(explorer.activeTab).click({ force: true }); - - // cy.get(pages.integrationActiveTab) - // .should("be.visible") - // .click({ force: true }); -}); - Cypress.Commands.add("selectAction", (option) => { cy.get(".ads-v2-menu__menu-item-children") .contains(option) @@ -2119,6 +2113,7 @@ Cypress.Commands.add( ); Cypress.Commands.add("CreatePage", () => { + EditorNavigation.ViaSidebar(SidebarButton.Pages); cy.get(pages.AddPage).first().click(); cy.xpath("//span[text()='New blank page']/parent::div").click(); }); diff --git a/app/client/cypress/support/dataSourceCommands.js b/app/client/cypress/support/dataSourceCommands.js index f8e0bfbc45c2..912d3d7abcaf 100644 --- a/app/client/cypress/support/dataSourceCommands.js +++ b/app/client/cypress/support/dataSourceCommands.js @@ -1,6 +1,8 @@ /* eslint-disable cypress/no-unnecessary-waiting */ /* eslint-disable cypress/no-assigning-return-values */ +import EditorNavigation, { SidebarButton } from "./Pages/EditorNavigation"; + require("cy-verify-downloads").addCustomCommand(); require("cypress-file-upload"); import { ObjectsRegistry } from "../support/Objects/Registry"; @@ -52,15 +54,11 @@ Cypress.Commands.add("testSaveDeleteDatasource", () => { }); Cypress.Commands.add("NavigateToDatasourceEditor", () => { - cy.get(explorer.addDBQueryEntity).last().click({ force: true }); dataSources.NavigateToDSCreateNew(); }); Cypress.Commands.add("NavigateToActiveDatasources", () => { - cy.get(explorer.addDBQueryEntity).last().click({ force: true }); - cy.get(pages.integrationActiveTab) - .should("be.visible") - .click({ force: true }); + EditorNavigation.ViaSidebar(SidebarButton.Data); }); Cypress.Commands.add("testDatasource", (expectedRes = true) => { @@ -261,7 +259,7 @@ Cypress.Commands.add( ); Cypress.Commands.add("createPostgresDatasource", () => { - cy.NavigateToDatasourceEditor(); + dataSources.NavigateToDSCreateNew(); cy.get(datasourceEditor.PostgreSQL).click({ force: true }); cy.fillPostgresDatasourceForm(); cy.testSaveDatasource(); @@ -269,13 +267,12 @@ Cypress.Commands.add("createPostgresDatasource", () => { // this can be modified further when google sheets automation is done. Cypress.Commands.add("createGoogleSheetsDatasource", () => { - cy.NavigateToDatasourceEditor(); + dataSources.NavigateToDSCreateNew(); cy.get(datasourceEditor.GoogleSheets).click(); }); Cypress.Commands.add("deleteDatasource", (datasourceName) => { - cy.NavigateToQueryEditor(); - dataSources.DeleteDatasouceFromActiveTab(datasourceName); + dataSources.DeleteDatasourceFromWithinDS(datasourceName); }); Cypress.Commands.add("renameDatasource", (datasourceName) => { @@ -331,8 +328,7 @@ Cypress.Commands.add("createNewAuthApiDatasource", (renameVal) => { Cypress.Commands.add("deleteAuthApiDatasource", (renameVal) => { //Navigate to active datasources panel. - cy.get(pages.addEntityAPI).last().should("be.visible").click({ force: true }); - dataSources.DeleteDatasouceFromActiveTab(renameVal); + dataSources.DeleteDatasourceFromWithinDS(renameVal); }); Cypress.Commands.add("createGraphqlDatasource", (datasourceName) => { diff --git a/app/client/cypress/support/gitSync.js b/app/client/cypress/support/gitSync.js index 0447218586e9..25f9f3c07c0e 100644 --- a/app/client/cypress/support/gitSync.js +++ b/app/client/cypress/support/gitSync.js @@ -416,12 +416,12 @@ Cypress.Commands.add("gitDiscardChanges", () => { .should("have.text", "Are you sure?"); cy.get(gitSyncLocators.discardChanges).click(); cy.contains(Cypress.env("MESSAGES").DISCARDING_AND_PULLING_CHANGES()); + cy.validateToastMessage("Discarded changes successfully."); cy.wait(2000); assertHelper.AssertContains( "Unable to import application in workspace", "not.exist", ); - cy.validateToastMessage("Discarded changes successfully."); }); Cypress.Commands.add( diff --git a/app/client/cypress/support/queryCommands.js b/app/client/cypress/support/queryCommands.js index 6b997f78e38a..c32f0f7e3583 100644 --- a/app/client/cypress/support/queryCommands.js +++ b/app/client/cypress/support/queryCommands.js @@ -1,6 +1,7 @@ /* eslint-disable cypress/no-unnecessary-waiting */ /* eslint-disable cypress/no-assigning-return-values */ import { ObjectsRegistry } from "../support/Objects/Registry"; +import EditorNavigation, { SidebarButton } from "./Pages/EditorNavigation"; require("cy-verify-downloads").addCustomCommand(); require("cypress-file-upload"); const jsEditorLocators = require("../locators/JSEditor.json"); @@ -21,40 +22,20 @@ export const initLocalstorage = () => { }); }; -Cypress.Commands.add("NavigateToQueryEditor", () => { - cy.get(explorer.addDBQueryEntity).last().click({ force: true }); -}); - Cypress.Commands.add("NavigateToQueriesInExplorer", () => { cy.get(explorer.entityQuery).click({ force: true }); }); Cypress.Commands.add("NavigateToActiveDSQueryPane", (datasourceName) => { - DataSources.NavigateToActiveTab(); - - cy.get(datasource.datasourceCard) - .contains(datasourceName) - .scrollIntoView() - .should("be.visible") - .closest(datasource.datasourceCard) - .within(() => { - cy.get(queryLocators.createQuery).click({ force: true }); - }) - .wait(2000); //for the specified page to load + DataSources.navigateToDatasource(datasourceName); + cy.get(queryLocators.createQuery).click({ force: true }); + cy.wait(2000); //for the specified page to load }); Cypress.Commands.add("NavigateToDSGeneratePage", (datasourceName) => { - DataSources.NavigateToActiveTab(); - - cy.get(datasource.datasourceCard) - .contains(datasourceName) - .scrollIntoView() - .should("be.visible") - .closest(datasource.datasourceCard) - .within(() => { - cy.get(datasource.datasourceCardGeneratePageBtn).click(); - }) - .wait(2000); //for the specified page to load + DataSources.navigateToDatasource(datasourceName); + cy.get(datasource.datasourceCardGeneratePageBtn).click(); + cy.wait(2000); //for the specified page to load }); Cypress.Commands.add("ClickGotIt", () => { diff --git a/app/client/src/components/editorComponents/ActionRightPane/index.tsx b/app/client/src/components/editorComponents/ActionRightPane/index.tsx index 2ed260fea044..fe641b9c841a 100644 --- a/app/client/src/components/editorComponents/ActionRightPane/index.tsx +++ b/app/client/src/components/editorComponents/ActionRightPane/index.tsx @@ -315,6 +315,7 @@ function ActionSidebar({ <CollapsibleGroup height={additionalSections ? "50%" : "100%"}> {showSchema && ( <CollapsibleSection + data-testId="datasource-schema-container" height={ datasourceStructure?.tables?.length && !isLoadingSchema ? "50%" diff --git a/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx b/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx index 20783c5b95e1..d8467a692f90 100644 --- a/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx +++ b/app/client/src/components/editorComponents/EntityExplorerSidebar.tsx @@ -219,7 +219,7 @@ export const EntityExplorerSidebar = memo(({ children }: Props) => { > {/* SIDEBAR */} <div - className="flex flex-col p-0 bg-white t--sidebar min-w-52 max-w-96 group" + className="flex flex-col p-0 bg-white min-w-52 max-w-96 group" onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave} ref={sidebarRef} diff --git a/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx b/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx index a2b7f22beb7c..d7ddd0696a36 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/DatasourceBlankState.tsx @@ -55,7 +55,7 @@ const DatasourceBlankState = ( userWorkspacePermissions, ); return ( - <Container> + <Container className="t--data-blank-state"> <Content> <BlankStateIllustration /> <Text kind="body-s"> diff --git a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx index c55cf0edc417..7edd24fd8522 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/DatasourceViewModeSchema.tsx @@ -224,7 +224,7 @@ const DatasourceViewModeSchema = (props: Props) => { return ( <ViewModeSchemaContainer> - <DataWrapperContainer> + <DataWrapperContainer data-testId="datasource-schema-container"> <StructureContainer> {props.datasource && ( <DatasourceStructureHeader diff --git a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx index bcc50e0aa68a..4c717d24e6b0 100644 --- a/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx +++ b/app/client/src/pages/Editor/DatasourceInfo/GoogleSheetSchema.tsx @@ -377,7 +377,7 @@ function GoogleSheetSchema(props: Props) { return ( <ViewModeSchemaContainer> <DataWrapperContainer> - <StructureContainer> + <StructureContainer data-testId="datasource-schema-container"> {datasource && ( <DatasourceStructureHeader datasource={datasource} diff --git a/app/client/src/pages/Editor/EditorHeader.test.tsx b/app/client/src/pages/Editor/EditorHeader.test.tsx deleted file mode 100644 index cc0e0373e38c..000000000000 --- a/app/client/src/pages/Editor/EditorHeader.test.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import React from "react"; -import EditorHeader from "./EditorHeader"; -import { render, screen } from "test/testUtils"; -import type { AppState } from "@appsmith/reducers"; - -function renderComponent(initialState?: Partial<AppState>) { - render(<EditorHeader />, { - initialState, - }); -} - -describe("EditorHeader", () => { - it("Show sidebar nav button by default", () => { - renderComponent(); - const wrapper = screen.queryAllByTestId("sidebar-nav-button"); - expect(wrapper.length).toBe(1); - }); - it("sidebar nav button should be hidden when signposting is enabled", () => { - const initialState: any = { - entities: { - pageList: { - applicationId: "1", - }, - }, - ui: { - onBoarding: { - firstTimeUserOnboardingApplicationIds: ["1"], - }, - }, - }; - - renderComponent(initialState); - const wrapper = screen.queryAllByTestId("sidebar-nav-button"); - expect(wrapper.length).toBe(0); - }); -}); diff --git a/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx b/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx index 2c4e38209c27..72cf3245b1f8 100644 --- a/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx +++ b/app/client/src/pages/Editor/IDE/LeftPane/AddLibraryPopover.tsx @@ -19,6 +19,7 @@ const AddLibraryPopover = () => { <Popover onOpenChange={setOpen} open={open}> <PopoverTrigger> <Button + className="t--install-library-button" isIconButton kind="tertiary" onClick={() => setOpen(true)} diff --git a/app/client/src/pages/Editor/IDE/LeftPane/CreateDatasourcePopover.tsx b/app/client/src/pages/Editor/IDE/LeftPane/CreateDatasourcePopover.tsx index becb39b391ac..5b0fa6ed685c 100644 --- a/app/client/src/pages/Editor/IDE/LeftPane/CreateDatasourcePopover.tsx +++ b/app/client/src/pages/Editor/IDE/LeftPane/CreateDatasourcePopover.tsx @@ -27,6 +27,7 @@ const CreateDatasourcePopover = () => { <Popover open={false}> <PopoverTrigger> <Button + className={"t--add-datasource-button"} isIconButton kind="tertiary" onClick={() => diff --git a/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx b/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx index 850b28264061..b11e1276da7f 100644 --- a/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx +++ b/app/client/src/pages/Editor/IDE/LeftPane/DataSidePane.tsx @@ -104,6 +104,7 @@ const DataSidePane = () => { <Text kind="heading-xs">{key}</Text> <List items={value.map((data) => ({ + className: "t--datasource", title: data.name, onClick: () => goToDatasource(data.id), description: `${ diff --git a/app/client/src/pages/Editor/IDE/LeftPane/index.tsx b/app/client/src/pages/Editor/IDE/LeftPane/index.tsx index 853b7215e94d..3949b139f082 100644 --- a/app/client/src/pages/Editor/IDE/LeftPane/index.tsx +++ b/app/client/src/pages/Editor/IDE/LeftPane/index.tsx @@ -16,6 +16,7 @@ import { import AppSettingsPane from "./AppSettings"; import DataSidePane from "./DataSidePane"; import LibrarySidePane from "./LibrarySidePane"; +import { inGuidedTour } from "selectors/onboardingSelectors"; const LeftPaneContainer = styled.div` height: 100%; @@ -27,7 +28,8 @@ const LeftPaneContainer = styled.div` const LeftPane = () => { const isAppSidebarEnabled = useSelector(getIsAppSidebarEnabled); const { path } = useRouteMatch(); - if (!isAppSidebarEnabled) { + const guidedTourEnabled = useSelector(inGuidedTour); + if (!isAppSidebarEnabled || guidedTourEnabled) { return <WidgetsEditorEntityExplorer />; } return ( diff --git a/app/client/src/pages/Editor/IDE/Sidebar/SidebarButton.tsx b/app/client/src/pages/Editor/IDE/Sidebar/SidebarButton.tsx index d9ef50f519e5..c979d870c0c9 100644 --- a/app/client/src/pages/Editor/IDE/Sidebar/SidebarButton.tsx +++ b/app/client/src/pages/Editor/IDE/Sidebar/SidebarButton.tsx @@ -47,7 +47,11 @@ function SidebarButton(props: Props) { isDisabled={!!props.title && !props.tooltip} placement={"right"} > - <IconContainer onClick={props.onClick} selected={props.selected}> + <IconContainer + className={`t--sidebar-${props.title || props.tooltip}`} + onClick={props.onClick} + selected={props.selected} + > <Icon name={props.icon} size="lg" /> </IconContainer> </Tooltip> diff --git a/app/client/src/pages/Editor/IDE/Sidebar/index.tsx b/app/client/src/pages/Editor/IDE/Sidebar/index.tsx index 0a6150acd463..b2cfb623ec98 100644 --- a/app/client/src/pages/Editor/IDE/Sidebar/index.tsx +++ b/app/client/src/pages/Editor/IDE/Sidebar/index.tsx @@ -1,9 +1,9 @@ -import React, { useCallback, useState } from "react"; +import React, { useCallback, useState, useEffect } from "react"; import { getIsAppSidebarAnnouncementEnabled, getIsAppSidebarEnabled, } from "selectors/ideSelectors"; -import { useSelector } from "react-redux"; +import { useSelector, useDispatch } from "react-redux"; import styled from "styled-components"; import SidebarButton from "./SidebarButton"; import { builderURL } from "@appsmith/RouteBuilder"; @@ -11,12 +11,15 @@ import { getCurrentPageId } from "selectors/editorSelectors"; import history, { NavigationMethod } from "utils/history"; import { ButtonButtons, TopButtons } from "entities/IDE/constants"; import useCurrentAppState from "../hooks"; +import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors"; +import { fetchWorkspace } from "@appsmith/actions/workspaceActions"; import { AnnouncementPopover, AnnouncementPopoverTrigger, AnnouncementPopoverContent, Button, } from "design-system"; +import { inGuidedTour } from "selectors/onboardingSelectors"; const Container = styled.div` width: 50px; @@ -38,6 +41,7 @@ const DummyTrigger = styled.div` `; function Sidebar() { + const dispatch = useDispatch(); const appState = useCurrentAppState(); const [isPopoverOpen, setIsPopoverOpen] = useState(true); const isAppSidebarEnabled = useSelector(getIsAppSidebarEnabled); @@ -47,6 +51,14 @@ function Sidebar() { const isAppSidebarAnnouncementDismissed = localStorage.getItem("isAppSidebarAnnouncementDismissed") === "true"; const pageId = useSelector(getCurrentPageId); + + const currentWorkspaceId = useSelector(getCurrentWorkspaceId); + const guidedTourEnabled = useSelector(inGuidedTour); + + useEffect(() => { + dispatch(fetchWorkspace(currentWorkspaceId)); + }, [currentWorkspaceId]); + const onClick = useCallback( (suffix) => { history.push( @@ -73,8 +85,12 @@ function Sidebar() { ); }; + if (guidedTourEnabled) { + return null; + } + return ( - <Container> + <Container className="t--sidebar"> {isAppSidebarAnnouncementEnabled && !isAppSidebarAnnouncementDismissed && ( <AnnouncementPopover open={isPopoverOpen}> @@ -103,7 +119,11 @@ function Sidebar() { <SidebarButton icon={b.icon} key={b.state} - onClick={() => onClick(b.urlSuffix)} + onClick={() => { + if (appState !== b.state) { + onClick(b.urlSuffix); + } + }} selected={appState === b.state} title={b.title} /> @@ -114,7 +134,11 @@ function Sidebar() { <SidebarButton icon={b.icon} key={b.state} - onClick={() => onClick(b.urlSuffix)} + onClick={() => { + if (appState !== b.state) { + onClick(b.urlSuffix); + } + }} selected={appState === b.state} tooltip={b.title} />
ad910fe03eb17533afc6922f088f158d406f29bd
2022-04-01 12:54:22
dependabot[bot]
chore: bump spring-core from 5.2.3.RELEASE to 5.3.18 in /app/server/appsmith-plugins/saasPlugin (#12475)
false
bump spring-core from 5.2.3.RELEASE to 5.3.18 in /app/server/appsmith-plugins/saasPlugin (#12475)
chore
diff --git a/app/server/appsmith-plugins/saasPlugin/pom.xml b/app/server/appsmith-plugins/saasPlugin/pom.xml index 1575b165972f..2d7db47fe7ed 100644 --- a/app/server/appsmith-plugins/saasPlugin/pom.xml +++ b/app/server/appsmith-plugins/saasPlugin/pom.xml @@ -32,7 +32,7 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>5.2.3.RELEASE</version> + <version>5.3.18</version> <scope>provided</scope> </dependency>
d8e41b4b5c3605ea84894a1d1e1c4834845d2b0d
2021-12-21 13:38:10
NandanAnantharamu
test: updated org test (#9868)
false
updated org test (#9868)
test
diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js index 670518256c70..a694fd439cf5 100644 --- a/app/client/cypress/support/commands.js +++ b/app/client/cypress/support/commands.js @@ -55,8 +55,9 @@ Cypress.Commands.add("renameOrg", (orgName, newOrgName) => { .click({ force: true }); cy.get(homePage.renameOrgInput) .should("be.visible") - .type(newOrgName); - cy.get(commonlocators.homeIcon).click({ force: true }); + .type(newOrgName.concat("{enter}")); + cy.wait(3000); + //cy.get(commonlocators.homeIcon).click({ force: true }); cy.wait("@updateOrganization").should( "have.nested.property", "response.body.responseMeta.status",
ab5fd20a7645e6cc4b3b6059ad91ae3dc30c35c3
2023-01-23 17:50:37
Sumesh Pradhan
fix: Redis rdb persistance | User session persistance (#19981)
false
Redis rdb persistance | User session persistance (#19981)
fix
diff --git a/deploy/docker/entrypoint.sh b/deploy/docker/entrypoint.sh index 6ba07cf3688a..6404ac8f2cf2 100755 --- a/deploy/docker/entrypoint.sh +++ b/deploy/docker/entrypoint.sh @@ -248,8 +248,14 @@ configure_supervisord() { fi if [[ $APPSMITH_REDIS_URL == *"localhost"* || $APPSMITH_REDIS_URL == *"127.0.0.1"* ]]; then cp "$SUPERVISORD_CONF_PATH/redis.conf" /etc/supervisor/conf.d/ + # Initialize Redis rdb directory + local redis_db_path="$stacks_path/data/redis" + mkdir -p "$redis_db_path" # Enable saving Redis session data to disk more often, so recent sessions aren't cleared on restart. - sed -i 's/^# save 60 10000$/save 60 1/g' /etc/redis/redis.conf + sed -i \ + -e 's/^save 60 10000$/save 15 1/g' \ + -e "s|^dir /var/lib/redis$|dir ${redis_db_path}|g" \ + /etc/redis/redis.conf fi if ! [[ -e "/appsmith-stacks/ssl/fullchain.pem" ]] || ! [[ -e "/appsmith-stacks/ssl/privkey.pem" ]]; then cp "$SUPERVISORD_CONF_PATH/cron.conf" /etc/supervisor/conf.d/
bd993e145cf4a9957529a4ad7cf934141759d138
2023-05-17 08:12:44
Nidhi
chore: Split up prepare workspace into separate method (#23425)
false
Split up prepare workspace into separate method (#23425)
chore
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java index b2dad4e74488..66d4b052353f 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Workspace.java @@ -4,14 +4,13 @@ import com.appsmith.external.views.Views; import com.appsmith.server.constants.Url; import com.fasterxml.jackson.annotation.JsonView; - +import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; import org.springframework.data.mongodb.core.mapping.Document; -import jakarta.validation.constraints.NotBlank; import java.util.List; import java.util.Set; @@ -46,7 +45,7 @@ public class Workspace extends BaseDomain { @Deprecated @JsonView(Views.Public.class) private Boolean isAutoGeneratedOrganization; - + @JsonView(Views.Public.class) private Boolean isAutoGeneratedWorkspace; @@ -60,6 +59,9 @@ public class Workspace extends BaseDomain { @JsonView(Views.Public.class) private String tenantId; + @JsonView(Views.Internal.class) + private Boolean hasEnvironments; + @JsonView(Views.Internal.class) private Set<String> defaultPermissionGroups; diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java index f93c662c762c..71d4dcc0384f 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/WorkspaceServiceCEImpl.java @@ -4,7 +4,6 @@ import com.appsmith.external.models.Policy; import com.appsmith.server.acl.AclPermission; import com.appsmith.server.acl.AppsmithRole; -import com.appsmith.server.acl.RoleGraph; import com.appsmith.server.constants.Constraint; import com.appsmith.server.constants.FieldName; import com.appsmith.server.domains.Asset; @@ -23,17 +22,16 @@ import com.appsmith.server.repositories.ApplicationRepository; import com.appsmith.server.repositories.AssetRepository; import com.appsmith.server.repositories.PluginRepository; -import com.appsmith.server.repositories.UserRepository; import com.appsmith.server.repositories.WorkspaceRepository; import com.appsmith.server.services.AnalyticsService; import com.appsmith.server.services.AssetService; import com.appsmith.server.services.BaseService; import com.appsmith.server.services.PermissionGroupService; import com.appsmith.server.services.SessionUserService; -import com.appsmith.server.services.UserWorkspaceService; import com.appsmith.server.solutions.PermissionGroupPermission; import com.appsmith.server.solutions.WorkspacePermission; import com.mongodb.DBObject; +import jakarta.validation.Validator; import lombok.extern.slf4j.Slf4j; import org.modelmapper.ModelMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -50,8 +48,6 @@ import reactor.core.publisher.Mono; import reactor.core.scheduler.Scheduler; -import jakarta.validation.Validator; - import java.util.Arrays; import java.util.List; import java.util.Map; @@ -175,12 +171,8 @@ public Mono<Workspace> create(Workspace workspace, User user, Boolean isDefault) // Does the user have permissions to create a workspace? Mono<Boolean> createWorkspaceAllowedMono = isCreateWorkspaceAllowed(isDefault); - if (workspace.getEmail() == null) { - workspace.setEmail(user.getEmail()); - } - - workspace.setSlug(TextUtils.makeSlug(workspace.getName())); - workspace.setTenantId(user.getTenantId()); + // Populate all the required fields for a valid workspace + prepareWorkspaceToCreate(workspace, user); return createWorkspaceAllowedMono .flatMap(isCreateWorkspaceAllowed -> { @@ -213,6 +205,15 @@ public Mono<Workspace> create(Workspace workspace, User user, Boolean isDefault) .flatMap(analyticsService::sendCreateEvent); } + protected void prepareWorkspaceToCreate(Workspace workspace, User user) { + if (workspace.getEmail() == null) { + workspace.setEmail(user.getEmail()); + } + + workspace.setSlug(TextUtils.makeSlug(workspace.getName())); + workspace.setTenantId(user.getTenantId()); + } + protected Mono<Workspace> createWorkspaceDependents(Workspace createdWorkspace) { // Nothing to create return Mono.just(createdWorkspace);
778922bd745b658d79eaa69d4eda7a5ef30ece4a
2023-03-31 17:07:09
Ankita Kinger
chore: Updating tests which will fail on app invites getting merged (#21949)
false
Updating tests which will fail on app invites getting merged (#21949)
chore
diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js index 5e35cf65008c..d529d61d1d2d 100644 --- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js +++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/ExportApplication_spec.js @@ -1,3 +1,4 @@ +import { REPO, CURRENT_REPO } from "../../../../fixtures/REPO"; const dsl = require("../../../../fixtures/displayWidgetDsl.json"); import homePage from "../../../../locators/HomePage"; import { ObjectsRegistry } from "../../../../support/Objects/Registry"; @@ -41,48 +42,53 @@ describe("Export application as a JSON file", function () { }); it("User with admin access,should be able to export the app", function () { - cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD")); - cy.generateUUID().then((uid) => { - workspaceId = uid; - appid = uid; - localStorage.setItem("WorkspaceName", workspaceId); - cy.createWorkspace(); - cy.wait("@createWorkspace").then((interception) => { - newWorkspaceName = interception.response.body.data.name; - cy.renameWorkspace(newWorkspaceName, workspaceId); - }); - cy.CreateAppForWorkspace(workspaceId, appid); - cy.wait("@getPagesForCreateApp").should( - "have.nested.property", - "response.body.responseMeta.status", - 200, - ); - cy.get("h2").contains("Drag and drop a widget here"); - cy.get(homePage.shareApp).click({ force: true }); - // cy.shareApp(Cypress.env("TESTUSERNAME1"), homePage.adminRole); - HomePage.InviteUserToWorkspaceFromApp( - Cypress.env("TESTUSERNAME1"), - "Administrator", - ); - cy.LogOut(); + if (CURRENT_REPO === REPO.CE) { + cy.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD")); + cy.generateUUID().then((uid) => { + workspaceId = uid; + appid = uid; + localStorage.setItem("WorkspaceName", workspaceId); + cy.createWorkspace(); + cy.wait("@createWorkspace").then((interception) => { + newWorkspaceName = interception.response.body.data.name; + cy.renameWorkspace(newWorkspaceName, workspaceId); + }); + cy.CreateAppForWorkspace(workspaceId, appid); + cy.wait("@getPagesForCreateApp").should( + "have.nested.property", + "response.body.responseMeta.status", + 200, + ); + cy.get("h2").contains("Drag and drop a widget here"); + cy.get(homePage.shareApp).click({ force: true }); + // cy.shareApp(Cypress.env("TESTUSERNAME1"), homePage.adminRole); + HomePage.InviteUserToWorkspaceFromApp( + Cypress.env("TESTUSERNAME1"), + "Administrator", + ); + cy.LogOut(); - cy.LogintoApp(Cypress.env("TESTUSERNAME1"), Cypress.env("TESTPASSWORD1")); - cy.wait(2000); - cy.log({ appid }); - cy.get(homePage.searchInput).type(appid); - // eslint-disable-next-line cypress/no-unnecessary-waiting - cy.wait(2000); + cy.LogintoApp( + Cypress.env("TESTUSERNAME1"), + Cypress.env("TESTPASSWORD1"), + ); + cy.wait(2000); + cy.log({ appid }); + cy.get(homePage.searchInput).type(appid); + // eslint-disable-next-line cypress/no-unnecessary-waiting + cy.wait(2000); - cy.get(homePage.applicationCard).first().trigger("mouseover"); - cy.get(homePage.appMoreIcon).first().click({ force: true }); - cy.get(homePage.exportAppFromMenu).should("be.visible"); - cy.get("body").click(50, 40); - cy.get(homePage.applicationCard).first().trigger("mouseover"); - cy.get(homePage.appEditIcon).first().click({ force: true }); - cy.get(homePage.applicationName).click({ force: true }); - cy.contains("Export Application").should("be.visible"); - }); - cy.LogOut(); + cy.get(homePage.applicationCard).first().trigger("mouseover"); + cy.get(homePage.appMoreIcon).first().click({ force: true }); + cy.get(homePage.exportAppFromMenu).should("be.visible"); + cy.get("body").click(50, 40); + cy.get(homePage.applicationCard).first().trigger("mouseover"); + cy.get(homePage.appEditIcon).first().click({ force: true }); + cy.get(homePage.applicationName).click({ force: true }); + cy.contains("Export Application").should("be.visible"); + }); + cy.LogOut(); + } }); it("User with developer access,should not be able to export the app", function () { @@ -104,7 +110,7 @@ describe("Export application as a JSON file", function () { ); cy.get("h2").contains("Drag and drop a widget here"); cy.get(homePage.shareApp).click({ force: true }); - HomePage.InviteUserToWorkspaceFromApp( + HomePage.InviteUserToApplication( Cypress.env("TESTUSERNAME1"), "Developer", ); @@ -150,7 +156,7 @@ describe("Export application as a JSON file", function () { cy.get("h2").contains("Drag and drop a widget here"); cy.get(homePage.shareApp).click({ force: true }); - HomePage.InviteUserToWorkspaceFromApp( + HomePage.InviteUserToApplication( Cypress.env("TESTUSERNAME1"), "App Viewer", ); diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/MemberRoles_Spec.ts b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/MemberRoles_Spec.ts index e8e78b2af4eb..4c3d11374f2b 100644 --- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/MemberRoles_Spec.ts +++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/MemberRoles_Spec.ts @@ -1,3 +1,4 @@ +import { REPO, CURRENT_REPO } from "../../../../fixtures/REPO"; import HomePage from "../../../../locators/HomePage"; import * as _ from "../../../../support/Objects/ObjectsCore"; let workspaceId: any, appid: any; @@ -56,7 +57,7 @@ describe("Create new workspace and invite user & validate all roles", () => { _.agHelper.GetNClick(_.homePage._shareWorkspace(workspaceId)); // click on selet a role _.agHelper.Sleep(2000); - cy.xpath(HomePage.selectRole).click(); + _.agHelper.GetNClick(HomePage.selectRole); cy.get(".t--dropdown-option") .should("have.length", 1) .and("contain.text", `App Viewer`); @@ -86,16 +87,17 @@ describe("Create new workspace and invite user & validate all roles", () => { ); _.homePage.FilterApplication(appid, workspaceId); cy.get(_.homePage._applicationCard).first().trigger("mouseover"); - _.agHelper.GetNClick(_.homePage._appHoverIcon("edit")); - // cy.xpath(_.homePage._editPageLanding).should("exist"); + _.agHelper.AssertElementExist(_.homePage._appHoverIcon("edit")); + + _.agHelper.GetNClick(_.homePage._shareWorkspace(workspaceId)); _.agHelper.Sleep(2000); - _.agHelper.ClickButton("SHARE"); - _.agHelper.Sleep(); - cy.xpath(HomePage.selectRole).click(); + _.agHelper.GetNClick(HomePage.selectRole); cy.get(".t--dropdown-option") .should("have.length", 2) .and("contain.text", `App Viewer`, `Developer`); - _.agHelper.GetNClick(HomePage.editModeInviteModalCloseBtn); + _.agHelper.GetNClick(HomePage.closeBtn); + _.agHelper.GetNClick(_.homePage._appHoverIcon("edit")); + _.homePage.Signout(); }); @@ -126,17 +128,18 @@ describe("Create new workspace and invite user & validate all roles", () => { _.agHelper.Sleep(); _.homePage.FilterApplication(appid, workspaceId); cy.get(_.homePage._applicationCard).first().trigger("mouseover"); - _.agHelper.GetNClick(_.homePage._appHoverIcon("edit")); - // cy.xpath(_.homePage._editPageLanding).should("exist"); + _.agHelper.AssertElementExist(_.homePage._appHoverIcon("edit")); + + _.agHelper.GetNClick(_.homePage._shareWorkspace(workspaceId)); _.agHelper.Sleep(2000); - _.agHelper.ClickButton("SHARE"); - _.agHelper.Sleep(); _.agHelper.GetNClick(HomePage.selectRole); cy.get(".t--dropdown-option") .should("have.length", 3) .should("contain.text", `App Viewer`, `Developer`); cy.get(".t--dropdown-option").should("contain.text", `Administrator`); - _.agHelper.GetNClick(HomePage.editModeInviteModalCloseBtn); + _.agHelper.GetNClick(HomePage.closeBtn); + _.agHelper.GetNClick(_.homePage._appHoverIcon("edit")); + _.homePage.Signout(); }); @@ -157,6 +160,7 @@ describe("Create new workspace and invite user & validate all roles", () => { expect($list.eq(1)).to.contain(Cypress.env("TESTUSERNAME1")); expect($list.eq(2)).to.contain(Cypress.env("TESTUSERNAME2")); }); + _.agHelper.AssertElementAbsence("[nam='arrow-right-s-fill']"); _.homePage.NavigateToHome(); }); diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/ShareAppTests_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/ShareAppTests_spec.js index 17386f280fe6..e56b11954943 100644 --- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/ShareAppTests_spec.js +++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Workspace/ShareAppTests_spec.js @@ -1,5 +1,6 @@ /// <reference types="Cypress" /> +import { REPO, CURRENT_REPO } from "../../../../fixtures/REPO"; import homePage from "../../../../locators/HomePage"; const publish = require("../../../../locators/publishWidgetspage.json"); import { ObjectsRegistry } from "../../../../support/Objects/Registry"; @@ -30,7 +31,7 @@ describe("Create new workspace and share with a user", function () { ); cy.get("h2").contains("Drag and drop a widget here"); cy.get(homePage.shareApp).click({ force: true }); - HomePage.InviteUserToWorkspaceFromApp( + HomePage.InviteUserToApplication( Cypress.env("TESTUSERNAME1"), "App Viewer", ); @@ -44,7 +45,9 @@ describe("Create new workspace and share with a user", function () { // eslint-disable-next-line cypress/no-unnecessary-waiting cy.wait(2000); cy.get(homePage.appsContainer).contains(workspaceId); - cy.xpath(homePage.ShareBtn).first().should("be.visible"); + if (CURRENT_REPO === REPO.CE) { + cy.xpath(homePage.ShareBtn).first().should("be.visible"); + } cy.get(homePage.applicationCard).trigger("mouseover"); cy.get(homePage.appEditIcon).should("not.exist"); cy.launchApp(appid); diff --git a/app/client/cypress/support/Pages/HomePage.ts b/app/client/cypress/support/Pages/HomePage.ts index 848fe97c18e7..353755c8cb02 100644 --- a/app/client/cypress/support/Pages/HomePage.ts +++ b/app/client/cypress/support/Pages/HomePage.ts @@ -150,7 +150,10 @@ export class HomePage { email: string, role: string, ) { - const successMessage = "The user has been invited successfully"; + const successMessage = + CURRENT_REPO === REPO.CE + ? "The user has been invited successfully" + : "The user/group have been invited successfully"; this.StubPostHeaderReq(); this.agHelper.AssertElementVisible(this._workspaceList(workspaceName)); this.agHelper.GetNClick(this._shareWorkspace(workspaceName), 0, true); @@ -188,6 +191,9 @@ export class HomePage { cy.intercept("POST", "/api/v1/users/invite", (req) => { req.headers["origin"] = "Cypress"; }).as("mockPostInvite"); + cy.intercept("POST", "/api/v1/applications/invite", (req) => { + req.headers["origin"] = "Cypress"; + }).as("mockPostAppInvite"); } public NavigateToHome() { @@ -369,7 +375,10 @@ export class HomePage { this.agHelper.Sleep(3500); } public InviteUserToWorkspaceFromApp(email: string, role: string) { - const successMessage = "The user has been invited successfully"; + const successMessage = + CURRENT_REPO === REPO.CE + ? "The user has been invited successfully" + : "The user/group have been invited successfully"; this.StubPostHeaderReq(); cy.xpath(this._email).click({ force: true }).type(email); cy.xpath(this._selectRole).first().click({ force: true }); @@ -383,6 +392,29 @@ export class HomePage { cy.contains(successMessage); } + public InviteUserToApplicationFromApp(email: string, role: string) { + const successMessage = "The user/group have been invited successfully"; + this.StubPostHeaderReq(); + cy.xpath(this._email).click({ force: true }).type(email); + cy.xpath(this._selectRole).first().click({ force: true }); + this.agHelper.Sleep(500); + cy.xpath(this._userRole(role)).click({ force: true }); + this.agHelper.ClickButton("Invite"); + cy.wait("@mockPostAppInvite") + .its("request.headers") + .should("have.property", "origin", "Cypress"); + cy.contains(email, { matchCase: false }); + cy.contains(successMessage); + } + + public InviteUserToApplication(email: string, role: string) { + if (CURRENT_REPO === REPO.CE) { + this.InviteUserToWorkspaceFromApp(email, role); + } else { + this.InviteUserToApplicationFromApp(email, role); + } + } + public DeleteWorkspace(workspaceNameToDelete: string) { cy.get(this._homeIcon).click(); this.agHelper.GetNClick( diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js index fd49460e0c3a..8cfef84de560 100644 --- a/app/client/cypress/support/commands.js +++ b/app/client/cypress/support/commands.js @@ -19,6 +19,7 @@ const pages = require("../locators/Pages.json"); const commonlocators = require("../locators/commonlocators.json"); const widgetsPage = require("../locators/Widgets.json"); import ApiEditor from "../locators/ApiEditor"; +import { CURRENT_REPO, REPO } from "../fixtures/REPO"; const apiwidget = require("../locators/apiWidgetslocator.json"); const explorer = require("../locators/explorerlocators.json"); @@ -230,8 +231,10 @@ Cypress.Commands.add("LoginUser", (uname, pword, goToLoginPage = true) => { Cypress.Commands.add("LogintoApp", (uname, pword) => { cy.LogOutUser(); cy.LoginUser(uname, pword); - cy.get(".t--applications-container .createnew").should("be.visible"); - cy.get(".t--applications-container .createnew").should("be.enabled"); + if (CURRENT_REPO === REPO.CE) { + cy.get(".t--applications-container .createnew").should("be.visible"); + cy.get(".t--applications-container .createnew").should("be.enabled"); + } initLocalstorage(); }); diff --git a/app/client/src/ce/constants/workspaceConstants.ts b/app/client/src/ce/constants/workspaceConstants.ts index e7e34ba5ae52..9a7d864ce163 100644 --- a/app/client/src/ce/constants/workspaceConstants.ts +++ b/app/client/src/ce/constants/workspaceConstants.ts @@ -21,7 +21,7 @@ export type WorkspaceUserRoles = { id: string; name: string; description: string; - entityType: string; + entityType: ENTITY_TYPE; entityName: string; entityId: string; autoCreated: boolean; @@ -44,3 +44,8 @@ export type Workspaces = { workspace: Workspace; users: WorkspaceUser[]; }; + +export enum ENTITY_TYPE { + WORKSPACE = "Workspace", + APPLICATION = "Application", +} diff --git a/app/client/src/ce/utils/permissionHelpers.tsx b/app/client/src/ce/utils/permissionHelpers.tsx index 5ce863e1c616..d99149dc4ef6 100644 --- a/app/client/src/ce/utils/permissionHelpers.tsx +++ b/app/client/src/ce/utils/permissionHelpers.tsx @@ -69,6 +69,16 @@ export const hasDeleteWorkspacePermission = (permissions: string[] = []) => { return isPermitted(permissions, PERMISSION_TYPE.MANAGE_WORKSPACE); }; +export const hasInviteUserToApplicationPermission = ( + workspacePermissions: string[] = [], + _applicationPermissions: string[] = [], +) => { + return isPermitted( + workspacePermissions, + PERMISSION_TYPE.INVITE_USER_TO_WORKSPACE, + ); +}; + export const hasCreateWorkspacePermission = (_permissions?: string[]) => true; export const hasCreateDatasourcePermission = (_permissions?: string[]) => true; diff --git a/app/client/src/pages/workspace/AppInviteUsersForm.tsx b/app/client/src/pages/workspace/AppInviteUsersForm.tsx index 8088af23d794..4b9d34efb6fe 100644 --- a/app/client/src/pages/workspace/AppInviteUsersForm.tsx +++ b/app/client/src/pages/workspace/AppInviteUsersForm.tsx @@ -27,6 +27,7 @@ import { MAKE_APPLICATION_PUBLIC_TOOLTIP, } from "@appsmith/constants/messages"; import { getAppsmithConfigs } from "@appsmith/configs"; +import { hasInviteUserToApplicationPermission } from "@appsmith/utils/permissionHelpers"; const { cloudHosting } = getAppsmithConfigs(); @@ -35,9 +36,10 @@ const ShareToggle = styled.div` height: 23px; `; -const BottomContainer = styled.div<{ canInviteToWorkspace?: boolean }>` - ${({ canInviteToWorkspace }) => - canInviteToWorkspace ? `border-top: 1px solid ${Colors.GREY_200}` : ``}; +const BottomContainer = styled.div<{ canInviteToApplication?: boolean }>` + ${({ canInviteToApplication }) => + canInviteToApplication ? `border-top: 1px solid ${Colors.GREY_200}` : ``}; + margin-top: 12px; `; function AppInviteUsersForm(props: any) { @@ -56,9 +58,9 @@ function AppInviteUsersForm(props: any) { const currentWorkspace = useWorkspace(currentWorkspaceId); const userWorkspacePermissions = currentWorkspace.userPermissions ?? []; const userAppPermissions = currentApplicationDetails?.userPermissions ?? []; - const canInviteToWorkspace = isPermitted( + const canInviteToApplication = hasInviteUserToApplicationPermission( userWorkspacePermissions, - PERMISSION_TYPE.INVITE_USER_TO_WORKSPACE, + userAppPermissions, ); const canShareWithPublic = isPermitted( userAppPermissions, @@ -96,14 +98,14 @@ function AppInviteUsersForm(props: any) { }, [defaultPageId]); useEffect(() => { - if (currentUser?.name !== ANONYMOUS_USERNAME && canInviteToWorkspace) { + if (currentUser?.name !== ANONYMOUS_USERNAME && canInviteToApplication) { fetchCurrentWorkspace(props.workspaceId); } }, [props.workspaceId, fetchCurrentWorkspace, currentUser?.name]); return ( <> - {canInviteToWorkspace && ( + {canInviteToApplication && ( <WorkspaceInviteUsersForm applicationId={applicationId} isApplicationInvite @@ -112,10 +114,8 @@ function AppInviteUsersForm(props: any) { /> )} <BottomContainer - canInviteToWorkspace={canInviteToWorkspace} - className={`flex space-between ${ - canInviteToWorkspace ? "mt-6 pt-5" : "" - }`} + canInviteToApplication={canInviteToApplication} + className={`flex space-between ${canInviteToApplication ? "pt-5" : ""}`} > <div className="flex gap-1.5 cursor-pointer" diff --git a/app/client/src/pages/workspace/settings.tsx b/app/client/src/pages/workspace/settings.tsx index c706aade6893..4c60cfe98a7b 100644 --- a/app/client/src/pages/workspace/settings.tsx +++ b/app/client/src/pages/workspace/settings.tsx @@ -33,6 +33,7 @@ import { SEARCH_USERS, } from "@appsmith/constants/messages"; import { getAppsmithConfigs } from "@appsmith/configs"; +import { APPLICATIONS_URL } from "constants/routes"; const { cloudHosting } = getAppsmithConfigs(); @@ -110,6 +111,17 @@ export default function Settings() { }; useEffect(() => { + const hasManageWorkspacePermissions = isPermitted( + currentWorkspace?.userPermissions, + PERMISSION_TYPE.MANAGE_WORKSPACE, + ); + const canInviteToWorkspace = isPermitted( + currentWorkspace?.userPermissions, + PERMISSION_TYPE.INVITE_USER_TO_WORKSPACE, + ); + if (!hasManageWorkspacePermissions || !canInviteToWorkspace) { + history.replace(APPLICATIONS_URL); + } if (currentWorkspace) { setPageTitle(`${currentWorkspace?.name}`); }
c7ba1a2edfa4eeb369f93536a864792c4049a1f3
2023-02-10 12:05:08
Vemparala Surya Vamsi
fix: modal autofocus fix issue #19957 (#20244)
false
modal autofocus fix issue #19957 (#20244)
fix
diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/Modal/Modal_focus_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/Modal/Modal_focus_spec.js new file mode 100644 index 000000000000..2d624c65efc3 --- /dev/null +++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/Modal/Modal_focus_spec.js @@ -0,0 +1,90 @@ +const dsl = require("../../../../../fixtures/ModalDsl.json"); +const explorer = require("../../../../../locators/explorerlocators.json"); +const widgets = require("../../../../../locators/Widgets.json"); +import { ObjectsRegistry } from "../../../../../support/Objects/Registry"; +const agHelper = ObjectsRegistry.AggregateHelper, + ee = ObjectsRegistry.EntityExplorer; + +describe("Modal focus", function() { + const someInputText = "some text"; + + function setupModalWithInputWidget() { + //drag a button to open modal + cy.dragAndDropToCanvas("buttonwidget", { x: 400, y: 550 }); + cy.openPropertyPane("buttonwidget"); + cy.get(widgets.toggleOnClick).click(); + + cy.updateCodeInput( + ".t--property-control-onclick", + `{{showModal('Modal1')}}`, + ); + //add modal + ee.SelectEntityByName("Modal1", "Widgets"); + cy.get(widgets.modalWidget).should("exist"); + + cy.get(explorer.addWidget).click(); + + cy.wait(500); + //drag input field into modal + cy.get(".t--widget-card-draggable-inputwidgetv2").trigger("dragstart", { + force: true, + }); + + cy.get(widgets.modalWidget) + .scrollIntoView() + .trigger("mousemove", 50, 100, { eventConstructor: "MouseEvent" }) + .trigger("mousemove", 50, 100, { eventConstructor: "MouseEvent" }) + .trigger("mouseup", 50, 100, { eventConstructor: "MouseEvent" }); + } + + after(() => { + agHelper.SaveLocalStorageCache(); + }); + + before(() => { + agHelper.RestoreLocalStorageCache(); + cy.addDsl(dsl); + }); + + it("should focus on the input field when autofocus for the input field is enabled", () => { + setupModalWithInputWidget(); + cy.openPropertyPane("inputwidgetv2"); + + // autofocus for input field is enabled + cy.get(".t--property-control-autofocus") + .find(".bp3-switch input") + .click({ force: true }); + //enter some text to the input field + cy.get(`${widgets.modalWidget} .t--widget-inputwidgetv2 input`) + .click() + .type(someInputText); + + //close Modal + cy.get(widgets.modalCloseButton).click({ force: true }); + + //open the modal + cy.get(widgets.widgetBtn) + .contains("Submit") + .click({ force: true }); + //check if the focus is on the input field + cy.focused().should("have.value", someInputText); + }); + it("should not focus on the input field if autofocus is disabled", () => { + cy.openPropertyPane("inputwidgetv2"); + + // autofocus for input field is disabled + cy.get(".t--property-control-autofocus") + .find(".bp3-switch input") + .click({ force: true }); + //close Modal + + cy.get(widgets.modalCloseButton).click({ force: true }); + //open the modal + + cy.get(widgets.widgetBtn) + .contains("Submit") + .click({ force: true }); + //check if the focus is not on the input field + cy.focused().should("not.have.value", someInputText); + }); +}); diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/Modal_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/Modal/Modal_functionaliy_spec.js similarity index 91% rename from app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/Modal_spec.js rename to app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/Modal/Modal_functionaliy_spec.js index 49330c3267d8..1da3bda23685 100644 --- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/Modal_spec.js +++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/Widgets/Modal/Modal_functionaliy_spec.js @@ -1,8 +1,8 @@ -const dsl = require("../../../../fixtures/ModalDsl.json"); -const commonlocators = require("../../../../locators/commonlocators.json"); -const explorer = require("../../../../locators/explorerlocators.json"); -const widgets = require("../../../../locators/Widgets.json"); -import { ObjectsRegistry } from "../../../../support/Objects/Registry"; +const dsl = require("../../../../../fixtures/ModalDsl.json"); +const commonlocators = require("../../../../../locators/commonlocators.json"); +const explorer = require("../../../../../locators/explorerlocators.json"); +const widgets = require("../../../../../locators/Widgets.json"); +import { ObjectsRegistry } from "../../../../../support/Objects/Registry"; const agHelper = ObjectsRegistry.AggregateHelper, ee = ObjectsRegistry.EntityExplorer; diff --git a/app/client/src/widgets/ModalWidget/component/index.tsx b/app/client/src/widgets/ModalWidget/component/index.tsx index 63fa4fe74b22..c7ab8c0d74b9 100644 --- a/app/client/src/widgets/ModalWidget/component/index.tsx +++ b/app/client/src/widgets/ModalWidget/component/index.tsx @@ -177,8 +177,6 @@ export default function ModalComponent(props: ModalComponentProps) { setModalPosition("unset"); }, 100); - modalContentRef.current?.focus(); - return () => { // handle modal close events when this component unmounts // will be called in all cases :-
589bdfc0745bb747a0927f57dd4e081f447fbb35
2022-04-05 14:42:41
Arsalan
fix: Fixed jest test case and added cypress case
false
Fixed jest test case and added cypress case
fix
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WidgetSelection/WidgetSelection_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WidgetSelection/WidgetSelection_spec.js index 28e332c4c48c..628c962605e2 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WidgetSelection/WidgetSelection_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/WidgetSelection/WidgetSelection_spec.js @@ -46,4 +46,19 @@ describe("Widget Selection", function() { //should open property pane cy.get(`.t--property-pane-view`).should("have.length", 1); }); + + it("3. Should not select widgets if we hit CTRL + A on other Pages", function() { + // Switch to the Explorer Pane + cy.get("#switcher--explorer").click(); + // Click to create a New Data Source + cy.get(".t--entity-add-btn") + .eq(3) + .click(); + // Hit CTRL +A + cy.get("body").type("{ctrl}{a}"); + // Switch to the Canvas + cy.get("#switcher--widgets").click(); + // Widgets should not be selected + cy.get(".t--multi-selection-box").should("not.exist"); + }); }); diff --git a/app/client/src/pages/Editor/GlobalHotKeys.test.tsx b/app/client/src/pages/Editor/GlobalHotKeys.test.tsx index 83232662e3ca..c1b95d2b0ff0 100644 --- a/app/client/src/pages/Editor/GlobalHotKeys.test.tsx +++ b/app/client/src/pages/Editor/GlobalHotKeys.test.tsx @@ -30,6 +30,13 @@ import { SAVE_HOTKEY_TOASTER_MESSAGE, } from "@appsmith/constants/messages"; +jest.mock("constants/routes", () => { + return { + ...jest.requireActual("constants/routes"), + matchBuilderPath: () => true, + }; +}); + describe("Canvas Hot Keys", () => { const mockGetIsFetchingPage = jest.spyOn(utilities, "getIsFetchingPage"); const spyGetCanvasWidgetDsl = jest.spyOn(utilities, "getCanvasWidgetDsl");
737680bb9b03789f3f6b9a9bf12bd03c83010a82
2022-04-08 14:35:20
Anagh Hegde
fix: Reset of isPublic flag during git merge operation (#12703)
false
Reset of isPublic flag during git merge operation (#12703)
fix
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java index d19580475f09..378dd28ec1d3 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java @@ -766,6 +766,10 @@ public Mono<Application> importApplicationInOrganization(String organizationId, ) .flatMap(existingApplication -> { importedApplication.setId(existingApplication.getId()); + // For the existing application we don't need to default value of the flag + // The isPublic flag has a default value as false and this would be confusing to user + // when it is reset to false during importing where the application already is present in DB + importedApplication.setIsPublic(null); AppsmithBeanUtils.copyNestedNonNullProperties(importedApplication, existingApplication); // Here we are expecting the changes present in DB are committed to git directory // so that these won't be lost when we are pulling changes from remote and diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java index bca0af1e8344..76c6c887f631 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportExportApplicationServiceTests.java @@ -1346,6 +1346,52 @@ public void importApplicationIntoOrganization_pageAddedInBranchApplication_Succe } + @Test + @WithUserDetails(value = "api_user") + public void importUpdatedApplicationIntoOrganizationFromFile_publicApplication_visibilityFlagNotReset() { + // Create a application and make it public + // Now add a page and export the same import it to the app + // Check if the policies and visibility flag are not reset + + Policy manageAppPolicy = Policy.builder().permission(MANAGE_APPLICATIONS.getValue()) + .users(Set.of("api_user")) + .build(); + Policy readAppPolicy = Policy.builder().permission(READ_APPLICATIONS.getValue()) + .users(Set.of("api_user", FieldName.ANONYMOUS_USER)) + .build(); + + Application testApplication = new Application(); + testApplication.setName("importUpdatedApplicationIntoOrganizationFromFile_publicApplication_visibilityFlagNotReset"); + testApplication.setOrganizationId(orgId); + testApplication.setUpdatedAt(Instant.now()); + testApplication.setLastDeployedAt(Instant.now()); + testApplication.setModifiedBy("some-user"); + testApplication.setGitApplicationMetadata(new GitApplicationMetadata()); + GitApplicationMetadata gitData = new GitApplicationMetadata(); + gitData.setBranchName("master"); + testApplication.setGitApplicationMetadata(gitData); + + Application application = applicationPageService.createApplication(testApplication, orgId) + .flatMap(application1 -> { + application1.getGitApplicationMetadata().setDefaultApplicationId(application1.getId()); + return applicationService.save(application1); + }).block(); + ApplicationAccessDTO applicationAccessDTO = new ApplicationAccessDTO(); + applicationAccessDTO.setPublicAccess(true); + applicationService.changeViewAccess(application.getId(), "master", applicationAccessDTO).block(); + + Mono<Application> applicationMono = importExportApplicationService.exportApplicationById(application.getId(), "master") + .flatMap(applicationJson -> importExportApplicationService.importApplicationInOrganization(orgId, applicationJson, application.getId(), "master")); + + StepVerifier + .create(applicationMono) + .assertNext(application1 -> { + assertThat(application1.getIsPublic()).isEqualTo(Boolean.TRUE); + assertThat(application1.getPolicies()).containsAll(Set.of(manageAppPolicy, readAppPolicy)); + }) + .verifyComplete(); + } + /** * Testcase for checking the discard changes flow for following events: * 1. Import application in org
b5529310d17097d5177ec95e92ce81c31738565b
2021-09-03 15:02:53
Nayan
feat: Removed check on template organization ID when creating the default organization and application after signup (#7084)
false
Removed check on template organization ID when creating the default organization and application after signup (#7084)
feat
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java index 513ea8c22964..40a92ac54587 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java @@ -508,22 +508,16 @@ public Mono<UserSignupDTO> createUserAndSendEmail(User user, String originHeader }) .switchIfEmpty(Mono.defer(() -> { return signupIfAllowed(user) - .zipWith(configService.getTemplateOrganizationId().defaultIfEmpty("")) - .flatMap(tuple -> { - final User savedUser = tuple.getT1(); - final String templateOrganizationId = tuple.getT2(); + .flatMap(savedUser -> { final UserSignupDTO userSignupDTO = new UserSignupDTO(); userSignupDTO.setUser(savedUser); - if (!StringUtils.hasText(templateOrganizationId)) { - // Since template organization is not configured, we create an empty default organization. - log.debug("Creating blank default organization for user '{}'.", savedUser.getEmail()); - return organizationService.createDefault(new Organization(), savedUser) - .map(org -> { - userSignupDTO.setDefaultOrganizationId(org.getId()); - return userSignupDTO; - }); - } - return Mono.just(userSignupDTO); + + log.debug("Creating blank default organization for user '{}'.", savedUser.getEmail()); + return organizationService.createDefault(new Organization(), savedUser) + .map(org -> { + userSignupDTO.setDefaultOrganizationId(org.getId()); + return userSignupDTO; + }); }) .flatMap(userSignupDTO -> findByEmail(userSignupDTO.getUser().getEmail()).map(user1 -> { userSignupDTO.setUser(user1);
2b2372c6aafb825d0cfe9e16242acd93e17a485f
2023-01-09 19:52:23
akash-codemonk
feat: editor header UI update (#19414)
false
editor header UI update (#19414)
feat
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DynamicHeight/DynamicHeight_Tab_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DynamicHeight/DynamicHeight_Tab_spec.js index 2c0e65897218..ac52f8a294f1 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DynamicHeight/DynamicHeight_Tab_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DynamicHeight/DynamicHeight_Tab_spec.js @@ -1,6 +1,7 @@ const dsl = require("../../../../fixtures/dynamicTabWidgetdsl.json"); const commonlocators = require("../../../../locators/commonlocators.json"); const publish = require("../../../../locators/publishWidgetspage.json"); +import * as _ from "../../../../support/Objects/ObjectsCore"; describe("Dynamic Height Width validation for Tab widget", function() { before(() => { @@ -39,8 +40,8 @@ describe("Dynamic Height Width validation for Tab widget", function() { cy.PublishtheApp(); validateHeight(); cy.get(publish.backToEditor).click(); - cy.get(".t--switch-preview-mode-toggle").should("be.visible"); - cy.get(".t--switch-preview-mode-toggle").click({ force: true }); + _.agHelper.AssertElementVisible(_.locators._previewModeToggle("edit")); + _.agHelper.GetNClick(_.locators._previewModeToggle("edit")); cy.wait(5000); cy.get(".t--tabid-tab1").click({ force: true }); cy.wait(3000); @@ -59,8 +60,8 @@ describe("Dynamic Height Width validation for Tab widget", function() { }); it("Tab widget validation of height with preview mode", function() { - cy.get(".t--switch-comment-mode-off").should("be.visible"); - cy.get(".t--switch-comment-mode-off").click({ force: true }); + _.agHelper.AssertElementVisible(_.locators._previewModeToggle("preview")); + _.agHelper.GetNClick(_.locators._previewModeToggle("preview")); cy.wait(3000); cy.openPropertyPane("tabswidget"); cy.changeLayoutHeight(commonlocators.fixed); diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/UpdateUsersName_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/UpdateUsersName_spec.js index 2d15f1f9cb47..10ca612df41d 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/UpdateUsersName_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/ExplorerTests/UpdateUsersName_spec.js @@ -1,9 +1,11 @@ import homePage from "../../../../locators/HomePage"; +import * as _ from "../../../../support/Objects/ObjectsCore"; describe("Update a user's name", function() { let username; it("1. Update a user's name", function() { + _.homePage.NavigateToHome(); cy.get(homePage.profileMenu).click(); cy.get(".t--edit-profile").click({ force: true }); diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js index 9727df576e1b..faee06ba6d0f 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js @@ -24,7 +24,7 @@ describe("Omnibar functionality test cases", () => { it("2.Verify omnibar is present across all pages and validate its fields", function() { cy.get(omnibar.globalSearch) .trigger("mouseover") - .should("have.css", "background-color", "rgb(240, 240, 240)"); + .should("have.css", "background-color", "rgba(0, 0, 0, 0)"); cy.get(omnibar.globalSearch).click({ force: true }); // verifying all sections are present in omnibar cy.get(omnibar.categoryTitle) diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/PreviewMode_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/PreviewMode_spec.js index ff4ee09730b7..a5847aea9a5a 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/PreviewMode_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/OtherUIFeatures/PreviewMode_spec.js @@ -1,6 +1,7 @@ const dsl = require("../../../../fixtures/previewMode.json"); const commonlocators = require("../../../../locators/commonlocators.json"); const publishPage = require("../../../../locators/publishWidgetspage.json"); +import * as _ from "../../../../support/Objects/ObjectsCore"; describe("Preview mode functionality", function() { before(() => { @@ -8,8 +9,7 @@ describe("Preview mode functionality", function() { }); it("checks entity explorer and property pane visiblity", function() { - cy.get(".t--switch-preview-mode-toggle").click(); - + _.agHelper.GetNClick(_.locators._previewModeToggle("edit")); // in preview mode, entity explorer and property pane are not visible cy.get(".t--entity-explorer").should("not.be.visible"); cy.get(".t--property-pane-sidebar").should("not.be.visible"); @@ -31,19 +31,19 @@ describe("Preview mode functionality", function() { }); it("check invisible widget should not show in proview mode and should show in edit mode", function() { - cy.get(".t--switch-comment-mode-off").click(); + _.agHelper.GetNClick(_.locators._previewModeToggle("preview")); cy.openPropertyPane("buttonwidget"); cy.UncheckWidgetProperties(commonlocators.visibleCheckbox); // button should not show in preview mode - cy.get(".t--switch-preview-mode-toggle").click(); + _.agHelper.GetNClick(_.locators._previewModeToggle("edit")); cy.get(`${publishPage.buttonWidget} button`).should("not.exist"); // Text widget should show cy.get(`${publishPage.textWidget} .bp3-ui-text`).should("exist"); // button should show in edit mode - cy.get(".t--switch-comment-mode-off").click(); + _.agHelper.GetNClick(_.locators._previewModeToggle("preview")); cy.get(`${publishPage.buttonWidget} button`).should("exist"); }); diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/SettingsPane/PageSettings_spec.ts b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/SettingsPane/PageSettings_spec.ts index 2ca83710af4d..2c4d38e7a7d4 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/SettingsPane/PageSettings_spec.ts +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/SettingsPane/PageSettings_spec.ts @@ -34,15 +34,15 @@ describe("Page Settings", () => { }); it("4. Check SetPageNavigation settings", () => { - _.agHelper.GetNClick(_.locators._previewModeToggle); + _.agHelper.GetNClick(_.locators._previewModeToggle("edit")); _.agHelper.AssertElementExist(_.locators._deployedPage); - _.agHelper.GetNClick(_.locators._editModeToggle); + _.agHelper.GetNClick(_.locators._previewModeToggle("preview")); _.appSettings.OpenAppSettings(); _.appSettings.GoToPageSettings("Page2"); _.pageSettings.TogglePageNavigation(); - _.agHelper.GetNClick(_.locators._previewModeToggle); + _.agHelper.GetNClick(_.locators._previewModeToggle("edit")); _.agHelper.AssertElementAbsence(_.locators._deployedPage); - _.agHelper.GetNClick(_.locators._editModeToggle); + _.agHelper.GetNClick(_.locators._previewModeToggle("preview")); }); it("5. Page name allows accented character", () => { @@ -62,10 +62,7 @@ describe("Page Settings", () => { it("7. Page name doesn't allow empty", () => { _.appSettings.OpenAppSettings(); _.appSettings.GoToPageSettings("Page3"); - _.pageSettings.AssertPageErrorMessage( - "", - "Page name cannot be empty", - ); + _.pageSettings.AssertPageErrorMessage("", "Page name cannot be empty"); _.appSettings.ClosePane(); }); diff --git a/app/client/cypress/locators/commonlocators.json b/app/client/cypress/locators/commonlocators.json index 0d6ca2a1dbeb..5e9b3faae112 100644 --- a/app/client/cypress/locators/commonlocators.json +++ b/app/client/cypress/locators/commonlocators.json @@ -82,7 +82,6 @@ "entitySearchResult": ".t--entity-name:contains('", "saveStatusContainer": ".t--save-status-container", "saveStatusIsSaving": "t--save-status-is-saving", - "saveStatusSuccess": ".t--save-status-success", "saveStatusError": ".t--save-status-error", "selectWidgetVirtualList": ".menu-virtual-list div", "tableNextPage": ".t--table-widget-next-page", diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/apppage.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/apppage.snap.png index 6b03585b9ba0..4b22085eb9bb 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/apppage.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/apppage.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/emptyAppBuilder.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/emptyAppBuilder.snap.png index 6b03585b9ba0..4b22085eb9bb 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/emptyAppBuilder.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/emptyAppBuilder.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/quickPageWizard.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/quickPageWizard.snap.png index cf740f12cc12..799c7161e583 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/quickPageWizard.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/AppPageLayout_spec.js/quickPageWizard.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png index 39e979154713..ccb84b655dbb 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/DatasourcePageLayout_spec.js/emptydatasourcepage.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png index e02faa71c1a9..70c7e07e0ffc 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorComment_spec.js/jsObjAfterCommenting1.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png index a41fa9ae8460..778c16b6d9b3 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorComment_spec.js/jsObjBeforeCommenting1.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png index fa4cf50adfc5..af03e92ed89c 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterGoLineStartSmart5.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png index f965647fa4dd..67fc9d5b64dd 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify1.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png index 19c3d37c28b1..61e35dec9a8e 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify2.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png index a0dc81019ce7..b8fd93d0af77 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify3.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png index 3b350d81593c..b74524540b48 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png index d092f84f62b8..aace7d7e8a7c 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify4_1.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png index 19c3d37c28b1..61e35dec9a8e 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify6.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png index 19c3d37c28b1..61e35dec9a8e 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjAfterPrettify7.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png index 81fdb0997dd8..d41fd112b0f8 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforeGoLineStartSmart5.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png index 1e0ad4d677c6..c475f5f65eda 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify1.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png index 87768c5edf24..3e68de0aa3b7 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify2.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png index 809166ce521e..c0abc4cd56c8 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify3.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png index 9e7f5b833b0f..1305109950af 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify4.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png index be5896570af3..bddb10c092e9 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify6.snap.png differ diff --git a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png index 7b15210bdc12..e9abedfb56ad 100644 Binary files a/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png and b/app/client/cypress/snapshots/Smoke_TestSuite/ClientSideTests/VisualTests/JSEditorIndent_spec.js/jsObjBeforePrettify7.snap.png differ diff --git a/app/client/cypress/support/Objects/CommonLocators.ts b/app/client/cypress/support/Objects/CommonLocators.ts index b9f35ea2af91..ff4db2d89e19 100644 --- a/app/client/cypress/support/Objects/CommonLocators.ts +++ b/app/client/cypress/support/Objects/CommonLocators.ts @@ -13,7 +13,7 @@ export class CommonLocators { widgetName + "') span.bp3-editable-text-content"; _widgetNameTxt = ".editable-text-container input.bp3-editable-text-input"; - _saveStatusSuccess = ".t--save-status-success"; + _saveStatusContainer = ".t--save-status-container"; _codeMirrorTextArea = ".CodeMirror textarea"; _codeMirrorCode = ".CodeMirror-code"; _codeEditorTargetTextArea = ".CodeEditorTarget textarea"; @@ -72,7 +72,7 @@ export class CommonLocators { "//div[contains(@class, 't--property-control-" + ddName.replace(/ +/g, "").toLowerCase() + "')]//button[contains(@class, 't--open-dropdown-Select-Action')]"; - _selectPropPageDropdown = (ddName: string) => + _selectPropPageDropdown = (ddName: string) => "//div[contains(@class, 't--property-control-" + ddName.replace(/ +/g, "").toLowerCase() + "')]//button[contains(@class, 't--open-dropdown-Select-Page')]"; @@ -164,7 +164,8 @@ export class CommonLocators { "']"; _dropDownMultiTreeSelect = ".rc-tree-select-multiple"; _omnibarDescription = "[data-cy='description']"; - _previewModeToggle = ".t--switch-preview-mode-toggle"; + _previewModeToggle = (currentMode: "preview" | "edit") => + `[data-cy='${currentMode}-mode']`; _editModeToggle = ".t--switch-comment-mode-off"; _editorVariable = ".cm-variable"; _consoleString = ".cm-string"; diff --git a/app/client/cypress/support/Pages/AggregateHelper.ts b/app/client/cypress/support/Pages/AggregateHelper.ts index bbdf1be2bd53..5dd71ea9ac7c 100644 --- a/app/client/cypress/support/Pages/AggregateHelper.ts +++ b/app/client/cypress/support/Pages/AggregateHelper.ts @@ -138,7 +138,9 @@ export class AggregateHelper { public AssertAutoSave() { // wait for save query to trigger & n/w call to finish occuring - cy.get(this.locator._saveStatusSuccess, { timeout: 30000 }).should("exist"); //adding timeout since waiting more time is not worth it! + cy.get(this.locator._saveStatusContainer, { timeout: 30000 }).should( + "not.exist", + ); //adding timeout since waiting more time is not worth it! } public ValidateCodeEditorContent(selector: string, contentToValidate: any) { diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js index 46bd104295fa..97fe75ad92f5 100644 --- a/app/client/cypress/support/commands.js +++ b/app/client/cypress/support/commands.js @@ -1160,7 +1160,9 @@ Cypress.Commands.add("CheckForPageSaveError", () => { }); Cypress.Commands.add("assertPageSave", () => { - cy.get(commonlocators.saveStatusSuccess).should("exist", { timeout: 40000 }); + cy.get(commonlocators.saveStatusContainer).should("not.exist", { + timeout: 40000, + }); }); Cypress.Commands.add( diff --git a/app/client/src/actions/editorActions.ts b/app/client/src/actions/editorActions.ts index 8a865261efe9..b39e0df20c37 100644 --- a/app/client/src/actions/editorActions.ts +++ b/app/client/src/actions/editorActions.ts @@ -1,5 +1,17 @@ import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; +/** + * init action that sets preview mode. navigates to canvas when payload is true + * navigates back when the payload is false i.e when switched to edit mode + * + * @param payload + * @returns + */ +export const setPreviewModeInitAction = (payload: boolean) => ({ + type: ReduxActionTypes.SET_PREVIEW_MODE_INIT, + payload, +}); + /** * action that sets preview mode * diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx index 56a2871cc30a..102c0b61ac1a 100644 --- a/app/client/src/ce/constants/ReduxActionConstants.tsx +++ b/app/client/src/ce/constants/ReduxActionConstants.tsx @@ -605,6 +605,7 @@ export const ReduxActionTypes = { SET_EXPLORER_PINNED: "SET_EXPLORER_PINNED", SET_EXPLORER_ACTIVE: "SET_EXPLORER_ACTIVE", SET_PREVIEW_MODE: "SET_PREVIEW_MODE", + SET_PREVIEW_MODE_INIT: "SET_PREVIEW_MODE_INIT", SET_CANVAS_CARDS_STATE: "SET_CANVAS_TOP_SECTION_VISIBILITY", DELETE_CANVAS_CARDS_STATE: "DELETE_CANVAS_CARDS_STATE", UPDATE_EXPLORER_WIDTH: "UPDATE_EXPLORER_WIDTH", diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index 967f7f9590a9..b93dc4026d0c 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -178,6 +178,16 @@ export const EDIT_APP = () => `Edit App`; export const FORK_APP = () => `Fork App`; export const SIGN_IN = () => `Sign in`; +export const EDITOR_HEADER = { + saving: () => "Saving", + saveFailed: () => "Save failed", + share: () => "SHARE", + previewTooltip: { + text: () => "Preview", + shortcut: () => "P", + }, +}; + // Homepage export const CREATE_NEW_APPLICATION = () => `Create new`; export const SEARCH_APPS = () => `Search for apps...`; @@ -335,7 +345,7 @@ export const OMNIBAR_PLACEHOLDER_NAV = () => "Search widgets and queries"; export const OMNIBAR_PLACEHOLDER_DOC = () => "Search documentation"; export const CREATE_NEW_OMNIBAR_PLACEHOLDER = () => "Create a new Query, API or JS Object"; -export const HELPBAR_PLACEHOLDER = () => "Quick search & navigation"; +export const HELPBAR_PLACEHOLDER = () => "Search"; export const NO_SEARCH_DATA_TEXT = () => "No results found"; export const WIDGET_BIND_HELP = () => diff --git a/app/client/src/components/editorComponents/Debugger/index.tsx b/app/client/src/components/editorComponents/Debugger/index.tsx index 2d2b9da9f150..41cc356fff5f 100644 --- a/app/client/src/components/editorComponents/Debugger/index.tsx +++ b/app/client/src/components/editorComponents/Debugger/index.tsx @@ -18,6 +18,7 @@ import { import { matchBuilderPath } from "constants/routes"; import { getTypographyByKey, TooltipComponent } from "design-system"; import { DEBUGGER_TAB_KEYS } from "./helpers"; +import { BottomBarCTAStyles } from "pages/Editor/BottomBar/styles"; function Debugger() { const showDebugger = useSelector( @@ -35,6 +36,8 @@ const TriggerContainer = styled.div<{ overflow: visible; display: flex; align-items: center; + justify-content: center; + ${BottomBarCTAStyles} .debugger-count { color: ${Colors.WHITE}; @@ -51,8 +54,8 @@ const TriggerContainer = styled.div<{ display: flex; align-items: center; justify-content: center; - top: -8px; - left: 100%; + top: 0px; + left: 80%; font-size: 10px; border-radius: 50%; } @@ -108,7 +111,12 @@ export function DebuggerTrigger() { preventOverflow: { enabled: true }, }} > - <Icon name="bug" onClick={onClick} size={IconSize.XL} /> + <Icon + fillColor={Colors.GRAY_700} + name="bug-line" + onClick={onClick} + size={IconSize.XXXL} + /> </TooltipComponent> {!!messageCounters.errors && ( <div className="debugger-count t--debugger-count"> diff --git a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx index 7a4ca2c8cf11..4df0e6b81dc6 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/HelpBar.tsx @@ -7,6 +7,7 @@ import { HELPBAR_PLACEHOLDER } from "@appsmith/constants/messages"; import AnalyticsUtil from "utils/AnalyticsUtil"; import { modText } from "utils/helpers"; import { filterCategories, SEARCH_CATEGORY_ID } from "./utils"; +import { Colors } from "constants/Colors"; const StyledHelpBar = styled.div` padding: 0 ${(props) => props.theme.spaces[4]}px; @@ -18,14 +19,13 @@ const StyledHelpBar = styled.div` justify-content: space-between; align-items: center; color: ${(props) => props.theme.colors.globalSearch.helpBarText}; - background: ${(props) => props.theme.colors.globalSearch.helpBarBackground}; height: 28px; flex: 1; - max-width: 350px; - border: 1.5px solid transparent; + max-width: 205px; + border: 1px solid ${Colors.GRAY_200}; cursor: default; &:hover { - border: 1.5px solid ${(props) => props.theme.colors.tertiary.light}; + border: 1px solid ${(props) => props.theme.colors.tertiary.light}; } `; @@ -42,8 +42,10 @@ function HelpBar({ toggleShowModal }: Props) { data-cy="global-search-modal-trigger" onClick={toggleShowModal} > - <Text type={TextType.P2}>{HELPBAR_PLACEHOLDER()}</Text> - <Text italic type={TextType.P3}> + <Text color={Colors.GRAY_400} type={TextType.P2}> + {HELPBAR_PLACEHOLDER()} + </Text> + <Text color={Colors.GRAY_400} italic type={TextType.P3}> {comboText} </Text> </StyledHelpBar> diff --git a/app/client/src/constants/DefaultTheme.tsx b/app/client/src/constants/DefaultTheme.tsx index d517d9a71710..8e7f682c464a 100644 --- a/app/client/src/constants/DefaultTheme.tsx +++ b/app/client/src/constants/DefaultTheme.tsx @@ -415,6 +415,7 @@ export type Theme = { headerHeight: string; smallHeaderHeight: string; bottomBarHeight: string; + pageTabsHeight: string; integrationsPageUnusableHeight: string; backBanner: string; homePage: any; @@ -2141,9 +2142,9 @@ export const light: ColorType = { globalSearch: { ...globalSearch, helpBarBackground: "#F0F0F0", - helpBarText: "#A9A7A7", + helpBarText: Colors.GRAY_400, helpButtonBackground: "#F0F0F0", - helpIcon: "#939090", + helpIcon: Colors.GRAY_700, }, navigationMenu: { contentActive: "#090707", @@ -2158,7 +2159,7 @@ export const light: ColorType = { header: { separator: "#E0DEDE", appName: lightShades[8], - background: lightShades[0], + background: lightShades[11], deployToolTipText: lightShades[8], deployToolTipBackground: "#FFF", shareBtnHighlight: "#F86A2B", @@ -2896,8 +2897,9 @@ export const theme: Theme = { sidebar: 256, }, headerHeight: "48px", - smallHeaderHeight: "32px", + smallHeaderHeight: "40px", bottomBarHeight: "34px", + pageTabsHeight: "32px", integrationsPageUnusableHeight: "182px", backBanner: "30px", canvasBottomPadding: 200, diff --git a/app/client/src/pages/AppViewer/PageTabs.tsx b/app/client/src/pages/AppViewer/PageTabs.tsx index 54b5ea712801..2182cceb4809 100644 --- a/app/client/src/pages/AppViewer/PageTabs.tsx +++ b/app/client/src/pages/AppViewer/PageTabs.tsx @@ -49,7 +49,7 @@ const StyleTabText = styled.div` justify-content: center; ${getTypographyByKey("h6")} color: ${(props) => props.theme.colors.header.tabText}; - height: ${(props) => `calc(${props.theme.smallHeaderHeight})`}; + height: ${(props) => props.theme.pageTabsHeight}; & span { height: 100%; max-width: 138px; diff --git a/app/client/src/pages/Editor/BottomBar/ManualUpgrades.tsx b/app/client/src/pages/Editor/BottomBar/ManualUpgrades.tsx index 37376e23e35a..7f4683b6e7dd 100644 --- a/app/client/src/pages/Editor/BottomBar/ManualUpgrades.tsx +++ b/app/client/src/pages/Editor/BottomBar/ManualUpgrades.tsx @@ -27,6 +27,7 @@ import { useLocation } from "react-router"; import DisclaimerIcon from "remixicon-react/ErrorWarningLineIcon"; import AnalyticsUtil from "utils/AnalyticsUtil"; import classNames from "classnames"; +import { BottomBarCTAStyles } from "./styles"; const StyledList = styled.ul` list-style: disc; @@ -74,6 +75,12 @@ const BodyContainer = styled.div` } `; +const StyledTrigger = styled.div` + ${BottomBarCTAStyles} + display: flex; + justify-content: center; +`; + function UpdatesModal({ applicationVersion, closeModal, @@ -256,13 +263,13 @@ function ManualUpgrades(props: { preventOverflow: { enabled: true }, }} > - <div + <StyledTrigger onClick={() => { setShowModal(applicationVersion < latestVersion); }} > {props.children} - </div> + </StyledTrigger> </TooltipComponent> <UpdatesModal applicationVersion={applicationVersion} diff --git a/app/client/src/pages/Editor/BottomBar/index.tsx b/app/client/src/pages/Editor/BottomBar/index.tsx index f69845b0a1bb..3be6dd96dfda 100644 --- a/app/client/src/pages/Editor/BottomBar/index.tsx +++ b/app/client/src/pages/Editor/BottomBar/index.tsx @@ -4,6 +4,7 @@ import QuickGitActions from "pages/Editor/gitSync/QuickGitActions"; import { Layers } from "constants/Layers"; import { DebuggerTrigger } from "components/editorComponents/Debugger"; import { Colors } from "constants/Colors"; +import HelpButton from "pages/Editor/HelpButton"; import ManualUpgrades from "./ManualUpgrades"; import { Icon, IconSize } from "design-system"; import PaneCountSwitcher from "pages/common/PaneCountSwitcher"; @@ -14,6 +15,7 @@ const Container = styled.div` width: 100%; height: ${(props) => props.theme.bottomBarHeight}; display: flex; + position: fixed; justify-content: space-between; background-color: ${(props) => props.theme.colors.editorBottomBar.background}; z-index: ${Layers.bottomBar}; @@ -26,7 +28,7 @@ export default function BottomBar(props: { className?: string }) { return ( <Container className={props.className ?? ""}> <QuickGitActions /> - <div className="flex justify-between items-center gap-4"> + <div className="flex justify-between items-center gap-1"> <ManualUpgrades showTooltip> <Icon className="t--upgrade" @@ -35,6 +37,7 @@ export default function BottomBar(props: { className?: string }) { size={IconSize.XXXL} /> </ManualUpgrades> + <HelpButton /> <DebuggerTrigger /> {isMultiPane && <PaneCountSwitcher />} </div> diff --git a/app/client/src/pages/Editor/BottomBar/styles.ts b/app/client/src/pages/Editor/BottomBar/styles.ts new file mode 100644 index 000000000000..3c7259badb50 --- /dev/null +++ b/app/client/src/pages/Editor/BottomBar/styles.ts @@ -0,0 +1,10 @@ +import { Colors } from "constants/Colors"; +import { css } from "styled-components"; + +export const BottomBarCTAStyles = css` + height: ${(props) => props.theme.bottomBarHeight}; + width: 32px; + :hover { + background-color: ${Colors.GRAY_100}; + } +`; diff --git a/app/client/src/pages/Editor/EditorAppName/index.tsx b/app/client/src/pages/Editor/EditorAppName/index.tsx index feb56c78df16..1eccb34933cc 100644 --- a/app/client/src/pages/Editor/EditorAppName/index.tsx +++ b/app/client/src/pages/Editor/EditorAppName/index.tsx @@ -69,7 +69,7 @@ const Container = styled.div<{ isPopoverOpen: boolean }>` } &&&& .${Classes.EDITABLE_TEXT_CONTENT}, &&&& .${Classes.EDITABLE_TEXT_INPUT} { display: block; - ${getTypographyByKey("h4")}; + ${getTypographyByKey("h5")}; line-height: ${(props) => props.theme.smallHeaderHeight} !important; padding: 0 ${(props) => props.theme.spaces[2]}px; } @@ -233,7 +233,7 @@ export function EditorAppName(props: EditorAppNameProps) { <StyledIcon fillColor={theme.colors.navigationMenu.contentActive} name={isPopoverOpen ? "expand-less" : "down-arrow"} - size={IconSize.XXL} + size={IconSize.LARGE} /> )} </Container> diff --git a/app/client/src/pages/Editor/EditorHeader.tsx b/app/client/src/pages/Editor/EditorHeader.tsx index 5426769e2e5d..6781970d0abe 100644 --- a/app/client/src/pages/Editor/EditorHeader.tsx +++ b/app/client/src/pages/Editor/EditorHeader.tsx @@ -32,7 +32,6 @@ import { } from "@appsmith/selectors/workspaceSelectors"; import { connect, useDispatch, useSelector } from "react-redux"; import DeployLinkButtonDialog from "components/designSystems/appsmith/header/DeployLinkButton"; -import { EditInteractionKind, SavingState } from "design-system"; import { updateApplication } from "actions/applicationActions"; import { getApplicationList, @@ -41,20 +40,22 @@ import { showAppInviteUsersDialogSelector, } from "selectors/applicationSelectors"; import EditorAppName from "./EditorAppName"; -import ProfileDropdown from "pages/common/ProfileDropdown"; import { getCurrentUser } from "selectors/usersSelectors"; -import { ANONYMOUS_USERNAME, User } from "constants/userConstants"; +import { User } from "constants/userConstants"; import { + Category, + EditInteractionKind, + IconPositions, + SavingState, Button, getTypographyByKey, Icon, IconSize, - Size, TooltipComponent, + Size, } from "design-system"; import { Profile } from "pages/common/ProfileImage"; import HelpBar from "components/editorComponents/GlobalSearch/HelpBar"; -import HelpButton from "./HelpButton"; import { getTheme, ThemeMode } from "selectors/themeSelectors"; import ToggleModeButton from "pages/Editor/ToggleModeButton"; import { Colors } from "constants/Colors"; @@ -73,6 +74,7 @@ import { createMessage, DEPLOY_BUTTON_TOOLTIP, DEPLOY_MENU_OPTION, + EDITOR_HEADER, INVITE_TAB, INVITE_USERS_PLACEHOLDER, IN_APP_EMBED_SETTING, @@ -112,16 +114,26 @@ const HeaderWrapper = styled.div` flex-direction: row; box-shadow: none; border-bottom: 1px solid ${(props) => props.theme.colors.menuBorder}; - & .editable-application-name { ${getTypographyByKey("h4")} color: ${(props) => props.theme.colors.header.appName}; } - & ${Profile} { width: 24px; height: 24px; } + + @media only screen and (max-width: 900px) { + & .help-bar { + display: none; + } + } + + @media only screen and (max-width: 700px) { + & .app-realtume-editors { + display: none; + } + } `; const HeaderSection = styled.div` @@ -130,20 +142,16 @@ const HeaderSection = styled.div` flex: 1; overflow: visible; align-items: center; - :nth-child(1) { justify-content: flex-start; max-width: 30%; } - :nth-child(2) { justify-content: center; } - :nth-child(3) { justify-content: flex-end; } - > .${Popover2Classes.POPOVER2_TARGET} { max-width: calc(100% - 50px); min-width: 100px; @@ -155,32 +163,18 @@ const AppsmithLink = styled((props) => { // eslint-disable @typescript-eslint/no-unused-vars return <Link {...props} />; })` - height: 20px; - width: 20px; + height: 24px; + width: 24px; display: inline-block; - img { - width: 20px; - height: 20px; + width: 24px; + height: 24px; } `; const DeploySection = styled.div` display: flex; -`; - -const ProfileDropdownContainer = styled.div``; - -const StyledInviteButton = styled(Button)` - margin-right: ${(props) => props.theme.spaces[9]}px; - height: ${(props) => props.theme.smallHeaderHeight}; - ${getTypographyByKey("btnLarge")} - padding: ${(props) => props.theme.spaces[2]}px; -`; - -const StyledDeployButton = styled(StyledInviteButton)` - margin-right: 0px; - height: 20px; + align-items: center; `; const BindingBanner = styled.div` @@ -205,32 +199,16 @@ const BindingBanner = styled.div` `; const StyledDeployIcon = styled(Icon)` - height: 20px; + height: ${(props) => props.theme.smallHeaderHeight}; width: 20px; align-self: center; - background: var(--ads-color-brand); - &:hover { - background: var(--ads-color-brand-hover); + background-color: ${Colors.GRAY_100}; } `; -const ShareButton = styled.div` - cursor: pointer; -`; - -const StyledShareText = styled.span` - font-size: 12px; - font-weight: 600; - margin-left: 4px; -`; - -const StyledSharedIcon = styled(Icon)` - display: inline-block; -`; - const HamburgerContainer = styled.div` - height: 34px; + height: ${(props) => props.theme.smallHeaderHeight}; width: 34px; :hover { @@ -238,6 +216,17 @@ const HamburgerContainer = styled.div` } `; +const StyledButton = styled(Button)` + padding: 0 6px; + height: ${(props) => props.theme.smallHeaderHeight}; + color: ${Colors.GREY_900}; + + svg { + height: 18px; + width: 18px; + } +`; + type EditorHeaderProps = { pageSaveError?: boolean; pageName?: string; @@ -261,10 +250,15 @@ const GlobalSearch = lazy(() => { export function ShareButtonComponent() { return ( - <ShareButton className="flex items-center t--application-share-btn header__application-share-btn"> - <StyledSharedIcon name="share-line" /> - <StyledShareText>SHARE</StyledShareText> - </ShareButton> + <StyledButton + category={Category.tertiary} + className="t--application-share-btn" + icon={"share-line"} + iconPosition={IconPositions.left} + size={Size.medium} + tag={"button"} + text={createMessage(EDITOR_HEADER.share)} + /> ); } @@ -284,7 +278,6 @@ export function EditorHeader(props: EditorHeaderProps) { const isGitConnected = useSelector(getIsGitConnected); const isErroredSavingName = useSelector(getIsErroredSavingAppName); const applicationList = useSelector(getApplicationList); - const user = useSelector(getCurrentUser); const isPreviewMode = useSelector(previewModeSelector); const deployLink = useHref(viewerURL, { pageId }); const isMultiPane = useSelector(isMultiPaneActive); @@ -371,8 +364,11 @@ export function EditorHeader(props: EditorHeaderProps) { return ( <ThemeProvider theme={theme}> - <HeaderWrapper className="pr-3" data-testid="t--appsmith-editor-header"> - <HeaderSection className="space-x-3"> + <HeaderWrapper + className="pl-1 pr-1" + data-testid="t--appsmith-editor-header" + > + <HeaderSection className="space-x-2"> {!isMultiPane && ( <HamburgerContainer className={classNames({ @@ -400,16 +396,16 @@ export function EditorHeader(props: EditorHeaderProps) { className="relative w-4 h-4 text-trueGray-600 group t--pin-entity-explorer" onMouseEnter={onMenuHover} > - <MenuIcon className="absolute w-4 h-4 transition-opacity cursor-pointer fill-current group-hover:opacity-0" /> + <MenuIcon className="absolute w-3.5 h-3.5 transition-opacity cursor-pointer fill-current group-hover:opacity-0" /> {!pinned && ( <UnpinIcon - className="absolute w-4 h-4 transition-opacity opacity-0 cursor-pointer fill-current group-hover:opacity-100" + className="absolute w-3.5 h-3.5 transition-opacity opacity-0 cursor-pointer fill-current group-hover:opacity-100" onClick={onPin} /> )} {pinned && ( <PinIcon - className="absolute w-4 h-4 transition-opacity opacity-0 cursor-pointer fill-current group-hover:opacity-100" + className="absolute w-3.5 h-3.5 transition-opacity opacity-0 cursor-pointer fill-current group-hover:opacity-100" onClick={onPin} /> )} @@ -417,6 +413,7 @@ export function EditorHeader(props: EditorHeaderProps) { </TooltipComponent> </HamburgerContainer> )} + <TooltipComponent content={createMessage(LOGO_TOOLTIP)} hoverOpenDelay={TOOLTIP_HOVER_ON_DELAY} @@ -463,25 +460,25 @@ export function EditorHeader(props: EditorHeaderProps) { setIsPopoverOpen={setIsPopoverOpen} /> </TooltipComponent> - <ToggleModeButton showSelectedMode={!isPopoverOpen} /> + <EditorSaveIndicator /> </HeaderSection> <HeaderSection className={classNames({ "-translate-y-full opacity-0": isPreviewMode, "translate-y-0 opacity-100": !isPreviewMode, "transition-all transform duration-400": true, + "help-bar": "true", })} > <HelpBar /> - <HelpButton /> </HeaderSection> - <HeaderSection className="space-x-3"> - <EditorSaveIndicator /> + <HeaderSection className="gap-x-2"> <Boxed alternative={<EndTour />} step={GUIDED_TOUR_STEPS.BUTTON_ONSUCCESS_BINDING} > <RealtimeAppEditors applicationId={applicationId} /> + <ToggleModeButton /> <FormDialogComponent Form={AppInviteUsersForm} applicationId={applicationId} @@ -518,13 +515,18 @@ export function EditorHeader(props: EditorHeaderProps) { hoverOpenDelay={TOOLTIP_HOVER_ON_DELAY} position="bottom-right" > - <StyledDeployButton + <StyledButton + category={Category.tertiary} className="t--application-publish-btn" data-guided-tour-iid="deploy" + icon={"rocket"} + iconPosition={IconPositions.left} isLoading={isPublishing} onClick={() => handleClickDeploy(true)} - size={Size.small} + size={Size.medium} + tag={"button"} text={DEPLOY_MENU_OPTION()} + width={"88px"} /> </TooltipComponent> @@ -532,7 +534,7 @@ export function EditorHeader(props: EditorHeaderProps) { link={deployLink} trigger={ <StyledDeployIcon - fillColor="var(--ads-color-brand-text)" + fill={Colors.GREY_900} name={"down-arrow"} size={IconSize.XXL} /> @@ -540,15 +542,6 @@ export function EditorHeader(props: EditorHeaderProps) { /> </DeploySection> </Boxed> - {user && user.username !== ANONYMOUS_USERNAME && ( - <ProfileDropdownContainer> - <ProfileDropdown - name={user.name} - photoId={user?.photoId} - userName={user?.username || ""} - /> - </ProfileDropdownContainer> - )} </HeaderSection> <Suspense fallback={<span />}> <GlobalSearch /> diff --git a/app/client/src/pages/Editor/EditorSaveIndicator.tsx b/app/client/src/pages/Editor/EditorSaveIndicator.tsx index 75639df6f378..72807e539d62 100644 --- a/app/client/src/pages/Editor/EditorSaveIndicator.tsx +++ b/app/client/src/pages/Editor/EditorSaveIndicator.tsx @@ -1,28 +1,15 @@ -import React, { useState } from "react"; +import React from "react"; import { useSelector } from "react-redux"; import styled from "styled-components"; -import moment from "moment/moment"; - -import { AppState } from "@appsmith/reducers"; -import { TooltipComponent } from "design-system"; -import { HeaderIcons } from "icons/HeaderIcons"; +import { Icon, TextType, Text } from "design-system"; import { getIsPageSaving, getPageSavingError } from "selectors/editorSelectors"; -import { - createMessage, - EDITOR_HEADER_SAVE_INDICATOR, -} from "@appsmith/constants/messages"; import { Colors } from "constants/Colors"; -import { Icon } from "design-system"; +import { createMessage, EDITOR_HEADER } from "ce/constants/messages"; const SaveStatusContainer = styled.div` - border-radius: 50%; - display: flex; align-items: center; - justify-content: center; - .bp3-popover-target { - display: flex; - } + display: flex; `; const StyledLoader = styled(Icon)` @@ -35,61 +22,33 @@ const StyledLoader = styled(Icon)` `; export function EditorSaveIndicator() { - const [lastUpdatedTimeMessage, setLastUpdatedTimeMessage] = useState<string>( - createMessage(EDITOR_HEADER_SAVE_INDICATOR), - ); - - const lastUpdatedTime = useSelector( - (state: AppState) => state.ui.editor.lastUpdatedTime, - ); const isSaving = useSelector(getIsPageSaving); const pageSaveError = useSelector(getPageSavingError); - const findLastUpdatedTimeMessage = () => { - const savedMessage = createMessage(EDITOR_HEADER_SAVE_INDICATOR); - setLastUpdatedTimeMessage( - lastUpdatedTime - ? `${savedMessage} ${moment(lastUpdatedTime * 1000).fromNow()}` - : savedMessage, - ); - }; - let saveStatusIcon: React.ReactNode; + let saveStatusText = ""; if (isSaving) { saveStatusIcon = ( - <StyledLoader className="t--save-status-is-saving" name="loader" /> + <StyledLoader className="t--save-status-is-saving" name="refresh" /> ); + saveStatusText = createMessage(EDITOR_HEADER.saving); } else { - if (!pageSaveError) { + if (pageSaveError) { saveStatusIcon = ( - <TooltipComponent - content={lastUpdatedTimeMessage} - hoverOpenDelay={200} - onOpening={findLastUpdatedTimeMessage} - > - <HeaderIcons.SAVE_SUCCESS - className="t--save-status-success" - color={Colors.GREEN} - height={20} - width={20} - /> - </TooltipComponent> - ); - } else { - saveStatusIcon = ( - <HeaderIcons.SAVE_FAILURE - className={"t--save-status-error"} - color={Colors.WARNING_SOLID} - height={20} - width={20} - /> + <Icon className={"t--save-status-error"} name="cloud-off-line" /> ); + saveStatusText = createMessage(EDITOR_HEADER.saveFailed); } } + if (!pageSaveError && !isSaving) return null; + return ( - <SaveStatusContainer className={"t--save-status-container"}> + <SaveStatusContainer className={"t--save-status-container gap-x-1"}> {saveStatusIcon} + <Text color={Colors.GREY_9} type={TextType.P3}> + {saveStatusText} + </Text> </SaveStatusContainer> ); } diff --git a/app/client/src/pages/Editor/GuidedTour/EndTour.tsx b/app/client/src/pages/Editor/GuidedTour/EndTour.tsx index f4f6ac7073ea..efc3c7981557 100644 --- a/app/client/src/pages/Editor/GuidedTour/EndTour.tsx +++ b/app/client/src/pages/Editor/GuidedTour/EndTour.tsx @@ -24,7 +24,9 @@ function EndTour() { }; return ( - <EndTutorial onClick={endTour}>{createMessage(END_TUTORIAL)}</EndTutorial> + <EndTutorial className="mr-3" onClick={endTour}> + {createMessage(END_TUTORIAL)} + </EndTutorial> ); } diff --git a/app/client/src/pages/Editor/HelpButton.tsx b/app/client/src/pages/Editor/HelpButton.tsx index 9b77233aa3de..28d0e15e94d4 100644 --- a/app/client/src/pages/Editor/HelpButton.tsx +++ b/app/client/src/pages/Editor/HelpButton.tsx @@ -3,7 +3,7 @@ import styled, { createGlobalStyle, withTheme } from "styled-components"; import { Popover, Position } from "@blueprintjs/core"; import DocumentationSearch from "components/designSystems/appsmith/help/DocumentationSearch"; -import { Icon, IconSize } from "design-system"; +import { Icon, IconSize, TooltipComponent } from "design-system"; import { HELP_MODAL_WIDTH } from "constants/HelpConstants"; import AnalyticsUtil from "utils/AnalyticsUtil"; @@ -11,8 +11,6 @@ import { Theme } from "constants/DefaultTheme"; import { getCurrentUser } from "selectors/usersSelectors"; import { useSelector } from "react-redux"; import bootIntercom from "utils/bootIntercom"; -import { Colors } from "constants/Colors"; -import { TooltipComponent } from "design-system"; import { createMessage, HELP_RESOURCE_TOOLTIP, @@ -20,6 +18,7 @@ import { import { TOOLTIP_HOVER_ON_DELAY } from "constants/AppConstants"; import { useCallback } from "react"; import { useState } from "react"; +import { BottomBarCTAStyles } from "./BottomBar/styles"; const HelpPopoverStyle = createGlobalStyle` .bp3-popover.bp3-minimal.navbar-help-popover { @@ -29,19 +28,10 @@ const HelpPopoverStyle = createGlobalStyle` const StyledTrigger = styled.div` cursor: pointer; - width: 25px; - height: 25px; - border-radius: 50%; display: flex; align-items: center; justify-content: center; - margin: 0 ${(props) => props.theme.spaces[4]}px; - background: ${(props) => - props.theme.colors.globalSearch.helpButtonBackground}; - - &:hover { - border: 1.5px solid ${Colors.GREY_10}; - } + ${BottomBarCTAStyles} `; type TriggerProps = { @@ -54,13 +44,16 @@ const Trigger = withTheme(({ theme, tooltipsDisabled }: TriggerProps) => ( content={createMessage(HELP_RESOURCE_TOOLTIP)} disabled={tooltipsDisabled} hoverOpenDelay={TOOLTIP_HOVER_ON_DELAY} - position="bottom" + modifiers={{ + preventOverflow: { enabled: true }, + }} + position={"bottom"} > <StyledTrigger> <Icon fillColor={theme.colors.globalSearch.helpIcon} - name="help" - size={IconSize.LARGE} + name="question-line" + size={IconSize.XXXL} /> </StyledTrigger> </TooltipComponent> diff --git a/app/client/src/pages/Editor/MainContainer.tsx b/app/client/src/pages/Editor/MainContainer.tsx index 3f707024d284..0ade98098c30 100644 --- a/app/client/src/pages/Editor/MainContainer.tsx +++ b/app/client/src/pages/Editor/MainContainer.tsx @@ -84,8 +84,8 @@ function MainContainer() { </Container> <BottomBar className={classNames({ - "translate-y-full fixed bottom-0": isPreviewMode, - "translate-y-0 relative opacity-100": !isPreviewMode, + "translate-y-full bottom-0": isPreviewMode, + "translate-y-0 opacity-100": !isPreviewMode, "transition-all transform duration-400": true, })} /> diff --git a/app/client/src/pages/Editor/RealtimeAppEditors.tsx b/app/client/src/pages/Editor/RealtimeAppEditors.tsx index 750835212610..6a56990fa4ed 100644 --- a/app/client/src/pages/Editor/RealtimeAppEditors.tsx +++ b/app/client/src/pages/Editor/RealtimeAppEditors.tsx @@ -1,7 +1,7 @@ import React, { useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; import { getRealtimeAppEditors } from "selectors/appCollabSelectors"; -import { TooltipComponent } from "design-system"; +import { getTypographyByKey, TooltipComponent } from "design-system"; import ProfileImage from "pages/common/ProfileImage"; import UserApi from "@appsmith/api/UserApi"; import styled from "styled-components"; @@ -12,24 +12,32 @@ import { } from "actions/appCollabActions"; import { getCurrentPageId } from "selectors/editorSelectors"; import { getIsAppLevelSocketConnected } from "selectors/websocketSelectors"; +import { Colors } from "constants/Colors"; const UserImageContainer = styled.div` display: flex; - margin-right: ${(props) => props.theme.spaces[4]}px; + margin-right: ${(props) => props.theme.spaces[3]}px; div { cursor: default; margin-left: ${(props) => props.theme.spaces[1]}px; width: 24px; height: 24px; + margin-left: 0px; } - div:first-child { - margin-left: 0px; + .profile-image { + margin-right: -6px; + border: 1px solid ${Colors.WHITE}; + span { + color: ${Colors.GRAY_700}; + font-weight: normal; + ${getTypographyByKey("btnSmall")}; + } } - div:last-child { - margin-right: 0; + .more { + z-index: 1; } `; @@ -64,8 +72,8 @@ function RealtimeAppEditors(props: RealtimeAppEditorsProps) { useEditAppCollabEvents(applicationId); return realtimeAppEditors.length > 0 ? ( - <UserImageContainer> - {realtimeAppEditors.slice(0, 5).map((el) => ( + <UserImageContainer className="app-realtume-editors"> + {realtimeAppEditors.slice(0, 3).map((el) => ( <TooltipComponent content={ <> @@ -79,16 +87,16 @@ function RealtimeAppEditors(props: RealtimeAppEditorsProps) { key={el.email} > <ProfileImage - className="app-realtime-editors" + className="profile-image" source={`/api/${UserApi.photoURL}/${el.email}`} userName={el.name || el.email} /> </TooltipComponent> ))} - {realtimeAppEditors.length > 5 ? ( + {realtimeAppEditors.length > 3 ? ( <ProfileImage - className="app-realtime-editors" - commonName={`+${realtimeAppEditors.length - 5}`} + className="profile-image more" + commonName={`+${realtimeAppEditors.length - 3}`} /> ) : null} </UserImageContainer> diff --git a/app/client/src/pages/Editor/ToggleModeButton.tsx b/app/client/src/pages/Editor/ToggleModeButton.tsx index 63f6e080ef7e..2a19a7a230cf 100644 --- a/app/client/src/pages/Editor/ToggleModeButton.tsx +++ b/app/client/src/pages/Editor/ToggleModeButton.tsx @@ -1,171 +1,84 @@ import React, { useCallback } from "react"; import styled from "styled-components"; import { useDispatch, useSelector } from "react-redux"; -import { TooltipComponent } from "design-system"; -import Pen from "remixicon-react/PencilFillIcon"; -import Eye from "remixicon-react/EyeLineIcon"; -import { Indices } from "constants/Layers"; +import { + Button, + Category, + IconPositions, + Size, + TooltipComponent, +} from "design-system"; import { AppState } from "@appsmith/reducers"; import { APP_MODE } from "entities/App"; -import AnalyticsUtil from "utils/AnalyticsUtil"; import { getAppMode } from "selectors/applicationSelectors"; -import { setPreviewModeAction } from "actions/editorActions"; +import { setPreviewModeInitAction } from "actions/editorActions"; import { previewModeSelector } from "selectors/editorSelectors"; import { isExploringSelector } from "selectors/onboardingSelectors"; - -const ModeButton = styled.div<{ - active: boolean; - showSelectedMode: boolean; - type: string; -}>` - position: relative; - display: flex; - align-items: center; - justify-content: center; - cursor: pointer; - +import { Colors } from "constants/Colors"; +import { createMessage, EDITOR_HEADER } from "ce/constants/messages"; + +const StyledButton = styled(Button)<{ active: boolean }>` + ${(props) => + props.active && + ` + background-color: ${Colors.GREY_200}; + border: 1.2px solid transparent; + `} + padding: 0 ${(props) => props.theme.spaces[2]}px; + color: ${Colors.GREY_900}; height: ${(props) => props.theme.smallHeaderHeight}; - width: ${(props) => props.theme.smallHeaderHeight}; - background: ${(props) => - props.active && props.showSelectedMode - ? props.theme.colors.toggleMode.activeModeBackground - : "transparent"}; - svg path { - fill: ${(props) => - props.type !== "fill" - ? "transparent" - : props.active - ? props.theme.colors.toggleMode.activeModeIcon - : props.theme.colors.toggleMode.modeIcon}; - stroke: ${(props) => - props.type !== "stroke" - ? "transparent" - : props.active - ? props.theme.colors.toggleMode.activeModeIcon - : props.theme.colors.toggleMode.modeIcon}; + svg { + height: 18px; + width: 18px; } +`; - svg rect:not(:first-child) { - fill: ${(props) => - props.active - ? props.theme.colors.toggleMode.activeModeIcon - : props.theme.colors.toggleMode.modeIcon}; - } +function ToggleModeButton() { + const dispatch = useDispatch(); + const isExploring = useSelector(isExploringSelector); + const isPreviewMode = useSelector(previewModeSelector); + const appMode = useSelector(getAppMode); - svg circle { - stroke: ${(props) => - props.active - ? props.theme.colors.toggleMode.activeModeIconCircleStroke - : props.theme.colors.toggleMode.modeIconCircleStroke}; - } -`; + const mode = useSelector((state: AppState) => state.entities.app.mode); + const isViewMode = mode === APP_MODE.PUBLISHED; -const Container = styled.div` - display: flex; - flex: 1; - z-index: ${Indices.Layer1}; -`; + const onClickPreviewModeButton = useCallback(() => { + dispatch(setPreviewModeInitAction(!isPreviewMode)); + }, [dispatch, setPreviewModeInitAction, isPreviewMode]); -function EditModeReset() { - return ( - <TooltipComponent - content={ - <> - Edit Mode - <span style={{ color: "#fff", marginLeft: 20 }}>V</span> - </> - } - hoverOpenDelay={1000} - position="bottom" - > - <Pen size={20} /> - </TooltipComponent> - ); -} + if (isExploring || isViewMode) return null; -function ViewModeReset() { return ( <TooltipComponent content={ <> - View Mode - <span style={{ color: "#fff", marginLeft: 20 }}>V</span> + {createMessage(EDITOR_HEADER.previewTooltip.text)} + <span style={{ color: "#fff", marginLeft: 20 }}> + {createMessage(EDITOR_HEADER.previewTooltip.shortcut)} + </span> </> } + disabled={appMode !== APP_MODE.EDIT} hoverOpenDelay={1000} position="bottom" > - <Eye size={20} /> + <StyledButton + active={isPreviewMode} + category={Category.tertiary} + data-cy={`${isPreviewMode ? "preview" : "edit"}-mode`} + icon={"play-circle-line"} + iconPosition={IconPositions.left} + onClick={onClickPreviewModeButton} + size={Size.medium} + tag={"button"} + text={createMessage(EDITOR_HEADER.previewTooltip.text).toUpperCase()} + /> </TooltipComponent> ); } -function ViewOrEditMode({ mode }: { mode?: APP_MODE }) { - return mode === APP_MODE.EDIT ? <EditModeReset /> : <ViewModeReset />; -} - -function ToggleModeButton({ showSelectedMode = true }) { - const dispatch = useDispatch(); - const isExploring = useSelector(isExploringSelector); - const isPreviewMode = useSelector(previewModeSelector); - const appMode = useSelector(getAppMode); - - const mode = useSelector((state: AppState) => state.entities.app.mode); - const isViewMode = mode === APP_MODE.PUBLISHED; - - const onClickPreviewModeButton = useCallback(() => { - dispatch(setPreviewModeAction(true)); - }, [dispatch, setPreviewModeAction]); - - return ( - <Container className="t--comment-mode-switch-toggle"> - <div style={{ display: "flex" }}> - {!isExploring && !isViewMode && ( - <ModeButton - active={!isPreviewMode} - className="t--switch-comment-mode-off" - onClick={() => { - AnalyticsUtil.logEvent("COMMENTS_TOGGLE_MODE", { - mode, - source: "CLICK", - }); - dispatch(setPreviewModeAction(false)); - }} - showSelectedMode={showSelectedMode} - type="fill" - > - <ViewOrEditMode mode={mode} /> - </ModeButton> - )} - {appMode === APP_MODE.EDIT && ( - <TooltipComponent - content={ - <> - Preview Mode - <span style={{ color: "#fff", marginLeft: 20 }}>P</span> - </> - } - hoverOpenDelay={1000} - position="bottom" - > - <ModeButton - active={isPreviewMode} - className="t--switch-preview-mode-toggle" - onClick={onClickPreviewModeButton} - showSelectedMode={showSelectedMode} - type="fill" - > - <Eye size={20} /> - </ModeButton> - </TooltipComponent> - )} - </div> - </Container> - ); -} - export default ToggleModeButton; diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx index 92eb81fcbc81..4b3cafa6be72 100644 --- a/app/client/src/pages/Editor/index.tsx +++ b/app/client/src/pages/Editor/index.tsx @@ -199,7 +199,9 @@ class Editor extends Component<Props> { this.props.loadingGuidedTour ) { return ( - <CenteredWrapper style={{ height: "calc(100vh - 35px)" }}> + <CenteredWrapper + style={{ height: `calc(100vh - ${theme.smallHeaderHeight})` }} + > <Spinner /> </CenteredWrapper> ); diff --git a/app/client/src/sagas/PageSagas.tsx b/app/client/src/sagas/PageSagas.tsx index f3f6ae1e37e6..84074e8774d4 100644 --- a/app/client/src/sagas/PageSagas.tsx +++ b/app/client/src/sagas/PageSagas.tsx @@ -56,6 +56,7 @@ import { all, call, debounce, + delay, put, select, takeEvery, @@ -129,6 +130,7 @@ import { LOCAL_STORAGE_KEYS } from "utils/localStorage"; import { generateAutoHeightLayoutTreeAction } from "actions/autoHeightActions"; import { getUsedActionNames } from "selectors/actionSelectors"; import { getPageList } from "selectors/entitiesSelector"; +import { setPreviewModeAction } from "actions/editorActions"; const WidgetTypes = WidgetFactory.widgetTypes; @@ -1159,6 +1161,26 @@ function* setCanvasCardsStateSaga(action: ReduxAction<string>) { ); } +function* setPreviewModeInitSaga(action: ReduxAction<boolean>) { + const currentPageId: string = yield select(getCurrentPageId); + if (action.payload) { + // we animate out elements and then move to the canvas + yield put(setPreviewModeAction(action.payload)); + history.push( + builderURL({ + pageId: currentPageId, + }), + ); + } else { + // when switching back to edit mode + // we go back to the previous route e.g query, api etc. + history.goBack(); + // small delay to wait for the content to render and then animate + yield delay(10); + yield put(setPreviewModeAction(action.payload)); + } +} + export default function* pageSagas() { yield all([ takeLatest(ReduxActionTypes.FETCH_PAGE_INIT, fetchPageSaga), @@ -1188,5 +1210,6 @@ export default function* pageSagas() { ReduxActionTypes.DELETE_CANVAS_CARDS_STATE, deleteCanvasCardsStateSaga, ), + takeEvery(ReduxActionTypes.SET_PREVIEW_MODE_INIT, setPreviewModeInitSaga), ]); }
2af307f5ede7a4cd786310149110889072299a8e
2024-08-26 12:54:23
albinAppsmith
fix: Added back the pencil icon for editable text component (#35855)
false
Added back the pencil icon for editable text component (#35855)
fix
diff --git a/app/client/packages/design-system/ads-old/src/EditableTextSubComponent/index.tsx b/app/client/packages/design-system/ads-old/src/EditableTextSubComponent/index.tsx index 7dc18944b16c..93cd4b8a5114 100644 --- a/app/client/packages/design-system/ads-old/src/EditableTextSubComponent/index.tsx +++ b/app/client/packages/design-system/ads-old/src/EditableTextSubComponent/index.tsx @@ -5,7 +5,7 @@ import { } from "@blueprintjs/core"; import styled from "styled-components"; import type { noop } from "lodash"; -import { Spinner } from "@appsmith/ads"; +import { Icon, Spinner } from "@appsmith/ads"; import { Text, TextType } from "../index"; import type { CommonComponentProps } from "../types/common"; @@ -217,6 +217,17 @@ export const EditableTextSubComponent = React.forwardRef( [inputValidation, onTextChanged], ); + const iconName = + !isEditing && + savingState === SavingState.NOT_STARTED && + !props.hideEditIcon + ? "pencil-line" + : !isEditing && savingState === SavingState.SUCCESS + ? "success" + : savingState === SavingState.ERROR || (isEditing && !!isInvalid) + ? "error" + : undefined; + return ( <> <TextContainer @@ -240,7 +251,11 @@ export const EditableTextSubComponent = React.forwardRef( value={value} /> - {savingState === SavingState.STARTED ? <Spinner size="md" /> : null} + {savingState === SavingState.STARTED ? ( + <Spinner size="md" /> + ) : value && !props.hideEditIcon && iconName ? ( + <Icon name={iconName} size="md" /> + ) : null} </TextContainer> {isEditing && !!isInvalid ? ( <Text className="error-message" type={TextType.P2}>
9fd635145cab2b21dc1eeb7dddf6f413e6affa54
2022-03-09 20:30:15
yatinappsmith
test: Add Github token to test build docker (#11729)
false
Add Github token to test build docker (#11729)
test
diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml index a02ec1730d5d..a00314f77ab6 100644 --- a/.github/workflows/test-build-docker-image.yml +++ b/.github/workflows/test-build-docker-image.yml @@ -636,6 +636,8 @@ jobs: CYPRESS_TESTPASSWORD2: ${{ secrets.CYPRESS_TESTPASSWORD1 }} CYPRESS_S3_ACCESS_KEY: ${{ secrets.CYPRESS_S3_ACCESS_KEY }} CYPRESS_S3_SECRET_KEY: ${{ secrets.CYPRESS_S3_SECRET_KEY }} + CYPRESS_GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.CYPRESS_GITHUB_PERSONAL_ACCESS_TOKEN }} + CYPRESS_TEST_GITHUB_USER_NAME: ${{ secrets.CYPRESS_TEST_GITHUB_USER_NAME }} APPSMITH_DISABLE_TELEMETRY: true APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }} POSTGRES_PASSWORD: postgres @@ -657,6 +659,8 @@ jobs: CYPRESS_TESTPASSWORD2: ${{ secrets.CYPRESS_TESTPASSWORD1 }} CYPRESS_S3_ACCESS_KEY: ${{ secrets.CYPRESS_S3_ACCESS_KEY }} CYPRESS_S3_SECRET_KEY: ${{ secrets.CYPRESS_S3_SECRET_KEY }} + CYPRESS_GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.CYPRESS_GITHUB_PERSONAL_ACCESS_TOKEN }} + CYPRESS_TEST_GITHUB_USER_NAME: ${{ secrets.CYPRESS_TEST_GITHUB_USER_NAME }} APPSMITH_DISABLE_TELEMETRY: true APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }} COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
5e6e6caedb15e1d6b4d48551211c23c78091f5a2
2021-12-18 21:36:25
Abhijeet
fix: Use Appsmith user profile as a fallback git profile (#9821)
false
Use Appsmith user profile as a fallback git profile (#9821)
fix
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/GitControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/GitControllerCE.java index 6a2b6b98c8bd..502aaf6c4308 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/GitControllerCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/GitControllerCE.java @@ -46,7 +46,7 @@ public GitControllerCE(GitService service) { @PostMapping("/profile/default") public Mono<ResponseDTO<Map<String, GitProfile>>> saveGitProfile(@RequestBody GitProfile gitProfile) { - //Add to the userData object - git config data + log.debug("Going to add default git profile for user"); return service.updateOrCreateGitProfileForCurrentUser(gitProfile) .map(response -> new ResponseDTO<>(HttpStatus.OK.value(), response, null)); } @@ -54,14 +54,14 @@ public Mono<ResponseDTO<Map<String, GitProfile>>> saveGitProfile(@RequestBody Gi @PutMapping("/profile/{defaultApplicationId}") public Mono<ResponseDTO<Map<String, GitProfile>>> saveGitProfile(@PathVariable String defaultApplicationId, @RequestBody GitProfile gitProfile) { - // Add to the userData object - git config data + log.debug("Going to add repo specific git profile for application: {}", defaultApplicationId); return service.updateOrCreateGitProfileForCurrentUser(gitProfile, defaultApplicationId) .map(response -> new ResponseDTO<>(HttpStatus.ACCEPTED.value(), response, null)); } @GetMapping("/profile/default") public Mono<ResponseDTO<GitProfile>> getDefaultGitConfigForUser() { - return service.getGitProfileForUser() + return service.getDefaultGitProfileOrCreateIfEmpty() .map(gitConfigResponse -> new ResponseDTO<>(HttpStatus.OK.value(), gitConfigResponse, null)); } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java index 594025e2b99d..c3ec058f8b7f 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCE.java @@ -22,7 +22,7 @@ public interface GitServiceCE { Mono<Map<String, GitProfile>> updateOrCreateGitProfileForCurrentUser(GitProfile gitProfile, String defaultApplicationId); - Mono<GitProfile> getGitProfileForUser(); + Mono<GitProfile> getDefaultGitProfileOrCreateIfEmpty(); Mono<GitProfile> getGitProfileForUser(String defaultApplicationId); diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java index de411070ce9d..fccce86f9605 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java @@ -148,24 +148,33 @@ public Mono<GitApplicationMetadata> getGitApplicationMetadata(String defaultAppl @Override public Mono<Map<String, GitProfile>> updateOrCreateGitProfileForCurrentUser(GitProfile gitProfile, String defaultApplicationId) { - if(gitProfile.getAuthorName() == null || gitProfile.getAuthorName().length() == 0) { + // Throw error in following situations: + // 1. Updating or creating global git profile (defaultApplicationId = "default") and update is made with empty + // authorName or authorEmail + // 2. Updating or creating repo specific profile and user want to use repo specific profile but provided empty + // values for authorName and email + + if((DEFAULT.equals(defaultApplicationId) || Boolean.FALSE.equals(gitProfile.getUseGlobalProfile())) + && StringUtils.isEmptyOrNull(gitProfile.getAuthorName()) + ) { return Mono.error( new AppsmithException(AppsmithError.INVALID_PARAMETER, "Author Name")); - } else if(gitProfile.getAuthorEmail() == null || gitProfile.getAuthorEmail().length() == 0) { + } else if((DEFAULT.equals(defaultApplicationId) || Boolean.FALSE.equals(gitProfile.getUseGlobalProfile())) + && StringUtils.isEmptyOrNull(gitProfile.getAuthorEmail()) + ) { return Mono.error( new AppsmithException(AppsmithError.INVALID_PARAMETER, "Author Email")); } else if (StringUtils.isEmptyOrNull(defaultApplicationId)) { return Mono.error( new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.APPLICATION_ID)); } - if (StringUtils.equalsIgnoreCase(DEFAULT, defaultApplicationId)) { - gitProfile.setUseGlobalProfile(Boolean.TRUE); + if (DEFAULT.equals(defaultApplicationId)) { + gitProfile.setUseGlobalProfile(null); } else if (!Boolean.TRUE.equals(gitProfile.getUseGlobalProfile())) { gitProfile.setUseGlobalProfile(Boolean.FALSE); } return sessionUserService.getCurrentUser() .flatMap(user -> userService.findByEmail(user.getEmail())) - .flatMap(user -> userDataService - .getForUser(user.getId()) + .flatMap(user -> userDataService.getForUser(user.getId()) .flatMap(userData -> { // GitProfiles will be null if the user has not created any git profile. GitProfile savedProfile = userData.getGitProfileByKey(defaultApplicationId); @@ -179,9 +188,8 @@ public Mono<Map<String, GitProfile>> updateOrCreateGitProfileForCurrentUser(GitP } return Mono.just(userData.getGitProfiles()); }) - .filter(profiles -> !CollectionUtils.isNullOrEmpty(profiles)) .switchIfEmpty(Mono.defer(() -> { - // If profiles are empty use Appsmith's user details as git default profile + // If profiles are empty use Appsmith's user profile as git default profile GitProfile profile = new GitProfile(); String authorName = StringUtils.isEmptyOrNull(user.getName()) ? user.getUsername() : user.getName(); @@ -194,19 +202,27 @@ public Mono<Map<String, GitProfile>> updateOrCreateGitProfileForCurrentUser(GitP .map(UserData::getGitProfiles); }) ) + .filter(profiles -> !CollectionUtils.isNullOrEmpty(profiles)) ); } @Override public Mono<Map<String, GitProfile>> updateOrCreateGitProfileForCurrentUser(GitProfile gitProfile) { - gitProfile.setUseGlobalProfile(true); + gitProfile.setUseGlobalProfile(null); return updateOrCreateGitProfileForCurrentUser(gitProfile, DEFAULT); } @Override - public Mono<GitProfile> getGitProfileForUser() { - // Get default git profile - return getGitProfileForUser(DEFAULT); + public Mono<GitProfile> getDefaultGitProfileOrCreateIfEmpty() { + // Get default git profile if the default is empty then use Appsmith profile as a fallback value + return getGitProfileForUser(DEFAULT) + .flatMap(gitProfile -> { + if (StringUtils.isEmptyOrNull(gitProfile.getAuthorName()) || StringUtils.isEmptyOrNull(gitProfile.getAuthorEmail())) { + return updateGitProfileWithAppsmithProfile(DEFAULT); + } + gitProfile.setUseGlobalProfile(null); + return Mono.just(gitProfile); + }); } @Override @@ -216,11 +232,44 @@ public Mono<GitProfile> getGitProfileForUser(String defaultApplicationId) { GitProfile gitProfile = userData.getGitProfileByKey(defaultApplicationId); if (gitProfile != null && gitProfile.getUseGlobalProfile() == null) { gitProfile.setUseGlobalProfile(true); + } else if (gitProfile == null) { + // If the profile is requested for repo specific using the applicationId + GitProfile gitProfile1 = new GitProfile(); + gitProfile1.setAuthorName(""); + gitProfile1.setAuthorEmail(""); + gitProfile1.setUseGlobalProfile(true); + return gitProfile1; } return gitProfile; }); } + private Mono<GitProfile> updateGitProfileWithAppsmithProfile(String key) { + return sessionUserService.getCurrentUser() + .flatMap(user -> userService.findByEmail(user.getEmail())) + .flatMap(currentUser -> { + GitProfile gitProfile = new GitProfile(); + String authorName = StringUtils.isEmptyOrNull(currentUser.getName()) + ? currentUser.getUsername() + : currentUser.getName(); + gitProfile.setAuthorEmail(currentUser.getEmail()); + gitProfile.setAuthorName(authorName); + gitProfile.setUseGlobalProfile(null); + return userDataService.getForUser(currentUser) + .flatMap(userData -> { + UserData updates = new UserData(); + if (CollectionUtils.isNullOrEmpty(userData.getGitProfiles())) { + updates.setGitProfiles(Map.of(key, gitProfile)); + } else { + userData.getGitProfiles().put(key, gitProfile); + updates.setGitProfiles(userData.getGitProfiles()); + } + return userDataService.updateForUser(currentUser, updates) + .thenReturn(gitProfile); + }); + }); + } + /** * This method will make a commit to local repo * @param commitDTO information required for making a commit @@ -322,7 +371,7 @@ public Mono<String> commitApplication(GitCommitDTO commitDTO, String defaultAppl GitProfile authorProfile = currentUserData.getGitProfileByKey(gitApplicationData.getDefaultApplicationId()); - if (authorProfile == null || authorProfile.getUseGlobalProfile()) { + if (authorProfile == null || Boolean.TRUE.equals(authorProfile.getUseGlobalProfile())) { // Use default author profile as the fallback value if (currentUserData.getGitProfileByKey(DEFAULT) != null) { authorProfile = currentUserData.getGitProfileByKey(DEFAULT); @@ -426,9 +475,7 @@ public Mono<Application> connectApplicationToGit(String defaultApplicationId, Gi "Unable to find git author configuration for logged-in user. You can set up a git profile from the user profile section.")) ); - Mono<Map<String, GitProfile>> profileMono = Boolean.TRUE.equals(gitConnectDTO.getGitProfile().getUseGlobalProfile()) - ? this.getGitProfileForUser().map(profile -> Map.of(DEFAULT, profile)) - : updateOrCreateGitProfileForCurrentUser(gitConnectDTO.getGitProfile(), defaultApplicationId); + Mono<Map<String, GitProfile>> profileMono = updateOrCreateGitProfileForCurrentUser(gitConnectDTO.getGitProfile(), defaultApplicationId); return profileMono .switchIfEmpty(Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_CONFIGURATION, @@ -832,7 +879,7 @@ public Mono<Application> checkoutBranch(String defaultApplicationId, String bran return getApplicationById(defaultApplicationId) .flatMap(application -> { if (isInvalidDefaultApplicationGitMetadata(application.getGitApplicationMetadata())) { - throw new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION); + return Mono.error(new AppsmithException(AppsmithError.INVALID_GIT_SSH_CONFIGURATION)); } return applicationService.findByBranchNameAndDefaultApplicationId( branchName, defaultApplicationId, READ_APPLICATIONS @@ -986,7 +1033,7 @@ public Mono<GitPullDTO> pullApplication(String applicationId, String branchName) gitAuth.getPrivateKey(), gitAuth.getPublicKey()) .onErrorResume(error -> { - if (error.getMessage().contains("Nothing to fetch.")) { + if (error.getMessage().contains("Nothing to fetch")) { MergeStatusDTO mergeStatus = new MergeStatusDTO(); mergeStatus.setStatus("Nothing to fetch from remote. All changes are up to date."); mergeStatus.setMergeAble(true); @@ -1463,21 +1510,4 @@ private Mono<String> commitAndPushWithDefaultCommit(Path repoSuffix, GitAuth aut ); } - private Mono<Map<String, GitProfile>> fetchGitProfile(UserData userData, String key) { - if (CollectionUtils.isNullOrEmpty(userData.getGitProfiles())) { - return sessionUserService.getCurrentUser() - .map(currentUser -> { - String authorName = StringUtils.isEmptyOrNull(currentUser.getName()) - ? currentUser.getUsername() - : currentUser.getName(); - GitProfile gitProfile = new GitProfile(); - - gitProfile.setAuthorEmail(currentUser.getEmail()); - gitProfile.setAuthorName(authorName); - return Map.of(); - }); - } - return Mono.just(userData.getGitProfiles()); - } - } diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java index 13a6d249773c..7c26021993a3 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/GitServiceTest.java @@ -15,7 +15,6 @@ import com.appsmith.server.domains.User; import com.appsmith.server.domains.UserData; import com.appsmith.server.dtos.GitConnectDTO; -import com.appsmith.server.dtos.GitMergeDTO; import com.appsmith.server.dtos.GitPullDTO; import com.appsmith.server.dtos.PageDTO; import com.appsmith.server.exceptions.AppsmithError; @@ -44,7 +43,6 @@ import java.time.Instant; import java.util.ArrayList; import java.util.List; -import java.util.Map; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.ArgumentMatchers.eq; @@ -106,77 +104,6 @@ private GitConnectDTO getConnectRequest(String remoteUrl, GitProfile gitProfile) return gitConnectDTO; } - @Test - @WithUserDetails(value = "api_user") - public void saveConfig_gitConfigValues_SaveToUserObject() { - Mockito.when(userService.findByEmail(Mockito.anyString())).thenReturn(Mono.just(new User())); - GitProfile gitGlobalConfigDTO = getConfigRequest("[email protected]", "Test 1"); - Mono<Map<String, GitProfile>> gitProfilesMono = gitDataService.updateOrCreateGitProfileForCurrentUser(gitGlobalConfigDTO); - - StepVerifier - .create(gitProfilesMono) - .assertNext(gitProfileMap -> { - GitProfile defaultProfile = gitProfileMap.get(DEFAULT_GIT_PROFILE); - assertThat(defaultProfile.getAuthorName()).isEqualTo(gitGlobalConfigDTO.getAuthorName()); - assertThat(defaultProfile.getAuthorEmail()).isEqualTo(gitGlobalConfigDTO.getAuthorEmail()); - }); - } - - @Test - @WithUserDetails(value = "api_user") - public void saveConfig_AuthorEmailNull_ThrowInvalidParameterError() { - Mockito.when(userService.findByEmail(Mockito.anyString())).thenReturn(Mono.just(new User())); - GitProfile gitGlobalConfigDTO = getConfigRequest(null, "Test 1"); - - Mono<Map<String, GitProfile>> userDataMono = gitDataService.updateOrCreateGitProfileForCurrentUser(gitGlobalConfigDTO); - StepVerifier - .create(userDataMono) - .expectErrorMatches(throwable -> throwable instanceof AppsmithException - && throwable.getMessage().contains(AppsmithError.INVALID_PARAMETER.getMessage("Author Email"))) - .verify(); - } - - @Test - @WithUserDetails(value = "api_user") - public void saveConfig_AuthorNameEmptyString_ThrowInvalidParameterError() { - Mockito.when(userService.findByEmail(Mockito.anyString())).thenReturn(Mono.just(new User())); - GitProfile gitGlobalConfigDTO = getConfigRequest("[email protected]", null); - - Mono<Map<String, GitProfile>> userDataMono = gitDataService.updateOrCreateGitProfileForCurrentUser(gitGlobalConfigDTO); - StepVerifier - .create(userDataMono) - .expectErrorMatches(throwable -> throwable instanceof AppsmithException - && throwable.getMessage().contains(AppsmithError.INVALID_PARAMETER.getMessage("Author Name"))) - .verify(); - } - - @Test - @WithUserDetails(value = "api_user") - public void getConfig_ValueExistsInDB_Success() { - UserData userData = new UserData(); - GitProfile gitProfile1 = new GitProfile(); - gitProfile1.setAuthorEmail("[email protected]"); - gitProfile1.setAuthorName("test"); - userData.setGitProfiles(userData.setGitProfileByKey(DEFAULT_GIT_PROFILE, gitProfile1)); - User user = new User(); - user.setId("userId"); - ApplicationJson applicationJson = new ApplicationJson(); - applicationJson.setExportedApplication(new Application()); - - Mockito.when(userService.findByEmail(Mockito.anyString())).thenReturn(Mono.just(user)); - Mockito.when(userDataService.getForCurrentUser()).thenReturn(Mono.just(userData)); - Mockito.when(userDataService.getForUser(Mockito.anyString())).thenReturn(Mono.just(userData)); - Mockito.when(userDataService.updateForUser(Mockito.any(User.class), Mockito.any(UserData.class))).thenReturn(Mono.just(userData)); - Mono<GitProfile> gitConfigMono = gitDataService.getGitProfileForUser(); - - StepVerifier - .create(gitConfigMono) - .assertNext(configData -> { - assertThat(configData.getAuthorName()).isEqualTo(gitProfile1.getAuthorName()); - assertThat(configData.getAuthorEmail()).isEqualTo(gitProfile1.getAuthorEmail()); - }); - } - @Test @WithUserDetails(value = "api_user") public void connectApplicationToGit_EmptyRemoteUrl_ThrowInvalidParameterException() { @@ -1069,6 +996,13 @@ public void pullChanges_NoChangesInRemotePullException_ShowError() throws IOExce .thenReturn(Mono.just(Paths.get(""))); Mockito.when(gitFileUtils.reconstructApplicationFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString())) .thenReturn(Mono.justOrEmpty(new ApplicationJson())); + Mockito.when(gitExecutor.getStatus(Mockito.any(), Mockito.any())) + .thenReturn(Mono.just(new GitStatusDTO())); + Mockito.when(gitExecutor.fetchRemote(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean())) + .thenReturn(Mono.just("fetchResult")); + Mockito.when(gitExecutor.pullApplication( + Mockito.any(Path.class),Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString())) + .thenReturn(Mono.just(mergeStatusDTO)); Mono<GitPullDTO> applicationMono = gitDataService.pullApplication(application.getId(), application.getGitApplicationMetadata().getBranchName()); @@ -1076,28 +1010,12 @@ public void pullChanges_NoChangesInRemotePullException_ShowError() throws IOExce .create(applicationMono) .assertNext(gitPullDTO -> { assertThat(gitPullDTO.getMergeStatus().getStatus()).isEqualTo("Nothing to fetch from remote. All changes are upto date."); - }); - } - - @Test - @WithUserDetails(value = "api_user") - public void pullChanges_HydrateApplicationToFileSystem_ShowError() throws IOException, GitAPIException { - Application application = createApplicationConnectedToGit("NoChangesInRemotePullException"); - - Mockito.when(gitFileUtils.saveApplicationToLocalRepo(Mockito.any(Path.class), Mockito.any(ApplicationJson.class), Mockito.anyString())) - .thenReturn(Mono.just(Paths.get(""))); - Mockito.when(gitFileUtils.reconstructApplicationFromGitRepo(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString())) - .thenReturn(Mono.justOrEmpty(new ApplicationJson())); - - Mono<GitPullDTO> applicationMono = gitDataService.pullApplication(application.getId(), application.getGitApplicationMetadata().getBranchName()); - - StepVerifier - .create(applicationMono) - .assertNext(gitPullDTO -> { - assertThat(gitPullDTO.getMergeStatus().getStatus()).isEqualTo("Nothing to fetch from remote. All changes are upto date."); - }); + }) + .verifyComplete(); } + // TODO TCs for merge and merge status needs to be re-written to address all the scenarios + /* @Test @WithUserDetails(value = "api_user") public void isMergeBranch_ConflictingChanges_Success() throws IOException, GitAPIException { @@ -1113,12 +1031,17 @@ public void isMergeBranch_ConflictingChanges_Success() throws IOException, GitAP .thenReturn(Mono.just(Paths.get(""))); Mockito.when(gitExecutor.isMergeBranch(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString())) .thenReturn(Mono.just(mergeStatus)); + Mockito.when(gitExecutor.getStatus(Mockito.any(), Mockito.any())) + .thenReturn(Mono.just(new GitStatusDTO())); + Mockito.when(gitExecutor.fetchRemote(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean())) + .thenReturn(Mono.just("fetchResult")); Mono<MergeStatusDTO> applicationMono = gitDataService.isBranchMergeable(application.getId(), gitMergeDTO); StepVerifier .create(applicationMono) - .assertNext(s -> assertThat(s.isMergeAble())); + .assertNext(s -> assertThat(s.isMergeAble())) + .verifyComplete(); } @@ -1136,6 +1059,10 @@ public void isMergeBranch_NonConflictingChanges_Success() throws IOException, Gi .thenReturn(Mono.just(Paths.get(""))); Mockito.when(gitExecutor.isMergeBranch(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString())) .thenReturn(Mono.just(mergeStatus)); + Mockito.when(gitExecutor.getStatus(Mockito.any(), Mockito.any())) + .thenReturn(Mono.just(new GitStatusDTO())); + Mockito.when(gitExecutor.fetchRemote(Mockito.any(Path.class), Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean())) + .thenReturn(Mono.just("fetchResult")); Mockito.when(importExportApplicationService.exportApplicationById(Mockito.anyString(), Mockito.any(SerialiseApplicationObjective.class))) .thenReturn(Mono.just(new ApplicationJson())); @@ -1143,9 +1070,12 @@ public void isMergeBranch_NonConflictingChanges_Success() throws IOException, Gi StepVerifier .create(applicationMono) - .assertNext(s -> assertThat(s.isMergeAble())); + .assertNext(s -> assertThat(s.isMergeAble())) + .verifyComplete(); } + */ + @Test @WithUserDetails(value = "api_user") public void checkoutRemoteBranch_NotPresentInLocal_NewChildApplicationCreated() throws GitAPIException, IOException { diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java index 4da43745e867..7c9c705dcf73 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserDataServiceTest.java @@ -3,13 +3,16 @@ import com.appsmith.server.constants.CommentOnboardingState; import com.appsmith.server.domains.Application; import com.appsmith.server.domains.Asset; +import com.appsmith.server.domains.GitProfile; import com.appsmith.server.domains.User; import com.appsmith.server.domains.UserData; +import com.appsmith.server.exceptions.AppsmithError; import com.appsmith.server.exceptions.AppsmithException; import com.appsmith.server.repositories.ApplicationRepository; import com.appsmith.server.repositories.AssetRepository; import com.appsmith.server.repositories.UserDataRepository; import com.appsmith.server.solutions.UserChangedHandler; +import org.assertj.core.api.AssertionsForClassTypes; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -36,6 +39,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Map; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; @@ -67,8 +71,13 @@ public class UserDataServiceTest { @Autowired private ApplicationRepository applicationRepository; + @Autowired + private GitService gitService; + private Mono<User> userMono; + private static final String DEFAULT_GIT_PROFILE = "default"; + @Before public void setup() { userMono = userService.findByEmail("[email protected]"); @@ -350,4 +359,89 @@ public void setCommentState_WhenParamIsValid_StateIsSet() { assertThat(userData.getCommentOnboardingState()).isEqualTo(CommentOnboardingState.ONBOARDED); }).verifyComplete(); } + + // Git user profile tests + private GitProfile createGitProfile(String commitEmail, String author) { + GitProfile gitProfile = new GitProfile(); + gitProfile.setAuthorEmail(commitEmail); + gitProfile.setAuthorName(author); + return gitProfile; + } + + @Test + @WithUserDetails(value = "api_user") + public void saveConfig_AuthorEmailNull_ThrowInvalidParameterError() { + GitProfile gitGlobalConfigDTO = createGitProfile(null, "Test 1"); + + Mono<Map<String, GitProfile>> userDataMono = gitService.updateOrCreateGitProfileForCurrentUser(gitGlobalConfigDTO); + StepVerifier + .create(userDataMono) + .expectErrorMatches(throwable -> throwable instanceof AppsmithException + && throwable.getMessage().contains(AppsmithError.INVALID_PARAMETER.getMessage("Author Email"))) + .verify(); + } + + @Test + @WithUserDetails(value = "api_user") + public void saveRepoLevelConfig_AuthorEmailNullAndName_SavesGitProfile() { + GitProfile gitProfileDTO = createGitProfile(null, null); + + Mono<Map<String, GitProfile>> userDataMono = gitService.updateOrCreateGitProfileForCurrentUser(gitProfileDTO, "defaultAppId"); + StepVerifier + .create(userDataMono) + .assertNext(gitProfileMap -> { + AssertionsForClassTypes.assertThat(gitProfileMap).isNotNull(); + AssertionsForClassTypes.assertThat(gitProfileMap.get("defaultAppId").getAuthorEmail()).isNullOrEmpty(); + AssertionsForClassTypes.assertThat(gitProfileMap.get("defaultAppId").getAuthorName()).isNullOrEmpty(); + AssertionsForClassTypes.assertThat(gitProfileDTO.getUseGlobalProfile()).isFalse(); + }) + .verifyComplete(); + } + + @Test + @WithUserDetails(value = "api_user") + public void saveConfig_AuthorNameEmptyString_ThrowInvalidParameterError() { + GitProfile gitGlobalConfigDTO = createGitProfile("[email protected]", null); + + Mono<Map<String, GitProfile>> userDataMono = gitService.updateOrCreateGitProfileForCurrentUser(gitGlobalConfigDTO); + StepVerifier + .create(userDataMono) + .expectErrorMatches(throwable -> throwable instanceof AppsmithException + && throwable.getMessage().contains(AppsmithError.INVALID_PARAMETER.getMessage("Author Name"))) + .verify(); + } + + + @Test + @WithUserDetails(value = "api_user") + public void getAndUpdateDefaultGitProfile_fallbackValueFromUserProfileIfEmpty_updateWithProfile() { + + Mono<GitProfile> gitConfigMono = gitService.getDefaultGitProfileOrCreateIfEmpty(); + + Mono<User> userData = userDataService.getForCurrentUser() + .flatMap(userData1 -> userService.getById(userData1.getUserId())); + + StepVerifier + .create(gitConfigMono.zipWhen(gitProfile -> userData)) + .assertNext(tuple -> { + GitProfile gitProfile = tuple.getT1(); + User user = tuple.getT2(); + assertThat(gitProfile.getAuthorName()).isEqualTo(user.getName()); + assertThat(gitProfile.getAuthorEmail()).isEqualTo(user.getEmail()); + }) + .verifyComplete(); + + GitProfile gitGlobalConfigDTO = createGitProfile("[email protected]", "Test 1"); + Mono<Map<String, GitProfile>> gitProfilesMono = gitService.updateOrCreateGitProfileForCurrentUser(gitGlobalConfigDTO); + + StepVerifier + .create(gitProfilesMono) + .assertNext(gitProfileMap -> { + GitProfile defaultProfile = gitProfileMap.get(DEFAULT_GIT_PROFILE); + AssertionsForClassTypes.assertThat(defaultProfile.getAuthorName()).isEqualTo(gitGlobalConfigDTO.getAuthorName()); + AssertionsForClassTypes.assertThat(defaultProfile.getAuthorEmail()).isEqualTo(gitGlobalConfigDTO.getAuthorEmail()); + }) + .verifyComplete(); + } + }
95e8e3703c7026e97689115132e4a02356cd44d3
2025-02-18 18:05:04
sneha122
fix: UQI dropdown search issue fixed (#39330)
false
UQI dropdown search issue fixed (#39330)
fix
diff --git a/app/client/src/components/formControls/DropDownControl.test.tsx b/app/client/src/components/formControls/DropDownControl.test.tsx index 72044cf19115..c523719ceadd 100644 --- a/app/client/src/components/formControls/DropDownControl.test.tsx +++ b/app/client/src/components/formControls/DropDownControl.test.tsx @@ -554,6 +554,7 @@ describe("DropdownControl Single select tests", () => { isLoading: false, maxTagCount: 3, isAllowClear: true, + isSearchable: true, }; beforeEach(() => { @@ -587,4 +588,34 @@ describe("DropdownControl Single select tests", () => { expect(options.length).toBe(0); }); }); + + it("should filter options when searching", async () => { + render( + <Provider store={store}> + <ReduxFormDecorator> + <DropDownControl {...dropDownPropsSingleSelect} /> + </ReduxFormDecorator> + </Provider>, + ); + + // Find and click the dropdown to open it + const dropdownSelect = await screen.findByTestId( + "t--dropdown-actionConfiguration.testPath", + ); + + fireEvent.mouseDown(dropdownSelect.querySelector(".rc-select-selector")!); + + // Find the search input and type "Option 2" + const searchInput = screen.getByPlaceholderText("Type to search..."); + + fireEvent.change(searchInput, { target: { value: "Option 2" } }); + + // Get all visible options + const visibleOptions = screen.getAllByRole("option"); + + // // Should only show one option + expect(visibleOptions).toHaveLength(1); + // The visible option should be "Option 1" + expect(visibleOptions[0]).toHaveTextContent("Option 2"); + }); }); diff --git a/app/client/src/components/formControls/DropDownControl.tsx b/app/client/src/components/formControls/DropDownControl.tsx index 63c3708ea8c6..5aa7fa449252 100644 --- a/app/client/src/components/formControls/DropDownControl.tsx +++ b/app/client/src/components/formControls/DropDownControl.tsx @@ -466,6 +466,10 @@ function renderDropdown( onDeselect={onRemoveOptions} onPopupScroll={handlePopupScroll} onSelect={onSelectOptions} + // Default value of optionFilterProp prop is `value` which searches the dropdown based on value and not label, + // hence explicitly setting this to label to search based on label. + // For eg. If value is `Create_ticket` and label is `Create ticket`, we should be able to search using `Create ticket`. + optionFilterProp="label" placeholder={props.placeholderText} showSearch={props.isSearchable} value={isMultiSelect ? selectedOptions : selectedOptions[0]}
2aaa413d6dc9468af33e1af468cf77a92fecadb7
2022-10-04 17:08:02
balajisoundar
chore: Remove the unnecessary error log from the derived property function (#17290)
false
Remove the unnecessary error log from the derived property function (#17290)
chore
diff --git a/app/client/src/widgets/TableWidgetV2/widget/derived.js b/app/client/src/widgets/TableWidgetV2/widget/derived.js index 6413cf05ca33..53fce2c5bbde 100644 --- a/app/client/src/widgets/TableWidgetV2/widget/derived.js +++ b/app/client/src/widgets/TableWidgetV2/widget/derived.js @@ -1,5 +1,3 @@ -/* eslint-disable no-console */ - /* eslint-disable @typescript-eslint/no-unused-vars*/ export default { getSelectedRow: (props, moment, _) => { @@ -288,11 +286,7 @@ export default { try { computedValues = JSON.parse(column.computedValue); } catch (e) { - console.error( - e, - "Error parsing column computedValue: ", - column.computedValue, - ); + /* do nothing */ } } else if (_.isArray(column.computedValue)) { computedValues = column.computedValue;
15f380e6689fa7ac57b2edb464d7dedef629ebe7
2023-10-23 10:15:26
NandanAnantharamu
test: updated flaky test for iframe (#28258)
false
updated flaky test for iframe (#28258)
test
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/IframeTest_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/IframeTest_spec.ts index fac8bae5f99a..7996471e5926 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/IframeTest_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Iframe/IframeTest_spec.ts @@ -3,6 +3,7 @@ import { locators, entityExplorer, propPane, + deployMode, } from "../../../../../support/Objects/ObjectsCore"; import testdata from "../../../../../fixtures/testdata.json"; @@ -113,20 +114,22 @@ describe("Iframe widget Tests", function () { agHelper.ValidateToastMessage("URL Changed"); }); - // Border Color is failing Skipping to unblock - Fixing it in a separate PR by 20/10/2023 - it.skip("3. Verify colors, borders and shadows", () => { + it("3. Verify colors, borders and shadows", () => { propPane.MoveToTab("Style"); - // Border Color + // Change Border Color propPane.SelectColorFromColorPicker("bordercolor", 10); - agHelper.AssertCSS("iframe", "border-color", "rgb(185, 28, 28)"); - // Verify border + // Change border agHelper.GetNClick(propPane._segmentedControl("0px")); - agHelper.AssertCSS("iframe", "border-radius", "0px"); - // Verify Box Shadow + // Change Box Shadow agHelper.GetNClick(`${propPane._segmentedControl("0")}:contains('Large')`); + + //Verify details in Deploy mode + deployMode.DeployApp(); + agHelper.AssertCSS("iframe", "border-color", "rgb(185, 28, 28)"); + agHelper.AssertCSS("iframe", "border-radius", "0px"); agHelper.AssertCSS( "iframe", "box-shadow", diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_2_spec.ts index 5bceb351588a..ffe658846269 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_2_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Others/IconButton_2_spec.ts @@ -67,10 +67,11 @@ describe("Icon Button widget Tests", function () { it("3. Validate icon can be selected from dropdown and icon can be searched by typing", () => { // Select from dropdown agHelper.GetNClick(`${locators._propertyControl}icon`); - agHelper.GetNClick(propPane._dataIcon("power")); + agHelper.GetElement(propPane._iconDropdown).scrollTo("top"); + agHelper.GetNClick(propPane._dataIcon("airplane")); agHelper.AssertElementVisibility( `${locators._widgetInDeployed("iconbuttonwidget")} ${propPane._dataIcon( - "power", + "airplane", )}`, ); diff --git a/app/client/cypress/support/Pages/PropertyPane.ts b/app/client/cypress/support/Pages/PropertyPane.ts index ed91976e769d..3f04b4b01d6d 100644 --- a/app/client/cypress/support/Pages/PropertyPane.ts +++ b/app/client/cypress/support/Pages/PropertyPane.ts @@ -169,6 +169,8 @@ export class PropertyPane { control; _dataIcon = (icon: string) => `[data-icon="${icon}"]`; + _iconDropdown = "[data-test-id='virtuoso-scroller']"; + public OpenJsonFormFieldSettings(fieldName: string) { this.agHelper.GetNClick(this._jsonFieldEdit(fieldName)); }
7644b674837b391bb0dd9ec53f99131a5cf04dfc
2024-10-11 15:36:18
Ilia
feat: show chat description (#36805)
false
show chat description (#36805)
feat
diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/AIChat.tsx b/app/client/packages/design-system/widgets/src/components/AIChat/src/AIChat.tsx index 40a50d43754f..4fbadd4aaad5 100644 --- a/app/client/packages/design-system/widgets/src/components/AIChat/src/AIChat.tsx +++ b/app/client/packages/design-system/widgets/src/components/AIChat/src/AIChat.tsx @@ -1,6 +1,7 @@ -import { Button, Text, TextArea } from "@appsmith/wds"; +import { Button, Flex, Text, TextArea } from "@appsmith/wds"; import type { FormEvent, ForwardedRef, KeyboardEvent } from "react"; import React, { forwardRef, useCallback } from "react"; +import { ChatDescriptionModal } from "./ChatDescriptionModal"; import { ChatTitle } from "./ChatTitle"; import styles from "./styles.module.css"; import { ThreadMessage } from "./ThreadMessage"; @@ -12,6 +13,7 @@ const MIN_PROMPT_LENGTH = 3; const _AIChat = (props: AIChatProps, ref: ForwardedRef<HTMLDivElement>) => { const { // assistantName, + chatDescription, chatTitle, isWaitingForResponse = false, onApplyAssistantSuggestion, @@ -23,6 +25,8 @@ const _AIChat = (props: AIChatProps, ref: ForwardedRef<HTMLDivElement>) => { username, ...rest } = props; + const [isChatDescriptionModalOpen, setIsChatDescriptionModalOpen] = + React.useState(false); const handleFormSubmit = useCallback( (event: FormEvent<HTMLFormElement>) => { @@ -44,15 +48,31 @@ const _AIChat = (props: AIChatProps, ref: ForwardedRef<HTMLDivElement>) => { return ( <div className={styles.root} ref={ref} {...rest}> + <ChatDescriptionModal + isOpen={isChatDescriptionModalOpen} + setOpen={() => + setIsChatDescriptionModalOpen(!isChatDescriptionModalOpen) + } + > + {chatDescription} + </ChatDescriptionModal> + <div className={styles.header}> - <ChatTitle title={chatTitle} /> + <Flex alignItems="center" gap="spacing-2"> + <ChatTitle title={chatTitle} /> + <Button + icon="info-square-rounded" + onPress={() => setIsChatDescriptionModalOpen(true)} + variant="ghost" + /> + </Flex> - <div className={styles.username}> + <Flex alignItems="center" gap="spacing-2"> <UserAvatar username={username} /> <Text data-testid="t--aichat-username" size="body"> {username} </Text> - </div> + </Flex> </div> <ul className={styles.thread} data-testid="t--aichat-thread"> diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatDescriptionModal/ChatDescriptionModal.tsx b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatDescriptionModal/ChatDescriptionModal.tsx new file mode 100644 index 000000000000..06b983a1e32f --- /dev/null +++ b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatDescriptionModal/ChatDescriptionModal.tsx @@ -0,0 +1,17 @@ +import { Modal, ModalBody, ModalContent, ModalHeader } from "@appsmith/wds"; +import React from "react"; +import type { ChatDescriptionModalProps } from "./types"; + +export const ChatDescriptionModal = ({ + children, + ...rest +}: ChatDescriptionModalProps) => { + return ( + <Modal {...rest}> + <ModalContent> + <ModalHeader title="Information about the bot" /> + <ModalBody>{children}</ModalBody> + </ModalContent> + </Modal> + ); +}; diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatDescriptionModal/index.ts b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatDescriptionModal/index.ts new file mode 100644 index 000000000000..e16a07a5b8f4 --- /dev/null +++ b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatDescriptionModal/index.ts @@ -0,0 +1,2 @@ +export * from "./ChatDescriptionModal"; +export * from "./types"; diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatDescriptionModal/types.ts b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatDescriptionModal/types.ts new file mode 100644 index 000000000000..41e2f9c04360 --- /dev/null +++ b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatDescriptionModal/types.ts @@ -0,0 +1,3 @@ +import type { ModalProps } from "@appsmith/wds"; + +export interface ChatDescriptionModalProps extends ModalProps {} diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/styles.module.css b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/styles.module.css index a952c30dbf76..f231c0590300 100644 --- a/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/styles.module.css +++ b/app/client/packages/design-system/widgets/src/components/AIChat/src/ChatTitle/styles.module.css @@ -1,6 +1,6 @@ .root { display: flex; - gap: 12px; + gap: var(--inner-spacing-3); align-items: center; /* TODO: --type-title doesn't exists. Define it */ font-size: var(--type-title, 22.499px); @@ -15,7 +15,7 @@ width: 48px; min-width: 48px; height: 48px; - border-radius: 8px; + border-radius: var(--border-radius-elevation-2); /* TODO: --bd-neutral doesn't exists. Define it */ border: 1px solid var(--bd-neutral, #81858b); background: #f8f8f8; diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/ThreadMessage.tsx b/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/ThreadMessage.tsx index 7b827d3f576d..9be3e3b7cec3 100644 --- a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/ThreadMessage.tsx +++ b/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/ThreadMessage.tsx @@ -57,7 +57,7 @@ export const ThreadMessage = ({ {promptSuggestions.length > 0 && ( <Flex className={styles.suggestions} - gap="var(--inner-spacing-5)" + gap="spacing-5" paddingTop="spacing-4" wrap="wrap" > diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/styles.module.css b/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/styles.module.css index e8081ecad004..198d74d9cca0 100644 --- a/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/styles.module.css +++ b/app/client/packages/design-system/widgets/src/components/AIChat/src/ThreadMessage/styles.module.css @@ -1,12 +1,12 @@ .root { display: flex; - gap: 16px; - padding: 12px 0; + gap: var(--inner-spacing-4); + padding: var(--inner-spacing-3) 0; } @container (min-width: 700px) { .root { - padding: 24px 0; + padding: var(--inner-spacing-5) 0; } } @@ -19,7 +19,7 @@ } .sentTime { - margin: 0 0 8px; + margin: 0 0 var(--outer-spacing-3); /* TODO: --type-caption doesn't exists. Define it */ font-size: var(--type-caption, 12.247px); /* TODO: --type-caption-lineheight doesn't exists. Define it */ diff --git a/app/client/packages/design-system/widgets/src/components/AIChat/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/AIChat/src/styles.module.css index 3c0780cf6209..b1905d1daf5a 100644 --- a/app/client/packages/design-system/widgets/src/components/AIChat/src/styles.module.css +++ b/app/client/packages/design-system/widgets/src/components/AIChat/src/styles.module.css @@ -9,8 +9,8 @@ .header { display: flex; flex-direction: column; - gap: 8px; - padding: 22px 40px; + gap: var(--inner-spacing-2); + padding: var(--inner-spacing-5) var(--inner-spacing-6); align-items: flex-start; border-bottom: 1px solid var(--color-bd-elevation-1); background: rgba(255, 255, 255, 0.45); @@ -24,18 +24,13 @@ } } -.username { - display: flex; - align-items: center; - gap: 8px; -} - .thread { display: flex; flex-direction: column; - gap: 12px; + gap: var(--inner-spacing-3); align-self: stretch; - padding: 0px 40px var(--inner-spacing-5) 40px; + padding: 0px var(--inner-spacing-6) var(--inner-spacing-5) + var(--inner-spacing-6); } .promptForm { diff --git a/app/client/packages/design-system/widgets/src/components/Modal/src/index.ts b/app/client/packages/design-system/widgets/src/components/Modal/src/index.ts index 8f811e192d44..d92e4cafc9c6 100644 --- a/app/client/packages/design-system/widgets/src/components/Modal/src/index.ts +++ b/app/client/packages/design-system/widgets/src/components/Modal/src/index.ts @@ -3,3 +3,4 @@ export * from "./ModalHeader"; export * from "./ModalFooter"; export * from "./ModalBody"; export * from "./ModalContent"; +export * from "./types"; diff --git a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/index.tsx b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/index.tsx index 0c2d773abae5..99126ca71667 100644 --- a/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/index.tsx +++ b/app/client/src/modules/ui-builder/ui/wds/WDSAIChatWidget/widget/index.tsx @@ -249,6 +249,7 @@ class WDSAIChatWidget extends BaseWidget<WDSAIChatWidgetProps, State> { return ( <AIChat assistantName={this.props.assistantName} + chatDescription={this.props.chatDescription} chatTitle={this.props.chatTitle} isWaitingForResponse={this.state.isWaitingForResponse} onApplyAssistantSuggestion={this.handleApplyAssistantSuggestion}
3945fc3140062409d8161a402168bb9600534e93
2023-06-07 19:39:17
Ankita Kinger
chore: Adding eslint rule for @appsmith imports (#24207)
false
Adding eslint rule for @appsmith imports (#24207)
chore
diff --git a/app/client/.eslintrc.js b/app/client/.eslintrc.js index a9e7e7978b23..ee6ec52fc9ad 100644 --- a/app/client/.eslintrc.js +++ b/app/client/.eslintrc.js @@ -42,6 +42,10 @@ const eslintConfig = { message: "Reason: Please don’t import Remix icons statically. (They won’t always be needed, but they *will* always be present in the bundle and will increase the bundle size.) Instead, please use the importRemixIcon wrapper from design-system-old (e.g. const StarIcon = importRemixIcon(() => import('remixicon-react/Star'))).", }, + { + group: ["**/ce/*"], + message: "Reason: Please use @appsmith import instead.", + }, ], }, ], diff --git a/app/client/src/ee/.eslintrc b/app/client/src/ee/.eslintrc new file mode 100644 index 000000000000..4d8c9b8f5eeb --- /dev/null +++ b/app/client/src/ee/.eslintrc @@ -0,0 +1,5 @@ +{ + "rules": { + "@typescript-eslint/no-restricted-imports": "off" + } +}
2a2e37a256e4cefb9bf00011f6f93b1774136a97
2025-01-19 21:00:51
Sagar Khalasi
test: Api curl remaining cases (#38753)
false
Api curl remaining cases (#38753)
test
diff --git a/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_RunValidations_spec.ts b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_RunValidations_spec.ts new file mode 100644 index 000000000000..83a785ddb367 --- /dev/null +++ b/app/client/cypress/e2e/Regression/ServerSide/ApiTests/API_RunValidations_spec.ts @@ -0,0 +1,45 @@ +import ApiEditor from "../../../../locators/ApiEditor"; +import { + apiPage, + agHelper, + dataManager, + assertHelper, +} from "../../../../support/Objects/ObjectsCore"; + +describe( + "API Panel request body", + { tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] }, + function () { + it("1. Ensure that the run button is disabled when there are empty fields.", function () { + apiPage.CreateApi("FirstAPI"); + apiPage.AssertRunButtonDisability(true); + }); + + it('2. Validate we get an appropriate error message when an invalid URL is entered. Error should show up when nothing is entered & we click on "Import".', function () { + apiPage.CreateAndFillApi( + "htt://failedurlfortest", + "WhatTrumpThinks", + "SecondAPI", + ); + agHelper.GetNClick(apiPage._apiRunBtn, 0, true, 10000); + apiPage.ResponseStatusCheck("PE-RST-5000"); + }); + + // Cypress issue: https://github.com/cypress-io/cypress/issues/8267 + it("3. Validate keyboard navigation e.g. Cmd + Enter should trigger the Run button", function () { + apiPage.CreateAndFillApi( + dataManager.dsValues[dataManager.defaultEnviorment].randomTrumpApi, + "WhatTrumpThinks", + "ThirdAPI", + ); + agHelper.GetNClick(ApiEditor.dataSourceField, 0, true); + cy.get(ApiEditor.dataSourceField).type( + this.isMac ? "{cmd}{enter}" : "{ctrl}{enter}", + { + release: false, + }, + ); + assertHelper.AssertNetworkStatus("@postExecute"); + }); + }, +);
4a8fb690ed080ab56d6fcd4dba68a7d6efbc8464
2024-09-04 11:10:41
Nidhi
chore: Enable netty metrics (#36104)
false
Enable netty metrics (#36104)
chore
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ReactorNettyConfiguration.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ReactorNettyConfiguration.java new file mode 100644 index 000000000000..430ea5c3992f --- /dev/null +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ReactorNettyConfiguration.java @@ -0,0 +1,15 @@ +package com.appsmith.server.configurations; + +import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory; +import org.springframework.boot.web.server.WebServerFactoryCustomizer; +import org.springframework.stereotype.Component; + +import java.util.function.Function; + +@Component +public class ReactorNettyConfiguration implements WebServerFactoryCustomizer<NettyReactiveWebServerFactory> { + @Override + public void customize(NettyReactiveWebServerFactory factory) { + factory.addServerCustomizers(httpServer -> httpServer.metrics(true, Function.identity())); + } +}
2e2f4419bd7b41445782a98618ba830727e657c0
2024-07-23 00:38:48
Pawan Kumar
chore: add tests for app theming (#34839)
false
add tests for app theming (#34839)
chore
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/AppTheming/AnvilAppThemingSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/AppTheming/AnvilAppThemingSnapshot_spec.ts new file mode 100644 index 000000000000..7000e5d226dc --- /dev/null +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/AppTheming/AnvilAppThemingSnapshot_spec.ts @@ -0,0 +1,91 @@ +import { ANVIL_EDITOR_TEST } from "../../../../../support/Constants"; +import { + agHelper, + anvilSnapshot, +} from "../../../../../support/Objects/ObjectsCore"; + +describe( + `${ANVIL_EDITOR_TEST}: Anvil tests for App Theming`, + { tags: ["@tag.Anvil"] }, + () => { + before(() => { + agHelper.AddDsl("anvilAppTheming"); + }); + + it("1. Theme - Light and Dark Mode", () => { + anvilSnapshot.matchSnapshotForCanvasMode("AppTheming"); + anvilSnapshot.matchSnapshotForPreviewMode("AppTheming"); + anvilSnapshot.matchSnapshotForDeployMode("AppTheming"); + + anvilSnapshot.setTheme("dark"); + + anvilSnapshot.matchSnapshotForCanvasMode("AppTheming", "dark"); + anvilSnapshot.matchSnapshotForPreviewMode("AppTheming", "dark"); + anvilSnapshot.matchSnapshotForDeployMode("AppTheming", "dark"); + + anvilSnapshot.setTheme("light"); + }); + + it("2. Theme - Accent Color", () => { + anvilSnapshot.setAccentColor("#d54137"); + + anvilSnapshot.matchSnapshotForCanvasMode("AppThemingCustomAccent"); + anvilSnapshot.matchSnapshotForPreviewMode("AppThemingCustomAccent"); + anvilSnapshot.matchSnapshotForDeployMode("AppThemingCustomAccent"); + + anvilSnapshot.setAccentColor("#0080ff"); + }); + + it("3. Typography", () => { + anvilSnapshot.setTypography("Inter"); + + anvilSnapshot.matchSnapshotForCanvasMode("AppThemingTypography"); + anvilSnapshot.matchSnapshotForPreviewMode("AppThemingTypography"); + anvilSnapshot.matchSnapshotForDeployMode("AppThemingTypography"); + + anvilSnapshot.setTypography("System Default"); + }); + + it("4. Density", () => { + ["Tight", "Regular", "Loose"].forEach((density) => { + anvilSnapshot.setDensity(density); + + anvilSnapshot.matchSnapshotForCanvasMode(`AppThemingDensity${density}`); + anvilSnapshot.matchSnapshotForPreviewMode( + `AppThemingDensity${density}`, + ); + anvilSnapshot.matchSnapshotForDeployMode(`AppThemingDensity${density}`); + }); + }); + + it("5. Sizing", () => { + ["Small", "Regular", "Big"].forEach((size) => { + anvilSnapshot.setSizing(size); + + anvilSnapshot.matchSnapshotForCanvasMode(`AppThemingSizing${size}`); + anvilSnapshot.matchSnapshotForPreviewMode(`AppThemingSizing${size}`); + anvilSnapshot.matchSnapshotForDeployMode(`AppThemingSizing${size}`); + }); + }); + + it("6. Corners", () => { + ["0px", "6px", "20px"].forEach((corner) => { + anvilSnapshot.setCorners(corner); + + anvilSnapshot.matchSnapshotForCanvasMode(`AppThemingCorner${corner}`); + anvilSnapshot.matchSnapshotForPreviewMode(`AppThemingCorner${corner}`); + anvilSnapshot.matchSnapshotForDeployMode(`AppThemingCorner${corner}`); + }); + }); + + it("7. Icon Style", () => { + ["Filled", "Outlined"].forEach((iconStyle) => { + anvilSnapshot.setIconStyle(iconStyle); + + anvilSnapshot.matchSnapshotForCanvasMode(`AppThemingIcon${iconStyle}`); + anvilSnapshot.matchSnapshotForPreviewMode(`AppThemingIcon${iconStyle}`); + anvilSnapshot.matchSnapshotForDeployMode(`AppThemingIcon${iconStyle}`); + }); + }); + }, +); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilButtonWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilButtonWidgetSnapshot_spec.ts index 0cb2a0391efc..32e2a215c4dd 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilButtonWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilButtonWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("ButtonWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("ButtonWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("ButtonWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("ButtonWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("ButtonWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("ButtonWidget"); + anvilSnapshot.matchSnapshotForDeployMode("ButtonWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxGroupWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxGroupWidgetSnapshot_spec.ts index 2de30c91dd04..77367eb7706e 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxGroupWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxGroupWidgetSnapshot_spec.ts @@ -14,15 +14,18 @@ describe( it("1. Canvas Mode", () => { anvilSnapshot.triggerCheckboxGroupInvalidState(); - anvilSnapshot.verifyCanvasMode("CheckboxGroupWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("CheckboxGroupWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("CheckboxGroupWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("CheckboxGroupWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("CheckboxGroupWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("CheckboxGroupWidget"); + anvilSnapshot.matchSnapshotForDeployMode("CheckboxGroupWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxWidgetSnapshot_spec.ts index ea3238adcba5..4bec7f5d9536 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("CheckboxWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("CheckboxWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("CheckboxWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("CheckboxWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("CheckboxWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("CheckboxWidget"); + anvilSnapshot.matchSnapshotForDeployMode("CheckboxWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCurrencyInputWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCurrencyInputWidgetSnapshot_spec.ts index a4857ab3b54d..fe65f5d4a0b7 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCurrencyInputWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCurrencyInputWidgetSnapshot_spec.ts @@ -14,15 +14,18 @@ describe( it("1. Canvas Mode", () => { anvilSnapshot.triggerInputInvalidState(); - anvilSnapshot.verifyCanvasMode("CurrencyInputWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("CurrencyInputWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("CurrencyInputWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("CurrencyInputWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("CurrencyInputWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("CurrencyInputWidget"); + anvilSnapshot.matchSnapshotForDeployMode("CurrencyInputWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilHeadingWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilHeadingWidgetSnapshot_spec.ts index ac83277ceb89..005190388998 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilHeadingWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilHeadingWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("HeadingWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("HeadingWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("HeadingWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("HeadingWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("HeadingWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("HeadingWidget"); + anvilSnapshot.matchSnapshotForDeployMode("HeadingWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilIconButtonWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilIconButtonWidgetSnapshot_spec.ts index 0427cec192de..1431f1a632a3 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilIconButtonWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilIconButtonWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("IconButtonWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("IconButtonWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("IconButtonWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("IconButtonWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("IconButtonWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("IconButtonWidget"); + anvilSnapshot.matchSnapshotForDeployMode("IconButtonWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInlineButtonWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInlineButtonWidgetSnapshot_spec.ts index 807cf521d655..9744fb27290c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInlineButtonWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInlineButtonWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("InlineButtonWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("InlineButtonWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("InlineButtonWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("InlineButtonWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("InlineButtonWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("InlineButtonWidget"); + anvilSnapshot.matchSnapshotForDeployMode("InlineButtonWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInputWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInputWidgetSnapshot_spec.ts index 0a2bc6db2364..ca8110184a2e 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInputWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInputWidgetSnapshot_spec.ts @@ -14,15 +14,18 @@ describe( it("1. Canvas Mode", () => { anvilSnapshot.triggerInputInvalidState(); - anvilSnapshot.verifyCanvasMode("InputWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("InputWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("InputWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("InputWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("InputWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("InputWidget"); + anvilSnapshot.matchSnapshotForDeployMode("InputWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilParagraphWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilParagraphWidgetSnapshot_spec.ts index 59660d204724..2fc78c9a212d 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilParagraphWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilParagraphWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("ParagraphWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("ParagraphWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("ParagraphWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("ParagraphWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("ParagraphWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("ParagraphWidget"); + anvilSnapshot.matchSnapshotForDeployMode("ParagraphWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilPhoneInputWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilPhoneInputWidgetSnapshot_spec.ts index 4be15cf9010e..4dac924d2331 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilPhoneInputWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilPhoneInputWidgetSnapshot_spec.ts @@ -14,15 +14,18 @@ describe( it("1. Canvas Mode", () => { anvilSnapshot.triggerInputInvalidState(); - anvilSnapshot.verifyCanvasMode("PhoneInputWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("PhoneInputWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("PhoneInputWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("PhoneInputWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("PhoneInputWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("PhoneInputWidget"); + anvilSnapshot.matchSnapshotForDeployMode("PhoneInputWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilRadioGroupWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilRadioGroupWidgetSnapshot_spec.ts index fbd3c89d5061..1cc2e0134123 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilRadioGroupWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilRadioGroupWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("RadioGroupWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("RadioGroupWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("RadioGroupWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("RadioGroupWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("RadioGroupWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("RadioGroupWidget"); + anvilSnapshot.matchSnapshotForDeployMode("RadioGroupWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilStatsWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilStatsWidgetSnapshot_spec.ts index 56f9d3b032d7..acf667d9d6a9 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilStatsWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilStatsWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("StatsWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("StatsWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("StatsWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("StatsWidget"); + anvilSnapshot.enterPreviewMode("StatsWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("StatsWidget"); + anvilSnapshot.matchSnapshotForDeployMode("StatsWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchGroupWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchGroupWidgetSnapshot_spec.ts index 798a9e23390f..a6c0cfdf620c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchGroupWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchGroupWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("SwitchGroupWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("SwitchGroupWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("SwitchGroupWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("SwitchoGroupWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("SwitchGroupWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("SwitchGroupWidget"); + anvilSnapshot.matchSnapshotForDeployMode("SwitchGroupWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchWidgetSnapshot_spec.ts index 54459d397c5b..c14d8b1022df 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("SwitchWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("SwitchWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("SwitchWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("SwitchWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("SwitchWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("SwitchWidget"); + anvilSnapshot.matchSnapshotForDeployMode("SwitchWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts index 024dc44bd679..71a9dee23835 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("TableWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("TableWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("TableWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("TableWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("TableWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("TableWidget"); + anvilSnapshot.matchSnapshotForDeployMode("TableWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilToolbarButtonWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilToolbarButtonWidgetSnapshot_spec.ts index 481132191c17..bc2dccda99d2 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilToolbarButtonWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilToolbarButtonWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("ToolbarButtonWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("ToolbarButtonWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("ToolbarButtonWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("ToolbarButtonWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("ToolbarButtonWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("ToolbarButtonWidget"); + anvilSnapshot.matchSnapshotForDeployMode("ToolbarButtonWidget"); }); }, ); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilZoneSectionWidgetSnapshot_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilZoneSectionWidgetSnapshot_spec.ts index 1e5f01c63551..88ff44c651bc 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilZoneSectionWidgetSnapshot_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilZoneSectionWidgetSnapshot_spec.ts @@ -13,15 +13,18 @@ describe( }); it("1. Canvas Mode", () => { - anvilSnapshot.verifyCanvasMode("ZoneSectionWidget"); + anvilSnapshot.matchSnapshotForCanvasMode("ZoneSectionWidget"); + anvilSnapshot.setTheme("dark"); + anvilSnapshot.matchSnapshotForCanvasMode("ZoneSectionWidget", "dark"); + anvilSnapshot.setTheme("light"); }); it("2. Preview Mode", () => { - anvilSnapshot.verifyPreviewMode("ZoneSectionWidget"); + anvilSnapshot.matchSnapshotForPreviewMode("ZoneSectionWidget"); }); it("3. Deploy Mode", () => { - anvilSnapshot.verifyDeployMode("ZoneSectionWidget"); + anvilSnapshot.matchSnapshotForDeployMode("ZoneSectionWidget"); }); }, ); diff --git a/app/client/cypress/fixtures/anvilAppTheming.json b/app/client/cypress/fixtures/anvilAppTheming.json new file mode 100644 index 000000000000..f0d53cd5543d --- /dev/null +++ b/app/client/cypress/fixtures/anvilAppTheming.json @@ -0,0 +1,2135 @@ +{ + "dsl": { + "widgetName": "MainContainer", + "backgroundColor": "none", + "rightColumn": 4896, + "snapColumns": 64, + "detachFromLayout": true, + "widgetId": "0", + "topRow": 0, + "bottomRow": 380, + "containerStyle": "none", + "snapRows": 124, + "parentRowSpace": 1, + "type": "CANVAS_WIDGET", + "canExtend": true, + "version": 89, + "minHeight": 1292, + "layout": [ + { + "layoutId": "79cjfjtdmc", + "layoutType": "ALIGNED_LAYOUT_COLUMN", + "layout": [ + { + "insertChild": true, + "isDropTarget": false, + "isPermanent": false, + "layout": [ + { + "alignment": "start", + "widgetId": "2ben87f8ij", + "widgetType": "SECTION_WIDGET" + } + ], + "layoutId": "5ps0c7dycp", + "layoutType": "WIDGET_ROW", + "maxChildLimit": 1 + }, + { + "insertChild": true, + "isDropTarget": false, + "isPermanent": false, + "layout": [ + { + "alignment": "start", + "widgetId": "01nnjbo9ie", + "widgetType": "SECTION_WIDGET" + } + ], + "layoutId": "urafuo9j7f", + "layoutType": "WIDGET_ROW", + "maxChildLimit": 1 + } + ], + "layoutStyle": { + "border": "none", + "height": "100%", + "padding": "spacing-4", + "gap": "spacing-4" + }, + "isDropTarget": true, + "isPermanent": true, + "childTemplate": { + "insertChild": true, + "isDropTarget": false, + "isPermanent": false, + "layout": [], + "layoutId": "", + "layoutType": "WIDGET_ROW", + "maxChildLimit": 1 + } + } + ], + "dynamicTriggerPathList": [], + "parentColumnSpace": 1, + "dynamicBindingPathList": [], + "leftColumn": 0, + "children": [ + { + "needsErrorInfo": false, + "boxShadow": "NONE", + "mobileBottomRow": 10, + "widgetName": "Section1", + "isCanvas": true, + "displayName": "Section", + "searchTags": [ + "div", + "parent", + "group" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "SECTION_WIDGET", + "hideCard": true, + "mobileRightColumn": 64, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "children": [ + { + "needsErrorInfo": false, + "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}", + "mobileBottomRow": 10, + "widgetName": "Zone1", + "flexGrow": 12, + "isCanvas": true, + "displayName": "Zone", + "searchTags": [ + "div", + "parent", + "group" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "ZONE_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [ + { + "key": "borderRadius" + }, + { + "key": "boxShadow" + } + ], + "children": [ + { + "resetFormOnClick": false, + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "Button1", + "buttonColor": "accent", + "isCanvas": false, + "displayName": "Button", + "searchTags": [ + "click", + "submit" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_BUTTON_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "text": "Do something", + "isDisabled": false, + "key": "9wpi87rlmd", + "isDeprecated": false, + "rightColumn": 64, + "widgetId": "ostw64p6fl", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "recaptchaType": "V3", + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Suggested", + "Buttons" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "hug", + "disabledWhenInvalid": false, + "mobileLeftColumn": 0, + "buttonVariant": "filled" + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "IconButton1", + "buttonColor": "accent", + "displayName": "Icon Button", + "searchTags": [ + "click", + "submit" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_ICON_BUTTON_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "isDisabled": false, + "key": "tqsc3t0xnc", + "isDeprecated": false, + "rightColumn": 64, + "iconName": "plus", + "widgetId": "a3qx5e9xgq", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Buttons" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "hug", + "mobileLeftColumn": 0, + "buttonVariant": "filled" + }, + { + "needsErrorInfo": false, + "isCompact": false, + "mobileBottomRow": 10, + "widgetName": "MenuButton1", + "displayName": "Menu Button", + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_MENU_BUTTON_WIDGET", + "hideCard": false, + "triggerButtonVariant": "filled", + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "triggerButtonColor": "accent", + "isDisabled": false, + "key": "vbcgoun0ge", + "isDeprecated": false, + "rightColumn": 64, + "widgetId": "fmrjv4eoyx", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "menuItems": { + "menuItem1": { + "label": "Bake", + "id": "menuItem1", + "widgetId": "", + "isVisible": true, + "isDisabled": false, + "index": 0 + }, + "menuItem2": { + "label": "Fry", + "id": "menuItem2", + "widgetId": "", + "isVisible": true, + "isDisabled": false, + "index": 1 + }, + "menuItem3": { + "label": "Boil", + "id": "menuItem3", + "widgetId": "", + "isVisible": true, + "isDisabled": false, + "index": 2 + } + }, + "isVisible": true, + "label": "Open The Menu…", + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Buttons" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "mobileLeftColumn": 0, + "menuItemsSource": "static" + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "ToolbarButtons1", + "color": "accent", + "isCanvas": false, + "displayName": "Toolbar Buttons", + "searchTags": [ + "click", + "submit" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_TOOLBAR_BUTTONS_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "buttonsList": { + "button1": { + "label": "Add", + "isVisible": true, + "isDisabled": false, + "widgetId": "", + "id": "button1", + "index": 0, + "icon": "plus", + "iconPosition": "start" + }, + "button2": { + "label": "Edit", + "isVisible": true, + "isDisabled": false, + "widgetId": "", + "id": "button2", + "index": 1, + "icon": "pencil", + "iconPosition": "start" + }, + "button3": { + "label": "Copy", + "isVisible": true, + "isDisabled": false, + "widgetId": "", + "id": "button3", + "index": 2, + "icon": "copy", + "iconPosition": "start" + }, + "separator": { + "isVisible": true, + "isDisabled": false, + "isSeparator": true, + "widgetId": "", + "id": "separator", + "index": 2, + "label": "Separator", + "itemType": "SEPARATOR" + }, + "button4": { + "label": "Delete", + "isVisible": true, + "isDisabled": false, + "widgetId": "", + "id": "button4", + "index": 2, + "icon": "trash", + "iconPosition": "start" + } + }, + "variant": "ghost", + "isDisabled": false, + "key": "l35o4v2s54", + "orientation": "horizontal", + "isDeprecated": false, + "rightColumn": 64, + "widgetId": "vesit2xs63", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Buttons" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0 + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "InlineButtons1", + "isCanvas": false, + "displayName": "Inline Buttons", + "searchTags": [ + "click", + "submit" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_INLINE_BUTTONS_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "buttonsList": { + "button1": { + "label": "Delete", + "isVisible": true, + "isDisabled": false, + "id": "button1", + "index": 0, + "variant": "outlined", + "color": "negative" + }, + "button2": { + "label": "Separator", + "isVisible": true, + "isDisabled": false, + "id": "button2", + "isSeparator": true, + "index": 1, + "itemType": "SEPARATOR" + }, + "button3": { + "label": "Cancel", + "isVisible": true, + "isDisabled": false, + "widgetId": "", + "id": "button3", + "index": 2, + "variant": "outlined", + "color": "accent" + }, + "button4": { + "label": "Save Changes", + "isVisible": true, + "isDisabled": false, + "widgetId": "", + "id": "button4", + "index": 3, + "variant": "filled", + "color": "accent" + } + }, + "isDisabled": false, + "key": "arajgelb55", + "isDeprecated": false, + "rightColumn": 64, + "widgetId": "5oe5e2jd4w", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Buttons" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0 + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "CurrencyInput1Copy", + "displayName": "Currency Input", + "searchTags": [ + "amount", + "total" + ], + "topRow": 0, + "bottomRow": 10, + "defaultCurrencyCode": "USD", + "parentRowSpace": 10, + "autoFocus": false, + "type": "WDS_CURRENCY_INPUT_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "isReadOnly": false, + "parentColumnSpace": 1, + "resetOnSubmit": true, + "leftColumn": 0, + "dynamicBindingPathList": [], + "isDisabled": false, + "key": "txp8u0artf", + "isRequired": false, + "isDeprecated": false, + "rightColumn": 64, + "dynamicHeight": "FIXED", + "widgetId": "ls6lgw9k58", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "showStepArrows": false, + "isVisible": true, + "label": "Current Price", + "allowCurrencyChange": false, + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Inputs" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "maxDynamicHeight": 9000, + "decimals": 0, + "iconAlign": "left", + "defaultText": "", + "minDynamicHeight": 4 + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "PhoneInput1Copy", + "displayName": "Phone Input", + "searchTags": [ + "call" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "defaultDialCode": "+1", + "autoFocus": false, + "type": "WDS_PHONE_INPUT_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "isReadOnly": false, + "parentColumnSpace": 1, + "resetOnSubmit": true, + "leftColumn": 0, + "dynamicBindingPathList": [], + "isDisabled": false, + "key": "ltegwoqtvs", + "isRequired": false, + "isDeprecated": false, + "rightColumn": 64, + "dynamicHeight": "FIXED", + "widgetId": "zyh5ae1osh", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "allowDialCodeChange": false, + "isVisible": true, + "label": "Phone number", + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Inputs" + ], + "allowFormatting": true, + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "maxDynamicHeight": 9000, + "iconAlign": "left", + "defaultText": "", + "minDynamicHeight": 4 + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "Input1Copy", + "displayName": "Input", + "searchTags": [ + "form", + "text input", + "number", + "textarea" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "autoFocus": false, + "type": "WDS_INPUT_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "isReadOnly": false, + "parentColumnSpace": 1, + "resetOnSubmit": true, + "leftColumn": 0, + "dynamicBindingPathList": [], + "labelPosition": "top", + "inputType": "TEXT", + "isDisabled": false, + "key": "c5ygz234hp", + "isRequired": false, + "isDeprecated": false, + "rightColumn": 64, + "widgetId": "00ukicaq9l", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "showStepArrows": false, + "isVisible": true, + "label": "Label", + "version": 2, + "parentId": "jx4iqd6be8", + "tags": [ + "Suggested", + "Inputs" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "iconAlign": "left", + "defaultText": "" + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "KeyValue1Copy", + "displayName": "KeyValue", + "searchTags": [ + "form", + "text input", + "number", + "textarea" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "autoFocus": false, + "type": "WDS_KEY_VALUE_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "isReadOnly": true, + "parentColumnSpace": 1, + "resetOnSubmit": true, + "leftColumn": 0, + "dynamicBindingPathList": [], + "labelPosition": "top", + "inputType": "TEXT", + "isDisabled": false, + "key": "9oejxvvj4i", + "isRequired": false, + "isDeprecated": false, + "rightColumn": 64, + "widgetId": "nob5q4y3d0", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "showStepArrows": false, + "isVisible": true, + "label": "Label", + "version": 2, + "parentId": "jx4iqd6be8", + "tags": [ + "Suggested", + "Inputs" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "iconAlign": "left", + "defaultText": "" + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "CheckboxGroup1", + "displayName": "Checkbox Group", + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_CHECKBOX_GROUP_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "options": [ + { + "label": "Blue", + "value": "BLUE" + }, + { + "label": "Green", + "value": "GREEN" + }, + { + "label": "Red", + "value": "RED" + } + ], + "isDisabled": false, + "key": "ucrmql1v7f", + "isRequired": false, + "orientation": "vertical", + "isDeprecated": false, + "rightColumn": 64, + "defaultSelectedValues": [ + "BLUE", + "RED" + ], + "dynamicHeight": "AUTO_HEIGHT", + "widgetId": "6wcxud2ydf", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "label": "Color", + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Toggles" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "maxDynamicHeight": 9000, + "minDynamicHeight": 4 + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "RadioGroup1", + "displayName": "Radio Group", + "searchTags": [ + "choice" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_RADIO_GROUP_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "defaultOptionValue": "L", + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "options": [ + { + "label": "Small", + "value": "S" + }, + { + "label": "Medium", + "value": "M" + }, + { + "label": "Large", + "value": "L" + } + ], + "isDisabled": false, + "key": "clbf2rdt01", + "isRequired": false, + "orientation": "vertical", + "isDeprecated": false, + "rightColumn": 64, + "dynamicHeight": "AUTO_HEIGHT", + "widgetId": "m0uselhj56", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "label": "Size", + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Toggles" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "maxDynamicHeight": 9000, + "isInline": true, + "minDynamicHeight": 4 + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "SwitchGroup1", + "displayName": "Switch Group", + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_SWITCH_GROUP_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "labelPosition": "end", + "options": [ + { + "label": "Blue", + "value": "BLUE" + }, + { + "label": "Green", + "value": "GREEN" + }, + { + "label": "Red", + "value": "RED" + } + ], + "isDisabled": false, + "key": "nqmp7s23l1", + "orientation": "vertical", + "isDeprecated": false, + "rightColumn": 64, + "defaultSelectedValues": [ + "BLUE", + "RED" + ], + "dynamicHeight": "AUTO_HEIGHT", + "widgetId": "jf2k6v99ih", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "label": "Label", + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Toggles" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "maxDynamicHeight": 9000, + "minDynamicHeight": 4 + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "Checkbox1", + "displayName": "Checkbox", + "searchTags": [ + "boolean" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_CHECKBOX_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "isDisabled": false, + "key": "h33zkd4jav", + "isRequired": false, + "isDeprecated": false, + "rightColumn": 64, + "dynamicHeight": "AUTO_HEIGHT", + "widgetId": "0x4xg3zjjr", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "label": "Label", + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Toggles" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "defaultCheckedState": true, + "maxDynamicHeight": 9000, + "minDynamicHeight": 4 + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "Switch1", + "displayName": "Switch", + "searchTags": [ + "boolean" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_SWITCH_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "labelPosition": "start", + "isDisabled": false, + "key": "eqw6ebvbg5", + "isDeprecated": false, + "rightColumn": 64, + "dynamicHeight": "AUTO_HEIGHT", + "widgetId": "tt2wt9nwon", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "label": "Label", + "defaultSwitchState": true, + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Toggles" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "maxDynamicHeight": 9000, + "minDynamicHeight": 4 + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "Heading1", + "displayName": "Heading", + "searchTags": [ + "typography", + "paragraph", + "label" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_HEADING_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "shouldTruncate": false, + "text": "Header", + "key": "d1onqg0foz", + "isDeprecated": false, + "rightColumn": 64, + "textAlign": "left", + "dynamicHeight": "AUTO_HEIGHT", + "widgetId": "npks2vk70s", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "textColor": "neutral", + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Suggested", + "Content" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "maxDynamicHeight": 9000, + "fontSize": "heading", + "minDynamicHeight": 4 + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "Paragraph1", + "displayName": "Paragraph", + "searchTags": [ + "typography", + "paragraph", + "label" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "WDS_PARAGRAPH_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "shouldTruncate": false, + "text": "The important thing is not to stop questioning. Curiosity has its reason for existence. One cannot help but be in awe when one contemplates the mysteries of eternity, life, and the marvelous structure of reality. It is enough if one merely tries to comprehend a little of this mystery each day.", + "key": "8rlq9b1c4h", + "isDeprecated": false, + "rightColumn": 64, + "textAlign": "left", + "dynamicHeight": "AUTO_HEIGHT", + "widgetId": "c07wbud7kn", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "textColor": "neutral", + "version": 1, + "parentId": "jx4iqd6be8", + "tags": [ + "Content" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "maxDynamicHeight": 9000, + "fontSize": "body", + "minDynamicHeight": 4 + } + ], + "elevatedBackground": true, + "flexVerticalAlignment": "stretch", + "key": "linhyaqn8o", + "isDeprecated": false, + "rightColumn": 64, + "detachFromLayout": false, + "widgetId": "jx4iqd6be8", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-zone-selection", + "focusBGCSSVar": "--on-canvas-ui-zone-focus", + "selectionColorCSSVar": "--on-canvas-ui-zone-focus", + "focusColorCSSVar": "--on-canvas-ui-zone-selection", + "disableParentSelection": false + }, + "isVisible": true, + "version": 1, + "parentId": "2ben87f8ij", + "tags": [ + "Layout" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "layout": [ + { + "isContainer": true, + "isDropTarget": true, + "isPermanent": true, + "layout": [ + { + "insertChild": true, + "layoutId": "rz06kb6w95", + "layoutType": "ALIGNED_WIDGET_ROW", + "layout": [ + { + "alignment": "start", + "widgetId": "ostw64p6fl", + "widgetType": "WDS_BUTTON_WIDGET" + }, + { + "alignment": "start", + "widgetId": "a3qx5e9xgq", + "widgetType": "WDS_ICON_BUTTON_WIDGET" + }, + { + "alignment": "start", + "widgetId": "fmrjv4eoyx", + "widgetType": "WDS_MENU_BUTTON_WIDGET" + } + ], + "allowedWidgetTypes": [ + "SMALL_WIDGETS" + ], + "maxChildLimit": 0 + }, + { + "insertChild": true, + "layoutId": "kojr6svjoo", + "layoutType": "ALIGNED_WIDGET_ROW", + "layout": [ + { + "alignment": "start", + "widgetId": "vesit2xs63", + "widgetType": "WDS_TOOLBAR_BUTTONS_WIDGET" + } + ], + "allowedWidgetTypes": [ + "SMALL_WIDGETS" + ], + "maxChildLimit": 0 + }, + { + "insertChild": true, + "layoutId": "wwn356h1z1", + "layoutType": "ALIGNED_WIDGET_ROW", + "layout": [ + { + "alignment": "start", + "widgetId": "5oe5e2jd4w", + "widgetType": "WDS_INLINE_BUTTONS_WIDGET" + } + ], + "allowedWidgetTypes": [ + "SMALL_WIDGETS" + ], + "maxChildLimit": 0 + }, + { + "insertChild": true, + "layoutId": "axasb5i2kc", + "layoutType": "ALIGNED_WIDGET_ROW", + "layout": [ + { + "alignment": "start", + "widgetId": "ls6lgw9k58", + "widgetType": "WDS_CURRENCY_INPUT_WIDGET" + }, + { + "alignment": "start", + "widgetId": "00ukicaq9l", + "widgetType": "WDS_INPUT_WIDGET" + }, + { + "alignment": "start", + "widgetId": "zyh5ae1osh", + "widgetType": "WDS_PHONE_INPUT_WIDGET" + }, + { + "alignment": "start", + "widgetId": "nob5q4y3d0", + "widgetType": "WDS_KEY_VALUE_WIDGET" + } + ], + "allowedWidgetTypes": [ + "SMALL_WIDGETS" + ], + "maxChildLimit": 0 + }, + { + "insertChild": true, + "layoutId": "vo86r8djd4", + "layoutType": "ALIGNED_WIDGET_ROW", + "layout": [ + { + "alignment": "start", + "widgetId": "6wcxud2ydf", + "widgetType": "WDS_CHECKBOX_GROUP_WIDGET" + }, + { + "alignment": "start", + "widgetId": "m0uselhj56", + "widgetType": "WDS_RADIO_GROUP_WIDGET" + }, + { + "alignment": "start", + "widgetId": "jf2k6v99ih", + "widgetType": "WDS_SWITCH_GROUP_WIDGET" + } + ], + "allowedWidgetTypes": [ + "SMALL_WIDGETS" + ], + "maxChildLimit": 0 + }, + { + "insertChild": true, + "layoutId": "p7lqsm5ai6", + "layoutType": "ALIGNED_WIDGET_ROW", + "layout": [ + { + "alignment": "start", + "widgetId": "0x4xg3zjjr", + "widgetType": "WDS_CHECKBOX_WIDGET" + }, + { + "alignment": "start", + "widgetId": "tt2wt9nwon", + "widgetType": "WDS_SWITCH_WIDGET" + } + ], + "allowedWidgetTypes": [ + "SMALL_WIDGETS" + ], + "maxChildLimit": 0 + }, + { + "insertChild": true, + "layoutId": "ub1q7xuhs4", + "layoutType": "ALIGNED_WIDGET_ROW", + "layout": [ + { + "alignment": "start", + "widgetId": "npks2vk70s", + "widgetType": "WDS_HEADING_WIDGET" + } + ], + "allowedWidgetTypes": [ + "SMALL_WIDGETS" + ], + "maxChildLimit": 0 + }, + { + "insertChild": true, + "layoutId": "8r046c2tzm", + "layoutType": "ALIGNED_WIDGET_ROW", + "layout": [ + { + "alignment": "start", + "widgetId": "c07wbud7kn", + "widgetType": "WDS_PARAGRAPH_WIDGET" + } + ], + "allowedWidgetTypes": [ + "SMALL_WIDGETS" + ], + "maxChildLimit": 0 + } + ], + "layoutId": "12r1i0sl54", + "layoutStyle": { + "border": "none", + "height": "100%" + }, + "layoutType": "ZONE" + } + ], + "responsiveBehavior": "fill", + "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", + "mobileLeftColumn": 0 + } + ], + "elevatedBackground": false, + "key": "djdfl70ah9", + "isDeprecated": false, + "rightColumn": 64, + "detachFromLayout": false, + "widgetId": "2ben87f8ij", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-section-selection", + "focusBGCSSVar": "--on-canvas-ui-section-focus", + "selectionColorCSSVar": "--on-canvas-ui-section-focus", + "focusColorCSSVar": "--on-canvas-ui-section-selection", + "disableParentSelection": true + }, + "zoneCount": 1, + "isVisible": true, + "version": 1, + "parentId": "0", + "tags": [ + "Layout" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "layout": [ + { + "isContainer": true, + "isDropTarget": true, + "isPermanent": true, + "layout": [ + { + "alignment": "start", + "widgetId": "jx4iqd6be8", + "widgetType": "ZONE_WIDGET" + } + ], + "layoutId": "cng9a3jery", + "layoutStyle": { + "border": "none" + }, + "layoutType": "SECTION", + "maxChildLimit": 4 + } + ], + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "spaceDistributed": { + "jx4iqd6be8": 12 + } + }, + { + "needsErrorInfo": false, + "boxShadow": "NONE", + "mobileBottomRow": 10, + "widgetName": "Section5", + "isCanvas": true, + "displayName": "Section", + "searchTags": [ + "div", + "parent", + "group" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "SECTION_WIDGET", + "hideCard": true, + "mobileRightColumn": 64, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "children": [ + { + "needsErrorInfo": false, + "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}", + "mobileBottomRow": 10, + "widgetName": "Zone5", + "flexGrow": 6, + "isCanvas": true, + "displayName": "Zone", + "searchTags": [ + "div", + "parent", + "group" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "ZONE_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [ + { + "key": "borderRadius" + }, + { + "key": "boxShadow" + } + ], + "children": [ + { + "isVisibleDownload": true, + "topRow": 0, + "isSortable": true, + "pageSize": "1", + "type": "WDS_TABLE_WIDGET", + "inlineEditingSaveOption": "ROW_LEVEL", + "animateLoading": true, + "dynamicBindingPathList": [], + "needsHeightForContent": true, + "leftColumn": 0, + "delimiter": ",", + "defaultSelectedRowIndex": 0, + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisibleFilters": true, + "isVisible": true, + "enableClientSideSearch": true, + "version": 2, + "totalRecordsCount": 0, + "tags": [ + "Suggested", + "Display" + ], + "isLoading": false, + "columnUpdatedAt": 1720506974270, + "defaultSelectedRowIndices": [ + 0 + ], + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "Table1", + "defaultPageSize": 0, + "columnOrder": [ + "Name", + "Company", + "Title", + "Phone_number", + "Email", + "Registration_date" + ], + "dynamicPropertyPathList": [ + { + "key": "tableData" + } + ], + "buttonColor": "accent", + "displayName": "Table", + "bottomRow": 10, + "columnWidthMap": {}, + "parentRowSpace": 10, + "hideCard": false, + "mobileRightColumn": 64, + "parentColumnSpace": 1, + "dynamicTriggerPathList": [], + "primaryColumns": { + "Name": { + "allowCellWrapping": false, + "allowSameOptionsInNewRow": true, + "index": 0, + "width": 150, + "originalId": "Name", + "id": "Name", + "alias": "Name", + "horizontalAlignment": "start", + "verticalAlignment": "center", + "columnType": "text", + "textColor": "#231F20", + "textSize": "0.875rem", + "fontStyle": "REGULAR", + "enableFilter": true, + "enableSort": true, + "isVisible": true, + "isDisabled": false, + "isCellEditable": false, + "isEditable": false, + "isCellVisible": true, + "isDerived": false, + "label": "Name", + "isSaveVisible": true, + "isDiscardVisible": true, + "sticky": "", + "validation": {}, + "currencyCode": "USD", + "decimals": 0, + "thousandSeparator": true, + "notation": "standard", + "buttonColor": "accent" + }, + "Company": { + "allowCellWrapping": false, + "allowSameOptionsInNewRow": true, + "index": 1, + "width": 150, + "originalId": "Company", + "id": "Company", + "alias": "Company", + "horizontalAlignment": "start", + "verticalAlignment": "center", + "columnType": "text", + "textColor": "#231F20", + "textSize": "0.875rem", + "fontStyle": "REGULAR", + "enableFilter": true, + "enableSort": true, + "isVisible": true, + "isDisabled": false, + "isCellEditable": false, + "isEditable": false, + "isCellVisible": true, + "isDerived": false, + "label": "Company", + "isSaveVisible": true, + "isDiscardVisible": true, + "sticky": "", + "validation": {}, + "currencyCode": "USD", + "decimals": 0, + "thousandSeparator": true, + "notation": "standard", + "buttonColor": "accent" + }, + "Title": { + "allowCellWrapping": false, + "allowSameOptionsInNewRow": true, + "index": 2, + "width": 150, + "originalId": "Title", + "id": "Title", + "alias": "Title", + "horizontalAlignment": "start", + "verticalAlignment": "center", + "columnType": "text", + "textColor": "#231F20", + "textSize": "0.875rem", + "fontStyle": "REGULAR", + "enableFilter": true, + "enableSort": true, + "isVisible": true, + "isDisabled": false, + "isCellEditable": false, + "isEditable": false, + "isCellVisible": true, + "isDerived": false, + "label": "Title", + "isSaveVisible": true, + "isDiscardVisible": true, + "sticky": "", + "validation": {}, + "currencyCode": "USD", + "decimals": 0, + "thousandSeparator": true, + "notation": "standard", + "buttonColor": "accent" + }, + "Phone_number": { + "allowCellWrapping": false, + "allowSameOptionsInNewRow": true, + "index": 3, + "width": 150, + "originalId": "Phone number", + "id": "Phone_number", + "alias": "Phone number", + "horizontalAlignment": "start", + "verticalAlignment": "center", + "columnType": "text", + "textColor": "#231F20", + "textSize": "0.875rem", + "fontStyle": "REGULAR", + "enableFilter": true, + "enableSort": true, + "isVisible": true, + "isDisabled": false, + "isCellEditable": false, + "isEditable": false, + "isCellVisible": true, + "isDerived": false, + "label": "Phone number", + "isSaveVisible": true, + "isDiscardVisible": true, + "sticky": "", + "validation": {}, + "currencyCode": "USD", + "decimals": 0, + "thousandSeparator": true, + "notation": "standard", + "buttonColor": "accent" + }, + "Email": { + "allowCellWrapping": false, + "allowSameOptionsInNewRow": true, + "index": 4, + "width": 150, + "originalId": "Email", + "id": "Email", + "alias": "Email", + "horizontalAlignment": "start", + "verticalAlignment": "center", + "columnType": "text", + "textColor": "#231F20", + "textSize": "0.875rem", + "fontStyle": "REGULAR", + "enableFilter": true, + "enableSort": true, + "isVisible": true, + "isDisabled": false, + "isCellEditable": false, + "isEditable": false, + "isCellVisible": true, + "isDerived": false, + "label": "Email", + "isSaveVisible": true, + "isDiscardVisible": true, + "sticky": "", + "validation": {}, + "currencyCode": "USD", + "decimals": 0, + "thousandSeparator": true, + "notation": "standard", + "buttonColor": "accent" + }, + "Registration_date": { + "allowCellWrapping": false, + "allowSameOptionsInNewRow": true, + "index": 5, + "width": 150, + "originalId": "Registration date", + "id": "Registration_date", + "alias": "Registration date", + "horizontalAlignment": "start", + "verticalAlignment": "center", + "columnType": "date", + "textColor": "#231F20", + "textSize": "0.875rem", + "fontStyle": "REGULAR", + "enableFilter": true, + "enableSort": true, + "isVisible": true, + "isDisabled": false, + "isCellEditable": false, + "isEditable": false, + "isCellVisible": true, + "isDerived": false, + "label": "Registration date", + "isSaveVisible": true, + "isDiscardVisible": true, + "sticky": "", + "validation": {}, + "currencyCode": "USD", + "decimals": 0, + "thousandSeparator": true, + "notation": "standard", + "buttonColor": "accent" + } + }, + "key": "beucplfipo", + "canFreezeColumn": true, + "isDeprecated": false, + "rightColumn": 64, + "widgetId": "q9rrodd53l", + "tableData": [ + { + "Name": "John Doe", + "Company": "TechCorp", + "Title": "Software Engineer", + "Phone number": "(555) 123-4567", + "Email": "[email protected]", + "Registration date": "2023-01-15" + }, + { + "Name": "Jane Smith", + "Company": "Innovate Ltd", + "Title": "Project Manager", + "Phone number": "(555) 234-5678", + "Email": "[email protected]", + "Registration date": "2023-02-20" + }, + { + "Name": "Alice Johnson", + "Company": "Web Solutions", + "Title": "UX Designer", + "Phone number": "(555) 345-6789", + "Email": "[email protected]", + "Registration date": "2023-03-10" + }, + { + "Name": "Bob Brown", + "Company": "BuildIt", + "Title": "Construction Manager", + "Phone number": "(555) 456-7890", + "Email": "[email protected]", + "Registration date": "2023-04-05" + }, + { + "Name": "Charlie Davis", + "Company": "FinTech Inc", + "Title": "Financial Analyst", + "Phone number": "(555) 567-8901", + "Email": "[email protected]", + "Registration date": "2023-05-12" + }, + { + "Name": "Dana Lee", + "Company": "HealthFirst", + "Title": "Nurse Practitioner", + "Phone number": "(555) 678-9012", + "Email": "[email protected]", + "Registration date": "2023-06-01" + }, + { + "Name": "Evan Martinez", + "Company": "AutoPro", + "Title": "Mechanical Engineer", + "Phone number": "(555) 789-0123", + "Email": "[email protected]", + "Registration date": "2023-07-19" + }, + { + "Name": "Fiona Green", + "Company": "EduFuture", + "Title": "Curriculum Developer", + "Phone number": "(555) 890-1234", + "Email": "[email protected]", + "Registration date": "2023-08-23" + }, + { + "Name": "George Harris", + "Company": "MarketMasters", + "Title": "Marketing Director", + "Phone number": "(555) 901-2345", + "Email": "[email protected]", + "Registration date": "2023-09-07" + }, + { + "Name": "Hannah Wright", + "Company": "LegalEagle", + "Title": "Attorney", + "Phone number": "(555) 012-3456", + "Email": "[email protected]", + "Registration date": "2023-10-15" + }, + { + "Name": "Ian Walker", + "Company": "HomeGoods", + "Title": "Retail Manager", + "Phone number": "(555) 123-4567", + "Email": "[email protected]", + "Registration date": "2023-11-22" + }, + { + "Name": "Julia King", + "Company": "TravelWise", + "Title": "Travel Agent", + "Phone number": "(555) 234-5678", + "Email": "[email protected]", + "Registration date": "2023-12-30" + }, + { + "Name": "Kevin Scott", + "Company": "CleanEnergy", + "Title": "Environmental Scientist", + "Phone number": "(555) 345-6789", + "Email": "[email protected]", + "Registration date": "2024-01-08" + }, + { + "Name": "Laura Baker", + "Company": "MediaMinds", + "Title": "Content Strategist", + "Phone number": "(555) 456-7890", + "Email": "[email protected]", + "Registration date": "2024-02-18" + }, + { + "Name": "Michael Young", + "Company": "CyberSecure", + "Title": "Cybersecurity Specialist", + "Phone number": "(555) 567-8901", + "Email": "[email protected]", + "Registration date": "2024-03-29" + }, + { + "Name": "Nina Patel", + "Company": "AgriTech", + "Title": "Agricultural Engineer", + "Phone number": "(555) 678-9012", + "Email": "[email protected]", + "Registration date": "2024-04-10" + } + ], + "label": "Data", + "searchKey": "", + "parentId": "1us8ouxi9q", + "buttonLabel": "Action", + "renderMode": "CANVAS", + "mobileTopRow": 0, + "horizontalAlignment": "start", + "isVisibleSearch": true, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "isVisiblePagination": true, + "buttonVariant": "filled", + "verticalAlignment": "center" + } + ], + "elevatedBackground": true, + "flexVerticalAlignment": "stretch", + "key": "linhyaqn8o", + "isDeprecated": false, + "rightColumn": 64, + "detachFromLayout": false, + "widgetId": "1us8ouxi9q", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-zone-selection", + "focusBGCSSVar": "--on-canvas-ui-zone-focus", + "selectionColorCSSVar": "--on-canvas-ui-zone-focus", + "focusColorCSSVar": "--on-canvas-ui-zone-selection", + "disableParentSelection": false + }, + "isVisible": true, + "version": 1, + "parentId": "01nnjbo9ie", + "tags": [ + "Layout" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "layout": [ + { + "isContainer": true, + "isDropTarget": true, + "isPermanent": true, + "layout": [ + { + "insertChild": true, + "layoutId": "gr8jk27f2h", + "layoutType": "ALIGNED_WIDGET_ROW", + "layout": [ + { + "alignment": "start", + "widgetId": "q9rrodd53l", + "widgetType": "WDS_TABLE_WIDGET" + } + ], + "allowedWidgetTypes": [], + "maxChildLimit": 1 + } + ], + "layoutId": "pk7mjcqd8r", + "layoutStyle": { + "border": "none", + "height": "100%" + }, + "layoutType": "ZONE" + } + ], + "responsiveBehavior": "fill", + "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", + "mobileLeftColumn": 0 + }, + { + "needsErrorInfo": false, + "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}", + "mobileBottomRow": 10, + "widgetName": "Zone6", + "flexGrow": 6, + "isCanvas": true, + "displayName": "Zone", + "searchTags": [ + "div", + "parent", + "group" + ], + "topRow": 0, + "bottomRow": 10, + "parentRowSpace": 10, + "type": "ZONE_WIDGET", + "hideCard": false, + "mobileRightColumn": 64, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [ + { + "key": "borderRadius" + }, + { + "key": "boxShadow" + } + ], + "children": [ + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "StatsWidget1", + "isCanvas": false, + "displayName": "Stats", + "searchTags": [ + "statbox" + ], + "topRow": 0, + "bottomRow": 10, + "caption": "This week", + "parentRowSpace": 10, + "valueChangeColor": "positive", + "type": "WDS_STATS_WIDGET", + "hideCard": false, + "valueColor": "neutral", + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "valueChange": "+50%", + "value": "42", + "elevatedBackground": false, + "key": "6y3o4v323j", + "isDeprecated": false, + "rightColumn": 64, + "iconName": "shopping-bag", + "widgetId": "7ozq6nspt3", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "label": "Active Users", + "version": 1, + "parentId": "bd3ehi90wg", + "tags": [ + "Display" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0 + }, + { + "needsErrorInfo": false, + "mobileBottomRow": 10, + "widgetName": "StatsWidget1Copy", + "isCanvas": false, + "displayName": "Stats", + "searchTags": [ + "statbox" + ], + "topRow": 0, + "bottomRow": 10, + "caption": "This week", + "parentRowSpace": 10, + "valueChangeColor": "positive", + "type": "WDS_STATS_WIDGET", + "hideCard": false, + "valueColor": "neutral", + "mobileRightColumn": 64, + "animateLoading": true, + "parentColumnSpace": 1, + "dynamicTriggerPathList": [], + "leftColumn": 0, + "dynamicBindingPathList": [], + "valueChange": "+50%", + "value": "42", + "elevatedBackground": true, + "key": "6y3o4v323j", + "isDeprecated": false, + "rightColumn": 64, + "iconName": "shopping-bag", + "widgetId": "cg1zv8ldva", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-widget-selection", + "focusBGCSSVar": "--on-canvas-ui-widget-focus", + "selectionColorCSSVar": "--on-canvas-ui-widget-focus", + "focusColorCSSVar": "--on-canvas-ui-widget-selection", + "disableParentSelection": false + }, + "isVisible": true, + "label": "Active Users", + "version": 1, + "parentId": "bd3ehi90wg", + "tags": [ + "Display" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "responsiveBehavior": "fill", + "mobileLeftColumn": 0 + } + ], + "elevatedBackground": true, + "flexVerticalAlignment": "stretch", + "key": "linhyaqn8o", + "isDeprecated": false, + "rightColumn": 64, + "detachFromLayout": false, + "widgetId": "bd3ehi90wg", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-zone-selection", + "focusBGCSSVar": "--on-canvas-ui-zone-focus", + "selectionColorCSSVar": "--on-canvas-ui-zone-focus", + "focusColorCSSVar": "--on-canvas-ui-zone-selection", + "disableParentSelection": false + }, + "isVisible": true, + "version": 1, + "parentId": "01nnjbo9ie", + "tags": [ + "Layout" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "layout": [ + { + "isContainer": true, + "isDropTarget": true, + "isPermanent": true, + "layout": [ + { + "insertChild": true, + "layoutId": "p1n6y45dps", + "layoutType": "ALIGNED_WIDGET_ROW", + "layout": [ + { + "alignment": "start", + "widgetId": "7ozq6nspt3", + "widgetType": "WDS_STATS_WIDGET" + } + ], + "allowedWidgetTypes": [ + "SMALL_WIDGETS" + ], + "maxChildLimit": 0 + }, + { + "insertChild": true, + "layoutId": "qyrdp795el", + "layoutType": "ALIGNED_WIDGET_ROW", + "layout": [ + { + "alignment": "start", + "widgetId": "cg1zv8ldva", + "widgetType": "WDS_STATS_WIDGET" + } + ], + "allowedWidgetTypes": [ + "SMALL_WIDGETS" + ], + "maxChildLimit": 0 + } + ], + "layoutId": "j58fiy2ziz", + "layoutStyle": { + "border": "none", + "height": "100%" + }, + "layoutType": "ZONE" + } + ], + "responsiveBehavior": "fill", + "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", + "mobileLeftColumn": 0 + } + ], + "elevatedBackground": false, + "key": "djdfl70ah9", + "isDeprecated": false, + "rightColumn": 64, + "detachFromLayout": false, + "widgetId": "01nnjbo9ie", + "onCanvasUI": { + "selectionBGCSSVar": "--on-canvas-ui-section-selection", + "focusBGCSSVar": "--on-canvas-ui-section-focus", + "selectionColorCSSVar": "--on-canvas-ui-section-focus", + "focusColorCSSVar": "--on-canvas-ui-section-selection", + "disableParentSelection": true + }, + "zoneCount": 2, + "isVisible": true, + "version": 1, + "parentId": "0", + "tags": [ + "Layout" + ], + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 0, + "layout": [ + { + "isContainer": true, + "isDropTarget": true, + "isPermanent": true, + "layout": [ + { + "alignment": "start", + "widgetId": "1us8ouxi9q", + "widgetType": "ZONE_WIDGET" + }, + { + "alignment": "start", + "widgetId": "bd3ehi90wg", + "widgetType": "ZONE_WIDGET" + } + ], + "layoutId": "x0zzmeu2do", + "layoutStyle": { + "border": "none" + }, + "layoutType": "SECTION", + "maxChildLimit": 4 + } + ], + "responsiveBehavior": "fill", + "mobileLeftColumn": 0, + "spaceDistributed": { + "1us8ouxi9q": 6, + "bd3ehi90wg": 6 + } + } + ] + } +} \ No newline at end of file diff --git a/app/client/cypress/fixtures/anvilButtonWidget.json b/app/client/cypress/fixtures/anvilButtonWidget.json index 52ba01be8ac5..5d15f8ca9f18 100644 --- a/app/client/cypress/fixtures/anvilButtonWidget.json +++ b/app/client/cypress/fixtures/anvilButtonWidget.json @@ -2,19 +2,19 @@ "dsl": { "widgetName": "MainContainer", "backgroundColor": "none", - "rightColumn": 4896, - "snapColumns": 64, + "rightColumn": 4896.0, + "snapColumns": 64.0, "detachFromLayout": true, "widgetId": "0", - "topRow": 0, - "bottomRow": 380, + "topRow": 0.0, + "bottomRow": 380.0, "containerStyle": "none", - "snapRows": 124, - "parentRowSpace": 1, + "snapRows": 124.0, + "parentRowSpace": 1.0, "type": "CANVAS_WIDGET", "canExtend": true, - "version": 89, - "minHeight": 1292, + "version": 89.0, + "minHeight": 1292.0, "layout": [ { "layoutId": "zf1rn0cr3v", @@ -26,14 +26,14 @@ "isPermanent": false, "layout": [ { - "alignment": "start", - "widgetId": "v8yjcqoas6", + "alignment" : "start" , + "widgetId" : "v8yjcqoas6" , "widgetType": "SECTION_WIDGET" } ], "layoutId": "qatp0f0qli", "layoutType": "WIDGET_ROW", - "maxChildLimit": 1 + "maxChildLimit": 1.0 }, { "insertChild": true, @@ -41,14 +41,14 @@ "isPermanent": false, "layout": [ { - "alignment": "start", - "widgetId": "22t51nvpve", + "alignment" : "start" , + "widgetId" : "22t51nvpve" , "widgetType": "SECTION_WIDGET" } ], "layoutId": "2rw4sa3p5s", "layoutType": "WIDGET_ROW", - "maxChildLimit": 1 + "maxChildLimit": 1.0 }, { "insertChild": true, @@ -56,14 +56,14 @@ "isPermanent": false, "layout": [ { - "alignment": "start", - "widgetId": "wa3fauc5cx", + "alignment" : "start" , + "widgetId" : "wa3fauc5cx" , "widgetType": "SECTION_WIDGET" } ], "layoutId": "2kjgp9j6vg", "layoutType": "WIDGET_ROW", - "maxChildLimit": 1 + "maxChildLimit": 1.0 }, { "insertChild": true, @@ -71,21 +71,21 @@ "isPermanent": false, "layout": [ { - "alignment": "start", - "widgetId": "c3qg79mmbs", + "alignment" : "start" , + "widgetId" : "c3qg79mmbs" , "widgetType": "SECTION_WIDGET" } ], "layoutId": "ixc3rg3glt", "layoutType": "WIDGET_ROW", - "maxChildLimit": 1 + "maxChildLimit": 1.0 } ], "layoutStyle": { - "border": "none", - "height": "100%", + "border" : "none" , + "height" : "100%" , "padding": "spacing-4", - "gap": "spacing-4" + "gap" : "spacing-4" }, "isDropTarget": true, "isPermanent": true, @@ -96,95 +96,80 @@ "layout": [], "layoutId": "", "layoutType": "WIDGET_ROW", - "maxChildLimit": 1 + "maxChildLimit": 1.0 } } ], "dynamicTriggerPathList": [], - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicBindingPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "children": [ { "needsErrorInfo": false, "boxShadow": "NONE", - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Section1", "isCanvas": true, "displayName": "Section", - "searchTags": [ - "div", - "parent", - "group" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["div", "parent", "group"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "SECTION_WIDGET", "hideCard": true, - "mobileRightColumn": 64, - "parentColumnSpace": 1, - "leftColumn": 0, + "mobileRightColumn": 64.0, + "parentColumnSpace": 1.0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "children": [ { "needsErrorInfo": false, "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}", - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Zone1", - "flexGrow": 12, + "flexGrow": 12.0, "isCanvas": true, "displayName": "Zone", - "searchTags": [ - "div", - "parent", - "group" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["div", "parent", "group"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "ZONE_WIDGET", "hideCard": false, - "mobileRightColumn": 64, - "parentColumnSpace": 1, - "leftColumn": 0, + "mobileRightColumn": 64.0, + "parentColumnSpace": 1.0, + "leftColumn": 0.0, "dynamicBindingPathList": [ - { - "key": "borderRadius" - }, - { - "key": "boxShadow" - } + {"key": "borderRadius"}, + {"key": "boxShadow" } ], "children": [ { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "x75woyqacu", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -195,48 +180,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy", "buttonColor": "neutral", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "5npsfsw7uy", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -247,48 +226,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2CopyCopy", "buttonColor": "negative", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "gtzwavo5zz", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -299,48 +272,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2CopyCopyCopy", "buttonColor": "warning", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "34d2yb2t59", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -351,48 +318,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2CopyCopyCopyCopy", "buttonColor": "positive", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "7zgoizvqf2", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -403,48 +364,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2CopyCopy1", "buttonColor": "neutral", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "7io1tl1uje", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -455,48 +410,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "outlined" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2CopyCopyCopyCopyCopy", "buttonColor": "positive", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "ujh45xvca3", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -507,48 +456,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "outlined" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "wkf4n8empq", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -559,48 +502,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "outlined" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2CopyCopyCopyCopy1", "buttonColor": "warning", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "mpima51xp0", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -611,48 +548,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "outlined" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2CopyCopyCopy1", "buttonColor": "negative", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "se9oq90vzz", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -663,48 +594,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "outlined" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1Copy", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "7eeot7rb75", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -715,48 +640,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "ghost" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2CopyCopy1Copy", "buttonColor": "neutral", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "xqiwegh9cw", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -767,48 +686,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "ghost" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2CopyCopyCopyCopyCopyCopy", "buttonColor": "positive", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "6ovzai7czh", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -819,48 +732,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "ghost" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2CopyCopyCopy1Copy", "buttonColor": "negative", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "jgge200zlv", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -871,48 +778,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "ghost" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2CopyCopyCopyCopy1Copy", "buttonColor": "warning", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "7a5uzqwl80", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -923,49 +824,43 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "ghost" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopy", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, - "iconName": "123", + "rightColumn": 64.0, + "iconName": "number-123", "widgetId": "87z6livnpl", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -976,49 +871,43 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy2", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, - "iconName": "123", + "rightColumn": 64.0, + "iconName": "number-123", "widgetId": "vbxoco7b0r", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -1029,50 +918,44 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled", "iconAlign": "end" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy3", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": true, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, - "iconName": "123", + "rightColumn": 64.0, + "iconName": "number-123", "widgetId": "jyin7lo020", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -1083,48 +966,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy3Copy1", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Very long label that can't fit in a button", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "v7oj2c1blu", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -1135,49 +1012,43 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy3Copy2", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": true, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, - "iconName": "123", + "rightColumn": 64.0, + "iconName": "number-123", "widgetId": "wmmdr2putr", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -1188,18 +1059,15 @@ }, "isVisible": false, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "8j9w9sv03h", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" } ], @@ -1207,7 +1075,7 @@ "flexVerticalAlignment": "stretch", "key": "f6b8hrxei4", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "detachFromLayout": false, "widgetId": "8j9w9sv03h", "onCanvasUI": { @@ -1218,14 +1086,12 @@ "disableParentSelection": false }, "isVisible": true, - "version": 1, + "version": 1.0, "parentId": "v8yjcqoas6", - "tags": [ - "Layout" - ], + "tags": ["Layout"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "layout": [ { "isContainer": true, @@ -1238,35 +1104,33 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "x75woyqacu", + "alignment" : "start" , + "widgetId" : "x75woyqacu" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "5npsfsw7uy", + "alignment" : "start" , + "widgetId" : "5npsfsw7uy" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "7zgoizvqf2", + "alignment" : "start" , + "widgetId" : "7zgoizvqf2" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "gtzwavo5zz", + "alignment" : "start" , + "widgetId" : "gtzwavo5zz" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "34d2yb2t59", + "alignment" : "start" , + "widgetId" : "34d2yb2t59" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 }, { "insertChild": true, @@ -1274,35 +1138,33 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "wkf4n8empq", + "alignment" : "start" , + "widgetId" : "wkf4n8empq" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "7io1tl1uje", + "alignment" : "start" , + "widgetId" : "7io1tl1uje" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "ujh45xvca3", + "alignment" : "start" , + "widgetId" : "ujh45xvca3" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "se9oq90vzz", + "alignment" : "start" , + "widgetId" : "se9oq90vzz" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "mpima51xp0", + "alignment" : "start" , + "widgetId" : "mpima51xp0" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 }, { "insertChild": true, @@ -1310,35 +1172,33 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "7eeot7rb75", + "alignment" : "start" , + "widgetId" : "7eeot7rb75" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "xqiwegh9cw", + "alignment" : "start" , + "widgetId" : "xqiwegh9cw" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "6ovzai7czh", + "alignment" : "start" , + "widgetId" : "6ovzai7czh" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "jgge200zlv", + "alignment" : "start" , + "widgetId" : "jgge200zlv" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "7a5uzqwl80", + "alignment" : "start" , + "widgetId" : "7a5uzqwl80" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 }, { "insertChild": true, @@ -1346,20 +1206,18 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "87z6livnpl", + "alignment" : "start" , + "widgetId" : "87z6livnpl" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "vbxoco7b0r", + "alignment" : "start" , + "widgetId" : "vbxoco7b0r" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 }, { "insertChild": true, @@ -1367,20 +1225,18 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "jyin7lo020", + "alignment" : "start" , + "widgetId" : "jyin7lo020" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "start", - "widgetId": "wmmdr2putr", + "alignment" : "start" , + "widgetId" : "wmmdr2putr" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 }, { "insertChild": true, @@ -1388,34 +1244,29 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "v7oj2c1blu", + "alignment" : "start" , + "widgetId" : "v7oj2c1blu" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 } ], "layoutId": "d58md2udti", - "layoutStyle": { - "border": "none", - "height": "100%" - }, + "layoutStyle": {"border": "none", "height": "100%"}, "layoutType": "ZONE" } ], "responsiveBehavior": "fill", "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", - "mobileLeftColumn": 0 + "mobileLeftColumn": 0.0 } ], "elevatedBackground": false, "key": "04mvbegryn", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "detachFromLayout": false, "widgetId": "v8yjcqoas6", "onCanvasUI": { @@ -1425,16 +1276,14 @@ "focusColorCSSVar": "--on-canvas-ui-section-selection", "disableParentSelection": true }, - "zoneCount": 1, + "zoneCount": 1.0, "isVisible": true, - "version": 1, + "version": 1.0, "parentId": "0", - "tags": [ - "Layout" - ], + "tags": ["Layout"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "layout": [ { "isContainer": true, @@ -1442,107 +1291,90 @@ "isPermanent": true, "layout": [ { - "alignment": "start", - "widgetId": "8j9w9sv03h", + "alignment" : "start" , + "widgetId" : "8j9w9sv03h" , "widgetType": "ZONE_WIDGET" } ], "layoutId": "ejuo2ps87t", - "layoutStyle": { - "border": "none" - }, + "layoutStyle": {"border": "none"}, "layoutType": "SECTION", - "maxChildLimit": 4 + "maxChildLimit": 4.0 } ], "responsiveBehavior": "fill", - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "spaceDistributed": { - "8j9w9sv03h": 12, - "esf9bo8rdb": 6, - "9skig54m85": 6 + "8j9w9sv03h": 12.0, + "esf9bo8rdb": 6.0, + "9skig54m85": 6.0 } }, { "needsErrorInfo": false, "boxShadow": "NONE", - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Section2", "isCanvas": true, "displayName": "Section", - "searchTags": [ - "div", - "parent", - "group" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["div", "parent", "group"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "SECTION_WIDGET", "hideCard": true, - "mobileRightColumn": 64, - "parentColumnSpace": 1, - "leftColumn": 0, + "mobileRightColumn": 64.0, + "parentColumnSpace": 1.0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "children": [ { "needsErrorInfo": false, "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}", - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Zone2", - "flexGrow": 12, + "flexGrow": 12.0, "isCanvas": true, "displayName": "Zone", - "searchTags": [ - "div", - "parent", - "group" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["div", "parent", "group"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "ZONE_WIDGET", "hideCard": false, - "mobileRightColumn": 64, - "parentColumnSpace": 1, - "leftColumn": 0, + "mobileRightColumn": 64.0, + "parentColumnSpace": 1.0, + "leftColumn": 0.0, "dynamicBindingPathList": [ - { - "key": "borderRadius" - }, - { - "key": "boxShadow" - } + {"key": "borderRadius"}, + {"key": "boxShadow" } ], "children": [ { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy3Copy", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "ccexmv1nin", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -1553,54 +1385,46 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "82umg6t5jk", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy3CopyCopy", "onClick": "{{}}", "buttonColor": "accent", "isCanvas": false, "dynamicPropertyPathList": [ - { - "key": "onClick" - } + {"key": "onClick"} ], "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "yhmyxkaqqe", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -1611,48 +1435,42 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "82umg6t5jk", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" }, { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy3CopyCopyCopy", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "dk0b1jq9ot", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -1663,18 +1481,15 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "82umg6t5jk", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" } ], @@ -1682,7 +1497,7 @@ "flexVerticalAlignment": "stretch", "key": "f6b8hrxei4", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "detachFromLayout": false, "widgetId": "82umg6t5jk", "onCanvasUI": { @@ -1693,14 +1508,12 @@ "disableParentSelection": false }, "isVisible": true, - "version": 1, + "version": 1.0, "parentId": "22t51nvpve", - "tags": [ - "Layout" - ], + "tags": ["Layout"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "layout": [ { "isContainer": true, @@ -1713,44 +1526,39 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "ccexmv1nin", + "alignment" : "start" , + "widgetId" : "ccexmv1nin" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "center", - "widgetId": "yhmyxkaqqe", + "alignment" : "center" , + "widgetId" : "yhmyxkaqqe" , "widgetType": "WDS_BUTTON_WIDGET" }, { - "alignment": "end", - "widgetId": "dk0b1jq9ot", + "alignment" : "end" , + "widgetId" : "dk0b1jq9ot" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 } ], "layoutId": "wezhh0gbiu", - "layoutStyle": { - "border": "none", - "height": "100%" - }, + "layoutStyle": {"border": "none", "height": "100%"}, "layoutType": "ZONE" } ], "responsiveBehavior": "fill", "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", - "mobileLeftColumn": 0 + "mobileLeftColumn": 0.0 } ], "elevatedBackground": false, "key": "04mvbegryn", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "detachFromLayout": false, "widgetId": "22t51nvpve", "onCanvasUI": { @@ -1760,16 +1568,14 @@ "focusColorCSSVar": "--on-canvas-ui-section-selection", "disableParentSelection": true }, - "zoneCount": 1, + "zoneCount": 1.0, "isVisible": true, - "version": 1, + "version": 1.0, "parentId": "0", - "tags": [ - "Layout" - ], + "tags": ["Layout"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "layout": [ { "isContainer": true, @@ -1777,105 +1583,86 @@ "isPermanent": true, "layout": [ { - "alignment": "start", - "widgetId": "82umg6t5jk", + "alignment" : "start" , + "widgetId" : "82umg6t5jk" , "widgetType": "ZONE_WIDGET" } ], "layoutId": "52wwglyrdw", - "layoutStyle": { - "border": "none" - }, + "layoutStyle": {"border": "none"}, "layoutType": "SECTION", - "maxChildLimit": 4 + "maxChildLimit": 4.0 } ], "responsiveBehavior": "fill", - "mobileLeftColumn": 0, - "spaceDistributed": { - "82umg6t5jk": 12 - } + "mobileLeftColumn": 0.0, + "spaceDistributed": {"82umg6t5jk": 12.0} }, { "needsErrorInfo": false, "boxShadow": "NONE", - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Section3", "isCanvas": true, "displayName": "Section", - "searchTags": [ - "div", - "parent", - "group" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["div", "parent", "group"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "SECTION_WIDGET", "hideCard": true, - "mobileRightColumn": 64, - "parentColumnSpace": 1, - "leftColumn": 0, + "mobileRightColumn": 64.0, + "parentColumnSpace": 1.0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "children": [ { "needsErrorInfo": false, "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}", - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Zone3", - "flexGrow": 6, + "flexGrow": 6.0, "isCanvas": true, "displayName": "Zone", - "searchTags": [ - "div", - "parent", - "group" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["div", "parent", "group"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "ZONE_WIDGET", "hideCard": false, - "mobileRightColumn": 64, - "parentColumnSpace": 1, - "leftColumn": 0, + "mobileRightColumn": 64.0, + "parentColumnSpace": 1.0, + "leftColumn": 0.0, "dynamicBindingPathList": [ - { - "key": "borderRadius" - }, - { - "key": "boxShadow" - } + {"key": "borderRadius"}, + {"key": "boxShadow" } ], "children": [ { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy3CopyCopy1Copy", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "ctap96gwts", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -1886,18 +1673,15 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "piz7tt0to3", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" } ], @@ -1905,7 +1689,7 @@ "flexVerticalAlignment": "stretch", "key": "f6b8hrxei4", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "detachFromLayout": false, "widgetId": "piz7tt0to3", "onCanvasUI": { @@ -1916,14 +1700,12 @@ "disableParentSelection": false }, "isVisible": true, - "version": 1, + "version": 1.0, "parentId": "wa3fauc5cx", - "tags": [ - "Layout" - ], + "tags": ["Layout"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "layout": [ { "isContainer": true, @@ -1936,87 +1718,71 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "ctap96gwts", + "alignment" : "start" , + "widgetId" : "ctap96gwts" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 } ], "layoutId": "lep7vtv1il", - "layoutStyle": { - "border": "none", - "height": "100%" - }, + "layoutStyle": {"border": "none", "height": "100%"}, "layoutType": "ZONE" } ], "responsiveBehavior": "fill", "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", - "mobileLeftColumn": 0 + "mobileLeftColumn": 0.0 }, { "needsErrorInfo": false, "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}", - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Zone4", - "flexGrow": 6, + "flexGrow": 6.0, "isCanvas": true, "displayName": "Zone", - "searchTags": [ - "div", - "parent", - "group" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["div", "parent", "group"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "ZONE_WIDGET", "hideCard": false, - "mobileRightColumn": 64, - "parentColumnSpace": 1, - "leftColumn": 0, + "mobileRightColumn": 64.0, + "parentColumnSpace": 1.0, + "leftColumn": 0.0, "dynamicBindingPathList": [ - { - "key": "borderRadius" - }, - { - "key": "boxShadow" - } + {"key": "borderRadius"}, + {"key": "boxShadow" } ], "children": [ { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy3CopyCopy1", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "4u9iglohfg", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -2027,18 +1793,15 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "m010rk2xo7", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" } ], @@ -2046,7 +1809,7 @@ "flexVerticalAlignment": "stretch", "key": "f6b8hrxei4", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "detachFromLayout": false, "widgetId": "m010rk2xo7", "onCanvasUI": { @@ -2057,14 +1820,12 @@ "disableParentSelection": false }, "isVisible": true, - "version": 1, + "version": 1.0, "parentId": "wa3fauc5cx", - "tags": [ - "Layout" - ], + "tags": ["Layout"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "layout": [ { "isContainer": true, @@ -2077,34 +1838,29 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "4u9iglohfg", + "alignment" : "start" , + "widgetId" : "4u9iglohfg" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 } ], "layoutId": "j8zcjs6hp3", - "layoutStyle": { - "border": "none", - "height": "100%" - }, + "layoutStyle": {"border": "none", "height": "100%"}, "layoutType": "ZONE" } ], "responsiveBehavior": "fill", "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", - "mobileLeftColumn": 0 + "mobileLeftColumn": 0.0 } ], "elevatedBackground": false, "key": "04mvbegryn", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "detachFromLayout": false, "widgetId": "wa3fauc5cx", "onCanvasUI": { @@ -2114,16 +1870,14 @@ "focusColorCSSVar": "--on-canvas-ui-section-selection", "disableParentSelection": true }, - "zoneCount": 2, + "zoneCount": 2.0, "isVisible": true, - "version": 1, + "version": 1.0, "parentId": "0", - "tags": [ - "Layout" - ], + "tags": ["Layout"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "layout": [ { "isContainer": true, @@ -2131,111 +1885,91 @@ "isPermanent": true, "layout": [ { - "alignment": "start", - "widgetId": "piz7tt0to3", + "alignment" : "start" , + "widgetId" : "piz7tt0to3" , "widgetType": "ZONE_WIDGET" }, { - "alignment": "start", - "widgetId": "m010rk2xo7", + "alignment" : "start" , + "widgetId" : "m010rk2xo7" , "widgetType": "ZONE_WIDGET" } ], "layoutId": "3t66a13vsa", - "layoutStyle": { - "border": "none" - }, + "layoutStyle": {"border": "none"}, "layoutType": "SECTION", - "maxChildLimit": 4 + "maxChildLimit": 4.0 } ], "responsiveBehavior": "fill", - "mobileLeftColumn": 0, - "spaceDistributed": { - "piz7tt0to3": 6, - "m010rk2xo7": 6 - } + "mobileLeftColumn": 0.0, + "spaceDistributed": {"piz7tt0to3": 6.0, "m010rk2xo7": 6.0} }, { "needsErrorInfo": false, "boxShadow": "NONE", - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Section4", "isCanvas": true, "displayName": "Section", - "searchTags": [ - "div", - "parent", - "group" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["div", "parent", "group"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "SECTION_WIDGET", "hideCard": true, - "mobileRightColumn": 64, - "parentColumnSpace": 1, - "leftColumn": 0, + "mobileRightColumn": 64.0, + "parentColumnSpace": 1.0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "children": [ { "needsErrorInfo": false, "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}", - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Zone5", - "flexGrow": 4, + "flexGrow": 4.0, "isCanvas": true, "displayName": "Zone", - "searchTags": [ - "div", - "parent", - "group" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["div", "parent", "group"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "ZONE_WIDGET", "hideCard": false, - "mobileRightColumn": 64, - "parentColumnSpace": 1, - "leftColumn": 0, + "mobileRightColumn": 64.0, + "parentColumnSpace": 1.0, + "leftColumn": 0.0, "dynamicBindingPathList": [ - { - "key": "borderRadius" - }, - { - "key": "boxShadow" - } + {"key": "borderRadius"}, + {"key": "boxShadow" } ], "children": [ { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy3CopyCopy1Copy1", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "wvm4rsp28w", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -2246,18 +1980,15 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "c1zk109ftd", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" } ], @@ -2265,7 +1996,7 @@ "flexVerticalAlignment": "stretch", "key": "f6b8hrxei4", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "detachFromLayout": false, "widgetId": "c1zk109ftd", "onCanvasUI": { @@ -2276,14 +2007,12 @@ "disableParentSelection": false }, "isVisible": true, - "version": 1, + "version": 1.0, "parentId": "c3qg79mmbs", - "tags": [ - "Layout" - ], + "tags": ["Layout"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "layout": [ { "isContainer": true, @@ -2296,87 +2025,71 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "wvm4rsp28w", + "alignment" : "start" , + "widgetId" : "wvm4rsp28w" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 } ], "layoutId": "rr29h0gs2r", - "layoutStyle": { - "border": "none", - "height": "100%" - }, + "layoutStyle": {"border": "none", "height": "100%"}, "layoutType": "ZONE" } ], "responsiveBehavior": "fill", "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", - "mobileLeftColumn": 0 + "mobileLeftColumn": 0.0 }, { "needsErrorInfo": false, "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}", - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Zone4Copy", - "flexGrow": 4, + "flexGrow": 4.0, "isCanvas": true, "displayName": "Zone", - "searchTags": [ - "div", - "parent", - "group" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["div", "parent", "group"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "ZONE_WIDGET", "hideCard": false, - "mobileRightColumn": 64, - "parentColumnSpace": 1, - "leftColumn": 0, + "mobileRightColumn": 64.0, + "parentColumnSpace": 1.0, + "leftColumn": 0.0, "dynamicBindingPathList": [ - { - "key": "borderRadius" - }, - { - "key": "boxShadow" - } + {"key": "borderRadius"}, + {"key": "boxShadow" } ], "children": [ { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy3CopyCopy1Copy2", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "jz6hajk7n5", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -2387,18 +2100,15 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "194q1o3h78", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" } ], @@ -2406,7 +2116,7 @@ "flexVerticalAlignment": "stretch", "key": "f6b8hrxei4", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "detachFromLayout": false, "widgetId": "194q1o3h78", "onCanvasUI": { @@ -2417,14 +2127,12 @@ "disableParentSelection": false }, "isVisible": true, - "version": 1, + "version": 1.0, "parentId": "c3qg79mmbs", - "tags": [ - "Layout" - ], + "tags": ["Layout"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "layout": [ { "isContainer": true, @@ -2437,87 +2145,71 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "jz6hajk7n5", + "alignment" : "start" , + "widgetId" : "jz6hajk7n5" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 } ], "layoutId": "5dcj1urevc", - "layoutStyle": { - "border": "none", - "height": "100%" - }, + "layoutStyle": {"border": "none", "height": "100%"}, "layoutType": "ZONE" } ], "responsiveBehavior": "fill", "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", - "mobileLeftColumn": 0 + "mobileLeftColumn": 0.0 }, { "needsErrorInfo": false, "boxShadow": "{{appsmith.theme.boxShadow.appBoxShadow}}", - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Zone4Copy1", - "flexGrow": 4, + "flexGrow": 4.0, "isCanvas": true, "displayName": "Zone", - "searchTags": [ - "div", - "parent", - "group" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["div", "parent", "group"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "ZONE_WIDGET", "hideCard": false, - "mobileRightColumn": 64, - "parentColumnSpace": 1, - "leftColumn": 0, + "mobileRightColumn": 64.0, + "parentColumnSpace": 1.0, + "leftColumn": 0.0, "dynamicBindingPathList": [ - { - "key": "borderRadius" - }, - { - "key": "boxShadow" - } + {"key": "borderRadius"}, + {"key": "boxShadow" } ], "children": [ { "resetFormOnClick": false, "needsErrorInfo": false, - "mobileBottomRow": 10, + "mobileBottomRow": 10.0, "widgetName": "Button2Copy1CopyCopyCopy3CopyCopy1Copy3", "buttonColor": "accent", "isCanvas": false, "displayName": "Button", - "searchTags": [ - "click", - "submit" - ], - "topRow": 0, - "bottomRow": 10, - "parentRowSpace": 10, + "searchTags": ["click", "submit"], + "topRow": 0.0, + "bottomRow": 10.0, + "parentRowSpace": 10.0, "type": "WDS_BUTTON_WIDGET", "hideCard": false, - "mobileRightColumn": 64, + "mobileRightColumn": 64.0, "animateLoading": true, - "parentColumnSpace": 1, + "parentColumnSpace": 1.0, "dynamicTriggerPathList": [], - "leftColumn": 0, + "leftColumn": 0.0, "dynamicBindingPathList": [], "text": "Do something", "isDisabled": false, "key": "bn9xz1h2d0", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "widgetId": "ok0k9hn4dg", "onCanvasUI": { "selectionBGCSSVar": "--on-canvas-ui-widget-selection", @@ -2528,18 +2220,15 @@ }, "isVisible": true, "recaptchaType": "V3", - "version": 1, + "version": 1.0, "parentId": "o7j5kktsuu", - "tags": [ - "Suggested", - "Buttons" - ], + "tags": ["Suggested", "Buttons"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "responsiveBehavior": "hug", "disabledWhenInvalid": false, - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "buttonVariant": "filled" } ], @@ -2547,7 +2236,7 @@ "flexVerticalAlignment": "stretch", "key": "f6b8hrxei4", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "detachFromLayout": false, "widgetId": "o7j5kktsuu", "onCanvasUI": { @@ -2558,14 +2247,12 @@ "disableParentSelection": false }, "isVisible": true, - "version": 1, + "version": 1.0, "parentId": "c3qg79mmbs", - "tags": [ - "Layout" - ], + "tags": ["Layout"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "layout": [ { "isContainer": true, @@ -2578,34 +2265,29 @@ "layoutType": "ALIGNED_WIDGET_ROW", "layout": [ { - "alignment": "start", - "widgetId": "ok0k9hn4dg", + "alignment" : "start" , + "widgetId" : "ok0k9hn4dg" , "widgetType": "WDS_BUTTON_WIDGET" } ], - "allowedWidgetTypes": [ - "SMALL_WIDGETS" - ], - "maxChildLimit": 0 + "allowedWidgetTypes": ["SMALL_WIDGETS"], + "maxChildLimit": 0.0 } ], "layoutId": "4ea1fxmoer", - "layoutStyle": { - "border": "none", - "height": "100%" - }, + "layoutStyle": {"border": "none", "height": "100%"}, "layoutType": "ZONE" } ], "responsiveBehavior": "fill", "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", - "mobileLeftColumn": 0 + "mobileLeftColumn": 0.0 } ], "elevatedBackground": false, "key": "04mvbegryn", "isDeprecated": false, - "rightColumn": 64, + "rightColumn": 64.0, "detachFromLayout": false, "widgetId": "c3qg79mmbs", "onCanvasUI": { @@ -2615,16 +2297,14 @@ "focusColorCSSVar": "--on-canvas-ui-section-selection", "disableParentSelection": true }, - "zoneCount": 3, + "zoneCount": 3.0, "isVisible": true, - "version": 1, + "version": 1.0, "parentId": "0", - "tags": [ - "Layout" - ], + "tags": ["Layout"], "renderMode": "CANVAS", "isLoading": false, - "mobileTopRow": 0, + "mobileTopRow": 0.0, "layout": [ { "isContainer": true, @@ -2632,35 +2312,33 @@ "isPermanent": true, "layout": [ { - "alignment": "start", - "widgetId": "c1zk109ftd", + "alignment" : "start" , + "widgetId" : "c1zk109ftd" , "widgetType": "ZONE_WIDGET" }, { - "alignment": "start", - "widgetId": "194q1o3h78", + "alignment" : "start" , + "widgetId" : "194q1o3h78" , "widgetType": "ZONE_WIDGET" }, { - "alignment": "start", - "widgetId": "o7j5kktsuu", + "alignment" : "start" , + "widgetId" : "o7j5kktsuu" , "widgetType": "ZONE_WIDGET" } ], "layoutId": "eogsma2p43", - "layoutStyle": { - "border": "none" - }, + "layoutStyle": {"border": "none"}, "layoutType": "SECTION", - "maxChildLimit": 4 + "maxChildLimit": 4.0 } ], "responsiveBehavior": "fill", - "mobileLeftColumn": 0, + "mobileLeftColumn": 0.0, "spaceDistributed": { - "c1zk109ftd": 4, - "194q1o3h78": 4, - "o7j5kktsuu": 4 + "c1zk109ftd": 4.0, + "194q1o3h78": 4.0, + "o7j5kktsuu": 4.0 } } ] diff --git a/app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeploy.snap.png new file mode 100644 index 000000000000..014c61a806cf Binary files /dev/null and b/app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeployIpad2.snap.png similarity index 100% rename from app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeployipad-2.snap.png rename to app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeployIpad2.snap.png diff --git a/app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeployIphone6.snap.png similarity index 100% rename from app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeployiphone-6.snap.png rename to app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeployIphone6.snap.png diff --git a/app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeployMacbook13.snap.png similarity index 100% rename from app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeploymacbook-13.snap.png rename to app/client/cypress/snapshots/AnvilButtonWidgetSnapshot_spec.ts/anvilButtonWidgetDeployMacbook13.snap.png diff --git a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetCanvas.snap.png index db241d821bbb..c00073656464 100644 Binary files a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetCanvasDark.snap.png index d15ce1bbcfeb..99723edea0c3 100644 Binary files a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeploy.snap.png new file mode 100644 index 000000000000..07af06a39ac8 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..a48d0521e5c2 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..4ab8649a1c4f Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..667b23d5a9ea Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployipad-2.snap.png deleted file mode 100644 index e4488853b979..000000000000 Binary files a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployiphone-6.snap.png deleted file mode 100644 index 5e97ab55d458..000000000000 Binary files a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeploymacbook-13.snap.png deleted file mode 100644 index 79536fca5c5a..000000000000 Binary files a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetPreview.snap.png deleted file mode 100644 index 398f84647c96..000000000000 Binary files a/app/client/cypress/snapshots/AnvilCheckboxGroupWidgetSnapshot_spec.ts/anvilCheckboxGroupWidgetPreview.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetCanvas.snap.png index e7f5bd257e44..638f7512b652 100644 Binary files a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetCanvasDark.snap.png index 3c7145004836..e10556e339c3 100644 Binary files a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeploy.snap.png new file mode 100644 index 000000000000..d056070f672a Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..cfef083ea76d Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..28688affe504 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..e167ae4c4eab Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployipad-2.snap.png deleted file mode 100644 index 8320898e4867..000000000000 Binary files a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployiphone-6.snap.png deleted file mode 100644 index 97aba9e0c472..000000000000 Binary files a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeploymacbook-13.snap.png deleted file mode 100644 index c970cb163e08..000000000000 Binary files a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetPreview.snap.png index 7e6e69d1b9ac..21192f733d80 100644 Binary files a/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilCheckboxWidgetSnapshot_spec.ts/anvilCheckboxWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetCanvas.snap.png index de542202bf6c..0300c70eca16 100644 Binary files a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetCanvasDark.snap.png index 4795b7a5101b..f3bb4c7cbcc1 100644 Binary files a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeploy.snap.png new file mode 100644 index 000000000000..55dfe0963484 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..a44d594b89a5 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..40beff09e2f2 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..ace1518f413b Binary files /dev/null and b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployipad-2.snap.png deleted file mode 100644 index bbf52bf8ae17..000000000000 Binary files a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployiphone-6.snap.png deleted file mode 100644 index f6f20218f20f..000000000000 Binary files a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeploymacbook-13.snap.png deleted file mode 100644 index e23c6f89e1f5..000000000000 Binary files a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetPreview.snap.png index 886484266c12..4cc425161260 100644 Binary files a/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilCurrencyInputWidgetSnapshot_spec.ts/anvilCurrencyInputWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetCanvas.snap.png index f66ee9c16fa4..2f0c8aeb79b3 100644 Binary files a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeploy.snap.png new file mode 100644 index 000000000000..2b867650b233 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..b6ed9501a928 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..c6366a825a8b Binary files /dev/null and b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..ff97d7e69f9a Binary files /dev/null and b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployipad-2.snap.png deleted file mode 100644 index 93c904c7829f..000000000000 Binary files a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployiphone-6.snap.png deleted file mode 100644 index 11f78a2bf539..000000000000 Binary files a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeploymacbook-13.snap.png deleted file mode 100644 index e6a532400eb8..000000000000 Binary files a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetPreview.snap.png index 349d52c3e2f1..8250dab8fa52 100644 Binary files a/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilHeadingWidgetSnapshot_spec.ts/anvilHeadingWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeploy.snap.png new file mode 100644 index 000000000000..16dbfc575203 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeployIpad2.snap.png similarity index 100% rename from app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeployipad-2.snap.png rename to app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeployIpad2.snap.png diff --git a/app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeployIphone6.snap.png similarity index 100% rename from app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeployiphone-6.snap.png rename to app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeployIphone6.snap.png diff --git a/app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeployMacbook13.snap.png similarity index 100% rename from app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeploymacbook-13.snap.png rename to app/client/cypress/snapshots/AnvilIconButtonWidgetSnapshot_spec.ts/anvilIconButtonWidgetDeployMacbook13.snap.png diff --git a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetCanvas.snap.png index 4221df873e9b..2ea0bd9d1459 100644 Binary files a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetCanvasDark.snap.png index 185c1d4ae4b8..a85340f51221 100644 Binary files a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeploy.snap.png new file mode 100644 index 000000000000..1242df0a23c0 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..35e847e4f176 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..461f4146d3c6 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..81b1c10e0676 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployipad-2.snap.png deleted file mode 100644 index af8328238139..000000000000 Binary files a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployiphone-6.snap.png deleted file mode 100644 index 17762cd68387..000000000000 Binary files a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeploymacbook-13.snap.png deleted file mode 100644 index c0751049fbc4..000000000000 Binary files a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetPreview.snap.png index 37d8062a14d5..2ebe45e1d741 100644 Binary files a/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilInlineButtonWidgetSnapshot_spec.ts/anvilInlineButtonWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetCanvas.snap.png index 8db986104bfa..0e50a787fb7a 100644 Binary files a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetCanvasDark.snap.png index 913044bd85ff..4d3d81b038a4 100644 Binary files a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeploy.snap.png new file mode 100644 index 000000000000..e837056c60c4 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..7187ace9df9a Binary files /dev/null and b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..e738b362115f Binary files /dev/null and b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..71d69088cd52 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployipad-2.snap.png deleted file mode 100644 index b19455051fb2..000000000000 Binary files a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployiphone-6.snap.png deleted file mode 100644 index 4093de0995a8..000000000000 Binary files a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeploymacbook-13.snap.png deleted file mode 100644 index 30a5d5f230c5..000000000000 Binary files a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetPreview.snap.png index aa24fbbe60c1..2aeb70b4da02 100644 Binary files a/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilInputWidgetSnapshot_spec.ts/anvilInputWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetCanvas.snap.png index ca77712bf132..80720a86ccf9 100644 Binary files a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeploy.snap.png new file mode 100644 index 000000000000..5125adede622 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..c8fd50be0da5 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..e95f5fca70df Binary files /dev/null and b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..133bbde75a69 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployipad-2.snap.png deleted file mode 100644 index 2e9d62e43325..000000000000 Binary files a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployiphone-6.snap.png deleted file mode 100644 index bb49e155d87e..000000000000 Binary files a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeploymacbook-13.snap.png deleted file mode 100644 index 8de83833b203..000000000000 Binary files a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetPreview.snap.png index 4a373b6111de..bc507cbf212a 100644 Binary files a/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilParagraphWidgetSnapshot_spec.ts/anvilParagraphWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetCanvas.snap.png index 80f930f00ab7..838e864772b0 100644 Binary files a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetCanvasDark.snap.png index e5a60fd8ccd7..12e321bb3467 100644 Binary files a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeploy.snap.png new file mode 100644 index 000000000000..ca337536f191 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..16d3674230c5 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..16406441c465 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..ad31a8ef9198 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployipad-2.snap.png deleted file mode 100644 index f4cdce9e79c4..000000000000 Binary files a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployiphone-6.snap.png deleted file mode 100644 index 7b7376481175..000000000000 Binary files a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeploymacbook-13.snap.png deleted file mode 100644 index 18016bf8cae6..000000000000 Binary files a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetPreview.snap.png index a3d8c1b65525..78ee48243c58 100644 Binary files a/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilPhoneInputWidgetSnapshot_spec.ts/anvilPhoneInputWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetCanvas.snap.png index dc7cd9035b2e..0c21e07e3677 100644 Binary files a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetCanvasDark.snap.png index c244edef1fc4..4904545566c8 100644 Binary files a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeploy.snap.png new file mode 100644 index 000000000000..ab2899a61ae4 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..6a0186d5d717 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..d7d5c6ba9c85 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..688f1ab51c93 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployipad-2.snap.png deleted file mode 100644 index adf2e7737b3f..000000000000 Binary files a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployiphone-6.snap.png deleted file mode 100644 index b5ffb8b445cf..000000000000 Binary files a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeploymacbook-13.snap.png deleted file mode 100644 index aeda9c99919b..000000000000 Binary files a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetPreview.snap.png index 1d30b7d5e769..a43461898213 100644 Binary files a/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilRadioGroupWidgetSnapshot_spec.ts/anvilRadioGroupWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetCanvas.snap.png index 37f3fc088610..06434512ee84 100644 Binary files a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetCanvasDark.snap.png index 32c180b0ad12..d6bb8a6bbe51 100644 Binary files a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeploy.snap.png new file mode 100644 index 000000000000..2604bb7793d4 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..c35cc253f724 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..c73ebbc717f8 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..ae6ba5ce2719 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployipad-2.snap.png deleted file mode 100644 index 1b17b5e85def..000000000000 Binary files a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployiphone-6.snap.png deleted file mode 100644 index 5bbc74fdbb0d..000000000000 Binary files a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeploymacbook-13.snap.png deleted file mode 100644 index 7c1130ffb547..000000000000 Binary files a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetPreview.snap.png deleted file mode 100644 index 998b53193707..000000000000 Binary files a/app/client/cypress/snapshots/AnvilStatsWidgetSnapshot_spec.ts/anvilStatsWidgetPreview.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetCanvas.snap.png index c5451dadc795..25a6e224ec47 100644 Binary files a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetCanvasDark.snap.png index 1949ff5946c1..372c306a8926 100644 Binary files a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeploy.snap.png new file mode 100644 index 000000000000..d311d84a2c3b Binary files /dev/null and b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..d76b0fb3ec01 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..720adcecad36 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..c41500b2eb8c Binary files /dev/null and b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployipad-2.snap.png deleted file mode 100644 index c31e5b502f47..000000000000 Binary files a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployiphone-6.snap.png deleted file mode 100644 index a11abdeaed78..000000000000 Binary files a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeploymacbook-13.snap.png deleted file mode 100644 index 321ee313ebab..000000000000 Binary files a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetPreview.snap.png new file mode 100644 index 000000000000..95464079c100 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchGroupWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchoGroupWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchoGroupWidgetPreview.snap.png deleted file mode 100644 index 1b87c03ff8d8..000000000000 Binary files a/app/client/cypress/snapshots/AnvilSwitchGroupWidgetSnapshot_spec.ts/anvilSwitchoGroupWidgetPreview.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetCanvas.snap.png index 75d9564de1c5..05cde1d1851a 100644 Binary files a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetCanvasDark.snap.png index 6496312a2245..a68b7638cff6 100644 Binary files a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeploy.snap.png new file mode 100644 index 000000000000..b58bf199d78f Binary files /dev/null and b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..cca05065c637 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..d51e119cc1da Binary files /dev/null and b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..c91e2c20ec33 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployipad-2.snap.png deleted file mode 100644 index 4f706e6d8424..000000000000 Binary files a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployiphone-6.snap.png deleted file mode 100644 index 48c0daa4407b..000000000000 Binary files a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeploymacbook-13.snap.png deleted file mode 100644 index 40401948a0ee..000000000000 Binary files a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetPreview.snap.png index 7d628b54d969..f28d5ac8e8a3 100644 Binary files a/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilSwitchWidgetSnapshot_spec.ts/anvilSwitchWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetCanvas.snap.png index c52f4153fa7c..48f94e8f6635 100644 Binary files a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetCanvasDark.snap.png index e14f85c17b9c..2ebdd516b6bb 100644 Binary files a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeploy.snap.png new file mode 100644 index 000000000000..77a560e978ad Binary files /dev/null and b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..334bd746c155 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..b39cad5b10d9 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..cb3800ddbf6c Binary files /dev/null and b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployipad-2.snap.png deleted file mode 100644 index f0ebc4195a4c..000000000000 Binary files a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployiphone-6.snap.png deleted file mode 100644 index a7373b73c04a..000000000000 Binary files a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeploymacbook-13.snap.png deleted file mode 100644 index 1c734b6533ce..000000000000 Binary files a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetPreview.snap.png index 42ad7020d51f..a546b3aed63d 100644 Binary files a/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilTableWidgetSnapshot_spec.ts/anvilTableWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetCanvas.snap.png index 5d788e1547e2..6570399ec676 100644 Binary files a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetCanvasDark.snap.png index 74ec33db5198..fc6cd6dc684f 100644 Binary files a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeploy.snap.png new file mode 100644 index 000000000000..2a8b74cb3853 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..d77a35808608 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..6969910c89cd Binary files /dev/null and b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..5507d155809e Binary files /dev/null and b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployipad-2.snap.png deleted file mode 100644 index e6e2eda3cf3a..000000000000 Binary files a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployiphone-6.snap.png deleted file mode 100644 index f499d7cfc7b1..000000000000 Binary files a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeploymacbook-13.snap.png deleted file mode 100644 index a464da47d9fa..000000000000 Binary files a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetPreview.snap.png index e8d57dec33bb..8b9610336376 100644 Binary files a/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilToolbarButtonWidgetSnapshot_spec.ts/anvilToolbarButtonWidgetPreview.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetCanvas.snap.png b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetCanvas.snap.png index 604cad61c897..beec045b8f04 100644 Binary files a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetCanvas.snap.png and b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetCanvas.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetCanvasDark.snap.png b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetCanvasDark.snap.png index 1f9edcf99b4d..1f2c0315dee8 100644 Binary files a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetCanvasDark.snap.png and b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetCanvasDark.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeploy.snap.png b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeploy.snap.png new file mode 100644 index 000000000000..22a20536010c Binary files /dev/null and b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeploy.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployIpad2.snap.png b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployIpad2.snap.png new file mode 100644 index 000000000000..56f7024dd737 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployIpad2.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployIphone6.snap.png b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployIphone6.snap.png new file mode 100644 index 000000000000..5625ecb033f5 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployIphone6.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployMacbook13.snap.png b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployMacbook13.snap.png new file mode 100644 index 000000000000..7d6fae1623a7 Binary files /dev/null and b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployMacbook13.snap.png differ diff --git a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployipad-2.snap.png b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployipad-2.snap.png deleted file mode 100644 index 31e18c4f995c..000000000000 Binary files a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployipad-2.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployiphone-6.snap.png b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployiphone-6.snap.png deleted file mode 100644 index 7265a1bb7bb8..000000000000 Binary files a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeployiphone-6.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeploymacbook-13.snap.png b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeploymacbook-13.snap.png deleted file mode 100644 index 1a885daf4d28..000000000000 Binary files a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetDeploymacbook-13.snap.png and /dev/null differ diff --git a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetPreview.snap.png b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetPreview.snap.png index bfdf68c72394..417d8133fc9e 100644 Binary files a/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetPreview.snap.png and b/app/client/cypress/snapshots/AnvilZoneSectionWidgetSnapshot_spec.ts/anvilZoneSectionWidgetPreview.snap.png differ diff --git a/app/client/cypress/support/Pages/Anvil/AnvilSnapshot.ts b/app/client/cypress/support/Pages/Anvil/AnvilSnapshot.ts index 6675792a9c81..bbe2c3105b6f 100644 --- a/app/client/cypress/support/Pages/Anvil/AnvilSnapshot.ts +++ b/app/client/cypress/support/Pages/Anvil/AnvilSnapshot.ts @@ -1,9 +1,11 @@ +import { camelCase } from "lodash"; import { ObjectsRegistry } from "../../Objects/Registry"; export class AnvilSnapshot { private appSettings = ObjectsRegistry.AppSettings; private agHelper = ObjectsRegistry.AggregateHelper; private deployMode = ObjectsRegistry.DeployMode; + private locators = { enterPreviewMode: ObjectsRegistry.CommonLocators._enterPreviewMode, exitPreviewMode: ObjectsRegistry.CommonLocators._exitPreviewMode, @@ -11,80 +13,171 @@ export class AnvilSnapshot { colorMode: "[data-testid=t--anvil-theme-settings-color-mode]", appViewerPage: "[data-testid=t--app-viewer-page]", propertyPaneSidebar: "[data-testid=t--property-pane-sidebar]", + accentColorInput: "[data-testid=t--color-picker-input]", + fontFamilySectionInput: + "[data-testid=t--anvil-theme-settings-font-family] input", + densityOptions: "[data-testid=t--anvil-theme-settings-density] > div", + sizingOptions: "[data-testid=t--anvil-theme-settings-sizing] > div", + cornersOptions: "[data-testid=t--anvil-theme-settings-corners] > div", + iconStyleOptions: "[data-testid=t--anvil-theme-settings-icon-style] > div", }; - public verifyCanvasMode = async (widgetName: string) => { - this.agHelper - .GetElement(this.locators.canvas) - .matchImageSnapshot(`anvil${widgetName}Canvas`, { - comparisonMethod: "ssim", - }); - - this.setTheme("dark"); + /** + * This method is used to match the snapshot of the canvas, preview, and deploy mode. + * Also, it generates/tests with snapshot name based on the widget name, mode, and theme. + * For e.g - + * - ("ButtonWidget", "canvas", "light") -> AnvilButtonWidgetCanvas + * - ("ButtonWidget", "preview", "dark") -> AnvilButtonWidgetPreviewDark + */ + public matchSnapshot( + locator: string, + name: string, + mode: "canvas" | "preview" | "deploy" = "canvas", + theme: "light" | "dark" = "light", + size?: Cypress.ViewportPreset, + ) { + const snapshotName = camelCase( + `anvil_${name}$_${mode}${theme == "dark" ? "_dark" : ""}${size ? `_${size}` : ""}`, + ); - this.agHelper - .GetElement(this.locators.canvas) - .matchImageSnapshot(`anvil${widgetName}CanvasDark`, { - comparisonMethod: "ssim", - }); + this.agHelper.GetElement(locator).matchImageSnapshot(snapshotName, { + comparisonMethod: "ssim", + }); + } - this.setTheme("light"); + public matchSnapshotForCanvasMode = ( + name: string, + theme: Parameters<typeof this.matchSnapshot>[3] = "light", + ) => { + this.matchSnapshot(this.locators.canvas, name, "canvas", theme); }; - public verifyPreviewMode = (widgetName: string) => { + public matchSnapshotForPreviewMode = ( + name: string, + theme: Parameters<typeof this.matchSnapshot>[3] = "light", + ) => { this.enterPreviewMode(); - this.agHelper.GetNClick(this.locators.canvas); - - this.agHelper - .GetElement(this.locators.canvas) - .matchImageSnapshot(`anvil${widgetName}Preview`, { - comparisonMethod: "ssim", - }); + this.matchSnapshot(this.locators.canvas, name, "preview", theme); this.exitPreviewMode(); }; - public verifyDeployMode = (widgetName: string) => { + public matchSnapshotForDeployMode = ( + name: string, + theme: Parameters<typeof this.matchSnapshot>[3] = "light", + ) => { this.deployMode.DeployApp(this.locators.appViewerPage); - this.verifyForDifferentDevices(widgetName, [ - "macbook-13", - "iphone-6", - "ipad-2", - ]); - }; + this.matchSnapshot(this.locators.appViewerPage, name, "deploy", theme); - private verifyForDifferentDevices = ( - widgetName: string, - devices: Cypress.ViewportPreset[], - ) => { - devices.forEach((device) => { + (["macbook-13", "iphone-6", "ipad-2"] as const).forEach((device) => { cy.viewport(device); - this.agHelper - .GetElement(this.locators.appViewerPage) - .matchImageSnapshot(`anvil${widgetName}Deploy${device}`, { - comparisonMethod: "ssim", - }); + this.matchSnapshot( + this.locators.appViewerPage, + name, + "deploy", + theme, + device, + ); }); + + cy.viewport(1400, 1200); + + this.agHelper.BrowserNavigation(-1); }; - private enterPreviewMode = (shouldOpen = true) => { + public enterPreviewMode = () => { this.agHelper.GetNClick(this.locators.enterPreviewMode); + this.agHelper.GetNClick( + this.locators.canvas, + 0, + false, + 500, + false, + false, + "topLeft", + ); }; private exitPreviewMode = () => { this.agHelper.GetNClick(this.locators.exitPreviewMode); + this.agHelper.GetNClick( + this.locators.canvas, + 0, + false, + 500, + false, + false, + "topLeft", + ); }; - private setTheme = (theme: "light" | "dark") => { + public setTheme = (theme: "light" | "dark") => { + this.updateThemeOption(() => { + this.agHelper.GetNClick( + `${this.locators.colorMode} [data-value=${theme.toUpperCase()}]`, + ); + }); + }; + + public setAccentColor = (color: string) => { + this.updateThemeOption(() => { + cy.get(this.locators.accentColorInput).clear().type(color); + }); + }; + + public setTypography = (name: string) => { + this.updateThemeOption(() => { + cy.get(this.locators.fontFamilySectionInput).click({ force: true }); + + cy.get(".rc-virtual-list .rc-select-item-option") + .find(".leading-normal") + .contains(name) + .click({ force: true }); + + cy.contains("Typography").click({ force: true }); + }); + }; + + public setDensity = (density: string) => { + this.updateThemeOption(() => { + cy.get(this.locators.densityOptions) + .contains(density) + .click({ force: true }); + }); + }; + + public setSizing = (sizing: string) => { + this.updateThemeOption(() => { + cy.get(this.locators.sizingOptions) + .contains(sizing) + .click({ force: true }); + }); + }; + + public setCorners = (corner: string) => { + this.updateThemeOption(() => { + cy.get(`${this.locators.cornersOptions} [data-value="${corner}"]`).click({ + force: true, + }); + }); + }; + + public setIconStyle = (iconStyle: string) => { + this.updateThemeOption(() => { + cy.get(this.locators.iconStyleOptions) + .contains(iconStyle) + .click({ force: true }); + }); + }; + + public updateThemeOption = (callback: () => void) => { this.appSettings.OpenAppSettings(); this.appSettings.GoToThemeSettings(); - this.agHelper.GetNClick( - `${this.locators.colorMode} [data-value=${theme.toUpperCase()}]`, - ); + callback(); this.appSettings.ClosePane(); }; diff --git a/app/client/packages/design-system/widgets/src/styles/src/text-input.module.css b/app/client/packages/design-system/widgets/src/styles/src/text-input.module.css index 3e671cbf5db9..7dbaaae6d76d 100644 --- a/app/client/packages/design-system/widgets/src/styles/src/text-input.module.css +++ b/app/client/packages/design-system/widgets/src/styles/src/text-input.module.css @@ -169,6 +169,10 @@ *----------------------------------------------------------------------------- */ & [data-field-input] input[data-size="small"] { + block-size: calc( + var(--body-line-height) + var(--body-margin-start) + + var(--body-margin-end) + ); padding-block: var(--inner-spacing-2); } } diff --git a/app/client/src/pages/Editor/ThemePropertyPane/SettingSection.tsx b/app/client/src/pages/Editor/ThemePropertyPane/SettingSection.tsx index 4c155c0c2152..758f0e637780 100644 --- a/app/client/src/pages/Editor/ThemePropertyPane/SettingSection.tsx +++ b/app/client/src/pages/Editor/ThemePropertyPane/SettingSection.tsx @@ -1,4 +1,5 @@ import * as Sentry from "@sentry/react"; +import type { ComponentPropsWithoutRef } from "react"; import React, { useState } from "react"; import { Collapse } from "@blueprintjs/core"; import styled from "styled-components"; @@ -20,7 +21,7 @@ const Title = styled.p` color: var(--ads-v2-color-fg-emphasis); `; -interface SettingSectionProps { +interface SettingSectionProps extends ComponentPropsWithoutRef<"div"> { isDefaultOpen?: boolean; className?: string; title: string; @@ -29,11 +30,11 @@ interface SettingSectionProps { } export function SettingSection(props: SettingSectionProps) { - const { className = "", collapsible = true } = props; - const [isOpen, setOpen] = useState(props.isDefaultOpen); + const { className = "", collapsible = true, isDefaultOpen, ...rest } = props; + const [isOpen, setOpen] = useState(isDefaultOpen); return ( - <SettingsWrapper className={className}> + <SettingsWrapper className={className} {...rest}> <div className={` cursor-pointer flex items-center justify-between capitalize text-sm`} onClick={() => setOpen((isOpen) => !isOpen)} diff --git a/app/client/src/pages/Editor/WDSThemePropertyPane/index.tsx b/app/client/src/pages/Editor/WDSThemePropertyPane/index.tsx index c6112255ffd5..2ba597b41d16 100644 --- a/app/client/src/pages/Editor/WDSThemePropertyPane/index.tsx +++ b/app/client/src/pages/Editor/WDSThemePropertyPane/index.tsx @@ -139,7 +139,10 @@ function WDSThemePropertyPane() { type="text" value={accentColor} /> - <div className={styles["presets-list"]}> + <div + className={styles["presets-list"]} + data-testid="t--anvil-theme-settings-accent-color-list" + > {THEME_SETTING_COLOR_PRESETS[theme.colorMode].map((color) => ( <button data-selected={theme.accentColor === color ? "" : undefined} @@ -183,11 +186,13 @@ function WDSThemePropertyPane() { <SettingSection className="px-4 py-3 border-t " + data-testid="t--anvil-theme-settings-typography" isDefaultOpen title="Typography" > <section className="space-y-2"> <Select + data-testid="t--anvil-theme-settings-font-family" dropdownClassName="t--theme-font-dropdown" onSelect={(value: string) => { updateTheme({ @@ -231,6 +236,7 @@ function WDSThemePropertyPane() { <section className="space-y-2"> <SubText>Density</SubText> <SegmentedControl + data-testid="t--anvil-theme-settings-density" isFullWidth={false} onChange={(value: string) => { updateTheme({ @@ -245,6 +251,7 @@ function WDSThemePropertyPane() { <section className="space-y-2"> <SubText>Sizing</SubText> <SegmentedControl + data-testid="t--anvil-theme-settings-sizing" isFullWidth={false} onChange={(value: string) => { updateTheme({ @@ -266,6 +273,7 @@ function WDSThemePropertyPane() { > <section className="space-y-2"> <SegmentedControl + data-testid="t--anvil-theme-settings-corners" isFullWidth={false} onChange={(value: string) => { updateTheme({ @@ -288,6 +296,7 @@ function WDSThemePropertyPane() { <section className="space-y-2"> <SubText>Icon Style</SubText> <SegmentedControl + data-testid="t--anvil-theme-settings-icon-style" isFullWidth={false} onChange={(value: string) => { updateTheme({
616a1fac166125728b473ade78dba9066ea1e586
2021-11-16 15:54:38
haojin111
feat: progress, loading and error states for git flows, pull button and minor misc changes (#9052)
false
progress, loading and error states for git flows, pull button and minor misc changes (#9052)
feat
diff --git a/app/client/src/actions/gitSyncActions.ts b/app/client/src/actions/gitSyncActions.ts index b7f47a3aae12..5aa418058582 100644 --- a/app/client/src/actions/gitSyncActions.ts +++ b/app/client/src/actions/gitSyncActions.ts @@ -1,7 +1,7 @@ import { ReduxActionTypes } from "constants/ReduxActionConstants"; import { ConnectToGitPayload } from "api/GitSyncAPI"; import { ReduxActionWithCallbacks } from "constants/ReduxActionConstants"; -import { GitSyncModalTab, GitConfig } from "entities/GitSync"; +import { GitSyncModalTab, GitConfig, MergeStatus } from "entities/GitSync"; import { GitApplicationMetadata } from "api/ApplicationApi"; import { GitStatusData } from "reducers/uiReducers/gitSyncReducer"; import { ReduxActionErrorTypes } from "../constants/ReduxActionConstants"; @@ -74,16 +74,6 @@ export const connectToGitSuccess = (payload: ConnectToGitResponse) => ({ payload, }); -export const disconnectToGitInit = () => ({ - type: ReduxActionTypes.DISCONNECT_TO_GIT_INIT, - payload: null, -}); - -export const disconnectToGitSuccess = (payload: unknown) => ({ - type: ReduxActionTypes.DISCONNECT_TO_GIT_SUCCESS, - payload, -}); - export const switchGitBranchInit = (branch: string) => ({ type: ReduxActionTypes.SWITCH_GIT_BRANCH_INIT, payload: branch, @@ -212,3 +202,16 @@ export const fetchMergeStatusSuccess = (payload: GitStatusData) => ({ export const fetchMergeStatusFailure = () => ({ type: ReduxActionErrorTypes.FETCH_MERGE_STATUS_ERROR, }); + +export const resetMergeStatus = () => ({ + type: ReduxActionTypes.RESET_MERGE_STATUS, +}); + +export const gitPullInit = () => ({ + type: ReduxActionTypes.GIT_PULL_INIT, +}); + +export const gitPullSuccess = (mergeStatus: MergeStatus) => ({ + type: ReduxActionTypes.GIT_PULL_SUCCESS, + payload: mergeStatus, +}); diff --git a/app/client/src/api/GitSyncAPI.tsx b/app/client/src/api/GitSyncAPI.tsx index 81fe645b19bb..47fd971f0bd4 100644 --- a/app/client/src/api/GitSyncAPI.tsx +++ b/app/client/src/api/GitSyncAPI.tsx @@ -74,10 +74,9 @@ class GitSyncAPI extends Api { destinationBranch, sourceBranch, }: MergeBranchPayload): AxiosPromise<ApiResponse> { - return Api.post(`${GitSyncAPI.baseURL}/merge/${applicationId}`, { - sourceBranch, - destinationBranch, - }); + return Api.post( + `${GitSyncAPI.baseURL}/merge/${applicationId}?sourceBranch=${sourceBranch}&destinationBranch=${destinationBranch}`, + ); } static getMergeStatus({ @@ -85,18 +84,17 @@ class GitSyncAPI extends Api { destinationBranch, sourceBranch, }: MergeStatusPayload) { - return Api.get(`${GitSyncAPI.baseURL}/merge/status/${applicationId}`, { - sourceBranch, - destinationBranch, - }); + return Api.get( + `${GitSyncAPI.baseURL}/merge/status/${applicationId}?sourceBranch=${sourceBranch}&destinationBranch=${destinationBranch}`, + ); } - static connect(payload: ConnectToGitPayload, applicationId: string) { - return Api.post(`${GitSyncAPI.baseURL}/connect/${applicationId}`, payload); + static pull({ applicationId }: { applicationId: string }) { + return Api.get(`${GitSyncAPI.baseURL}/pull/${applicationId}`); } - static disconnect(applicationId: string) { - return Api.post(`${GitSyncAPI.baseURL}/disconnect/${applicationId}`); + static connect(payload: ConnectToGitPayload, applicationId: string) { + return Api.post(`${GitSyncAPI.baseURL}/connect/${applicationId}`, payload); } static getGlobalConfig() { diff --git a/app/client/src/components/ads/Icon.tsx b/app/client/src/components/ads/Icon.tsx index 105e6d353d48..35393d54c3ca 100644 --- a/app/client/src/components/ads/Icon.tsx +++ b/app/client/src/components/ads/Icon.tsx @@ -101,6 +101,8 @@ import EyeOff from "remixicon-react/EyeOffLineIcon"; import FileTransfer from "remixicon-react/FileTransferLineIcon"; import Filter from "remixicon-react/Filter2FillIcon"; import GitMerge from "remixicon-react/GitMergeLineIcon"; +import GitCommit from "remixicon-react/GitCommitLineIcon"; +import GitPullRequst from "remixicon-react/GitPullRequestLineIcon"; import GuideIcon from "remixicon-react/GuideFillIcon"; import HelpIcon from "remixicon-react/QuestionMarkIcon"; import LeftArrowIcon2 from "remixicon-react/ArrowLeftSLineIcon"; @@ -108,6 +110,7 @@ import Link2 from "remixicon-react/LinkIcon"; import OvalCheck from "remixicon-react/CheckboxCircleLineIcon"; import OvalCheckFill from "remixicon-react/CheckboxCircleFillIcon"; import Pin3 from "remixicon-react/Pushpin2FillIcon"; +import QueryIcon from "remixicon-react/CodeSSlashLineIcon"; import RightArrowIcon from "remixicon-react/ArrowRightLineIcon"; import RightArrowIcon2 from "remixicon-react/ArrowRightSLineIcon"; import RocketIcon from "remixicon-react/RocketLineIcon"; @@ -121,6 +124,7 @@ import LogoutIcon from "remixicon-react/LogoutBoxRLineIcon"; import ShareLineIcon from "remixicon-react/ShareLineIcon"; import DownArrowIcon from "remixicon-react/ArrowDownSLineIcon"; import LoaderLineIcon from "remixicon-react/LoaderLineIcon"; +import WidgetIcon from "remixicon-react/FunctionLineIcon"; import RefreshLineIcon from "remixicon-react/RefreshLineIcon"; import GitBranchLineIcon from "remixicon-react/GitBranchLineIcon"; @@ -227,6 +231,8 @@ export const IconCollection = [ "gear", "general", "git-branch", + "git-commit", + "git-pull-request", "guide", "help", "invite-user", @@ -247,6 +253,7 @@ export const IconCollection = [ "pin-3", "play", "plus", + "query", "reaction", "reaction-2", "read-pin", @@ -285,6 +292,7 @@ export const IconCollection = [ "down-arrow", "loader", "setting", + "widget", "dropdown", "refresh", ] as const; @@ -495,6 +503,12 @@ const Icon = forwardRef( case "git-branch": returnIcon = <GitBranchLineIcon />; break; + case "git-commit": + returnIcon = <GitCommit />; + break; + case "git-pull-request": + returnIcon = <GitPullRequst />; + break; case "guide": returnIcon = <GuideIcon />; break; @@ -555,6 +569,9 @@ const Icon = forwardRef( case "plus": returnIcon = <CreateNewIcon />; break; + case "query": + returnIcon = <QueryIcon />; + break; case "reaction": returnIcon = <Reaction />; break; @@ -669,6 +686,9 @@ const Icon = forwardRef( case "loader": returnIcon = <LoaderLineIcon />; break; + case "widget": + returnIcon = <WidgetIcon />; + break; case "dropdown": returnIcon = <DropdownIcon />; break; diff --git a/app/client/src/constants/Colors.tsx b/app/client/src/constants/Colors.tsx index 610ee8548922..2d73335f75fd 100644 --- a/app/client/src/constants/Colors.tsx +++ b/app/client/src/constants/Colors.tsx @@ -93,7 +93,6 @@ export const Colors = { FAIR_PINK: "#FFE9E9", OPAQ_BLUE: "rgba(106, 134, 206, 0.1)", RATE_ACTIVE: "#FFCB45", - RATE_INACTIVE: "#D6D6D6", MALIBU: "#7DBCFF", ALABASTER_ALT: "#FAFAFA", THUNDER_ALT: "#1D1C1D", @@ -124,10 +123,20 @@ export const Colors = { BOX_SHADOW_DEFAULT_VARIANT4: "rgba(0, 0, 0, 0.25)", BOX_SHADOW_DEFAULT_VARIANT5: "rgba(0, 0, 0, 0.25)", + BUTTON_CUSTOM_SOLID_DARK_TEXT_COLOR: "#333", + BUTTON_DISABLED: "#c2c5c7", + + SELECT_DISABLED: "#ced9e080", + SELECT_PLACEHOLDER: "#bfbfbf", + SELECT_COLOR: "#182026", + + INPUT_TEXT_DISABLED: "rgba(92, 112, 128, 0.6)", + INPUT_DISABLED: "rgba(206, 217, 224, 0.5)", + // Following Design System colors GREY_1: "#FAFAFA", GREY_2: "#F0F0F0", GREY_3: "#EBEBEB", - GREY_4: "#716E6E", + GREY_4: "#716E6E", // seems like incorrect as it is same as GREY_8 GREY_5: "#E0DEDE", GREY_6: "#A9A7A7", GREY_7: "#858282", @@ -146,5 +155,8 @@ export const Colors = { GREEN_2: "#D5EFE3", GREEN_3: "#ECF9F3", MASALA: "#43403D", + // error warning + CRIMSON: "#D71010", + ALTO_3: "#D6D6D6", }; export type Color = typeof Colors[keyof typeof Colors]; diff --git a/app/client/src/constants/ReduxActionConstants.tsx b/app/client/src/constants/ReduxActionConstants.tsx index e22dbda74fea..809fd2fc8211 100644 --- a/app/client/src/constants/ReduxActionConstants.tsx +++ b/app/client/src/constants/ReduxActionConstants.tsx @@ -11,10 +11,14 @@ export const ReduxSagaChannels = { }; export const ReduxActionTypes = { + GIT_PULL_INIT: "GIT_PULL_INIT", + GIT_PULL_SUCCESS: "GIT_PULL_SUCCESS", SET_APP_VERSION_ON_WORKER: "SET_APP_VERSION_ON_WORKER", CLEAR_COMMIT_SUCCESSFUL_STATE: "CLEAR_COMMIT_SUCCESSFUL_STATE", FETCH_MERGE_STATUS_INIT: "FETCH_MERGE_STATUS_INIT", FETCH_MERGE_STATUS_SUCCESS: "FETCH_MERGE_STATUS_SUCCESS", + RESET_MERGE_STATUS: "RESET_MERGE_STATUS", + MERGE_BRANCH_INIT: "MERGE_BRANCH_INIT", MERGE_BRANCH_SUCCESS: "MERGE_BRANCH_SUCCESS", FETCH_GIT_STATUS_INIT: "FETCH_GIT_STATUS_INIT", @@ -41,9 +45,6 @@ export const ReduxActionTypes = { CONNECT_TO_GIT_INIT: "CONNECT_TO_GIT_INIT", CONNECT_TO_GIT_SUCCESS: "CONNECT_TO_GIT_SUCCESS", - DISCONNECT_TO_GIT_INIT: "DISCONNECT_TO_GIT_INIT", - DISCONNECT_TO_GIT_SUCCESS: "DISCONNECT_TO_GIT_SUCCESS", - CREATE_NEW_BRANCH_INIT: "CREATE_NEW_BRANCH_INIT", SWITCH_GIT_BRANCH_INIT: "SWITCH_GIT_BRANCH_INIT", COMMIT_TO_GIT_REPO_INIT: "COMMIT_TO_GIT_REPO_INIT", @@ -634,6 +635,7 @@ export const ReduxActionTypes = { export type ReduxActionType = typeof ReduxActionTypes[keyof typeof ReduxActionTypes]; export const ReduxActionErrorTypes = { + GIT_PULL_ERROR: "GIT_PULL_ERROR", FETCH_MERGE_STATUS_ERROR: "FETCH_MERGE_STATUS_ERROR", MERGE_BRANCH_ERROR: "MERGE_BRANCH_ERROR", FETCH_GIT_STATUS_ERROR: "FETCH_GIT_STATUS_ERROR", @@ -647,6 +649,7 @@ export const ReduxActionErrorTypes = { UPDATE_GLOBAL_GIT_CONFIG_ERROR: "UPDATE_GLOBAL_GIT_CONFIG_ERROR", FETCH_GLOBAL_GIT_CONFIG_ERROR: "FETCH_GLOBAL_GIT_CONFIG_ERROR", CONNECT_TO_GIT_ERROR: "CONNECT_TO_GIT_ERROR", + GIT_SYNC_ERROR: "GIT_SYNC_ERROR", DISCONNECT_TO_GIT_ERROR: "DISCONNECT_TO_GIT_ERROR", COMMIT_TO_GIT_REPO_ERROR: "COMMIT_TO_GIT_REPO_ERROR", FETCH_FEATURE_FLAGS_ERROR: "FETCH_FEATURE_FLAGS_ERROR", diff --git a/app/client/src/constants/messages.ts b/app/client/src/constants/messages.ts index 9e152d9a6188..ce7fcf643d29 100644 --- a/app/client/src/constants/messages.ts +++ b/app/client/src/constants/messages.ts @@ -556,8 +556,7 @@ export const DOCUMENTATION = () => "Documentation"; export const DOCUMENTATION_TOOLTIP = () => "Open Docs in Omnibar"; export const CONNECT = () => "Connect"; export const LATEST_DP_TITLE = () => "Latest deployed preview"; -export const LATEST_DP_SUBTITLE = () => - "See your application in action after successful push"; +export const LATEST_DP_SUBTITLE = () => "last deployed"; export const CHECK_DP = () => "CHECK"; export const DEPLOY_TO_CLOUD = () => "Deploy to cloud"; export const DEPLOY_WITHOUT_GIT = () => @@ -567,10 +566,13 @@ export const COMMIT = () => "COMMIT"; export const COMMIT_TO = () => "Commit to"; export const PUSH = () => "PUSH"; export const PULL = () => "PULL"; -export const COMMIT_AND_PUSH = () => "Commit and push"; +export const COMMIT_AND_PUSH = () => "Commit & push"; +export const PULL_CHANGS = () => "PULL CHANGES"; export const DEPLOY_KEY_TITLE = () => "Deployed Key"; export const DEPLOY_KEY_USAGE_GUIDE_MESSAGE = () => "Paste this key in your repository settings and give it write access."; +export const COMMITTING_AND_PUSHING_CHANGES = () => + "COMMITTING AND PUSHING CHANGES..."; export const MERGE_CHANGES = () => "Merge Changes"; export const SELECT_BRANCH_TO_MERGE = () => "Select branch to merge"; @@ -585,21 +587,39 @@ export const REMOTE_URL_INPUT_PLACEHOLDER = () => "Paste Your URL here"; export const COPIED_SSH_KEY = () => "Copied SSH Key"; export const INVALID_USER_DETAILS_MSG = () => "Please enter valid user details"; export const PASTE_SSH_URL_INFO = () => - "Please paste SSH URL of your repository"; + "Please enter valid SSH URL of your repository"; export const GENERATE_KEY = () => "Generate Key"; export const UPDATE_CONFIG = () => "UPDATE CONFIG"; export const CONNECT_BTN_LABEL = () => "CONNECT"; export const FETCH_GIT_STATUS = () => "fetching status..."; export const FETCH_MERGE_STATUS = () => "Checking mergeability..."; - +export const NO_MERGE_CONFLICT = () => + "This branch has no conflict with the base branch."; +export const MERGE_CONFLICT_ERROR = () => "Merge conflicts found!"; +export const FETCH_MERGE_STATUS_FAILURE = () => "Unable to fetch merge status"; +export const GIT_UPSTREAM_CHANGES = () => + "Looks like there are pending upstream changes. We will pull the changesand push them to your repo."; +export const GIT_CONFLICTING_INFO = () => + "Please resolve the conflicts manually on your repository."; + +export const OPEN_REPO = () => "OPEN REPO"; export const CONNECTING_REPO = () => "CONNECTING TO GIT REPO"; export const ERROR_CONNECTING = () => "Error while connecting"; +export const ERROR_COMMITTING = () => "Error while committing"; export const CONFIRM_SSH_KEY = () => "Make sure your SSH Key has write access."; export const READ_DOCUMENTATION = () => "Read documentation"; +export const LEARN_MORE = () => "Learn More"; +export const GIT_NO_UPDATED_TOOLTIP = () => "No new updates to push"; export const FIND_OR_CREATE_A_BRANCH = () => "Find or create a branch"; export const SYNC_BRANCHES = () => "Sync branches"; +export const CONFLICTS_FOUND = () => + "Conflicts found, please resolve them and pull again"; +export const UNCOMMITTED_CHANGES = () => "You have uncommitted changes"; +export const NO_COMMITS_TO_PULL = () => + "No commits to pull. In sync with the remote repository"; + // JS Snippets export const SNIPPET_DESCRIPTION = () => `Search and insert code snippets to perform complex actions quickly.`; diff --git a/app/client/src/entities/GitSync.ts b/app/client/src/entities/GitSync.ts index 2b05a24f65c9..e76730517344 100644 --- a/app/client/src/entities/GitSync.ts +++ b/app/client/src/entities/GitSync.ts @@ -13,3 +13,8 @@ export type Branch = { branchName: string; default: boolean; }; + +export type MergeStatus = { + merge: boolean; + conflictingFiles: Array<string>; +}; diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx index 632675ad03cf..034e5a10be79 100644 --- a/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx +++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/BranchButton.tsx @@ -1,5 +1,4 @@ import React, { useEffect, useState } from "react"; -import { ReactComponent as GitMerge } from "assets/icons/ads/git-merge.svg"; import styled from "styled-components"; import { useDispatch, useSelector } from "react-redux"; @@ -11,6 +10,7 @@ import { Colors } from "constants/Colors"; import { getCurrentAppGitMetaData } from "selectors/applicationSelectors"; import BranchList from "../components/BranchList"; import { fetchBranchesInit } from "actions/gitSyncActions"; +import Icon, { IconSize } from "components/ads/Icon"; const ButtonContainer = styled.div` display: flex; @@ -60,7 +60,7 @@ function BranchButton() { > <ButtonContainer className="t--branch-button"> <div className="icon"> - <GitMerge /> + <Icon name="git-branch" size={IconSize.XXXXL} /> </div> <div className="label">{currentBranch}</div> </ButtonContainer> diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx index 2cdc837605eb..f31641a7bf06 100644 --- a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx +++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx @@ -14,6 +14,9 @@ import { PULL, MERGE, CONNECT_GIT, + UNCOMMITTED_CHANGES, + CONFLICTS_FOUND, + NO_COMMITS_TO_PULL, createMessage, } from "constants/messages"; import { noop } from "lodash"; @@ -24,23 +27,32 @@ import { getTypographyByKey } from "constants/DefaultTheme"; import { useDispatch, useSelector } from "react-redux"; import { ReactComponent as GitCommitLine } from "assets/icons/ads/git-commit-line.svg"; import Button, { Category, Size } from "components/ads/Button"; -import { setIsGitSyncModalOpen } from "actions/gitSyncActions"; -import { GitSyncModalTab } from "entities/GitSync"; +import { gitPullInit, setIsGitSyncModalOpen } from "actions/gitSyncActions"; +import { GitSyncModalTab, MergeStatus } from "entities/GitSync"; import getFeatureFlags from "utils/featureFlags"; -import { getIsGitConnected } from "selectors/gitSyncSelectors"; +import { + getGitStatus, + getIsGitConnected, + getPullMergeStatus, + getPullInProgress, + getIsFetchingGitStatus, +} from "selectors/gitSyncSelectors"; +import SpinnerLoader from "pages/common/SpinnerLoader"; type QuickActionButtonProps = { count?: number; + disabled?: boolean; icon: React.ReactNode; + loading?: boolean; onClick: () => void; tooltipText: string; }; -const QuickActionButtonContainer = styled.div` +const QuickActionButtonContainer = styled.div<{ disabled?: boolean }>` padding: ${(props) => props.theme.spaces[1]}px ${(props) => props.theme.spaces[2]}px; margin-left: ${(props) => props.theme.spaces[2]}px; - cursor: pointer; + cursor: ${(props) => (props.disabled ? "not-allowed" : "pointer")}; &:hover { background-color: ${(props) => props.theme.colors.editorBottomBar.buttonBackgroundHover}; @@ -69,56 +81,105 @@ const capitalizeFirstLetter = (string = " ") => { return string.charAt(0).toUpperCase() + string.toLowerCase().slice(1); }; +const SpinnerContainer = styled.div` + margin-left: ${(props) => props.theme.spaces[2]}px; + display: flex; + align-items: center; + justify-content: center; + width: 24px; + height: 26px; +`; + function QuickActionButton({ count = 0, + disabled = false, icon, + loading, onClick, tooltipText, }: QuickActionButtonProps) { return ( <Tooltip content={capitalizeFirstLetter(tooltipText)} hoverOpenDelay={1000}> - <QuickActionButtonContainer onClick={onClick}> - {icon} - {count > 0 && ( - <span className="count">{count > 9 ? `${9}+` : count}</span> - )} - </QuickActionButtonContainer> + {loading ? ( + <SpinnerContainer> + <SpinnerLoader height="16px" width="16px" /> + </SpinnerContainer> + ) : ( + <QuickActionButtonContainer disabled={disabled} onClick={onClick}> + {icon} + {count > 0 && ( + <span className="count">{count > 9 ? `${9}+` : count}</span> + )} + </QuickActionButtonContainer> + )} </Tooltip> ); } +const getPullBtnStatus = (gitStatus: any, pullMergeStatus?: MergeStatus) => { + const { behindCount, conflicting = [], isClean } = gitStatus || {}; + const { conflictingFiles: pullConflicts = [] } = pullMergeStatus || {}; + let message = createMessage(NO_COMMITS_TO_PULL); + let disabled = true; + if (conflicting.length > 0 || pullConflicts.length > 0) + message = createMessage(CONFLICTS_FOUND); + else if (!isClean) message = createMessage(UNCOMMITTED_CHANGES); + else if (behindCount > 0) { + disabled = false; + message = createMessage(PULL); + } + + return { + disabled, + message, + }; +}; + const getQuickActionButtons = ({ commit, + gitStatus, merge, pull, + pullDisabled, + pullTooltipMessage, push, + showPullLoadingState, }: { commit: () => void; push: () => void; pull: () => void; merge: () => void; -}) => [ - { - icon: <Plus />, - onClick: commit, - tooltipText: createMessage(COMMIT), - }, - { - icon: <UpArrow />, - onClick: push, - tooltipText: createMessage(PUSH), - }, - { - icon: <DownArrow />, - onClick: pull, - tooltipText: createMessage(PULL), - }, - { - icon: <GitBranch />, - onClick: merge, - tooltipText: createMessage(MERGE), - }, -]; + gitStatus: any; + pullDisabled: boolean; + pullTooltipMessage: string; + showPullLoadingState: boolean; +}) => { + return [ + { + icon: <Plus />, + onClick: commit, + tooltipText: createMessage(COMMIT), + }, + { + icon: <UpArrow />, + onClick: push, + tooltipText: createMessage(PUSH), + }, + { + count: gitStatus?.behindCount, + icon: <DownArrow />, + onClick: () => !pullDisabled && pull(), + tooltipText: pullTooltipMessage, + disabled: pullDisabled, + loading: showPullLoadingState, + }, + { + icon: <GitBranch />, + onClick: merge, + tooltipText: createMessage(MERGE), + }, + ]; +}; const Container = styled.div` height: 100%; @@ -184,6 +245,17 @@ function ConnectGitPlaceholder() { export default function QuickGitActions() { const isGitConnected = useSelector(getIsGitConnected); const dispatch = useDispatch(); + const gitStatus = useSelector(getGitStatus); + const pullMergeStatus = useSelector(getPullMergeStatus); + + const { + disabled: pullDisabled, + message: pullTooltipMessage, + } = getPullBtnStatus(gitStatus, pullMergeStatus); + + const isPullInProgress = useSelector(getPullInProgress); + const isFetchingGitStatus = useSelector(getIsFetchingGitStatus); + const showPullLoadingState = isPullInProgress || isFetchingGitStatus; const quickActionButtons = getQuickActionButtons({ commit: () => { @@ -195,7 +267,7 @@ export default function QuickGitActions() { ); }, push: noop, - pull: noop, + pull: () => dispatch(gitPullInit()), merge: () => { dispatch( setIsGitSyncModalOpen({ @@ -204,12 +276,16 @@ export default function QuickGitActions() { }), ); }, + gitStatus, + pullDisabled, + pullTooltipMessage, + showPullLoadingState, }); return getFeatureFlags().GIT && isGitConnected ? ( <Container> <BranchButton /> {quickActionButtons.map((button) => ( - <QuickActionButton key={button.tooltipText} {...button} count={0} /> + <QuickActionButton key={button.tooltipText} {...button} /> ))} </Container> ) : ( diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx index a55cc57165d5..af7d77aafee8 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/Deploy.tsx @@ -5,20 +5,29 @@ import { COMMIT_TO, createMessage, COMMIT_AND_PUSH, + COMMITTING_AND_PUSHING_CHANGES, FETCH_GIT_STATUS, + GIT_NO_UPDATED_TOOLTIP, + GIT_UPSTREAM_CHANGES, + LEARN_MORE, + PULL_CHANGS, + GIT_CONFLICTING_INFO, + OPEN_REPO, } from "constants/messages"; import styled from "styled-components"; import TextInput from "components/ads/TextInput"; -import Button, { Size } from "components/ads/Button"; +import Button, { Category, Size } from "components/ads/Button"; import { LabelContainer } from "components/ads/Checkbox"; import { getGitStatus, getIsFetchingGitStatus, getIsCommittingInProgress, + getIsPullingProgress, + getGitError, + getPullMergeStatus, } from "selectors/gitSyncSelectors"; import { useDispatch, useSelector } from "react-redux"; -import { commitToRepoInit } from "actions/gitSyncActions"; import { Space } from "../components/StyledComponents"; import { Colors } from "constants/Colors"; @@ -26,10 +35,23 @@ import { getTypographyByKey } from "constants/DefaultTheme"; import { getCurrentAppGitMetaData } from "selectors/applicationSelectors"; import DeployPreview from "../components/DeployPreview"; -import { fetchGitStatusInit } from "actions/gitSyncActions"; +import { + commitToRepoInit, + fetchGitStatusInit, + gitPullInit, +} from "actions/gitSyncActions"; import { getIsCommitSuccessful } from "selectors/gitSyncSelectors"; import StatusLoader from "../components/StatusLoader"; import { clearCommitSuccessfulState } from "../../../../actions/gitSyncActions"; +import Statusbar from "pages/Editor/gitSync/components/Statusbar"; +import GitSyncError from "../components/GitSyncError"; +import GitChanged from "../components/GitChanged"; +import Tooltip from "components/ads/Tooltip"; +import Text, { Case, FontWeight, TextType } from "components/ads/Text"; +import { DOCS_BASE_URL } from "constants/ThirdPartyConstants"; +import Icon, { IconSize } from "components/ads/Icon"; +import { Classes } from "components/ads/common"; +import log from "loglevel"; const Section = styled.div` margin-bottom: ${(props) => props.theme.spaces[11]}px; @@ -53,6 +75,44 @@ const Container = styled.div` && ${LabelContainer} span { color: ${Colors.CHARCOAL}; } + .bp3-popover-target { + width: fit-content; + } +`; + +const StatusbarWrapper = styled.div` + width: 252px; + height: 38px; +`; + +const LintText = styled.a` + :hover { + text-decoration: none; + color: ${Colors.CRUSTA}; + } + color: ${Colors.CRUSTA}; + cursor: pointer; +`; + +const InfoWrapper = styled.div<{ isError?: boolean }>` + width: 100%; + padding: ${(props) => props.theme.spaces[3]}px; + background: ${(props) => + props.isError ? Colors.FAIR_PINK : Colors.WARNING_OUTLINE_HOVER}; + margin-bottom: ${(props) => props.theme.spaces[4]}px; + .${Classes.TEXT} { + &.t--read-document { + margin-left: ${(props) => props.theme.spaces[2]}px; + display: inline-flex; + .${Classes.ICON} { + margin-left: ${(props) => props.theme.spaces[3]}px; + } + } + } +`; + +const OpenRepoButton = styled(Button)` + margin-right: ${(props) => props.theme.spaces[3]}px; `; const INITIAL_COMMIT = "Initial Commit"; @@ -60,64 +120,76 @@ const NO_CHANGES_TO_COMMIT = "No changes to commit"; function Deploy() { const [commitMessage, setCommitMessage] = useState(INITIAL_COMMIT); - // const [showCompleteError, setShowCompleteError] = useState(false); const isCommittingInProgress = useSelector(getIsCommittingInProgress); const gitMetaData = useSelector(getCurrentAppGitMetaData); const gitStatus = useSelector(getGitStatus); const isFetchingGitStatus = useSelector(getIsFetchingGitStatus); + const isPulingProgress = useSelector(getIsPullingProgress); const isCommitAndPushSuccessful = useSelector(getIsCommitSuccessful); - // const gitPushError = useSelector(getGitPushError); - // const errorMsgRef = useRef<HTMLDivElement>(null); - const hasChangesToCommit = !gitStatus?.isClean; + const gitError = useSelector(getGitError); + const pullMergeStatus = useSelector(getPullMergeStatus); const currentBranch = gitMetaData?.branchName; const dispatch = useDispatch(); - const handleCommit = () => { + const handleCommit = (doPush: boolean) => { if (currentBranch) { dispatch( commitToRepoInit({ commitMessage, - doPush: true, // to push with commit + doPush, }), ); } }; + const handlePull = () => { + if (currentBranch) { + dispatch(gitPullInit()); + } + }; + const commitButtonText = createMessage(COMMIT_AND_PUSH); useEffect(() => { dispatch(fetchGitStatusInit()); - return () => { dispatch(clearCommitSuccessfulState()); }; }, []); - const commitButtonDisabled = !hasChangesToCommit || !commitMessage; const commitButtonLoading = isCommittingInProgress; - // const errorMsgShowMoreEnabled = useMemo(() => { - // let showMoreEnabled = false; - // if (errorMsgRef && errorMsgRef.current) { - // const element = errorMsgRef.current; - // if (element && element?.offsetHeight && element?.scrollHeight) { - // showMoreEnabled = element?.offsetHeight < element?.scrollHeight; - // } - // } - // return showMoreEnabled; - // }, [errorMsgRef.current, gitPushError]); - - const showCommitButton = hasChangesToCommit && !isFetchingGitStatus; + const commitRequired = gitStatus?.modifiedPages || gitStatus?.modifiedQueries; + const isConflicting = + !isFetchingGitStatus && + pullMergeStatus && + pullMergeStatus?.conflictingFiles?.length > 0; + // const pullRequired = + // gitStatus && gitStatus.behindCount > 0 && !isFetchingGitStatus; + let pullRequired = false; + if (!isFetchingGitStatus && gitError && gitError.code === 5006) { + pullRequired = gitError.message.indexOf("git push failed") > -1; + } + const showCommitButton = + // hasChangesToCommit && + !isConflicting && + !pullRequired && + !isFetchingGitStatus && + !isCommittingInProgress; + const isProgressing = + commitButtonLoading && (commitRequired || showCommitButton); const commitMessageDisplay = hasChangesToCommit ? commitMessage : NO_CHANGES_TO_COMMIT; - + log.log(gitStatus); + log.log(gitError); return ( <Container> <Title>{createMessage(DEPLOY_YOUR_APPLICATION)}</Title> <Section> + <GitChanged /> <Row> <SectionTitle> <span>{createMessage(COMMIT_TO)}</span> @@ -137,21 +209,113 @@ function Deploy() { <StatusLoader loaderMsg={createMessage(FETCH_GIT_STATUS)} /> )} <Space size={11} /> - {showCommitButton && ( + {pullRequired && !isConflicting && ( + <InfoWrapper> + <Text type={TextType.P3}> + {createMessage(GIT_UPSTREAM_CHANGES)} + </Text> + <LintText href={DOCS_BASE_URL} target="_blank"> + <Text + case={Case.UPPERCASE} + className="t--read-document" + color={Colors.CHARCOAL} + type={TextType.P3} + weight={FontWeight.BOLD} + > + {createMessage(LEARN_MORE)} + <Icon name="right-arrow" size={IconSize.SMALL} /> + </Text> + </LintText> + </InfoWrapper> + )} + {pullRequired && !isConflicting && ( <Button className="t--commit-button" - disabled={commitButtonDisabled} - isLoading={commitButtonLoading} - onClick={handleCommit} + isLoading={isPulingProgress} + onClick={handlePull} size={Size.medium} tag="button" - text={commitButtonText} + text={createMessage(PULL_CHANGS)} width="max-content" /> )} + {isConflicting && ( + <InfoWrapper isError> + <Text type={TextType.P3}> + {createMessage(GIT_CONFLICTING_INFO)} + </Text> + <LintText href={DOCS_BASE_URL} target="_blank"> + <Text + case={Case.UPPERCASE} + className="t--read-document" + color={Colors.CHARCOAL} + type={TextType.P3} + weight={FontWeight.BOLD} + > + {createMessage(LEARN_MORE)} + <Icon name="right-arrow" size={IconSize.SMALL} /> + </Text> + </LintText> + </InfoWrapper> + )} + {isConflicting && ( + <Row> + <OpenRepoButton + category={Category.tertiary} + className="t--commit-button" + href={gitMetaData?.remoteUrl} + isLoading={isPulingProgress} + size={Size.medium} + tag="a" + target="_blank" + text={createMessage(OPEN_REPO)} + width="max-content" + /> + <Button + className="t--commit-button" + isLoading={isPulingProgress} + onClick={handlePull} + size={Size.medium} + tag="button" + text={createMessage(PULL_CHANGS)} + width="max-content" + /> + </Row> + )} + {showCommitButton && ( + <Tooltip + autoFocus={false} + content={createMessage(GIT_NO_UPDATED_TOOLTIP)} + disabled={showCommitButton && !commitButtonLoading} + donotUsePortal + position="top" + > + <Button + className="t--commit-button" + disabled={commitButtonDisabled} + isLoading={commitButtonLoading} + onClick={() => handleCommit(true)} + size={Size.medium} + tag="button" + text={commitButtonText} + width="max-content" + /> + </Tooltip> + )} + {isProgressing && ( + <StatusbarWrapper> + <Statusbar + completed={!commitButtonLoading} + message={createMessage(COMMITTING_AND_PUSHING_CHANGES)} + period={2} + /> + </StatusbarWrapper> + )} + <GitSyncError /> </Section> - - <DeployPreview showSuccess={isCommitAndPushSuccessful} /> + {!pullRequired && !isConflicting && ( + <DeployPreview showSuccess={isCommitAndPushSuccessful} /> + )} </Container> ); } diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx index 24afbfd1ff19..14f92651811c 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnection.tsx @@ -12,8 +12,6 @@ import { REMOTE_URL, REMOTE_URL_INFO, createMessage, - DEPLOY_KEY_USAGE_GUIDE_MESSAGE, - DEPLOY_KEY_TITLE, REMOTE_URL_INPUT_PLACEHOLDER, CONNECTING_REPO, } from "constants/messages"; @@ -23,24 +21,20 @@ import UserGitProfileSettings from "../components/UserGitProfileSettings"; import { AUTH_TYPE_OPTIONS } from "../constants"; import { Colors } from "constants/Colors"; import Button, { Category, Size } from "components/ads/Button"; -import { useGitConnect, useSSHKeyPair } from "../hooks"; -import { ReactComponent as KeySvg } from "assets/icons/ads/key-2-line.svg"; -import { ReactComponent as CopySvg } from "assets/icons/ads/file-copy-line.svg"; -import { ReactComponent as TickSvg } from "assets/images/tick.svg"; +import { useGitConnect, useSSHKeyPair, useUserGitConfig } from "../hooks"; import { Toaster } from "components/ads/Toast"; import { Variant } from "components/ads/common"; import { useDispatch, useSelector } from "react-redux"; import copy from "copy-to-clipboard"; import { getCurrentAppGitMetaData } from "selectors/applicationSelectors"; import Text, { TextType } from "components/ads/Text"; -import { getGlobalGitConfig } from "selectors/gitSyncSelectors"; + +import { getGitError } from "selectors/gitSyncSelectors"; import { fetchGlobalGitConfigInit, fetchLocalGitConfigInit, updateLocalGitConfigInit, } from "actions/gitSyncActions"; -import TooltipComponent from "components/ads/Tooltip"; -import { getLocalGitConfig } from "selectors/gitSyncSelectors"; import { emailValidator } from "components/ads/TextInput"; import { isEqual } from "lodash"; import { @@ -57,8 +51,9 @@ import { } from "selectors/gitSyncSelectors"; import Statusbar from "pages/Editor/gitSync/components/Statusbar"; import ScrollIndicator from "components/ads/ScrollIndicator"; -import GitSyncError from "../components/GitError"; -import { ReduxActionErrorTypes } from "constants/ReduxActionConstants"; +import DeployedKeyUI from "../components/DeployedKeyUI"; +import GitSyncError from "../components/GitSyncError"; +import log from "loglevel"; export const UrlOptionContainer = styled.div` display: flex; @@ -84,85 +79,6 @@ const ButtonContainer = styled.div<{ topMargin: number }>` margin-top: ${(props) => `${props.theme.spaces[props.topMargin]}px`}; `; -const Icon = styled.span<{ - size: string; - color: string; - marginOffset?: number; - hoverColor: string; -}>` - display: flex; - justify-content: center; - align-items: center; - margin: ${(props) => `${props.theme.spaces[props.marginOffset || 0]}px`}; - cursor: pointer; - svg { - width: ${(props) => props.size}; - height: ${(props) => props.size}; - path { - fill: ${(props) => props.color}; - } - } - &:hover { - svg { - path { - fill: ${(props) => props.hoverColor}; - } - } - } -`; - -const DeployedKeyContainer = styled.div<{ $marginTop: number }>` - margin-top: ${(props) => `${props.theme.spaces[props.$marginTop]}px`}; - margin-bottom: 8px; - height: 50px; - width: calc(100% - 30px); - background-color: ${Colors.Gallery}; - padding: ${(props) => - `${props.theme.spaces[3]}px ${props.theme.spaces[4]}px`}; -`; - -const FlexColumn = styled.div` - display: flex; - flex-direction: column; - width: 90%; - margin-left: ${(props) => `${props.theme.spaces[4]}px`}; -`; - -const FlexRow = styled.div` - display: flex; - flex-direction: row; - width: 100%; -`; - -const Flex = styled.div` - display: flex; -`; - -const LabelText = styled.span` - font-size: 14px; - color: ${Colors.CODE_GRAY}; -`; - -const KeyText = styled.span` - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - width: 100%; - font-size: 10px; - font-weight: 400; - text-transform: uppercase; - color: ${Colors.CODE_GRAY}; -`; - -const LintText = styled.a` - :hover { - text-decoration: none; - color: ${Colors.CRUSTA}; - } - color: ${Colors.CRUSTA}; - cursor: pointer; -`; - const Container = styled.div` display: flex; flex-direction: column; @@ -177,12 +93,6 @@ const Container = styled.div` } `; -const TooltipWrapper = styled.div` - display: flex; - justify-content: center; - align-items: center; -`; - const RemoteUrlInfoWrapper = styled.div` margin-top: ${(props) => props.theme.spaces[3]}px; `; @@ -205,6 +115,16 @@ const StickyMenuWrapper = styled.div` const selectedAuthType = AUTH_TYPE_OPTIONS[0]; const HTTP_LITERAL = "https"; +const SSH_INIT_FORMAT_REGEX = new RegExp(/^(ssh|.+@).*/); + +const remoteUrlIsInvalid = (value: string) => + value.startsWith(HTTP_LITERAL) || !SSH_INIT_FORMAT_REGEX.test(value); + +type AuthorInfo = { + authorName: string; + authorEmail: string; +}; + type Props = { isImport?: boolean; }; @@ -217,48 +137,23 @@ function GitConnection({ isImport }: Props) { const isGitConnected = !!remoteUrlInStore; const isFetchingGlobalGitConfig = useSelector(getIsFetchingGlobalGitConfig); const isFetchingLocalGitConfig = useSelector(getIsFetchingLocalGitConfig); + const [triedSubmit, setTriedSubmit] = useState(false); - const globalGitConfig = useSelector(getGlobalGitConfig); - const localGitConfig = useSelector(getLocalGitConfig); - const isLocalConfigDefined = !!( - localGitConfig.authorEmail || localGitConfig.authorName - ); - - const isGlobalConfigDefined = !!( - globalGitConfig.authorEmail || globalGitConfig.authorName - ); + const gitError = useSelector(getGitError); const dispatch = useDispatch(); - const getInitGitConfig = useCallback(() => { - let initialAuthInfo = { - authorName: "", - authorEmail: "", - }; - - if (isGlobalConfigDefined) { - initialAuthInfo = { - authorName: globalGitConfig.authorName || "", - authorEmail: globalGitConfig.authorEmail || "", - }; - } - // when local config is defined we will only show local config - if (isLocalConfigDefined) { - initialAuthInfo = { - authorName: localGitConfig.authorName || "", - authorEmail: localGitConfig.authorEmail || "", - }; - } - - return initialAuthInfo; - }, [globalGitConfig, localGitConfig]); + const { + getInitGitConfig, + globalGitConfig, + isGlobalConfigDefined, + isLocalConfigDefined, + localGitConfig, + } = useUserGitConfig(); const initialAuthorInfoRef = useRef(getInitGitConfig()); - const [authorInfo, setAuthorInfo] = useState<{ - authorName: string; - authorEmail: string; - }>({ + const [authorInfo, setAuthorInfo] = useState<AuthorInfo>({ authorName: initialAuthorInfoRef.current.authorName, authorEmail: initialAuthorInfoRef.current.authorEmail, }); @@ -273,7 +168,6 @@ function GitConnection({ isImport }: Props) { const { deployKeyDocUrl, - // failedGeneratingSSHKey, fetchingSSHKeyPair, fetchSSHKeyPair, generateSSHKey, @@ -281,7 +175,7 @@ function GitConnection({ isImport }: Props) { SSHKeyPair, } = useSSHKeyPair(); - const { connectToGit, gitError, isConnectingToGit } = useGitConnect(); + const { connectToGit, isConnectingToGit } = useGitConnect(); const stopShowingCopiedAfterDelay = () => { timerRef.current = setTimeout(() => { @@ -340,6 +234,8 @@ function GitConnection({ isImport }: Props) { }; const onSubmit = useCallback(() => { + setTriedSubmit(true); + if ( authorInfo.authorName && authorInfo.authorEmail && @@ -352,12 +248,14 @@ function GitConnection({ isImport }: Props) { dispatch(updateLocalGitConfigInit(authorInfo)); } } else { - connectToGit({ - remoteUrl, - gitProfile: authorInfo, - isImport, - isDefaultProfile: useGlobalConfig, - }); + if (!isInvalidRemoteUrl) { + connectToGit({ + remoteUrl, + gitProfile: authorInfo, + isImport, + isDefaultProfile: useGlobalConfig, + }); + } } } else { Toaster.show({ @@ -385,19 +283,16 @@ function GitConnection({ isImport }: Props) { setRemoteUrl(value); }; - const remoteUrlIsInvalid = useCallback( - (value: string) => value.startsWith(HTTP_LITERAL), - [], - ); - const submitButtonDisabled = useMemo(() => { - const isAuthorInfoEmpty = !authorInfo.authorEmail || !authorInfo.authorName; - const isAuthorEmailInvalid = !emailValidator(authorInfo.authorEmail) - .isValid; const isAuthInfoUpdated = isAuthorInfoUpdated(); - let buttonDisabled = isAuthorInfoEmpty || isAuthorEmailInvalid; + let buttonDisabled = false; if (isGitConnected) { - buttonDisabled = buttonDisabled || !isAuthInfoUpdated; + const isFetchingConfig = + isFetchingGlobalGitConfig || isFetchingLocalGitConfig; + + buttonDisabled = buttonDisabled || !isAuthInfoUpdated || isFetchingConfig; + } else { + buttonDisabled = isInvalidRemoteUrl; } return buttonDisabled; }, [ @@ -405,13 +300,12 @@ function GitConnection({ isImport }: Props) { authorInfo.authorName, isAuthorInfoUpdated, isGitConnected, + isFetchingGlobalGitConfig, + isFetchingLocalGitConfig, + isInvalidRemoteUrl, ]); - const submitButtonIsLoading = useMemo(() => { - const isFetchingConfig = - isGitConnected && (isFetchingGlobalGitConfig || isFetchingLocalGitConfig); - return isConnectingToGit || isFetchingConfig; - }, [isConnectingToGit, isFetchingGlobalGitConfig, isFetchingLocalGitConfig]); + const submitButtonIsLoading = isConnectingToGit; useEffect(() => { // OnMount fetch global and local config @@ -437,13 +331,15 @@ function GitConnection({ isImport }: Props) { }, [setUseGlobalConfig, useGlobalConfig]); const scrollWrapperRef = React.createRef<HTMLDivElement>(); + useEffect(() => { - if (gitError.message && scrollWrapperRef.current) { + if (gitError?.message && scrollWrapperRef.current) { const top = scrollWrapperRef.current.scrollHeight; scrollWrapperRef.current?.scrollTo({ top: top, behavior: "smooth" }); } }, [gitError]); + log.log(gitError); return ( <Container ref={scrollWrapperRef}> <Section> @@ -496,52 +392,12 @@ function GitConnection({ isImport }: Props) { </ButtonContainer> ) ) : ( - <> - <FlexRow> - <DeployedKeyContainer $marginTop={8}> - <FlexRow> - <Flex> - <KeySvg /> - </Flex> - - <FlexColumn> - <LabelText>{createMessage(DEPLOY_KEY_TITLE)}</LabelText> - <KeyText>{SSHKeyPair}</KeyText> - </FlexColumn> - </FlexRow> - </DeployedKeyContainer> - {showCopied ? ( - <Icon - color={Colors.GREEN} - hoverColor={Colors.GREEN} - marginOffset={4} - size="16px" - > - <TickSvg /> - </Icon> - ) : ( - <TooltipWrapper> - <TooltipComponent content="Copy Key"> - <Icon - color={Colors.DARK_GRAY} - hoverColor={Colors.GRAY2} - marginOffset={3} - onClick={copyToClipboard} - size="22px" - > - <CopySvg /> - </Icon> - </TooltipComponent> - </TooltipWrapper> - )} - </FlexRow> - <Text color={Colors.GREY_9} type={TextType.P3}> - {createMessage(DEPLOY_KEY_USAGE_GUIDE_MESSAGE)} - <LintText href={deployKeyDocUrl} target="_blank"> - &nbsp;LEARN MORE - </LintText> - </Text> - </> + <DeployedKeyUI + SSHKeyPair={SSHKeyPair} + copyToClipboard={copyToClipboard} + deployKeyDocUrl={deployKeyDocUrl} + showCopied={showCopied} + /> )} </Section> @@ -555,10 +411,11 @@ function GitConnection({ isImport }: Props) { isLocalConfigDefined={isLocalConfigDefined} setAuthorInfo={setAuthorInfo} toggleUseDefaultConfig={toggleHandler} + triedSubmit={triedSubmit} useGlobalConfig={useGlobalConfig} /> <ButtonContainer topMargin={11}> - {!gitError.message && isConnectingToGit && ( + {isConnectingToGit && ( <StatusbarWrapper> <Statusbar completed={!submitButtonIsLoading} @@ -585,10 +442,7 @@ function GitConnection({ isImport }: Props) { } /> )} - <GitSyncError - error={gitError.message} - type={ReduxActionErrorTypes.CONNECT_TO_GIT_ERROR} - /> + {!isConnectingToGit && <GitSyncError />} </ButtonContainer> </> ) : null} diff --git a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx index c8d3d14bc328..adf288343a6c 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/Merge.tsx @@ -6,7 +6,6 @@ import { createMessage, MERGE_CHANGES, SELECT_BRANCH_TO_MERGE, - FETCH_MERGE_STATUS, } from "constants/messages"; import { ReactComponent as MergeIcon } from "assets/icons/ads/git-merge.svg"; import { ReactComponent as LeftArrow } from "assets/icons/ads/arrow-left-1.svg"; @@ -15,33 +14,40 @@ import styled from "styled-components"; import Button, { Size } from "components/ads/Button"; import { useSelector, useDispatch } from "react-redux"; import { getCurrentAppGitMetaData } from "selectors/applicationSelectors"; -import { getGitBranches } from "selectors/gitSyncSelectors"; +import { getGitBranches, getMergeStatus } from "selectors/gitSyncSelectors"; +import { getPullMergeStatus } from "selectors/gitSyncSelectors"; import { DropdownOptions } from "../../GeneratePage/components/constants"; -import { mergeBranchInit, fetchBranchesInit } from "actions/gitSyncActions"; +import { + mergeBranchInit, + fetchBranchesInit, + resetMergeStatus, + fetchGitStatusInit, +} from "actions/gitSyncActions"; import { getIsFetchingMergeStatus, getFetchingBranches, } from "selectors/gitSyncSelectors"; import { fetchMergeStatusInit } from "actions/gitSyncActions"; -import StatusLoader from "../components/StatusLoader"; +import MergeStatus from "../components/MergeStatus"; +import GitChanged from "../components/GitChanged"; +import { log } from "loglevel"; const Row = styled.div` display: flex; align-items: center; `; -const Flex = styled.div` - display: flex; -`; - const DEFAULT_OPTION = "--Select--"; export default function Merge() { + const dispatch = useDispatch(); const gitMetaData = useSelector(getCurrentAppGitMetaData); const gitBranches = useSelector(getGitBranches); const isFetchingBranches = useSelector(getFetchingBranches); const isFetchingMergeStatus = useSelector(getIsFetchingMergeStatus); - const dispatch = useDispatch(); + const mergeStatus = useSelector(getMergeStatus); + const isMergeAble = mergeStatus?.isMergeAble; + const pullMergeStatus: any = useSelector(getPullMergeStatus); const currentBranch = gitMetaData?.branchName; const [selectedBranchOption, setSelectedBranchOption] = useState({ @@ -86,7 +92,11 @@ export default function Merge() { }, [currentBranch, selectedBranchOption.value, dispatch]); useEffect(() => { + dispatch(fetchGitStatusInit()); dispatch(fetchBranchesInit()); + return () => { + dispatch(resetMergeStatus()); + }; }, []); useEffect(() => { @@ -106,12 +116,16 @@ export default function Merge() { }, [currentBranch, selectedBranchOption.value, dispatch]); const mergeBtnDisabled = - DEFAULT_OPTION === selectedBranchOption.value || isFetchingMergeStatus; + DEFAULT_OPTION === selectedBranchOption.value || + isFetchingMergeStatus || + !isMergeAble; + + log(pullMergeStatus); return ( <> <Title>{createMessage(MERGE_CHANGES)}</Title> - <Space size={7} /> + <GitChanged /> <Caption>{createMessage(SELECT_BRANCH_TO_MERGE)}</Caption> <Space size={4} /> <Row> @@ -143,12 +157,7 @@ export default function Merge() { width={"220px"} /> </Row> - {isFetchingMergeStatus && ( - <Flex> - <Space horizontal size={10} /> - <StatusLoader loaderMsg={createMessage(FETCH_MERGE_STATUS)} /> - </Flex> - )} + <MergeStatus /> <Space size={10} /> <Button diff --git a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx index 5acdc4e3bd79..78e415825276 100644 --- a/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx +++ b/app/client/src/pages/Editor/gitSync/components/DeployPreview.tsx @@ -19,6 +19,8 @@ import { import Text, { TextType, Case } from "components/ads/Text"; import { Colors } from "constants/Colors"; import SuccessTick from "pages/common/SuccessTick"; +import { howMuchTimeBeforeText } from "utils/helpers"; +import { getApplicationLastDeployedAt } from "selectors/editorSelectors"; const Container = styled.div` display: flex; @@ -62,12 +64,19 @@ const CloudIconWrapper = styled.div` export default function DeployPreview(props: { showSuccess: boolean }) { const applicationId = useSelector(getCurrentApplicationId); const pageId = useSelector(getCurrentPageId); + const lastDeployedAt = useSelector(getApplicationLastDeployedAt); const showDeployPreview = () => { const path = getApplicationViewerPageURL({ applicationId, pageId }); window.open(path, "_blank"); }; + const lastDeployedAtMsg = lastDeployedAt + ? `${createMessage(LATEST_DP_SUBTITLE)} ${howMuchTimeBeforeText( + lastDeployedAt, + )} ago` + : ""; + return ( <Container> <CloudIconWrapper> @@ -92,7 +101,7 @@ export default function DeployPreview(props: { showSuccess: boolean }) { </IconWrapper> </ButtonWrapper> <Text color={Colors.GREY_6} type={TextType.P3}> - {createMessage(LATEST_DP_SUBTITLE)} + {lastDeployedAtMsg} </Text> </ContentWrapper> </Container> diff --git a/app/client/src/pages/Editor/gitSync/components/DeployedKeyUI.tsx b/app/client/src/pages/Editor/gitSync/components/DeployedKeyUI.tsx new file mode 100644 index 000000000000..81b632a8bb5b --- /dev/null +++ b/app/client/src/pages/Editor/gitSync/components/DeployedKeyUI.tsx @@ -0,0 +1,155 @@ +import { Colors } from "constants/Colors"; +import { + createMessage, + DEPLOY_KEY_TITLE, + DEPLOY_KEY_USAGE_GUIDE_MESSAGE, +} from "constants/messages"; +import React from "react"; +import styled from "styled-components"; +import Text, { TextType } from "components/ads/Text"; +import TooltipComponent from "components/ads/Tooltip"; +import { ReactComponent as CopySvg } from "assets/icons/ads/file-copy-line.svg"; +import { ReactComponent as TickSvg } from "assets/images/tick.svg"; +import Key2LineIcon from "remixicon-react/Key2LineIcon"; +import { Space } from "./StyledComponents"; + +const TooltipWrapper = styled.div` + display: flex; + justify-content: center; + align-items: center; +`; + +const Icon = styled.span<{ + size: string; + color: string; + marginOffset?: number; + hoverColor: string; +}>` + display: flex; + justify-content: center; + align-items: center; + margin-top: ${(props) => `${props.theme.spaces[1]}px`}; + padding: ${(props) => `${props.theme.spaces[props.marginOffset || 0]}px`}; + cursor: pointer; + svg { + width: ${(props) => props.size}; + height: ${(props) => props.size}; + path { + fill: ${(props) => props.color}; + } + } + &:hover { + svg { + path { + fill: ${(props) => props.hoverColor}; + } + } + } +`; + +const DeployedKeyContainer = styled.div<{ $marginTop: number }>` + margin-top: ${(props) => `${props.theme.spaces[props.$marginTop]}px`}; + margin-bottom: 8px; + height: 35px; + width: calc(100% - 30px); + border: 1px solid ${Colors.ALTO_3}; + padding: ${(props) => + `${props.theme.spaces[3]}px ${props.theme.spaces[4]}px`}; + box-sizing: border-box; +`; + +const FlexRow = styled.div` + display: flex; + flex-direction: row; + width: 100%; +`; + +const LabelText = styled.span` + margin-left: ${(props) => `${props.theme.spaces[2]}px`}; + font-size: 14px; + color: ${Colors.CODE_GRAY}; + white-space: nowrap; +`; + +const KeyText = styled.span` + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + width: 100%; + font-size: 10px; + font-weight: 600; + text-transform: uppercase; + color: ${Colors.CODE_GRAY}; +`; + +const LintText = styled.a` + :hover { + text-decoration: none; + color: ${Colors.CRUSTA}; + } + color: ${Colors.CRUSTA}; + cursor: pointer; +`; + +type DeployedKeyUIProps = { + copyToClipboard: () => void; + deployKeyDocUrl: string; + showCopied: boolean; + SSHKeyPair: string; +}; + +function DeployedKeyUI(props: DeployedKeyUIProps) { + const { copyToClipboard, deployKeyDocUrl, showCopied, SSHKeyPair } = props; + return ( + <> + <Space size={7} /> + <Text color={Colors.GREY_9} type={TextType.P3}> + {createMessage(DEPLOY_KEY_USAGE_GUIDE_MESSAGE)} + <LintText href={deployKeyDocUrl} target="_blank"> + &nbsp;LEARN MORE + </LintText> + </Text> + <FlexRow> + <DeployedKeyContainer $marginTop={4}> + <FlexRow> + <Key2LineIcon + color={Colors.DOVE_GRAY2} + size={28} + style={{ marginTop: -4 }} + /> + <LabelText> + {createMessage(DEPLOY_KEY_TITLE)}&nbsp;:&nbsp; + </LabelText> + <KeyText>{SSHKeyPair}</KeyText> + </FlexRow> + </DeployedKeyContainer> + {showCopied ? ( + <Icon + color={Colors.GREEN} + hoverColor={Colors.GREEN} + marginOffset={4} + size="16px" + > + <TickSvg /> + </Icon> + ) : ( + <TooltipWrapper> + <TooltipComponent content="Copy Key"> + <Icon + color={Colors.DARK_GRAY} + hoverColor={Colors.GRAY2} + marginOffset={3} + onClick={copyToClipboard} + size="22px" + > + <CopySvg /> + </Icon> + </TooltipComponent> + </TooltipWrapper> + )} + </FlexRow> + </> + ); +} + +export default DeployedKeyUI; diff --git a/app/client/src/pages/Editor/gitSync/components/GitChanged.tsx b/app/client/src/pages/Editor/gitSync/components/GitChanged.tsx new file mode 100644 index 000000000000..3bcddf7c8676 --- /dev/null +++ b/app/client/src/pages/Editor/gitSync/components/GitChanged.tsx @@ -0,0 +1,100 @@ +import React from "react"; +import styled from "constants/DefaultTheme"; +import { Classes } from "components/ads/common"; +import Text, { TextType } from "components/ads/Text"; +import { Colors } from "constants/Colors"; +import Icon, { IconName, IconSize } from "components/ads/Icon"; +import { useSelector } from "react-redux"; +import { + getGitStatus, + getIsFetchingGitStatus, +} from "selectors/gitSyncSelectors"; + +const Loader = styled.div` + width: 135px; + height: 26px; + background: linear-gradient( + 90deg, + ${Colors.GREY_2} 0%, + rgba(240, 240, 240, 0) 100% + ); + margin-right: ${(props) => props.theme.spaces[8] + 5}px; +`; + +const Wrapper = styled.div` + width: 178px; + display: flex; + .${Classes.ICON} { + margin-right: ${(props) => props.theme.spaces[3]}px; + } +`; + +const GitChangedRow = styled.div` + display: flex; + align-items: center; + margin-bottom: ${(props) => props.theme.spaces[11]}px; +`; + +export enum Kind { + widget = "widget", + query = "query", + commit = "commit", + pullRequest = "pullRequest", +} + +type GitSyncProps = { + type: Kind; +}; + +function GitStatus(props: GitSyncProps) { + const { type } = props; + const status: any = useSelector(getGitStatus); + const loading = useSelector(getIsFetchingGitStatus); + let message = "", + iconName: IconName; + switch (type) { + case Kind.widget: + message = `${status?.modifiedPages || 0} widget${ + (status?.modifiedPages || 0) > 1 ? "s" : "" + } updated`; + iconName = "widget"; + break; + case Kind.query: + message = `${status?.modifiedQueries || 0} ${ + (status?.modifiedQueries || 0) > 1 ? "queries" : "query" + } modified`; + iconName = "query"; + break; + case Kind.commit: + message = `${status?.aheadCount || 0} commit${ + (status?.aheadCount || 0) > 1 ? "s" : "" + } to push`; + iconName = "git-commit"; + break; + case Kind.pullRequest: + message = `${status?.behindCount || 0} pull request${ + (status?.behindCount || 0) > 1 ? "s" : "" + } pending`; + iconName = "git-pull-request"; + break; + } + return loading ? ( + <Loader /> + ) : ( + <Wrapper> + <Icon fillColor={Colors.GREY_10} name={iconName} size={IconSize.XXL} /> + <Text type={TextType.P3}>{message}</Text> + </Wrapper> + ); +} + +export default function GitChanged() { + const gitStatus: any = useSelector(getGitStatus); + return ( + <GitChangedRow> + <GitStatus type={Kind.widget} /> + <GitStatus type={Kind.query} /> + {gitStatus?.aheadCount > 0 && <GitStatus type={Kind.commit} />} + </GitChangedRow> + ); +} diff --git a/app/client/src/pages/Editor/gitSync/components/GitError.tsx b/app/client/src/pages/Editor/gitSync/components/GitSyncError.tsx similarity index 62% rename from app/client/src/pages/Editor/gitSync/components/GitError.tsx rename to app/client/src/pages/Editor/gitSync/components/GitSyncError.tsx index 07b8a352a449..650c72639f01 100644 --- a/app/client/src/pages/Editor/gitSync/components/GitError.tsx +++ b/app/client/src/pages/Editor/gitSync/components/GitSyncError.tsx @@ -4,16 +4,10 @@ import { Classes } from "components/ads/common"; import Text, { Case, FontWeight, TextType } from "components/ads/Text"; import { Colors } from "constants/Colors"; import Icon, { IconSize } from "components/ads/Icon"; -import { - ReduxActionErrorType, - ReduxActionErrorTypes, -} from "constants/ReduxActionConstants"; import { DOCS_BASE_URL } from "constants/ThirdPartyConstants"; -import { - createMessage, - ERROR_CONNECTING, - READ_DOCUMENTATION, -} from "constants/messages"; +import { createMessage, READ_DOCUMENTATION } from "constants/messages"; +import { useSelector } from "store"; +import { getGitError } from "selectors/gitSyncSelectors"; const ErrorWrapper = styled.div` padding: 24px 0px; @@ -38,31 +32,32 @@ const LintText = styled.a` cursor: pointer; `; -type ErrorProps = { - error: string | null; - type: ReduxActionErrorType; -}; - -export default function GitSyncError(props: ErrorProps) { - let titleMessage = ""; - switch (props.type) { - case ReduxActionErrorTypes.CONNECT_TO_GIT_ERROR: - titleMessage = createMessage(ERROR_CONNECTING); - break; +export default function GitSyncError() { + const error = useSelector(getGitError); + const titleMessage = error?.errorType + ? error.errorType.replaceAll("_", " ") + : ""; + let errorVisible = false; + if (error) { + errorVisible = true; + if (error.code === 5006) { + errorVisible = error.message.indexOf("git push failed") < 0; + } } - - return props.error?.length ? ( + return errorVisible ? ( <ErrorWrapper> - <Text - case={Case.UPPERCASE} - color={Colors.ERROR_RED} - type={TextType.P1} - weight={FontWeight.BOLD} - > - {titleMessage} - </Text> + {titleMessage.length && ( + <Text + case={Case.UPPERCASE} + color={Colors.ERROR_RED} + type={TextType.P1} + weight={FontWeight.BOLD} + > + {titleMessage} + </Text> + )} <Text color={Colors.ERROR_RED} type={TextType.P2}> - {props.error} + {error?.message} </Text> <LintText href={DOCS_BASE_URL} target="_blank"> <Text diff --git a/app/client/src/pages/Editor/gitSync/components/MergeStatus.tsx b/app/client/src/pages/Editor/gitSync/components/MergeStatus.tsx new file mode 100644 index 000000000000..e88344fa59d1 --- /dev/null +++ b/app/client/src/pages/Editor/gitSync/components/MergeStatus.tsx @@ -0,0 +1,116 @@ +import React from "react"; +import { + createMessage, + FETCH_MERGE_STATUS, + FETCH_MERGE_STATUS_FAILURE, + MERGE_CONFLICT_ERROR, + NO_MERGE_CONFLICT, +} from "constants/messages"; +import styled from "constants/DefaultTheme"; +import StatusLoader from "./StatusLoader"; +import { Space } from "./StyledComponents"; +import { useSelector } from "react-redux"; +import { + getIsFetchingMergeStatus, + getMergeStatus, +} from "selectors/gitSyncSelectors"; +import Text, { TextType } from "components/ads/Text"; +import ErrorWarning from "remixicon-react/ErrorWarningLineIcon"; +import CheckLine from "remixicon-react/CheckLineIcon"; +import { Colors } from "constants/Colors"; + +const Flex = styled.div` + display: flex; +`; + +const MERGE_STATUS_STATE = { + FETCHING: "FETCHING", + NO_CONFLICT: "NO_CONFLICT", + MERGE_CONFLICT: "MERGE_CONFLICT", + NONE: "NONE", +}; + +const Wrapper = styled.div` + display: flex; + flex-direction: row; + margin-top: ${(props) => `${props.theme.spaces[3]}px`}; +`; + +function MergeStatus() { + const isFetchingMergeStatus = useSelector(getIsFetchingMergeStatus); + const mergeStatus = useSelector(getMergeStatus); + + let status = MERGE_STATUS_STATE.NONE; + if (isFetchingMergeStatus) { + status = MERGE_STATUS_STATE.FETCHING; + } else if (mergeStatus && mergeStatus?.isMergeAble) { + status = MERGE_STATUS_STATE.NO_CONFLICT; + } else if (mergeStatus && !mergeStatus?.isMergeAble) { + status = MERGE_STATUS_STATE.MERGE_CONFLICT; + } + + switch (status) { + case MERGE_STATUS_STATE.FETCHING: + return ( + <Flex> + <Space horizontal size={10} /> + <StatusLoader loaderMsg={createMessage(FETCH_MERGE_STATUS)} /> + </Flex> + ); + case MERGE_STATUS_STATE.NO_CONFLICT: + return ( + <Flex> + <Space horizontal size={10} /> + <Wrapper> + <CheckLine color={Colors.GREEN} size={18} /> + <Text + color={Colors.GREEN} + style={{ marginLeft: 8, alignSelf: "center" }} + type={TextType.P3} + weight="600" + > + {createMessage(NO_MERGE_CONFLICT)} + </Text> + </Wrapper> + </Flex> + ); + case MERGE_STATUS_STATE.MERGE_CONFLICT: + return ( + <Flex> + <Space horizontal size={10} /> + <Wrapper> + <ErrorWarning color={Colors.CRIMSON} size={18} /> + <Text + color={Colors.CRIMSON} + style={{ marginLeft: 8, alignSelf: "center" }} + type={TextType.P3} + weight="600" + > + {createMessage(MERGE_CONFLICT_ERROR)} + </Text> + </Wrapper> + </Flex> + ); + + case MERGE_STATUS_STATE.NONE: + return ( + <Flex> + <Space horizontal size={10} /> + <Wrapper> + <ErrorWarning size={18} /> + <Text + style={{ marginLeft: 8, alignSelf: "center" }} + type={TextType.P3} + > + {createMessage(FETCH_MERGE_STATUS_FAILURE)} + </Text> + </Wrapper> + </Flex> + ); + default: + return null; + // status === MERGE_STATUS_STATE.NONE will execute default case. + } +} + +export default MergeStatus; diff --git a/app/client/src/pages/Editor/gitSync/components/StyledComponents.tsx b/app/client/src/pages/Editor/gitSync/components/StyledComponents.tsx index 4e29bcf2c410..5389660df6ad 100644 --- a/app/client/src/pages/Editor/gitSync/components/StyledComponents.tsx +++ b/app/client/src/pages/Editor/gitSync/components/StyledComponents.tsx @@ -2,12 +2,13 @@ import styled from "styled-components"; import { getTypographyByKey } from "constants/DefaultTheme"; import { Colors } from "constants/Colors"; -export const Title = styled.h1` +export const Title = styled.p` ${(props) => getTypographyByKey(props, "h1")}; - margin-top: ${(props) => props.theme.spaces[7]}px; + margin: ${(props) => + `${props.theme.spaces[7]}px 0px ${props.theme.spaces[4]}px 0px`}; `; -export const Subtitle = styled.p` +export const Subtitle = styled.span` ${(props) => getTypographyByKey(props, "p1")}; color: ${Colors.BLACK}; `; diff --git a/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings/index.tsx b/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings/index.tsx index 984f07734693..2139fd74a6ea 100644 --- a/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings/index.tsx +++ b/app/client/src/pages/Editor/gitSync/components/UserGitProfileSettings/index.tsx @@ -7,10 +7,7 @@ import { AUTHOR_EMAIL, } from "constants/messages"; import styled from "styled-components"; -import TextInput, { - emailValidator, - notEmptyValidator, -} from "components/ads/TextInput"; +import TextInput, { emailValidator } from "components/ads/TextInput"; import { Classes as GitSyncClasses } from "../../constants"; import Checkbox from "components/ads/Checkbox"; import { GIT_PROFILE_ROUTE } from "constants/routes"; @@ -119,6 +116,7 @@ type UserGitProfileSettingsProps = { toggleUseDefaultConfig: (useDefaultConfig: boolean) => void; isLocalConfigDefined: boolean; isGlobalConfigDefined: boolean; + triedSubmit: boolean; }; const goToGitProfile = () => { @@ -131,6 +129,7 @@ function UserGitProfileSettings({ isLocalConfigDefined, setAuthorInfo, toggleUseDefaultConfig, + triedSubmit, useGlobalConfig, }: UserGitProfileSettingsProps) { // @@ -201,7 +200,7 @@ function UserGitProfileSettings({ defaultValue={authorInfo.authorName} disabled={disableInput} errorMsg={ - !authorInfo.authorName && !nameInputFocused + !authorInfo.authorName && !nameInputFocused && triedSubmit ? "Author name cannot be empty" : "" } @@ -210,7 +209,7 @@ function UserGitProfileSettings({ onBlur={() => setNameInputFocused(false)} onChange={(value) => changeHandler(AUTHOR_INFO_LABEL.NAME, value)} onFocus={() => setNameInputFocused(true)} - validator={notEmptyValidator} + trimValue={false} /> </InputContainer> @@ -224,7 +223,7 @@ function UserGitProfileSettings({ dataType="email" disabled={disableInput} errorMsg={ - !isValidEmail && !emailInputFocused + !isValidEmail && !emailInputFocused && triedSubmit ? "Please enter a valid email" : "" } diff --git a/app/client/src/pages/Editor/gitSync/hooks.ts b/app/client/src/pages/Editor/gitSync/hooks.ts index b9c69ea778ee..317220a68e34 100644 --- a/app/client/src/pages/Editor/gitSync/hooks.ts +++ b/app/client/src/pages/Editor/gitSync/hooks.ts @@ -5,6 +5,12 @@ import { connectToGitInit } from "actions/gitSyncActions"; import { ConnectToGitPayload } from "api/GitSyncAPI"; import { getCurrentApplication } from "selectors/applicationSelectors"; import { DOCS_BASE_URL } from "constants/ThirdPartyConstants"; +import { + getGlobalGitConfig, + getLocalGitConfig, + getIsGlobalConfigDefined, + getIsLocalConfigDefined, +} from "selectors/gitSyncSelectors"; export const useSSHKeyPair = () => { // As SSHKeyPair fetching and generation is only done only for GitConnection part, @@ -81,26 +87,17 @@ export const useGitConnect = () => { const [isConnectingToGit, setIsConnectingToGit] = useState(false); - const [gitError, setGitError] = useState({ message: null }); - const onGitConnectSuccess = useCallback(() => { - setGitError({ message: null }); setIsConnectingToGit(false); }, [setIsConnectingToGit]); - const onGitConnectFailure = useCallback( - (error: any) => { - setGitError({ message: error.message }); - setIsConnectingToGit(false); - }, - [setIsConnectingToGit], - ); + const onGitConnectFailure = useCallback(() => { + setIsConnectingToGit(false); + }, [setIsConnectingToGit]); const connectToGit = useCallback( (payload: ConnectToGitPayload) => { setIsConnectingToGit(true); - setGitError({ message: null }); - // Here after the ssh key pair generation, we fetch the application data again and on success of it dispatch( connectToGitInit({ @@ -115,7 +112,44 @@ export const useGitConnect = () => { return { isConnectingToGit, - gitError, connectToGit, }; }; + +export const useUserGitConfig = () => { + const globalGitConfig = useSelector(getGlobalGitConfig); + const localGitConfig = useSelector(getLocalGitConfig); + const isLocalConfigDefined = useSelector(getIsLocalConfigDefined); + const isGlobalConfigDefined = useSelector(getIsGlobalConfigDefined); + + const getInitGitConfig = useCallback(() => { + let initialAuthInfo = { + authorName: "", + authorEmail: "", + }; + + if (isGlobalConfigDefined) { + initialAuthInfo = { + authorName: globalGitConfig.authorName || "", + authorEmail: globalGitConfig.authorEmail || "", + }; + } + // when local config is defined we will only show local config + if (isLocalConfigDefined) { + initialAuthInfo = { + authorName: localGitConfig.authorName || "", + authorEmail: localGitConfig.authorEmail || "", + }; + } + + return initialAuthInfo; + }, [globalGitConfig, localGitConfig]); + + return { + getInitGitConfig, + globalGitConfig, + isGlobalConfigDefined, + isLocalConfigDefined, + localGitConfig, + }; +}; diff --git a/app/client/src/reducers/uiReducers/gitSyncReducer.ts b/app/client/src/reducers/uiReducers/gitSyncReducer.ts index 02ca237b2af2..cf63c3598a08 100644 --- a/app/client/src/reducers/uiReducers/gitSyncReducer.ts +++ b/app/client/src/reducers/uiReducers/gitSyncReducer.ts @@ -4,7 +4,7 @@ import { ReduxActionErrorTypes, ReduxActionTypes, } from "constants/ReduxActionConstants"; -import { GitSyncModalTab, GitConfig } from "entities/GitSync"; +import { GitSyncModalTab, GitConfig, MergeStatus } from "entities/GitSync"; const initialState: GitSyncReducerState = { isGitSyncModalOpen: false, @@ -32,7 +32,9 @@ const initialState: GitSyncReducerState = { branches: [], fetchingBranches: false, localGitConfig: { authorEmail: "", authorName: "" }, - isDisconnectingGit: false, + + isFetchingLocalGitConfig: false, + isFetchingGitConfig: false, }; const gitSyncReducer = createReducer(initialState, { @@ -49,6 +51,7 @@ const gitSyncReducer = createReducer(initialState, { ...state, isGitSyncModalOpen: action.payload.isOpen, activeGitSyncModalTab, + gitError: null, }; }, [ReduxActionTypes.COMMIT_TO_GIT_REPO_INIT]: (state: GitSyncReducerState) => ({ @@ -62,6 +65,7 @@ const gitSyncReducer = createReducer(initialState, { ...state, isCommitting: false, isCommitSuccessful: true, + gitError: null, }), [ReduxActionErrorTypes.COMMIT_TO_GIT_REPO_ERROR]: ( state: GitSyncReducerState, @@ -79,6 +83,7 @@ const gitSyncReducer = createReducer(initialState, { ...state, isPushingToGit: true, isPushSuccessful: false, + gitError: null, }), [ReduxActionTypes.PUSH_TO_GIT_SUCCESS]: (state: GitSyncReducerState) => ({ ...state, @@ -113,12 +118,14 @@ const gitSyncReducer = createReducer(initialState, { ) => ({ ...state, isFetchingGitConfig: true, + gitError: null, }), [ReduxActionTypes.UPDATE_GLOBAL_GIT_CONFIG_INIT]: ( state: GitSyncReducerState, ) => ({ ...state, isFetchingGitConfig: true, + gitError: null, }), [ReduxActionTypes.FETCH_GLOBAL_GIT_CONFIG_SUCCESS]: ( state: GitSyncReducerState, @@ -151,6 +158,7 @@ const gitSyncReducer = createReducer(initialState, { [ReduxActionTypes.FETCH_BRANCHES_INIT]: (state: GitSyncReducerState) => ({ ...state, fetchingBranches: true, + gitError: null, }), [ReduxActionTypes.FETCH_BRANCHES_SUCCESS]: ( state: GitSyncReducerState, @@ -171,12 +179,14 @@ const gitSyncReducer = createReducer(initialState, { ) => ({ ...state, isFetchingLocalGitConfig: true, + gitError: null, }), [ReduxActionTypes.UPDATE_LOCAL_GIT_CONFIG_INIT]: ( state: GitSyncReducerState, ) => ({ ...state, isFetchingLocalGitConfig: true, + gitError: null, }), [ReduxActionTypes.FETCH_LOCAL_GIT_CONFIG_SUCCESS]: ( state: GitSyncReducerState, @@ -209,6 +219,7 @@ const gitSyncReducer = createReducer(initialState, { [ReduxActionTypes.FETCH_GIT_STATUS_INIT]: (state: GitSyncReducerState) => ({ ...state, isFetchingGitStatus: true, + gitError: null, }), [ReduxActionTypes.FETCH_GIT_STATUS_SUCCESS]: ( state: GitSyncReducerState, @@ -224,25 +235,23 @@ const gitSyncReducer = createReducer(initialState, { ...state, isFetchingGitStatus: false, }), - [ReduxActionTypes.DISCONNECT_TO_GIT_INIT]: (state: GitSyncReducerState) => ({ - ...state, - isDisconnectingGit: true, - }), - [ReduxActionTypes.DISCONNECT_TO_GIT_SUCCESS]: ( + [ReduxActionErrorTypes.DISCONNECT_TO_GIT_ERROR]: ( state: GitSyncReducerState, ) => ({ ...state, isDisconnectingGit: false, }), - [ReduxActionErrorTypes.DISCONNECT_TO_GIT_ERROR]: ( + [ReduxActionErrorTypes.GIT_SYNC_ERROR]: ( state: GitSyncReducerState, + action: ReduxAction<unknown>, ) => ({ ...state, - isDisconnectingGit: false, + gitError: action.payload, }), [ReduxActionTypes.FETCH_MERGE_STATUS_INIT]: (state: GitSyncReducerState) => ({ ...state, isFetchingMergeStatus: true, + gitError: null, }), [ReduxActionTypes.FETCH_MERGE_STATUS_SUCCESS]: ( state: GitSyncReducerState, @@ -258,17 +267,48 @@ const gitSyncReducer = createReducer(initialState, { ...state, isFetchingMergeStatus: false, }), + [ReduxActionTypes.RESET_MERGE_STATUS]: (state: GitSyncReducerState) => ({ + ...state, + mergeStatus: null, + }), + [ReduxActionTypes.GIT_PULL_SUCCESS]: ( + state: GitSyncReducerState, + action: ReduxAction<MergeStatus>, + ) => ({ + ...state, + pullMergeStatus: action.payload, + pullInProgress: false, + }), + [ReduxActionTypes.GIT_PULL_INIT]: (state: GitSyncReducerState) => ({ + ...state, + pullMergeStatus: null, + pullInProgress: true, + }), + [ReduxActionErrorTypes.GIT_PULL_ERROR]: (state: GitSyncReducerState) => ({ + ...state, + pullInProgress: false, + }), }); export type GitStatusData = { - // This is outdated, update according to updated API response. + aheadCount: number; + behindCount: number; conflicting: Array<string>; - uncommitted: Array<string>; isClean: boolean; - removed: Array<string>; - added: Array<string>; modified: Array<string>; - untracked: Array<string>; + modifiedPages: number; + modifiedQueries: number; + remoteBranch: string; +}; + +export type GitErrorType = { + code: number; + errorType?: string; + message: string; +}; + +export type MergeStatusData = { + isMergeAble: boolean; }; export type GitSyncReducerState = { @@ -277,23 +317,29 @@ export type GitSyncReducerState = { isCommitSuccessful: boolean; isPushSuccessful: boolean; isPushingToGit?: boolean; + + fetchingBranches: boolean; + isFetchingGitConfig: boolean; + isFetchingLocalGitConfig: boolean; + + isFetchingGitStatus: boolean; + isFetchingMergeStatus: boolean; + activeGitSyncModalTab: GitSyncModalTab; isImportAppViaGitModalOpen: boolean; organizationIdForImport?: string; isErrorPopupVisible?: boolean; gitPushError?: string; globalGitConfig: GitConfig; - isFetchingGitConfig?: boolean; - - isDisconnectingGit: boolean; branches: Array<{ branchName: string; default: boolean }>; - fetchingBranches: boolean; - isFetchingLocalGitConfig?: boolean; - isFetchingGitStatus: boolean; - isFetchingMergeStatus: boolean; + localGitConfig: GitConfig; gitStatus?: GitStatusData; + mergeStatus?: MergeStatusData | null; + gitError?: GitErrorType; + pullMergeStatus?: MergeStatus; + pullInProgress?: boolean; }; export default gitSyncReducer; diff --git a/app/client/src/sagas/ErrorSagas.tsx b/app/client/src/sagas/ErrorSagas.tsx index 85f650316059..b9344614e903 100644 --- a/app/client/src/sagas/ErrorSagas.tsx +++ b/app/client/src/sagas/ErrorSagas.tsx @@ -93,6 +93,13 @@ export function* validateResponse(response: ApiResponse | any, show = true) { throw new IncorrectBindingError(response.responseMeta.error.message); } + if (response?.gitRequest) { + yield put({ + type: ReduxActionErrorTypes.GIT_SYNC_ERROR, + payload: response.responseMeta.error, + }); + } + yield put({ type: ReduxActionErrorTypes.API_ERROR, payload: { diff --git a/app/client/src/sagas/GitSyncSagas.ts b/app/client/src/sagas/GitSyncSagas.ts index dfc29c5ab6bd..3fd4c27f5463 100644 --- a/app/client/src/sagas/GitSyncSagas.ts +++ b/app/client/src/sagas/GitSyncSagas.ts @@ -7,7 +7,10 @@ import { import { all, put, select, takeLatest, call } from "redux-saga/effects"; import GitSyncAPI from "api/GitSyncAPI"; -import { getCurrentApplicationId } from "selectors/editorSelectors"; +import { + getCurrentApplicationId, + getCurrentPageId, +} from "selectors/editorSelectors"; import { validateResponse } from "./ErrorSagas"; import { commitToRepoSuccess, @@ -21,6 +24,7 @@ import { fetchLocalGitConfigInit, switchGitBranchInit, updateBranchLocally, + gitPullSuccess, } from "actions/gitSyncActions"; import { connectToGitSuccess, @@ -36,20 +40,20 @@ import { createMessage, GIT_USER_UPDATED_SUCCESSFULLY, } from "constants/messages"; -import { - fetchGitStatusInit, - disconnectToGitSuccess, -} from "../actions/gitSyncActions"; +import { fetchGitStatusInit } from "../actions/gitSyncActions"; import { GitApplicationMetadata } from "../api/ApplicationApi"; -import { fetchApplication } from "../actions/applicationActions"; -import { APP_MODE } from "entities/App"; + import history from "utils/history"; import { addBranchParam } from "constants/routes"; import { MergeBranchPayload, MergeStatusPayload } from "api/GitSyncAPI"; + import { mergeBranchSuccess, mergeBranchFailure, } from "../actions/gitSyncActions"; +import { getCurrentGitBranch } from "selectors/gitSyncSelectors"; +import { initEditor } from "actions/initActions"; +import { fetchPage } from "actions/pageActions"; function* commitToGitRepoSaga( action: ReduxAction<{ @@ -67,7 +71,10 @@ function* commitToGitRepoSaga( branch: gitMetaData?.branchName || "", applicationId, }); - const isValidResponse: boolean = yield validateResponse(response); + const isValidResponse: boolean = yield validateResponse({ + ...response, + gitRequest: true, + }); if (isValidResponse) { yield put(commitToRepoSuccess()); @@ -90,14 +97,19 @@ function* commitToGitRepoSaga( function* connectToGitSaga(action: ConnectToGitReduxAction) { try { const applicationId: string = yield select(getCurrentApplicationId); + const currentPageId: string = yield select(getCurrentPageId); const response: ApiResponse = yield GitSyncAPI.connect( action.payload, applicationId, ); - const isValidResponse: boolean = yield validateResponse(response); + const isValidResponse: boolean = yield validateResponse({ + ...response, + gitRequest: true, + }); if (isValidResponse) { yield put(connectToGitSuccess(response.data)); + yield put(fetchPage(currentPageId)); if (action.onSuccessCallback) { action.onSuccessCallback(response.data); } @@ -108,32 +120,11 @@ function* connectToGitSaga(action: ConnectToGitReduxAction) { } } catch (error) { if (action.onErrorCallback) { - action.onErrorCallback(error); + action.onErrorCallback(error as string); } yield put({ type: ReduxActionErrorTypes.CONNECT_TO_GIT_ERROR, - payload: { error, logToSentry: true }, - }); - } -} - -function* disconnectToGitSaga() { - try { - const applicationId: string = yield select(getCurrentApplicationId); - - const response: ApiResponse = yield GitSyncAPI.disconnect(applicationId); - const isValidResponse: boolean = yield validateResponse(response); - - if (isValidResponse) { - yield put(disconnectToGitSuccess(response.data)); - yield put( - fetchApplication({ payload: { applicationId, mode: APP_MODE.EDIT } }), - ); - } - } catch (error) { - yield put({ - type: ReduxActionErrorTypes.DISCONNECT_TO_GIT_ERROR, - payload: { error, logToSentry: true }, + payload: { gitError: error, logToSentry: true }, }); } } @@ -141,7 +132,13 @@ function* disconnectToGitSaga() { function* fetchGlobalGitConfig() { try { const response: ApiResponse = yield GitSyncAPI.getGlobalConfig(); - const isValidResponse: boolean = yield validateResponse(response, false); + const isValidResponse: boolean = yield validateResponse( + { + ...response, + gitRequest: true, + }, + false, + ); if (isValidResponse) { yield put(fetchGlobalGitConfigSuccess(response.data)); @@ -159,7 +156,10 @@ function* updateGlobalGitConfig(action: ReduxAction<GitConfig>) { const response: ApiResponse = yield GitSyncAPI.setGlobalConfig( action.payload, ); - const isValidResponse: boolean = yield validateResponse(response); + const isValidResponse: boolean = yield validateResponse({ + ...response, + gitRequest: true, + }); if (isValidResponse) { yield put(updateGlobalGitConfigSuccess(response.data)); @@ -184,7 +184,10 @@ function* switchBranch(action: ReduxAction<string>) { const response: ApiResponse = yield GitSyncAPI.checkoutBranch( applicationId, ); - const isValidResponse: boolean = yield validateResponse(response); + const isValidResponse: boolean = yield validateResponse({ + ...response, + gitRequest: true, + }); if (isValidResponse) { const updatedPath = addBranchParam(branch); @@ -325,7 +328,13 @@ function* fetchGitStatusSaga() { applicationId, branch: gitMetaData?.branchName || "", }); - const isValidResponse: boolean = yield validateResponse(response, false); + const isValidResponse: boolean = yield validateResponse( + { + ...response, + gitRequest: true, + }, + false, + ); if (isValidResponse) { yield put(fetchGitStatusSuccess(response.data)); } @@ -367,7 +376,7 @@ function* fetchMergeStatusSaga(action: ReduxAction<MergeStatusPayload>) { const applicationId: string = yield select(getCurrentApplicationId); const { destinationBranch, sourceBranch } = action.payload; - const response: ApiResponse = yield GitSyncAPI.merge({ + const response: ApiResponse = yield GitSyncAPI.getMergeStatus({ applicationId, sourceBranch, destinationBranch, @@ -384,11 +393,35 @@ function* fetchMergeStatusSaga(action: ReduxAction<MergeStatusPayload>) { } } +function* gitPullSaga() { + try { + const applicationId: string = yield select(getCurrentApplicationId); + const response = yield call(GitSyncAPI.pull, { applicationId }); + const isValidResponse: boolean = yield validateResponse(response, false); + const currentBranch = yield select(getCurrentGitBranch); + const currentPageId = yield select(getCurrentPageId); + if (isValidResponse) { + const { mergeStatus } = response.data; + yield put(gitPullSuccess(mergeStatus)); + // re-init after a successfull pull + if (mergeStatus.merge) { + yield put(initEditor(applicationId, currentPageId, currentBranch)); + } else { + // todo handle error + } + } + } catch (e) { + yield put({ + type: ReduxActionErrorTypes.GIT_PULL_ERROR, + payload: { error: e, logToSentry: true, show: false }, + }); + } +} + export default function* gitSyncSagas() { yield all([ takeLatest(ReduxActionTypes.COMMIT_TO_GIT_REPO_INIT, commitToGitRepoSaga), takeLatest(ReduxActionTypes.CONNECT_TO_GIT_INIT, connectToGitSaga), - takeLatest(ReduxActionTypes.DISCONNECT_TO_GIT_INIT, disconnectToGitSaga), takeLatest(ReduxActionTypes.PUSH_TO_GIT_INIT, pushToGitRepoSaga), takeLatest( ReduxActionTypes.FETCH_GLOBAL_GIT_CONFIG_INIT, @@ -416,5 +449,6 @@ export default function* gitSyncSagas() { takeLatest(ReduxActionTypes.FETCH_GIT_STATUS_INIT, fetchGitStatusSaga), takeLatest(ReduxActionTypes.MERGE_BRANCH_INIT, mergeBranchSaga), takeLatest(ReduxActionTypes.FETCH_MERGE_STATUS_INIT, fetchMergeStatusSaga), + takeLatest(ReduxActionTypes.GIT_PULL_INIT, gitPullSaga), ]); } diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts index 473c0e0989de..9a9947bfee9a 100644 --- a/app/client/src/sagas/InitSagas.ts +++ b/app/client/src/sagas/InitSagas.ts @@ -58,7 +58,10 @@ import { fetchCommentThreadsInit } from "actions/commentActions"; import { fetchJSCollectionsForView } from "actions/jsActionActions"; import { addBranchParam, BUILDER_PAGE_URL } from "constants/routes"; import history from "utils/history"; -import { updateBranchLocally } from "actions/gitSyncActions"; +import { + fetchGitStatusInit, + updateBranchLocally, +} from "actions/gitSyncActions"; import { getCurrentGitBranch } from "selectors/gitSyncSelectors"; function* failFastApiCalls( @@ -233,9 +236,10 @@ function* initializeEditorSaga( history.replace(pathname); } - // add branch query to path + // add branch query to path and fetch status if (branchInStore) { history.replace(addBranchParam(branchInStore)); + yield put(fetchGitStatusInit()); } } catch (e) { log.error(e); diff --git a/app/client/src/sagas/JSActionSagas.ts b/app/client/src/sagas/JSActionSagas.ts index 417fc3c68d3e..775770b71f3e 100644 --- a/app/client/src/sagas/JSActionSagas.ts +++ b/app/client/src/sagas/JSActionSagas.ts @@ -69,7 +69,7 @@ export function* fetchJSCollectionsSaga( const response = yield JSActionAPI.fetchJSCollections(applicationId); yield put({ type: ReduxActionTypes.FETCH_JS_ACTIONS_SUCCESS, - payload: response.data, + payload: response.data || [], }); } catch (error) { yield put({ diff --git a/app/client/src/sagas/PostEvaluationSagas.ts b/app/client/src/sagas/PostEvaluationSagas.ts index 2e0d1c643074..19ce023ef8f3 100644 --- a/app/client/src/sagas/PostEvaluationSagas.ts +++ b/app/client/src/sagas/PostEvaluationSagas.ts @@ -32,8 +32,8 @@ import { createMessage, ERROR_EVAL_ERROR_GENERIC, ERROR_EVAL_TRIGGER, - VALUE_IS_INVALID, JS_OBJECT_BODY_INVALID, + VALUE_IS_INVALID, } from "constants/messages"; import log from "loglevel"; import { AppState } from "reducers"; diff --git a/app/client/src/selectors/gitSyncSelectors.tsx b/app/client/src/selectors/gitSyncSelectors.tsx index b5a86cb0eba0..63374db30dee 100644 --- a/app/client/src/selectors/gitSyncSelectors.tsx +++ b/app/client/src/selectors/gitSyncSelectors.tsx @@ -51,6 +51,18 @@ export const getGlobalGitConfig = (state: AppState) => export const getLocalGitConfig = (state: AppState) => state.ui.gitSync.localGitConfig; +export const getIsLocalConfigDefined = createSelector( + getLocalGitConfig, + (localGitConfig) => + !!(localGitConfig.authorEmail || localGitConfig.authorName), +); + +export const getIsGlobalConfigDefined = createSelector( + getGlobalGitConfig, + (globalGitConfig) => + !!(globalGitConfig.authorEmail || globalGitConfig.authorName), +); + export const getIsFetchingGlobalGitConfig = (state: AppState) => state.ui.gitSync.isFetchingGitConfig; @@ -59,14 +71,18 @@ export const getIsFetchingLocalGitConfig = (state: AppState) => export const getGitStatus = (state: AppState) => state.ui.gitSync.gitStatus; +export const getGitError = (state: AppState) => state.ui.gitSync.gitError; + export const getIsFetchingGitStatus = (state: AppState) => state.ui.gitSync.isFetchingGitStatus; +export const getIsPullingProgress = (state: AppState) => + state.ui.gitSync.pullInProgress; + export const getIsFetchingMergeStatus = (state: AppState) => state.ui.gitSync.isFetchingMergeStatus; -export const getIsDisconnectingGit = (state: AppState) => - state.ui.gitSync.isDisconnectingGit; +export const getMergeStatus = (state: AppState) => state.ui.gitSync.mergeStatus; export const getIsGitConnected = createSelector( getCurrentAppGitMetaData, @@ -91,3 +107,9 @@ export const getCurrentGitBranch = (state: AppState) => { const { gitApplicationMetadata } = getCurrentApplication(state) || {}; return gitApplicationMetadata?.branchName; }; + +export const getPullMergeStatus = (state: AppState) => + state.ui.gitSync.pullMergeStatus; + +export const getPullInProgress = (state: AppState) => + state.ui.gitSync.pullInProgress; diff --git a/app/client/src/widgets/RateWidget/index.ts b/app/client/src/widgets/RateWidget/index.ts index cb204f1c1b61..c15f47a67f75 100644 --- a/app/client/src/widgets/RateWidget/index.ts +++ b/app/client/src/widgets/RateWidget/index.ts @@ -14,7 +14,7 @@ export const CONFIG = { maxCount: 5, defaultRate: 3, activeColor: Colors.RATE_ACTIVE, - inactiveColor: Colors.RATE_INACTIVE, + inactiveColor: Colors.ALTO_3, size: "LARGE", isRequired: false, isAllowHalf: false,
5bdb530f53898a4e4ab4df08425a10514427777b
2021-10-07 16:55:45
Abhishek Choudhary
docs: Update ServerSetup.md (#8255)
false
Update ServerSetup.md (#8255)
docs
diff --git a/contributions/ServerSetup.md b/contributions/ServerSetup.md index c4d49e2caa1e..d27151066e46 100644 --- a/contributions/ServerSetup.md +++ b/contributions/ServerSetup.md @@ -54,7 +54,7 @@ Before you can start to hack on the Appsmith server, your machine should have th - A Redis instance - Refer to the [Setting up a local Redis instance](#setting-up-a-local-redis-instance) section to setup a Redis instance using `Docker`. - An IDE - We use IntelliJ IDEA as our primary IDE for backend development. To set it up, refer to the [Setting up IntelliJ IDEA](#setting-up-intellij-idea) section. -This document doesn't provide instructions to install Java and Maven because these vary between different operating systems and distributions. Please refer to the documentation of your operating system or package manager to install these. Next we will setup MondoDB and Redis using `Docker`. +This document doesn't provide instructions to install Java and Maven because these vary between different operating systems and distributions. Please refer to the documentation of your operating system or package manager to install these. Next we will setup MongoDB and Redis using `Docker`. ### Setting up a local MongoDB instance
c0278c08973dd7ea7b8f6227488d156545594876
2023-04-03 16:41:18
allcontributors[bot]
docs: add nikhil-babar as a contributor for code (#22028)
false
add nikhil-babar as a contributor for code (#22028)
docs
diff --git a/README.md b/README.md index dcd104f07958..2b3f752bf31b 100644 --- a/README.md +++ b/README.md @@ -434,8 +434,8 @@ Lets build great software together. [![nzidol](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/13618973?v=4&w=50&h=50&mask=circle)](https://github.com/nzidol) [![onifs10](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/48095055?v=4&w=50&h=50&mask=circle)](https://github.com/onifs10) [![ps-xaf](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/4478450?v=4&w=50&h=50&mask=circle)](https://github.com/ps-xaf) - +[![nikhil-babar](https://images.weserv.nl/?url=https://avatars.githubusercontent.com/u/115392530?v=4&w=50&h=50&mask=circle)](https://github.com/nikhil-babar) ## License Appsmith is available under the [Apache License 2.0](https://github.com/appsmithorg/appsmith/blob/release/LICENSE). Use it wisely. -<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=841c3402-679b-456d-b528-537480a57269" /> +<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=841c3402-679b-456d-b528-537480a57269" /> \ No newline at end of file
f0059fe894c5676ff64c5189b9cf06be78ecae46
2024-08-08 18:46:40
Aman Agarwal
fix: table save row button onclick function (#35412)
false
table save row button onclick function (#35412)
fix
diff --git a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/mysql_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/mysql_spec.ts index 0ad5dc4743d2..1ae360fd1052 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/mysql_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/OneClickBinding/TableWidget/mysql_spec.ts @@ -14,88 +14,78 @@ import EditorNavigation, { const oneClickBinding = new OneClickBinding(); -// TODO: Adds two rows on click of save row will debug and fix this in a different PR - Sangeeth -describe.skip("Table widget one click binding feature", () => { - it("1.should check that queries are created and bound to table widget properly", () => { - entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 400); +describe( + "Table widget one click binding feature", + { tags: ["@tag.Widget"] }, + () => { + it("1.should check that queries are created and bound to table widget properly", () => { + entityExplorer.DragDropWidgetNVerify(draggableWidgets.TABLE, 400); - dataSources.CreateDataSource("MySql"); + dataSources.CreateDataSource("MySql"); - cy.get("@dsName").then((dsName) => { - EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); + cy.get("@dsName").then((dsName) => { + EditorNavigation.SelectEntityByName("Table1", EntityType.Widget); - oneClickBinding.ChooseAndAssertForm(`${dsName}`, dsName, "configs", { - searchableColumn: "configName", + oneClickBinding.ChooseAndAssertForm(`${dsName}`, dsName, "configs", { + searchableColumn: "configName", + }); }); - }); - - agHelper.GetNClick(oneClickBindingLocator.connectData); - - assertHelper.AssertNetworkStatus("@postExecute"); - - agHelper.Sleep(2000); - - [ - "id", - "configName", - "configJson", - "configVersion", - "updatedAt", - "updatedBy", - ].forEach((column) => { - agHelper.AssertElementExist(table._headerCell(column)); - }); - - agHelper.GetNClick(table._addNewRow, 0, true); - - table.EditTableCell(0, 1, "One Click Config", false); - table.UpdateTableCell(0, 2, `{{}"key":"oneClick"}`); - table.UpdateTableCell(0, 3, 36); - table.UpdateTableCell(0, 4, "2023-07-03 15:30:00", false, true); + agHelper.GetNClick(oneClickBindingLocator.connectData); - agHelper.Sleep(2000); + assertHelper.AssertNetworkStatus("@postExecute"); - agHelper.GetNClick(table._saveNewRow, 0, true); + [ + "id", + "configName", + "configJson", + "configVersion", + "updatedAt", + "updatedBy", + ].forEach((column) => { + agHelper.AssertElementExist(table._headerCell(column)); + }); - assertHelper.AssertNetworkStatus("@postExecute"); + agHelper.GetNClick(table._addNewRow, 0, true); - agHelper.TypeText(table._searchInput, "One Click Config"); + table.EditTableCell(0, 1, "One Click Config", false); - assertHelper.AssertNetworkStatus("@postExecute"); + table.UpdateTableCell(0, 2, `{{}"key":"oneClick"}`); + table.UpdateTableCell(0, 3, 36); + table.UpdateTableCell(0, 4, "2023-07-03 15:30:00", false, true); - agHelper.AssertElementExist(table._bodyCell("One Click Config")); + agHelper.GetNClick(table._saveNewRow, 0, true); - agHelper.Sleep(1000); + assertHelper.AssertNetworkStatus("@postExecute"); - table.EditTableCell(0, 1, "Bindings", false); - table.EditTableCell(0, 4, "2023-07-03 15:30:00", false); + agHelper.TypeText(table._searchInput, "One Click Config"); - agHelper.Sleep(1000); + assertHelper.AssertNetworkStatus("@postExecute"); - (cy as any).AssertTableRowSavable(6, 0); + agHelper.AssertElementExist(table._bodyCell("One Click Config")); - (cy as any).saveTableRow(6, 0); + table.EditTableCell(0, 1, "Bindings", false); + table.EditTableCell(0, 4, "2023-07-03 15:30:00", false); - assertHelper.AssertNetworkStatus("@postExecute"); + (cy as any).AssertTableRowSavable(6, 0); - assertHelper.AssertNetworkStatus("@postExecute"); + (cy as any).saveTableRow(6, 0); - agHelper.Sleep(500); - agHelper.ClearNType(table._searchInput, "Bindings"); + assertHelper.AssertNetworkStatus("@postExecute"); - assertHelper.AssertNetworkStatus("@postExecute"); + assertHelper.AssertNetworkStatus("@postExecute"); - agHelper.Sleep(2000); + agHelper.ClearNType(table._searchInput, "Bindings"); - agHelper.AssertElementExist(table._bodyCell("Bindings")); + assertHelper.AssertNetworkStatus("@postExecute"); - agHelper.ClearNType(table._searchInput, "One Click Config"); + agHelper.AssertElementExist(table._bodyCell("Bindings")); - assertHelper.AssertNetworkStatus("@postExecute"); + agHelper.ClearNType(table._searchInput, "One Click Config"); - agHelper.Sleep(2000); + assertHelper.AssertNetworkStatus("@postExecute"); - agHelper.AssertElementAbsence(table._bodyCell("One Click Config")); - }); -}); + agHelper.AssertElementAbsence(table._bodyCell("One Click Config")); + }); + }, +); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts index 640a79b2ffa6..bf1f91ae4a1c 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/TableV2/columnTypes/Select1_spec.ts @@ -130,7 +130,9 @@ describe( ]}} `, ); - cy.get(".t--property-control-filterable input").click({ force: true }); + cy.get(_.locators._propertyControlInput("filterable")).click({ + force: true, + }); cy.editTableSelectCell(0, 0); cy.get(".select-popover-wrapper .bp3-input-group input").should("exist"); cy.get(".select-popover-wrapper .bp3-input-group input").type("1", { @@ -363,6 +365,10 @@ describe( PageLeftPane.switchSegment(PagePaneSegment.UI); cy.openPropertyPane("tablewidgetv2"); cy.editColumn("step"); + _.agHelper.CheckUncheck( + _.locators._propertyControlInput("filterable"), + true, + ); cy.get(".t--property-control-serversidefiltering input").click(); cy.updateCodeInput( ".t--property-pane-section-selectproperties", diff --git a/app/client/src/widgets/TableWidgetV2/component/header/banner/AddNewRowBanner.tsx b/app/client/src/widgets/TableWidgetV2/component/header/banner/AddNewRowBanner.tsx index b2dbdc7c651f..35da61a17111 100644 --- a/app/client/src/widgets/TableWidgetV2/component/header/banner/AddNewRowBanner.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/header/banner/AddNewRowBanner.tsx @@ -69,7 +69,8 @@ function AddNewRowBannerComponent(props: AddNewRowBannerType) { className="t--save-new-row" disabled={props.disabledAddNewRowSave || isDiscardLoading} loading={isSaveLoading} - onClick={() => { + onClick={(event) => { + event.stopPropagation(); setIsSaveLoading(true); props.onAddNewRowAction(AddNewRowActions.SAVE, () => setIsSaveLoading(false),
853a2e6574a9a9c21e61e12153aec289052920f4
2022-10-04 16:51:58
akash-codemonk
fix: scenario where unselecting the first page and importing fails (#17261)
false
scenario where unselecting the first page and importing fails (#17261)
fix
diff --git a/app/client/src/sagas/TemplatesSagas.ts b/app/client/src/sagas/TemplatesSagas.ts index f170a7c00d81..c1ce8b06f3c3 100644 --- a/app/client/src/sagas/TemplatesSagas.ts +++ b/app/client/src/sagas/TemplatesSagas.ts @@ -1,12 +1,10 @@ import { ApplicationPayload, - Page, ReduxAction, ReduxActionErrorTypes, ReduxActionTypes, } from "@appsmith/constants/ReduxActionConstants"; import { all, put, takeEvery, call, select, take } from "redux-saga/effects"; -import { differenceBy } from "lodash"; import TemplatesAPI, { ImportTemplateResponse, FetchTemplateResponse, @@ -29,7 +27,6 @@ import { getCurrentApplicationId } from "selectors/editorSelectors"; import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors"; import { fetchApplication } from "actions/applicationActions"; import { APP_MODE } from "entities/App"; -import { getPageList } from "selectors/entitiesSelector"; import { executePageLoadActions, fetchActions, @@ -42,6 +39,7 @@ import { fetchDatasources } from "actions/datasourceActions"; import { fetchPluginFormConfigs } from "actions/pluginActions"; import { fetchAllPageEntityCompletion, saveLayout } from "actions/pageActions"; import { showReconnectDatasourceModal } from "actions/applicationActions"; +import { getAllPageIds } from "./selectors"; function* getAllTemplatesSaga() { try { @@ -230,7 +228,6 @@ function* forkTemplateToApplicationSaga( workspaceId, pagesToImport, ); - const currentListOfPages: Page[] = yield select(getPageList); // To fetch the new set of pages after merging the template into the existing application yield put( fetchApplication({ @@ -241,17 +238,8 @@ function* forkTemplateToApplicationSaga( const isValid: boolean = yield validateResponse(response); if (isValid) { - const postImportPageList = response.data.application.pages.map((page) => { - return { pageId: page.id, ...page }; - }); - const newPages = differenceBy( - postImportPageList, - currentListOfPages, - "pageId", - ); - - // Fetch the actions/jsobjects of the new set of pages that have been added yield call(postPageAdditionSaga, applicationId); + const pages: string[] = yield select(getAllPageIds); if (response.data.isPartialImport) { yield put( @@ -260,13 +248,13 @@ function* forkTemplateToApplicationSaga( unConfiguredDatasourceList: response.data.unConfiguredDatasourceList, workspaceId, - pageId: newPages[0].pageId, + pageId: pages[0], }), ); } history.push( builderURL({ - pageId: newPages[0].pageId, + pageId: pages[0], }), ); yield put(showTemplatesModal(false));
4b4b2f97d4f68ccedc18ba896aebd878e29e36bd
2022-09-29 00:33:54
Vishnu Gp
fix: Fixed NPE issue with analytics event on authentication method configuration (#17112)
false
Fixed NPE issue with analytics event on authentication method configuration (#17112)
fix
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java index e1ebba5977d1..75dd6d2c6bb7 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java @@ -381,7 +381,7 @@ public List<Map<String, Object>> getAnalyticsEvents(Map<String, String> original */ public void setAnalyticsEventAction(Map<String, Object> properties, String newVariable, String originalVariable, String authEnv) { // Authentication configuration added - if (!newVariable.isEmpty() && originalVariable.isEmpty()) { + if (!newVariable.isEmpty() && (originalVariable == null || originalVariable.isEmpty())) { properties.put("action", "Added"); } // Authentication configuration removed
8dc2942a7c381f7a358ae1c4153c99d2277d8248
2023-03-17 13:26:53
Pawan Kumar
chore: Generate tokens.json for figma (#21432)
false
Generate tokens.json for figma (#21432)
chore
diff --git a/app/client/packages/storybook/.storybook/decorators/theming.js b/app/client/packages/storybook/.storybook/decorators/theming.js index ee6e7a0cc30b..6c56286330fe 100644 --- a/app/client/packages/storybook/.storybook/decorators/theming.js +++ b/app/client/packages/storybook/.storybook/decorators/theming.js @@ -2,10 +2,10 @@ import React, { useEffect } from "react"; import webfontloader from "webfontloader"; import styled, { createGlobalStyle } from "styled-components"; -import { createTokens, createGlobalFontStack } from "@design-system/wds"; +import { createCSSVars, createGlobalFontStack } from "@design-system/wds"; const StyledContainer = styled.div` - ${createTokens} + ${createCSSVars} display: flex; width: 100%; diff --git a/app/client/packages/wds/package.json b/app/client/packages/wds/package.json index b358951981df..411bf2fc2778 100644 --- a/app/client/packages/wds/package.json +++ b/app/client/packages/wds/package.json @@ -14,5 +14,8 @@ "colorjs.io": "^0.4.3", "react": "^17.0.2", "react-dom": "^17.0.2" + }, + "scripts": { + "build:tokens": "npx ts-node ./src/utils/buildTokens.ts" } } diff --git a/app/client/packages/wds/src/components/Button/index.styled.tsx b/app/client/packages/wds/src/components/Button/index.styled.tsx index 3bca1031ed5d..aea6684d3ca1 100644 --- a/app/client/packages/wds/src/components/Button/index.styled.tsx +++ b/app/client/packages/wds/src/components/Button/index.styled.tsx @@ -188,10 +188,8 @@ export const StyledButton = styled.button<ButtonProps>` &:is([data-disabled]), &:is(:disabled) { pointer-events: none; - background: var(--wds-v2-color-bg-disabled); - color: var(--wds-v2-color-text-disabled); + opacity: 0.5; box-shadow: none; background-image: none; - border-color: transparent; } `; diff --git a/app/client/packages/wds/src/constants/defaultTokens.json b/app/client/packages/wds/src/constants/defaultTokens.json new file mode 100644 index 000000000000..a4d5aaab30e1 --- /dev/null +++ b/app/client/packages/wds/src/constants/defaultTokens.json @@ -0,0 +1,13 @@ +{ + "seedColor": "#1a7f37", + "rootUnit": 4, + "isDarkMode": false, + "borderRadius": 4, + "boxShadow": { + "x": 0, + "y": 0, + "blur": 0, + "spread": 0, + "color": "rgba(0, 0, 0, 0.2)" + } +} diff --git a/app/client/packages/wds/src/index.ts b/app/client/packages/wds/src/index.ts index f8f6fb611a8d..393ba1c7ddd0 100644 --- a/app/client/packages/wds/src/index.ts +++ b/app/client/packages/wds/src/index.ts @@ -1,3 +1,3 @@ export { Button } from "./components/Button"; -export { createTokens } from "./utils/createTokens"; +export { createCSSVars } from "./utils/createTokens"; export { fontMetricsMap, createGlobalFontStack } from "./utils/typography"; diff --git a/app/client/packages/wds/src/styles/tokens/raw.css b/app/client/packages/wds/src/styles/tokens/raw.css index eeaff2ec11ba..9cb466881645 100644 --- a/app/client/packages/wds/src/styles/tokens/raw.css +++ b/app/client/packages/wds/src/styles/tokens/raw.css @@ -1,59 +1,4 @@ :root { - /** - * ---------------------------------------------------------------------------- - * color pallette - *----------------------------------------------------------------------------- - */ - --wds-v2-color-transparent: "#00000000"; - --wds-v2-color-white: #ffffff; - - --wds-v2-color-gray-100: #e3e3e3; - --wds-v2-color-gray-200: #a9a7a7; - --wds-v2-color-gray-300: #858283; - --wds-v2-color-gray-400: #4b4849; - --wds-v2-color-gray-500: #202020; - --wds-v2-color-gray-600: #090707; - - --wds-v2-color-green-100: #b0f7c2; - --wds-v2-color-green-200: #37c56e; - --wds-v2-color-green-300: #149c51; - --wds-v2-color-green-400: #00592a; - --wds-v2-color-green-500: #00280f; - --wds-v2-color-green-600: #000b03; - - --wds-v2-color-red-100: #ffd9d2; - --wds-v2-color-red-200: #ff7a65; - --wds-v2-color-red-300: #e43e29; - --wds-v2-color-red-400: #891103; - --wds-v2-color-red-500: #39110b; - --wds-v2-color-red-600: #120402; - - --wds-v2-color-yellow-100: #ffdbb8; - --wds-v2-color-yellow-200: #ed9012; - --wds-v2-color-yellow-300: #cc7b00; - --wds-v2-color-yellow-400: #733800; - --wds-v2-color-yellow-500: #381900; - --wds-v2-color-yellow-600: #1a0900; - - --wds-v2-color-purple-100: #dde1ff; - --wds-v2-color-purple-200: #969cff; - --wds-v2-color-purple-300: #6f69ff; - --wds-v2-color-purple-400: #4000c7; - --wds-v2-color-purple-500: #1b0063; - --wds-v2-color-purple-600: #060026; - - --wds-v2-color-blue-100: #cce2ff; - --wds-v2-color-blue-200: #68aaff; - --wds-v2-color-blue-300: #2a82ea; - --wds-v2-color-blue-400: #024790; - --wds-v2-color-blue-500: #001f46; - --wds-v2-color-blue-600: #000719; - - /** - * ---------------------------------------------------------------------------- - * spacing - *----------------------------------------------------------------------------- - */ --wds-v2-spacing-root: 4px; --wds-v2-spacing-0: 0px; diff --git a/app/client/packages/wds/src/tokens.json b/app/client/packages/wds/src/tokens.json new file mode 100644 index 000000000000..a2967bc183bb --- /dev/null +++ b/app/client/packages/wds/src/tokens.json @@ -0,0 +1,92 @@ +{ + "semantic": { + "color-bg-accent": { + "value": "#1a7f37", + "type": "color" + }, + "color-bg-accent-hover": { + "value": "#278840", + "type": "color" + }, + "color-bg-accent-subtle": { + "value": "#9af8a9", + "type": "color" + }, + "color-bg-accent-active": { + "value": "#1a7f37", + "type": "color" + }, + "color-bg-accent-subtle-active": { + "value": "#9af5a9", + "type": "color" + }, + "color-bg-accent-subtle-hover": { + "value": "#a4ffb3", + "type": "color" + }, + "color-fg-accent": { + "value": "#1a7f37", + "type": "color" + }, + "color-fg-onaccent": { + "value": "#fff", + "type": "color" + }, + "color-bd-accent": { + "value": "#1a7f37", + "type": "color" + }, + "color-bd-onaccent": { + "value": "#006119", + "type": "color" + }, + "color-bd-onaccent-subtle": { + "value": "#eefff0", + "type": "color" + }, + "opacity-disabled": { + "value": 0.5, + "type": "opacity" + } + }, + "raw": { + "spacing-0": { + "value": "0px", + "type": "sizing" + }, + "spacing-1": { + "value": "4px", + "type": "sizing" + }, + "spacing-2": { + "value": "8px", + "type": "sizing" + }, + "spacing-3": { + "value": "12px", + "type": "sizing" + }, + "spacing-4": { + "value": "16px", + "type": "sizing" + }, + "spacing-5": { + "value": "20px", + "type": "sizing" + }, + "border-radius": { + "value": "4px", + "type": "borderRadius" + }, + "box-shadow": { + "value": { + "x": 0, + "y": 0, + "blur": 0, + "spread": 0, + "color": "rgba(0, 0, 0, 0.2)" + }, + "type": "boxShadow" + } + } +} diff --git a/app/client/packages/wds/src/utils/buildTokens.ts b/app/client/packages/wds/src/utils/buildTokens.ts new file mode 100644 index 000000000000..8d85694b8f02 --- /dev/null +++ b/app/client/packages/wds/src/utils/buildTokens.ts @@ -0,0 +1,58 @@ +import * as fs from "fs"; +import { kebabCase, startCase, range } from "lodash"; + +import defaults from "../constants/defaultTokens.json"; +import { createSemanticColorTokens } from "./createTokens"; + +type Token = { + value: string; + type: "color" | "sizing" | "borderRadius" | "boxShadow" | "opacity"; +}; + +// generating semantic tokens +const semanticColors = createSemanticColorTokens(defaults.seedColor); + +const transformedSemanticTokens: Record<string, Token> = {}; +for (const [key, value] of Object.entries(semanticColors)) { + transformedSemanticTokens[kebabCase(`color${startCase(key)}`)] = { + value: value, + type: "color", + }; +} + +// generating spacing tokens +const spacingTokens: Record<string, Token> = {}; + +range(6).map((value, index) => { + spacingTokens[`spacing-${index}`] = { + value: `${defaults.rootUnit * value}px`, + type: "sizing", + }; +}); + +const finalTokens = { + semantic: { + ...transformedSemanticTokens, + "opacity-disabled": { + value: 0.5, + type: "opacity", + }, + }, + raw: { + ...spacingTokens, + "border-radius": { + value: `${defaults.borderRadius}px`, + type: "borderRadius", + }, + "box-shadow": { + value: defaults.boxShadow, + type: "boxShadow", + }, + }, +}; + +// write to file +fs.writeFileSync( + `${__dirname}/../tokens.json`, + JSON.stringify(finalTokens, null, 2) + "\r\n", +); diff --git a/app/client/packages/wds/src/utils/createTokens.ts b/app/client/packages/wds/src/utils/createTokens.ts index 1c710b4ee71c..82eca66db168 100644 --- a/app/client/packages/wds/src/utils/createTokens.ts +++ b/app/client/packages/wds/src/utils/createTokens.ts @@ -1,16 +1,19 @@ -import { css, CSSProperties } from "styled-components"; +import kebabCase from "lodash/kebabCase"; +import type { CSSProperties } from "styled-components"; +import { css } from "styled-components"; import { lightenColor, - getComplementaryGrayscaleColor, - calulateHoverColor, darkenColor, + getComplementaryGrayscaleColor, parseColor, + calulateHoverColor, } from "./colors"; +import defaultsTokens from "../constants/defaultTokens.json"; /** * This function is used to create tokens for widgets */ -export const createTokens = css` +export const createCSSVars = css` ${({ accentColor: color, borderRadius, @@ -20,34 +23,90 @@ export const createTokens = css` borderRadius: CSSProperties["borderRadius"]; boxShadow: CSSProperties["boxShadow"]; }) => { - const accentColor = parseColor(color).toString({ format: "hex" }); - const accentHoverColor = calulateHoverColor(color); - const lightAccentColor = lightenColor(color); - const accentActiveColor = darkenColor(accentHoverColor); - const lightAccentHoverColor = calulateHoverColor(lightAccentColor); - const complementaryAccentColor = - getComplementaryGrayscaleColor(accentColor); - const lightAcctentActiveColor = darkenColor(lightAccentHoverColor, 0.03); - const onAccentBorderColor = darkenColor(color, 0.1); - const onAccentLightBorderColor = lightenColor(color, 0.98); + const colorTokens: any = createSemanticColorTokens(color); return css` - --wds-v2-color-bg-accent: ${accentColor}; - --wds-v2-color-bg-accent-hover: ${accentHoverColor}; - --wds-v2-color-bg-accent-light: ${lightAccentColor}; - --wds-v2-color-bg-accent-active: ${accentActiveColor}; - --wds-v2-color-bg-accent-light-active: ${lightAcctentActiveColor}; - --wds-v2-color-bg-accent-light-hover: ${lightAccentHoverColor}; - - --wds-v2-color-text-accent: ${accentColor}; - --wds-v2-color-text-onaccent: ${complementaryAccentColor}; - - --wds-v2-color-border-accent: ${accentColor}; - --wds-vs-color-border-onaccent: ${onAccentBorderColor}; - --wds-vs-color-border-onaccent-light: ${onAccentLightBorderColor}; + ${Object.keys(colorTokens).map( + (key) => css` + --wds-v2-color-${kebabCase(key)}: ${colorTokens[key]};`, + )} --wds-v2-shadow: ${boxShadow}; --wds-v2-radii: ${borderRadius}; `; }} `; + +/** Semantic tokens utils */ + +const getBgAccentColor = (color: CSSProperties["color"]) => { + return parseColor(color).toString({ format: "hex" }); +}; + +const getBgAccentHoverColor = (color: CSSProperties["color"]) => { + return calulateHoverColor(color); +}; + +const getBgAccentSubtleColor = (color: CSSProperties["color"]) => { + return lightenColor(color); +}; + +const getBgAccentSubtleHoverColor = (color: CSSProperties["color"]) => { + return calulateHoverColor(color); +}; + +const getBgAccentActiveColor = (color: CSSProperties["color"]) => { + return darkenColor(color); +}; + +const getFgOnAccentTextColor = (color: CSSProperties["color"]) => { + return getComplementaryGrayscaleColor(color); +}; + +const getAccentSubtleActiveColor = (color: CSSProperties["color"]) => { + return darkenColor(color, 0.03); +}; + +const getBdOnAccentColor = (color: CSSProperties["color"]) => { + return darkenColor(color, 0.1); +}; + +const getBdOnAccentSubtleColor = (color: CSSProperties["color"]) => { + return lightenColor(color, 0.98); +}; + +/** + * create semantic color tokens + * + * @param color + * @returns + */ +export const createSemanticColorTokens = ( + color: CSSProperties["color"] = defaultsTokens.seedColor, +) => { + const bgAccent = getBgAccentColor(color); + const bgAccentHover = getBgAccentHoverColor(color); + const bgAccentSubtle = getBgAccentSubtleColor(color); + const bgAccentActive = getBgAccentActiveColor(bgAccentHover); + const bgAccentSubtleHover = getBgAccentSubtleHoverColor(bgAccentSubtle); + const fgOnaccent = getFgOnAccentTextColor(bgAccent); + const bgAccentSubtleActive = getAccentSubtleActiveColor(bgAccentSubtleHover); + const bgOnAccent = getBdOnAccentColor(color); + const bdOnAccentSubtle = getBdOnAccentSubtleColor(color); + + return { + bgAccent, + bgAccentHover, + bgAccentSubtle, + bgAccentActive, + bgAccentSubtleActive, + bgAccentSubtleHover, + + fgAccent: color, + fgOnaccent, + + bdAccent: color, + bdOnaccent: bgOnAccent, + bdOnaccentSubtle: bdOnAccentSubtle, + }; +}; diff --git a/app/client/packages/wds/tokens.json b/app/client/packages/wds/tokens.json new file mode 100644 index 000000000000..63d55d0433ad --- /dev/null +++ b/app/client/packages/wds/tokens.json @@ -0,0 +1,98 @@ +{ + "semantic": { + "color-bg-accent": { + "value": "#1a7f37", + "type": "color" + }, + "color-bg-accent-hover": { + "value": "#278840", + "type": "color" + }, + "color-bg-accent-light": { + "value": "#9af8a9", + "type": "color" + }, + "color-bg-accent-active": { + "value": "#1a7f37", + "type": "color" + }, + "color-bg-accent-light-active": { + "value": "#9af5a9", + "type": "color" + }, + "color-bg-accent-light-hover": { + "value": "#a4ffb3", + "type": "color" + }, + "color-text-accent": { + "value": "#1a7f37", + "type": "color" + }, + "color-text-onaccent": { + "value": "#fff", + "type": "color" + }, + "color-border-accent": { + "value": "#1a7f37", + "type": "color" + }, + "color-border-onaccent": { + "value": "#006119", + "type": "color" + }, + "color-border-onaccent-light": { + "value": "#eefff0", + "type": "color" + } + }, + "raw": { + "0": { + "spacing0": { + "value": "0px", + "type": "sizing" + } + }, + "1": { + "spacing1": { + "value": "4px", + "type": "sizing" + } + }, + "2": { + "spacing2": { + "value": "8px", + "type": "sizing" + } + }, + "3": { + "spacing3": { + "value": "12px", + "type": "sizing" + } + }, + "4": { + "spacing4": { + "value": "16px", + "type": "sizing" + } + }, + "5": { + "spacing5": { + "value": "20px", + "type": "sizing" + } + }, + "6": { + "spacing6": { + "value": "24px", + "type": "sizing" + } + }, + "7": { + "spacing7": { + "value": "28px", + "type": "sizing" + } + } + } +} \ No newline at end of file diff --git a/app/client/packages/wds/tsconfig.json b/app/client/packages/wds/tsconfig.json index 4082f16a5d91..1b2f3c53b9c8 100644 --- a/app/client/packages/wds/tsconfig.json +++ b/app/client/packages/wds/tsconfig.json @@ -1,3 +1,14 @@ { - "extends": "../../tsconfig.json" + "extends": "../../tsconfig.json", + "include": [ + "./src/**/*", + ], + "ts-node": { + "compilerOptions": { + "module": "commonjs", + "types": [ + "node", + ], + } + } } diff --git a/app/client/yarn.lock b/app/client/yarn.lock index badf9d155aee..3bb378631953 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -10432,7 +10432,8 @@ eslint-plugin-prettier@^4.2.1: eslint-plugin-react-hooks@^2.3.0: version "2.5.1" - resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz#4ef5930592588ce171abeb26f400c7fbcbc23cd0" + integrity sha512-Y2c4b55R+6ZzwtTppKwSmK/Kar8AdLiC2f9NADCuxbcTgPPg41Gyqa6b9GppgXSvCtkRw43ZE86CT5sejKC6/g== eslint-plugin-react-hooks@^4.3.0: version "4.5.0" @@ -18876,7 +18877,8 @@ rxjs@^6.4.0, rxjs@^6.6.0: rxjs@^6.6.7: version "6.6.7" - resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0"
be1815294500030bb552538d10aae265d7dcab6f
2023-08-24 14:10:24
NandanAnantharamu
test: cypress - updated tests which were flaky in nature (#26577)
false
cypress - updated tests which were flaky in nature (#26577)
test
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableTextPagination_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableTextPagination_spec.js index 9848792758eb..7ceb8805f62d 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableTextPagination_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableTextPagination_spec.js @@ -136,24 +136,15 @@ describe("Test Create Api and Bind to Table widget", function () { cy.executeDbQuery("Api2", "onPageChange"); }); - it.skip("5. Table-Text, Validate Server Side Pagination of Paginate with response URL", function () { + it("5. Table-Text, Validate Server Side Pagination of Paginate with response URL", function () { /**Validate Response data with Table data in Text Widget */ entityExplorer.SelectEntityByName("Table1", "Widgets"); - cy.ValidatePaginateResponseUrlData( - apiLocators.apiPaginationPrevTest, - false, - ); + cy.ValidatePaginateResponseUrlData(apiLocators.apiPaginationPrevTest); cy.get("@postExecute.all"); deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE_V1)); table.WaitUntilTableLoad(0, 0); agHelper.Sleep(3000); - cy.wait("@postExecute").then((interception) => { - let valueToTest = JSON.stringify( - interception.response.body.data.body[0].name, - ); - cy.ValidatePaginationInputData(valueToTest); - }); deployMode.NavigateBacktoEditor(); cy.wait(3000); entityExplorer.SelectEntityByName("Table1", "Widgets"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2TextPagination_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2TextPagination_spec.js index bdc3d6f37989..9546a6d7e0bb 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2TextPagination_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/TableV2TextPagination_spec.js @@ -135,7 +135,7 @@ describe("Test Create Api and Bind to Table widget", function () { cy.executeDbQuery("Api2", "onPageChange"); }); - it.skip("5. Table-Text, Validate Server Side Pagination of Paginate with Response URL", function () { + it("5. Table-Text, Validate Server Side Pagination of Paginate with Response URL", function () { /**Validate Response data with Table data in Text Widget */ cy.get("body").then(($ele) => { if ($ele.find(locators._backToEditor).length) { @@ -144,20 +144,11 @@ describe("Test Create Api and Bind to Table widget", function () { }); entityExplorer.SelectEntityByName("Table1", "Widgets"); - cy.ValidatePaginateResponseUrlDataV2( - apiPageLocators.apiPaginationPrevTest, - false, - ); + cy.ValidatePaginateResponseUrlDataV2(apiPageLocators.apiPaginationPrevTest); cy.get("@postExecute.all"); deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.TABLE)); table.WaitUntilTableLoad(0, 0, "v2"); agHelper.Sleep(3000); - cy.wait("@postExecute").then((interception) => { - let valueToTest = JSON.stringify( - interception.response.body.data.body[0].name, - ); - cy.ValidatePaginationInputDataV2(valueToTest); - }); deployMode.NavigateBacktoEditor(); entityExplorer.SelectEntityByName("Table1", "Widgets"); cy.ValidatePaginateResponseUrlDataV2( diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxGroupTest.ts b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxGroupTest.ts index 6550da153947..b1a321d377f5 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxGroupTest.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Checkbox/CheckBoxGroupTest.ts @@ -222,7 +222,7 @@ describe("Checkbox Tests", function () { entityExplorer.SelectEntityByName("NewCheckBox", "Widgets"); }); - it("7. Verify Full color picker and font size", () => { + it.skip("7. Verify Full color picker and font size", () => { // Verify font color picker opens up propPane.MoveToTab("Style"); agHelper.GetNClick(propPane._propertyControlColorPicker("fontcolor")); @@ -259,7 +259,7 @@ describe("Checkbox Tests", function () { entityExplorer.SelectEntityByName("NewCheckBox", "Widgets"); propPane.MoveToTab("Style"); // Verify Accent color - propPane.SelectColorFromColorPicker("accentcolor", 10); + propPane.UpdatePropertyFieldValue("Accent color", "#b91c1c"); agHelper.AssertAttribute( `${locators._propertyControl}accentcolor ${propPane._roundCursorPointer}`, "color", diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_spec.js index f6ea4ef9ffe6..f7cdbfeed7c6 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Form/FormWidget_spec.js @@ -114,6 +114,7 @@ describe("Form Widget Functionality", function () { cy.get(publish.formWidget).should("be.visible"); _.deployMode.NavigateBacktoEditor(); }); + it("5. Toggle JS - Form-Unckeck Visible field Validation", function () { cy.openPropertyPane("formwidget"); //Uncheck the disabled checkbox using JS and validate @@ -130,12 +131,13 @@ describe("Form Widget Functionality", function () { cy.testJsontext("visible", "true"); _.deployMode.DeployApp(); cy.get(publish.formWidget).should("be.visible"); + _.deployMode.NavigateBacktoEditor(); }); - it.skip("6. Form-Copy Verification", function () { + it("6. Form-Copy Verification", function () { cy.openPropertyPane("formwidget"); //Copy Form and verify all properties - cy.copyWidget("formwidget", widgetsPage.formWidget); //to improve + cy.copyWidget("formwidget", widgetsPage.formWidget); _.deployMode.DeployApp(); }); diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js index df01196ea7bc..ad4d52a3d1a2 100644 --- a/app/client/cypress/support/commands.js +++ b/app/client/cypress/support/commands.js @@ -1203,77 +1203,59 @@ Cypress.Commands.add("ValidatePublishTableV2Data", (value) => { }); }); -Cypress.Commands.add( - "ValidatePaginateResponseUrlData", - (runTestCss, isNext) => { - cy.CheckAndUnfoldEntityItem("Queries/JS"); - cy.get(".t--entity-name").contains("Api2").click({ force: true }); - cy.wait(3000); - cy.NavigateToPaginationTab(); - cy.RunAPI(); - cy.get(ApiEditor.apiPaginationNextTest).click(); - cy.wait("@postExecute"); - // eslint-disable-next-line cypress/no-unnecessary-waiting - cy.wait(2000); - cy.get(runTestCss).click(); - cy.wait("@postExecute").then((interception) => { - let valueToTest = JSON.stringify( - interception.response.body.data.body[0].name, - ); +Cypress.Commands.add("ValidatePaginateResponseUrlData", (runTestCss) => { + cy.CheckAndUnfoldEntityItem("Queries/JS"); + cy.get(".t--entity-name").contains("Api2").click({ force: true }); + cy.wait(3000); + cy.NavigateToPaginationTab(); + cy.RunAPI(); + cy.get(ApiEditor.apiPaginationNextTest).click(); + cy.wait("@postExecute"); + // eslint-disable-next-line cypress/no-unnecessary-waiting + cy.wait(2000); + cy.get(runTestCss).click(); + cy.wait(2000); + cy.xpath("//div[@class='tr'][1]//div[@class='td'][6]//span") + .invoke("text") + .then((valueToTest) => { // eslint-disable-next-line cypress/no-unnecessary-waiting cy.get(ApiEditor.ApiRunBtn).should("not.be.disabled"); cy.get(".t--entity-name").contains("Table1").click({ force: true }); cy.isSelectRow(0); - if (isNext) { - cy.wait("@postExecute").then((interception) => { - valueToTest = JSON.stringify( - interception.response.body.data.body[0].name, - ); - }); - } cy.readTabledata("0", "5").then((tabData) => { const tableData = tabData; - expect(`\"${tableData}\"`).to.equal(valueToTest); + expect(tableData).to.equal(valueToTest); }); }); - }, -); +}); -Cypress.Commands.add( - "ValidatePaginateResponseUrlDataV2", - (runTestCss, isNext) => { - cy.CheckAndUnfoldEntityItem("Queries/JS"); - cy.get(".t--entity-name").contains("Api2").click({ force: true }); - cy.wait(3000); - cy.NavigateToPaginationTab(); - cy.RunAPI(); - cy.get(ApiEditor.apiPaginationNextTest).click(); - cy.wait("@postExecute"); - // eslint-disable-next-line cypress/no-unnecessary-waiting - cy.wait(2000); - cy.get(runTestCss).click(); - cy.wait("@postExecute").then((interception) => { - let valueToTest = JSON.stringify( - interception.response.body.data.body[0].name, - ); +Cypress.Commands.add("ValidatePaginateResponseUrlDataV2", (runTestCss) => { + cy.CheckAndUnfoldEntityItem("Queries/JS"); + cy.get(".t--entity-name").contains("Api2").click({ force: true }); + cy.wait(3000); + cy.NavigateToPaginationTab(); + cy.RunAPI(); + cy.get(ApiEditor.apiPaginationNextTest).click(); + cy.wait("@postExecute"); + // eslint-disable-next-line cypress/no-unnecessary-waiting + cy.wait(2000); + cy.get(runTestCss).click(); + cy.wait(2000); + cy.xpath("//div[@class='tr'][1]//div[@class='td'][6]//span") + .invoke("text") + .then((valueToTest) => { // eslint-disable-next-line cypress/no-unnecessary-waiting cy.get(ApiEditor.ApiRunBtn).should("not.be.disabled"); cy.get(".t--entity-name").contains("Table1").click({ force: true }); + cy.wait(2000); cy.isSelectRow(0); - if (isNext) { - cy.wait("@postExecute").then((interception) => { - valueToTest = JSON.stringify( - interception.response.body.data.body[0].name, - ); - }); - } cy.readTableV2data("0", "5").then((tabData) => { const tableData = tabData; - expect(`\"${tableData}\"`).to.equal(valueToTest); + cy.log(valueToTest); + expect(tableData).to.equal(valueToTest); }); }); - }, -); +}); Cypress.Commands.add("ValidatePaginationInputData", (valueToTest) => { cy.isSelectRow(0);
8dc9c0b017cdc4d5ae48c36b634217f5e104521a
2022-05-18 10:51:53
Satish Gandham
feat: Optimize create uneval tree via memoization (#13476)
false
Optimize create uneval tree via memoization (#13476)
feat
diff --git a/app/client/package.json b/app/client/package.json index fcbf51b9e70c..c2a34709c5d4 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -83,6 +83,7 @@ "mammoth": "^1.4.19", "marked": "^2.0.0", "memoize-one": "^5.2.1", + "micro-memoize": "^4.0.10", "moment": "^2.24.0", "moment-timezone": "^0.5.27", "nanoid": "^2.0.4", diff --git a/app/client/src/entities/DataTree/dataTreeFactory.ts b/app/client/src/entities/DataTree/dataTreeFactory.ts index ed77cb514501..c2fda4897a5a 100644 --- a/app/client/src/entities/DataTree/dataTreeFactory.ts +++ b/app/client/src/entities/DataTree/dataTreeFactory.ts @@ -23,6 +23,7 @@ import { } from "entities/DataTree/actionTriggers"; import { AppTheme } from "entities/AppTheming"; import { PluginId } from "api/PluginApi"; +import log from "loglevel"; export type ActionDispatcher = ( ...args: any[] @@ -164,6 +165,9 @@ export class DataTreeFactory { widgetsMeta, }: DataTreeSeed): DataTree { const dataTree: DataTree = {}; + const start = performance.now(); + const startActions = performance.now(); + actions.forEach((action) => { const editorConfig = editorConfigs[action.config.pluginId]; const dependencyConfig = pluginDependencyConfig[action.config.pluginId]; @@ -173,15 +177,24 @@ export class DataTreeFactory { dependencyConfig, ); }); + const endActions = performance.now(); + + const startJsActions = performance.now(); + jsActions.forEach((js) => { dataTree[js.config.name] = generateDataTreeJSAction(js); }); + const endJsActions = performance.now(); + + const startWidgets = performance.now(); + Object.values(widgets).forEach((widget) => { dataTree[widget.widgetName] = generateDataTreeWidget( widget, widgetsMeta[widget.widgetId], ); }); + const endWidgets = performance.now(); dataTree.pageList = pageList; dataTree.appsmith = { @@ -192,6 +205,17 @@ export class DataTreeFactory { theme, } as DataTreeAppsmith; (dataTree.appsmith as DataTreeAppsmith).ENTITY_TYPE = ENTITY_TYPE.APPSMITH; + const end = performance.now(); + + const out = { + total: end - start, + widgets: endWidgets - startWidgets, + actions: endActions - startActions, + jsActions: endJsActions - startJsActions, + }; + + log.debug("### Create unevalTree timing", out); + return dataTree; } } diff --git a/app/client/src/entities/DataTree/dataTreeWidget.test.ts b/app/client/src/entities/DataTree/dataTreeWidget.test.ts index a4fb85e407e7..f935ebadc480 100644 --- a/app/client/src/entities/DataTree/dataTreeWidget.test.ts +++ b/app/client/src/entities/DataTree/dataTreeWidget.test.ts @@ -289,7 +289,6 @@ describe("generateDataTreeWidget", () => { privateWidgets: {}, deepObj: { level1: { - value: 10, metaValue: 10, }, }, diff --git a/app/client/src/entities/DataTree/dataTreeWidget.ts b/app/client/src/entities/DataTree/dataTreeWidget.ts index 93e24c86dcb7..4e0b31f20caa 100644 --- a/app/client/src/entities/DataTree/dataTreeWidget.ts +++ b/app/client/src/entities/DataTree/dataTreeWidget.ts @@ -1,22 +1,28 @@ -import WidgetFactory from "utils/WidgetFactory"; import { getAllPathsFromPropertyConfig } from "entities/Widget/utils"; -import { getEntityDynamicBindingPathList } from "utils/DynamicBindingUtils"; import _ from "lodash"; - +import memoize from "micro-memoize"; import { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer"; -import { setOverridingProperty } from "./utils"; +import { getEntityDynamicBindingPathList } from "utils/DynamicBindingUtils"; +import WidgetFactory from "utils/WidgetFactory"; import { - OverridingPropertyPaths, - PropertyOverrideDependency, - OverridingPropertyType, DataTreeWidget, ENTITY_TYPE, + OverridingPropertyPaths, + OverridingPropertyType, + PropertyOverrideDependency, } from "./dataTreeFactory"; +import { setOverridingProperty } from "./utils"; -export const generateDataTreeWidget = ( +// We are splitting generateDataTreeWidget into two parts to memoize better as the widget doesn't change very often. +// Widget changes only when dynamicBindingPathList changes. +// Only meta properties change very often, for example typing in an input or selecting a table row. +const generateDataTreeWidgetWithoutMeta = ( widget: FlattenedWidgetProps, - widgetMetaProps: Record<string, unknown> = {}, -): DataTreeWidget => { +): { + dataTreeWidgetWithoutMetaProps: DataTreeWidget; + overridingMetaPropsMap: Record<string, boolean>; + defaultMetaProps: Record<string, unknown>; +} => { const derivedProps: any = {}; const blockedDerivedProps: Record<string, true> = {}; const unInitializedDefaultProps: Record<string, undefined> = {}; @@ -94,16 +100,6 @@ export const generateDataTreeWidget = ( }, ); - const overridingMetaProps: Record<string, unknown> = {}; - - // overridingMetaProps has all meta property value either from metaReducer or default set by widget whose dependent property also has default property. - Object.entries(defaultMetaProps).forEach(([key, value]) => { - if (overridingMetaPropsMap[key]) { - overridingMetaProps[key] = - key in widgetMetaProps ? widgetMetaProps[key] : value; - } - }); - const { bindingPaths, reactivePaths, @@ -134,12 +130,12 @@ export const generateDataTreeWidget = ( * * Therefore spread is replaced with "merge" which merges objects recursively. */ - return _.merge( + const dataTreeWidgetWithoutMetaProps = _.merge( {}, widget, unInitializedDefaultProps, defaultMetaProps, - widgetMetaProps, + // widgetMetaProps, derivedProps, { defaultProps, @@ -149,7 +145,7 @@ export const generateDataTreeWidget = ( ...widget.logBlackList, ...blockedDerivedProps, }, - meta: _.merge(overridingMetaProps, widgetMetaProps), + // meta: _.merge(overridingMetaProps, widgetMetaProps), propertyOverrideDependency, overridingPropertyPaths, bindingPaths, @@ -162,4 +158,59 @@ export const generateDataTreeWidget = ( }, }, ); + return { + dataTreeWidgetWithoutMetaProps, + overridingMetaPropsMap, + defaultMetaProps, + }; +}; + +// @todo set the max size dynamically based on number of widgets. (widgets.length) +// Remove the debug statements in July 2022 +const generateDataTreeWidgetWithoutMetaMemoized = memoize( + generateDataTreeWidgetWithoutMeta, + { + maxSize: 1000, + // onCacheHit: (cache, options) => { + // console.log("####### cache was hit: ", cache.keys.length); + // }, + // onCacheAdd: (cache, options) => { + // console.log( + // "####### cache was missed ", + // cache.keys.length, + // cache.keys[0][0].widgetName, + // ); + // }, + }, +); + +export const generateDataTreeWidget = ( + widget: FlattenedWidgetProps, + widgetMetaProps: Record<string, unknown> = {}, +) => { + const { + dataTreeWidgetWithoutMetaProps: dataTreeWidget, + defaultMetaProps, + overridingMetaPropsMap, + } = generateDataTreeWidgetWithoutMetaMemoized(widget); + const overridingMetaProps: Record<string, unknown> = {}; + + // overridingMetaProps has all meta property value either from metaReducer or default set by widget whose dependent property also has default property. + Object.entries(defaultMetaProps).forEach(([key, value]) => { + if (overridingMetaPropsMap[key]) { + overridingMetaProps[key] = + key in widgetMetaProps ? widgetMetaProps[key] : value; + } + }); + + const meta = _.merge(overridingMetaProps, widgetMetaProps); + + Object.entries(widgetMetaProps).forEach(([key, value]) => { + // Since meta properties are always updated as a whole, we are replacing instead of merging. + // Merging mutates the memoized value, avoid merging meta values + dataTreeWidget[key] = value; + }); + + dataTreeWidget["meta"] = meta; + return dataTreeWidget; }; diff --git a/app/client/src/entities/Widget/utils.ts b/app/client/src/entities/Widget/utils.ts index f7696aaf3218..b5b924341a48 100644 --- a/app/client/src/entities/Widget/utils.ts +++ b/app/client/src/entities/Widget/utils.ts @@ -1,11 +1,12 @@ -import { WidgetProps } from "widgets/BaseWidget"; import { PropertyPaneConfig, ValidationConfig, } from "constants/PropertyControlConstants"; +import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory"; import { get, isObject, isUndefined, omitBy } from "lodash"; +import memoize from "micro-memoize"; import { FlattenedWidgetProps } from "reducers/entityReducers/canvasWidgetsReducer"; -import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory"; +import { WidgetProps } from "widgets/BaseWidget"; /** * @typedef {Object} Paths @@ -163,7 +164,7 @@ const childHasPanelConfig = ( return { reactivePaths, triggerPaths, validationPaths, bindingPaths }; }; -export const getAllPathsFromPropertyConfig = ( +const getAllPathsFromPropertyConfigWithoutMemo = ( widget: WidgetProps, widgetConfig: readonly PropertyPaneConfig[], defaultProperties: Record<string, any>, @@ -276,6 +277,11 @@ export const getAllPathsFromPropertyConfig = ( return { reactivePaths, triggerPaths, validationPaths, bindingPaths }; }; +export const getAllPathsFromPropertyConfig = memoize( + getAllPathsFromPropertyConfigWithoutMemo, + { maxSize: 1000 }, +); + /** * this function gets the next available row for pasting widgets * NOTE: this function excludes modal widget when calculating next available row diff --git a/app/client/src/widgets/MultiSelectWidget/component/index.tsx b/app/client/src/widgets/MultiSelectWidget/component/index.tsx index 1f0bd1770732..9f8548b4ddea 100644 --- a/app/client/src/widgets/MultiSelectWidget/component/index.tsx +++ b/app/client/src/widgets/MultiSelectWidget/component/index.tsx @@ -164,7 +164,6 @@ function MultiSelectComponent({ }, []); const id = _.uniqueId(); - console.log("dropDownWidth", dropDownWidth); return ( <MultiSelectContainer className={loading ? Classes.SKELETON : ""} diff --git a/app/client/yarn.lock b/app/client/yarn.lock index a8438e1b73b4..ff8516ae112d 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -11464,6 +11464,11 @@ methods@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz" +micro-memoize@^4.0.10: + version "4.0.10" + resolved "https://registry.yarnpkg.com/micro-memoize/-/micro-memoize-4.0.10.tgz#cedf7682df990cd2290700af4537afa6dba7d4e9" + integrity sha512-rk0OlvEQkShjbr2EvGn1+GdCsgLDgABQyM9ZV6VoHNU7hiNM+eSOkjGWhiNabU/XWiEalWbjNQrNO+zcqd+pEA== + microevent.ts@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/microevent.ts/-/microevent.ts-0.1.1.tgz#70b09b83f43df5172d0205a63025bce0f7357fa0"
3461b689c21ac1e55375f508b99bcbab2547d545
2023-11-02 09:44:23
Dipyaman Biswas
feat: code split JSActionAPI and JSActionSagas (#28534)
false
code split JSActionAPI and JSActionSagas (#28534)
feat
diff --git a/app/client/src/actions/jsActionActions.ts b/app/client/src/actions/jsActionActions.ts index a0cb75fb63e7..68a80427ff2a 100644 --- a/app/client/src/actions/jsActionActions.ts +++ b/app/client/src/actions/jsActionActions.ts @@ -7,7 +7,7 @@ import { ReduxActionErrorTypes, } from "@appsmith/constants/ReduxActionConstants"; import type { JSCollection } from "entities/JSCollection"; -import type { CreateJSCollectionRequest } from "api/JSActionAPI"; +import type { CreateJSCollectionRequest } from "@appsmith/api/JSActionAPI"; import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes"; export interface FetchJSCollectionsPayload { diff --git a/app/client/src/actions/jsPaneActions.ts b/app/client/src/actions/jsPaneActions.ts index 3dfa95df25a2..a5aa62e7dd45 100644 --- a/app/client/src/actions/jsPaneActions.ts +++ b/app/client/src/actions/jsPaneActions.ts @@ -4,7 +4,7 @@ import type { JSCollection, JSAction } from "entities/JSCollection"; import type { RefactorAction, SetFunctionPropertyPayload, -} from "api/JSActionAPI"; +} from "@appsmith/api/JSActionAPI"; import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes"; import type { JSEditorTab } from "reducers/uiReducers/jsPaneReducer"; diff --git a/app/client/src/api/JSActionAPI.tsx b/app/client/src/ce/api/JSActionAPI.tsx similarity index 98% rename from app/client/src/api/JSActionAPI.tsx rename to app/client/src/ce/api/JSActionAPI.tsx index 9aa8cec8098e..8b0aec47df06 100644 --- a/app/client/src/api/JSActionAPI.tsx +++ b/app/client/src/ce/api/JSActionAPI.tsx @@ -1,7 +1,7 @@ import API from "api/Api"; import type { AxiosPromise } from "axios"; import type { JSCollection } from "entities/JSCollection"; -import type { ApiResponse } from "./ApiResponses"; +import type { ApiResponse } from "../../api/ApiResponses"; import type { Variable, JSAction } from "entities/JSCollection"; import type { PluginType } from "entities/Action"; diff --git a/app/client/src/sagas/JSActionSagas.ts b/app/client/src/ce/sagas/JSActionSagas.ts similarity index 87% rename from app/client/src/sagas/JSActionSagas.ts rename to app/client/src/ce/sagas/JSActionSagas.ts index 64bac2083728..300ed1cfe9b1 100644 --- a/app/client/src/sagas/JSActionSagas.ts +++ b/app/client/src/ce/sagas/JSActionSagas.ts @@ -6,14 +6,7 @@ import { ReduxActionTypes, ReduxActionErrorTypes, } from "@appsmith/constants/ReduxActionConstants"; -import { - all, - put, - takeEvery, - takeLatest, - select, - call, -} from "redux-saga/effects"; +import { put, select, call } from "redux-saga/effects"; import type { FetchActionsPayload } from "actions/pluginActionActions"; import type { JSCollection, JSAction } from "entities/JSCollection"; import { @@ -33,8 +26,8 @@ import { } from "@appsmith/selectors/entitiesSelector"; import history from "utils/history"; import { getCurrentPageId } from "selectors/editorSelectors"; -import type { JSCollectionCreateUpdateResponse } from "api/JSActionAPI"; -import JSActionAPI from "api/JSActionAPI"; +import type { JSCollectionCreateUpdateResponse } from "@appsmith/api/JSActionAPI"; +import JSActionAPI from "@appsmith/api/JSActionAPI"; import { createMessage, JS_ACTION_COPY_SUCCESS, @@ -44,7 +37,7 @@ import { ERROR_JS_ACTION_MOVE_FAIL, ERROR_JS_COLLECTION_RENAME_FAIL, } from "@appsmith/constants/messages"; -import { validateResponse } from "./ErrorSagas"; +import { validateResponse } from "../../sagas/ErrorSagas"; import type { FetchPageResponse, PageLayout } from "api/PageApi"; import PageApi from "api/PageApi"; import { updateCanvasWithDSL } from "sagas/PageSagas"; @@ -53,16 +46,16 @@ import type { ApiResponse } from "api/ApiResponses"; import AppsmithConsole from "utils/AppsmithConsole"; import { ENTITY_TYPE } from "entities/AppsmithConsole"; import LOG_TYPE from "entities/AppsmithConsole/logtype"; -import type { CreateJSCollectionRequest } from "api/JSActionAPI"; +import type { CreateJSCollectionRequest } from "@appsmith/api/JSActionAPI"; import * as log from "loglevel"; import { builderURL, jsCollectionIdURL } from "@appsmith/RouteBuilder"; import type { EventLocation } from "@appsmith/utils/analyticsUtilTypes"; import AnalyticsUtil from "utils/AnalyticsUtil"; -import { checkAndLogErrorsIfCyclicDependency } from "./helper"; +import { checkAndLogErrorsIfCyclicDependency } from "../../sagas/helper"; import { toast } from "design-system"; import { updateAndSaveLayout } from "actions/pageActions"; import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; -import { getWidgets } from "./selectors"; +import { getWidgets } from "../../sagas/selectors"; export function* fetchJSCollectionsSaga( action: EvaluationReduxAction<FetchActionsPayload>, @@ -123,7 +116,7 @@ export function* createJSCollectionSaga( }); } } -function* copyJSCollectionSaga( +export function* copyJSCollectionSaga( action: ReduxAction<{ id: string; destinationPageId: string; name: string }>, ) { const actionObject: JSCollection = yield select( @@ -177,7 +170,9 @@ function* copyJSCollectionSaga( } } -function* handleMoveOrCopySaga(actionPayload: ReduxAction<{ id: string }>) { +export function* handleMoveOrCopySaga( + actionPayload: ReduxAction<{ id: string }>, +) { const { id } = actionPayload.payload; const { pageId }: JSCollection = yield select(getJSCollection, id); history.push( @@ -188,7 +183,7 @@ function* handleMoveOrCopySaga(actionPayload: ReduxAction<{ id: string }>) { ); } -function* moveJSCollectionSaga( +export function* moveJSCollectionSaga( action: ReduxAction<{ id: string; destinationPageId: string; @@ -303,7 +298,9 @@ export function* deleteJSCollectionSaga( } } -function* saveJSObjectName(action: ReduxAction<{ id: string; name: string }>) { +export function* saveJSObjectName( + action: ReduxAction<{ id: string; name: string }>, +) { // Takes from state, checks if the name isValid, saves const collectionId = action.payload.id; const collection: JSCollectionData | undefined = yield select((state) => @@ -429,27 +426,3 @@ export function* fetchJSCollectionsForViewModeSaga( }); } } - -export function* watchJSActionSagas() { - yield all([ - takeEvery(ReduxActionTypes.FETCH_JS_ACTIONS_INIT, fetchJSCollectionsSaga), - takeEvery(ReduxActionTypes.CREATE_JS_ACTION_INIT, createJSCollectionSaga), - takeLatest(ReduxActionTypes.COPY_JS_ACTION_INIT, copyJSCollectionSaga), - takeEvery(ReduxActionTypes.COPY_JS_ACTION_SUCCESS, handleMoveOrCopySaga), - takeEvery(ReduxActionErrorTypes.COPY_JS_ACTION_ERROR, handleMoveOrCopySaga), - takeLatest(ReduxActionTypes.MOVE_JS_ACTION_INIT, moveJSCollectionSaga), - takeEvery(ReduxActionErrorTypes.MOVE_JS_ACTION_ERROR, handleMoveOrCopySaga), - takeEvery(ReduxActionTypes.MOVE_JS_ACTION_SUCCESS, handleMoveOrCopySaga), - takeEvery(ReduxActionTypes.MOVE_JS_ACTION_SUCCESS, handleMoveOrCopySaga), - takeLatest(ReduxActionTypes.DELETE_JS_ACTION_INIT, deleteJSCollectionSaga), - takeLatest(ReduxActionTypes.SAVE_JS_COLLECTION_NAME_INIT, saveJSObjectName), - takeLatest( - ReduxActionTypes.FETCH_JS_ACTIONS_FOR_PAGE_INIT, - fetchJSCollectionsForPageSaga, - ), - takeEvery( - ReduxActionTypes.FETCH_JS_ACTIONS_VIEW_MODE_INIT, - fetchJSCollectionsForViewModeSaga, - ), - ]); -} diff --git a/app/client/src/ce/sagas/index.tsx b/app/client/src/ce/sagas/index.tsx index b74948bfb96e..67f6759ef2da 100644 --- a/app/client/src/ce/sagas/index.tsx +++ b/app/client/src/ce/sagas/index.tsx @@ -26,7 +26,7 @@ import formEvaluationChangeListener from "sagas/FormEvaluationSaga"; import gitSyncSagas from "sagas/GitSyncSagas"; import globalSearchSagas from "sagas/GlobalSearchSagas"; import initSagas from "sagas/InitSagas"; -import { watchJSActionSagas } from "sagas/JSActionSagas"; +import { watchJSActionSagas } from "@appsmith/sagas/JSActionSagas"; import JSLibrarySaga from "sagas/JSLibrarySaga"; import jsPaneSagas from "sagas/JSPaneSagas"; import layoutConversionSagas from "sagas/layoutConversionSagas"; diff --git a/app/client/src/ee/api/JSActionAPI.tsx b/app/client/src/ee/api/JSActionAPI.tsx new file mode 100644 index 000000000000..46e7be0fcb50 --- /dev/null +++ b/app/client/src/ee/api/JSActionAPI.tsx @@ -0,0 +1,6 @@ +export * from "ce/api/JSActionAPI"; +import { default as CE_JSActionAPI } from "ce/api/JSActionAPI"; + +class JSActionAPI extends CE_JSActionAPI {} + +export default JSActionAPI; diff --git a/app/client/src/ee/sagas/JSActionSagas.ts b/app/client/src/ee/sagas/JSActionSagas.ts new file mode 100644 index 000000000000..280db5d50b48 --- /dev/null +++ b/app/client/src/ee/sagas/JSActionSagas.ts @@ -0,0 +1,41 @@ +export * from "ce/sagas/JSActionSagas"; +import { + ReduxActionTypes, + ReduxActionErrorTypes, +} from "@appsmith/constants/ReduxActionConstants"; +import { + fetchJSCollectionsSaga, + createJSCollectionSaga, + copyJSCollectionSaga, + handleMoveOrCopySaga, + moveJSCollectionSaga, + deleteJSCollectionSaga, + fetchJSCollectionsForPageSaga, + fetchJSCollectionsForViewModeSaga, + saveJSObjectName, +} from "ce/sagas/JSActionSagas"; +import { all, takeEvery, takeLatest } from "redux-saga/effects"; + +export function* watchJSActionSagas() { + yield all([ + takeEvery(ReduxActionTypes.FETCH_JS_ACTIONS_INIT, fetchJSCollectionsSaga), + takeEvery(ReduxActionTypes.CREATE_JS_ACTION_INIT, createJSCollectionSaga), + takeLatest(ReduxActionTypes.COPY_JS_ACTION_INIT, copyJSCollectionSaga), + takeEvery(ReduxActionTypes.COPY_JS_ACTION_SUCCESS, handleMoveOrCopySaga), + takeEvery(ReduxActionErrorTypes.COPY_JS_ACTION_ERROR, handleMoveOrCopySaga), + takeLatest(ReduxActionTypes.MOVE_JS_ACTION_INIT, moveJSCollectionSaga), + takeEvery(ReduxActionErrorTypes.MOVE_JS_ACTION_ERROR, handleMoveOrCopySaga), + takeEvery(ReduxActionTypes.MOVE_JS_ACTION_SUCCESS, handleMoveOrCopySaga), + takeEvery(ReduxActionTypes.MOVE_JS_ACTION_SUCCESS, handleMoveOrCopySaga), + takeLatest(ReduxActionTypes.DELETE_JS_ACTION_INIT, deleteJSCollectionSaga), + takeLatest(ReduxActionTypes.SAVE_JS_COLLECTION_NAME_INIT, saveJSObjectName), + takeLatest( + ReduxActionTypes.FETCH_JS_ACTIONS_FOR_PAGE_INIT, + fetchJSCollectionsForPageSaga, + ), + takeEvery( + ReduxActionTypes.FETCH_JS_ACTIONS_VIEW_MODE_INIT, + fetchJSCollectionsForViewModeSaga, + ), + ]); +} diff --git a/app/client/src/sagas/JSPaneSagas.ts b/app/client/src/sagas/JSPaneSagas.ts index 69dc8aa822fd..bee05939803b 100644 --- a/app/client/src/sagas/JSPaneSagas.ts +++ b/app/client/src/sagas/JSPaneSagas.ts @@ -43,8 +43,8 @@ import type { JSCollectionCreateUpdateResponse, RefactorAction, SetFunctionPropertyPayload, -} from "api/JSActionAPI"; -import JSActionAPI from "api/JSActionAPI"; +} from "@appsmith/api/JSActionAPI"; +import JSActionAPI from "@appsmith/api/JSActionAPI"; import ActionAPI from "api/ActionAPI"; import { updateJSCollectionSuccess, diff --git a/app/client/test/sagas.ts b/app/client/test/sagas.ts index 278501117f39..a889cbd565ac 100644 --- a/app/client/test/sagas.ts +++ b/app/client/test/sagas.ts @@ -4,7 +4,7 @@ import workspaceSagas from "@appsmith/sagas/WorkspaceSagas"; import { watchActionSagas } from "sagas/ActionSagas"; import layoutUpdateSagas from "sagas/AutoLayoutUpdateSagas"; import { watchDatasourcesSagas } from "sagas/DatasourcesSagas"; -import { watchJSActionSagas } from "sagas/JSActionSagas"; +import { watchJSActionSagas } from "@appsmith/sagas/JSActionSagas"; import apiPaneSagas from "../src/sagas/ApiPaneSagas"; import applicationSagas from "@appsmith/sagas/ApplicationSagas"; import batchSagas from "../src/sagas/BatchSagas";
c078976616cb6bd9c7b88d997f9217f3e44677e6
2021-09-02 08:47:42
Arpit Mohan
chore: Minor refactoring changes for RTS (#7011)
false
Minor refactoring changes for RTS (#7011)
chore
diff --git a/app/client/package.json b/app/client/package.json index 41a954ded95d..7b111546fe7f 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -88,7 +88,7 @@ "lodash": "^4.17.21", "lodash-es": "4.17.14", "lodash-move": "^1.1.1", - "loglevel": "^1.6.7", + "loglevel": "^1.7.1", "lottie-web": "^5.7.4", "marked": "^2.0.0", "moment": "^2.24.0", diff --git a/app/client/src/constants/WebsocketConstants.tsx b/app/client/src/constants/WebsocketConstants.tsx index ca1112a9319d..a3065c5ef67e 100644 --- a/app/client/src/constants/WebsocketConstants.tsx +++ b/app/client/src/constants/WebsocketConstants.tsx @@ -15,3 +15,5 @@ export const websocketDisconnectedEvent = () => ({ export const websocketConnectedEvent = () => ({ type: WEBSOCKET_EVENTS.CONNECTED, }); + +export const RTS_BASE_PATH = "/rts"; diff --git a/app/client/src/pages/Editor/Canvas.tsx b/app/client/src/pages/Editor/Canvas.tsx index 5b1925ea044d..1244f6db3514 100644 --- a/app/client/src/pages/Editor/Canvas.tsx +++ b/app/client/src/pages/Editor/Canvas.tsx @@ -17,6 +17,7 @@ import { APP_COLLAB_EVENTS, NAMESPACE_COLLAB_PAGE_EDIT, } from "constants/AppCollabConstants"; +import { RTS_BASE_PATH } from "constants/WebsocketConstants"; import { isMultiplayerEnabledForUser as isMultiplayerEnabledForUserSelector } from "selectors/appCollabSelectors"; interface CanvasProps { @@ -25,7 +26,9 @@ interface CanvasProps { } // This auto connects the socket -const pageEditSocket = io(NAMESPACE_COLLAB_PAGE_EDIT); +const pageEditSocket = io(NAMESPACE_COLLAB_PAGE_EDIT, { + path: RTS_BASE_PATH, +}); const shareMousePointer = (e: any, pageId: string) => { if (store.getState().ui.appCollab.editors.length < 2) return; diff --git a/app/client/src/sagas/WebsocketSagas/WebsocketSagas.ts b/app/client/src/sagas/WebsocketSagas/WebsocketSagas.ts index cefcad7f9b03..681c394dc30b 100644 --- a/app/client/src/sagas/WebsocketSagas/WebsocketSagas.ts +++ b/app/client/src/sagas/WebsocketSagas/WebsocketSagas.ts @@ -15,6 +15,7 @@ import { } from "constants/ReduxActionConstants"; import { WEBSOCKET_EVENTS, + RTS_BASE_PATH, websocketDisconnectedEvent, websocketConnectedEvent, } from "constants/WebsocketConstants"; @@ -29,7 +30,9 @@ import { isMultiplayerEnabledForUser } from "selectors/appCollabSelectors"; import { areCommentsEnabledForUserAndApp } from "selectors/commentsSelectors"; function connect() { - const socket = io(); + const socket = io({ + path: RTS_BASE_PATH, + }); return new Promise((resolve) => { socket.on("connect", () => { diff --git a/app/rts/.env.example b/app/rts/.env.example new file mode 100644 index 000000000000..9477484fb2cd --- /dev/null +++ b/app/rts/.env.example @@ -0,0 +1,2 @@ +APPSMITH_MONGODB_URI=mongodb://localhost:27017/appsmith +APPSMITH_API_BASE_URL=http://localhost:8080/api/v1 \ No newline at end of file diff --git a/app/rts/package.json b/app/rts/package.json index 04fbfed02ec2..09c00eeb6e2f 100644 --- a/app/rts/package.json +++ b/app/rts/package.json @@ -6,11 +6,16 @@ "author": "Appsmith Team", "license": "Apache-2.0", "private": true, + "engines": { + "node": "^14.15.4", + "npm": "^6.14.10" + }, "devDependencies": { "@types/express": "^4.17.11", "@types/mongodb": "^3.6.10", "axios": "^0.21.1", "express": "^4.17.1", + "loglevel": "^1.7.1", "mongodb": "^3.6.4", "socket.io": "^4.1.3", "socket.io-adapter": "^2.3.2", diff --git a/app/rts/src/server.ts b/app/rts/src/server.ts index d904b41b6bbf..2a86a5d5e72e 100644 --- a/app/rts/src/server.ts +++ b/app/rts/src/server.ts @@ -5,8 +5,12 @@ import { Server, Socket } from "socket.io" import { MongoClient, ObjectId } from "mongodb" import type mongodb from "mongodb" import axios from "axios" +import { LogLevelDesc } from "loglevel"; +import log from "loglevel"; import { AppUser, CurrentEditorsEvent, Policy, Comment, CommentThread, MousePointerEvent } from "./models" +const RTS_BASE_PATH = "/rts" + const APP_ROOM_PREFIX : string = "app:" const PAGE_ROOM_PREFIX : string = "page:" const ROOT_NAMESPACE : string = "/" @@ -17,16 +21,19 @@ const START_EDIT_EVENT_NAME : string = "collab:start_edit" const LEAVE_EDIT_EVENT_NAME : string = "collab:leave_edit" const MOUSE_POINTER_EVENT_NAME : string = "collab:mouse_pointer" +// Setting the logLevel for all log messages +const logLevel : LogLevelDesc = (process.env.APPSMITH_LOG_LEVEL || "debug") as LogLevelDesc +log.setLevel(logLevel); const MONGODB_URI = process.env.APPSMITH_MONGODB_URI if (MONGODB_URI == null || MONGODB_URI === "" || !MONGODB_URI.startsWith("mongodb")) { - console.error("Please provide a valid value for `APPSMITH_MONGODB_URI`.") + log.error("Please provide a valid value for `APPSMITH_MONGODB_URI`.") process.exit(1) } const API_BASE_URL = process.env.APPSMITH_API_BASE_URL if (API_BASE_URL == null || API_BASE_URL === "") { - console.error("Please provide a valid value for `APPSMITH_API_BASE_URL`.") + log.error("Please provide a valid value for `APPSMITH_API_BASE_URL`.") process.exit(1) } @@ -34,8 +41,11 @@ main() function main() { const app = express() + //Disable x-powered-by header to prevent information disclosure + app.disable("x-powered-by"); const server = new http.Server(app) const io = new Server(server, { + path: RTS_BASE_PATH, // TODO: Remove this CORS configuration. cors: { origin: "*", @@ -51,38 +61,38 @@ function main() { io.on("connection", (socket: Socket) => { subscribeToEditEvents(socket, APP_ROOM_PREFIX) onAppSocketConnected(socket) - .catch((error) => console.error("Error in socket connected handler", error)) + .catch((error) => log.error("Error in socket connected handler", error)) }) io.of(PAGE_EDIT_NAMESPACE).on("connection", (socket: Socket) => { subscribeToEditEvents(socket, PAGE_ROOM_PREFIX); onPageSocketConnected(socket, io) - .catch((error) => console.error("Error in socket connected handler", error)) + .catch((error) => log.error("Error in socket connected handler", error)) }); io.of(ROOT_NAMESPACE).adapter.on("leave-room", (room, id) => { - console.log(`ns:${ROOT_NAMESPACE}# socket ${id} left the room ${room}`) + log.debug(`ns:${ROOT_NAMESPACE}# socket ${id} left the room ${room}`) sendCurrentUsers(io, room, APP_ROOM_PREFIX); }); io.of(ROOT_NAMESPACE).adapter.on("join-room", (room, id) => { - console.log(`ns:${ROOT_NAMESPACE}# socket ${id} joined the room ${room}`) + log.debug(`ns:${ROOT_NAMESPACE}# socket ${id} joined the room ${room}`) sendCurrentUsers(io, room, APP_ROOM_PREFIX); }); io.of(PAGE_EDIT_NAMESPACE).adapter.on("leave-room", (room, id) => { - console.log(`ns:${PAGE_EDIT_NAMESPACE}# socket ${id} left the room ${room}`) + log.debug(`ns:${PAGE_EDIT_NAMESPACE}# socket ${id} left the room ${room}`) if(room.startsWith(PAGE_ROOM_PREFIX)) { // someone left the page edit, notify others io.of(PAGE_EDIT_NAMESPACE).to(room).emit(LEAVE_EDIT_EVENT_NAME, id); } }); watchMongoDB(io) - .catch((error) => console.error("Error watching MongoDB", error)) + .catch((error) => log.error("Error watching MongoDB", error)) app.use(express.static(path.join(__dirname, "static"))) server.listen(port, () => { - console.log(`RTS running at http://localhost:${port}`) + log.info(`RTS running at http://localhost:${port}`) }) } @@ -136,7 +146,18 @@ async function onPageSocketConnected(socket:Socket, socketIo:Server) { } async function tryAuth(socket:Socket) { - const connectionCookie = socket.handshake.headers.cookie + + /* ********************************************************* */ + // TODO: This change is not being used at the moment. Instead of using the environment variable API_BASE_URL + // we should be able to derive the API_BASE_URL from the host header. This will make configuration simpler + // for the user. The problem with this implementation is that Axios doesn't work for https endpoints currently. + // This needs to be debugged. + const host = socket.handshake.headers.host + const protocol = socket.handshake.headers.referer.startsWith("https") ? "https" : "http" + const apiUrl = "http://" + host + "/api/v1/users/me" + /* ********************************************************* */ + + const connectionCookie = socket.handshake.headers.cookie; if (connectionCookie != null && connectionCookie !== "") { const matchedCookie = connectionCookie.match(/\bSESSION=\S+/) if(matchedCookie) { @@ -145,7 +166,7 @@ async function tryAuth(socket:Socket) { try { response = await axios.request({ method: "GET", - url: API_BASE_URL + "/applications/new", + url: API_BASE_URL + "/users/me", headers: { Cookie: sessionCookie, }, @@ -154,16 +175,22 @@ async function tryAuth(socket:Socket) { if (error.response?.status === 401) { console.info("401 received when authenticating user with cookie: " + sessionCookie) } else if(error.response) { - console.error("Error response received while authentication: ", error.response) + log.error("Error response received while authentication: ", error.response) } else { - console.error("Error authenticating", error) + log.error("Error authenticating", error) } return false } - - const email = response.data.data.user.email - const name = response.data.data.user.name ? response.data.data.user.name : email; - + + const email = response.data.data.email + const name = response.data.data.name ? response.data.data.name : email; + + // If the session check API succeeds & the email/name is anonymousUser, then the user is not authenticated + // and we should not allow them to join any rooms + if (email === "anonymousUser" || name === "anonymousUser") { + return false; + } + socket.data.email = email socket.data.name = name @@ -251,7 +278,7 @@ async function watchMongoDB(io) { if (thread == null) { // This happens when `event.operationType === "drop"`, when a comment is deleted. - console.error("Null document recieved for comment change event", event) + log.error("Null document recieved for comment change event", event) return } @@ -295,7 +322,7 @@ async function watchMongoDB(io) { if (notification == null) { // This happens when `event.operationType === "drop"`, when a notification is deleted. - console.error("Null document recieved for notification change event", event) + log.error("Null document recieved for notification change event", event) return } @@ -308,11 +335,11 @@ async function watchMongoDB(io) { }) process.on('uncaughtExceptionMonitor', (err, origin) => { - console.error(`Caught exception: ${err}\n` + `Exception origin: ${origin}`); + log.error(`Caught exception: ${err}\n` + `Exception origin: ${origin}`); }); process.on('unhandledRejection', (reason, promise) => { - console.log('Unhandled Rejection at:', promise, 'reason:', reason); + log.debug('Unhandled Rejection at:', promise, 'reason:', reason); }); process.on("exit", () => { @@ -321,7 +348,7 @@ async function watchMongoDB(io) { .finally("Fin") }) - console.log("Watching MongoDB") + log.debug("Watching MongoDB") } function findPolicyEmails(policies: Policy[], permission: string): string[] { diff --git a/app/rts/yarn.lock b/app/rts/yarn.lock index ee6966670b4a..cdf98c269d79 100644 --- a/app/rts/yarn.lock +++ b/app/rts/yarn.lock @@ -395,6 +395,11 @@ isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +loglevel@^1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" + integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== + [email protected]: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
da56f612edcda82b605472b12e8c47ff42faf36c
2023-12-04 15:09:05
Aishwarya-U-R
test: Cypress | Fix Oracle_Spec.ts fix for new navigation flow (#29283)
false
Cypress | Fix Oracle_Spec.ts fix for new navigation flow (#29283)
test
diff --git a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts index 25ce5253756e..541b36e95dba 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts +++ b/app/client/cypress/e2e/Regression/ServerSide/Datasources/Oracle_Spec.ts @@ -163,7 +163,6 @@ describe("Validate Oracle DS", () => { 1, true, ); - dataSources.NavigateFromActiveDS(dataSourceName, true); query = `CREATE TABLE ${guid} ( aircraft_id NUMBER(5) PRIMARY KEY, aircraft_type VARCHAR2(50) NOT NULL, @@ -176,8 +175,7 @@ describe("Validate Oracle DS", () => { maintenance_last_date DATE, notes CLOB );`; - agHelper.RenameWithInPane("CreateAircraft"); - dataSources.EnterQuery(query); + dataSources.CreateQueryForDS(dataSourceName, query, "CreateAircraft"); dataSources.RunQuery(); query = `INSERT INTO ${guid} ( @@ -465,6 +463,7 @@ WHERE aircraft_type = 'Passenger Plane'`; "Verify Deletion of the Oracle datasource after all created queries are deleted", () => { dataSources.DeleteDatasourceFromWithinDS(dataSourceName, 409); //Since all queries exists + AppSidebar.navigate(AppSidebarButton.Editor); PageLeftPane.expandCollapseItem("Queries/JS"); entityExplorer.DeleteAllQueriesForDB(dataSourceName); deployMode.DeployApp(); diff --git a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js index 8a3f2e58b972..f65f568785db 100644 --- a/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js +++ b/app/client/cypress/e2e/Regression/ServerSide/QueryPane/SwitchDatasource_spec.js @@ -1,7 +1,6 @@ -const datasource = require("../../../../locators/DatasourcesEditor.json"); import { dataSources, agHelper } from "../../../../support/Objects/ObjectsCore"; describe("Switch datasource", function () { - let guid, dsName_1, dsName_2, MongoDB; + let dsName_1, dsName_2, MongoDB; beforeEach(() => { cy.startRoutesForDatasource(); });
d9024156d578d89cd6c78d3b4000c1829e7b56e1
2023-05-03 22:06:22
tkAppsmith
fix: Added single quotes on hint query containing mustache substitution fo… (#22848)
false
Added single quotes on hint query containing mustache substitution fo… (#22848)
fix
diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql index b5253c2bf8b2..3166e4d345dd 100644 --- a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql +++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/CREATE.sql @@ -2,7 +2,7 @@ INSERT INTO users (name, gender, email) VALUES ( - {{ nameInput.text }}, - {{ genderDropdown.selectedOptionValue }}, - {{ emailInput.text }} + '{{ nameInput.text }}', + '{{ genderDropdown.selectedOptionValue }}', + '{{ emailInput.text }}' ); \ No newline at end of file diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql index facf9fc3f9d6..966633a70592 100644 --- a/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql +++ b/app/server/appsmith-plugins/snowflakePlugin/src/main/resources/templates/UPDATE.sql @@ -1,3 +1,3 @@ UPDATE users SET status = 'APPROVED' - WHERE id = {{ usersTable.selectedRow.id }}; \ No newline at end of file + WHERE id = '{{ usersTable.selectedRow.id }}'; \ No newline at end of file diff --git a/app/server/appsmith-plugins/snowflakePlugin/src/test/java/com/external/plugins/SnowflakePluginTest.java b/app/server/appsmith-plugins/snowflakePlugin/src/test/java/com/external/plugins/SnowflakePluginTest.java index d1c7dc5821da..e49214865f13 100644 --- a/app/server/appsmith-plugins/snowflakePlugin/src/test/java/com/external/plugins/SnowflakePluginTest.java +++ b/app/server/appsmith-plugins/snowflakePlugin/src/test/java/com/external/plugins/SnowflakePluginTest.java @@ -10,6 +10,9 @@ import com.external.plugins.exceptions.SnowflakePluginError; import com.external.utils.ExecutionUtils; import com.external.utils.ValidationUtils; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.type.MapType; +import com.fasterxml.jackson.databind.type.TypeFactory; import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.HikariPoolMXBean; import lombok.extern.slf4j.Slf4j; @@ -17,13 +20,28 @@ import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; import org.mockito.stubbing.Answer; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import java.util.*; + +import java.util.Arrays; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,6 +58,8 @@ public class SnowflakePluginTest { SnowflakePlugin.SnowflakePluginExecutor pluginExecutor = new SnowflakePlugin.SnowflakePluginExecutor(); + private final ObjectMapper objectMapper = new ObjectMapper(); + @Test public void testValidateDatasource_withInvalidCredentials_returnsInvalids() { DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration(); @@ -147,4 +167,68 @@ public void verifyUniquenessOfSnowflakePluginErrorCode() { .collect(Collectors.toList()).size() == 0); } + + @Test + public void verifyTemplatesHasQuotesAroundMustacheSubstitutions() throws IOException { + + // reading meta file to get template file locations + InputStream input = new ClassPathResource("templates/meta.json").getInputStream(); + BufferedReader reader = new BufferedReader(new InputStreamReader(input)); + String meta = reader.lines().collect(Collectors.joining(System.lineSeparator())); + Map<String, List<Map<String, String>>> result; + ObjectMapper mapper; + TypeFactory factory; + MapType type; + + factory = TypeFactory.defaultInstance(); + type = factory.constructMapType(HashMap.class, String.class, List.class); + mapper = new ObjectMapper(); + result = mapper.readValue(meta, type); + + List<String> templates = new ArrayList<>(); + + // parsing each template file and putting to a string to process for mustache templates + result.get("templates").forEach(entry -> { + for (Map.Entry<String, String> mapEntry : entry.entrySet()) { + try(InputStream template = new ClassPathResource("templates/" + mapEntry.getValue()).getInputStream()) { + BufferedReader templateReader = new BufferedReader(new InputStreamReader(template)); + String file = templateReader.lines().collect(Collectors.joining(System.lineSeparator())); + templates.add(file); + } catch (IOException e){ + throw new RuntimeException(e); + } + } + }); + + String mustache = "\\{\\{.*?}}"; + Pattern mustachePattern = Pattern.compile(mustache); + + String enclosedMustache = "\\'\\{\\{.*?}}'"; + Pattern enclosedMustachePattern = Pattern.compile(enclosedMustache); + + // processing each template file in loop + for(String template : templates) { + + Matcher mustacheMatcher = mustachePattern.matcher(template); + Matcher enclosedMustacheMatcher = enclosedMustachePattern.matcher(template); + + int mustacheMatchCount = 0; + int enclosedMustacheMatchCount = 0; + + // finding count of mustache substitution expressions + while( mustacheMatcher.find() ) { + mustacheMatchCount++; + } + + // finding count of mustache substitution expressions enclosed in single quotes + while( enclosedMustacheMatcher.find() ) { + enclosedMustacheMatchCount++; + } + + // count of mustache substitution expression and enclosed expressions should be same in hint text + // current test is based on rationale that all fields in hint are text fields hence should be enclosed in quotes in an sql query. + // moving forward this condition can be deemed incompatible with introduction of numeric fields hence this test case can then be adjusted accordingly. + assertEquals(mustacheMatchCount, enclosedMustacheMatchCount); + } + } }
6ef4d2a6af2ac4a798b5053d7b726454b2268073
2024-06-21 12:52:18
Shrikant Sharat Kandula
ci: Run server tests on `pg` branch (#34372)
false
Run server tests on `pg` branch (#34372)
ci
diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml index 849cdbb44f76..2badc7d8b235 100644 --- a/.github/workflows/quality-checks.yml +++ b/.github/workflows/quality-checks.yml @@ -45,7 +45,7 @@ jobs: secrets: inherit with: pr: ${{ github.event.pull_request.number }} - is-pg-build: ${{ github.event.pull_request.base.ref == 'pg' }} + is-pg-build: ${{ github.event.pull_request.base.ref == 'pg' || github.event.pull_request.head.ref == 'pg' }} client-build: name: client-build diff --git a/.github/workflows/server-build.yml b/.github/workflows/server-build.yml index 30aca07c3147..3fd3085317aa 100644 --- a/.github/workflows/server-build.yml +++ b/.github/workflows/server-build.yml @@ -139,11 +139,10 @@ jobs: java-version: "17" - name: Conditionally start PostgreSQL + if: | + inputs.is-pg-build == 'true' && inputs.skip-tests != 'true' run: | - if [[ ${{ inputs.is-pg-build }} == 'true' ]]; then - echo "Requesting PostgreSQL container to be started for pg specific build." - docker run --name appsmith-pg -p 5432:5432 -d -e POSTGRES_PASSWORD=password postgres:alpine postgres -N 1500 - fi + docker run --name appsmith-pg -p 5432:5432 -d -e POSTGRES_PASSWORD=password postgres:alpine postgres -N 1500 # Retrieve maven dependencies from cache. After a successful run, these dependencies are cached again - name: Cache maven dependencies
9f3c5bd26dee3881e6bdce721b3e0faeee3ae9c4
2024-07-03 14:43:46
Rahul Barwal
fix: update widget sidebar for airgapped environment (#34656)
false
update widget sidebar for airgapped environment (#34656)
fix
diff --git a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Sidebar.ts b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Sidebar.ts index c924675dd37a..37921036bead 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Sidebar.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/ExplorerTests/Widgets_Sidebar.ts @@ -71,7 +71,7 @@ describe( if (Cypress.env("AIRGAPPED")) { // Remove map and custom widget in case of airgap - WIDGETS_CATALOG.Content = WIDGETS_CATALOG.Display.filter( + WIDGETS_CATALOG.Content = WIDGETS_CATALOG.Content.filter( (widget) => widget !== "Map", ); WIDGETS_CATALOG.Display = WIDGETS_CATALOG.Display.filter(
33236d8d43b36ff69227c6348df14459331fcd9b
2023-05-04 13:13:05
Valera Melnikov
chore: remove unnecessary props from button and improve test color co… (#22972)
false
remove unnecessary props from button and improve test color co… (#22972)
chore
diff --git a/app/client/packages/design-system/headless/src/components/Button/Button.tsx b/app/client/packages/design-system/headless/src/components/Button/Button.tsx index 289b70e7f657..f86105f786bf 100644 --- a/app/client/packages/design-system/headless/src/components/Button/Button.tsx +++ b/app/client/packages/design-system/headless/src/components/Button/Button.tsx @@ -10,15 +10,12 @@ import type { ButtonProps as SpectrumButtonProps } from "@react-types/button"; export interface ButtonProps extends SpectrumButtonProps { className?: string; - isActive?: boolean; - isHover?: boolean; } export type ButtonRef = FocusableRef<HTMLElement>; export const Button = forwardRef((props: ButtonProps, ref: ButtonRef) => { - const { autoFocus, children, className, isActive, isDisabled, isHover } = - props; + const { autoFocus, children, className, isDisabled } = props; const domRef = useFocusableRef(ref) as RefObject<HTMLButtonElement>; const { buttonProps, isPressed } = useButton(props, domRef); const { hoverProps, isHovered } = useHover({ isDisabled }); @@ -28,10 +25,10 @@ export const Button = forwardRef((props: ButtonProps, ref: ButtonRef) => { <button {...mergeProps(buttonProps, hoverProps, focusProps)} className={className} - data-active={isPressed || isActive ? "" : undefined} + data-active={isPressed ? "" : undefined} data-disabled={isDisabled ? "" : undefined} data-focused={isFocusVisible ? "" : undefined} - data-hovered={isHovered || isHover ? "" : undefined} + data-hovered={isHovered ? "" : undefined} ref={domRef} > {children} diff --git a/app/client/packages/design-system/theming/src/utils/TokensAccessor/index.ts b/app/client/packages/design-system/theming/src/utils/TokensAccessor/index.ts index 8193f7b2e07d..48ada6a2a9e2 100644 --- a/app/client/packages/design-system/theming/src/utils/TokensAccessor/index.ts +++ b/app/client/packages/design-system/theming/src/utils/TokensAccessor/index.ts @@ -1,3 +1,5 @@ +export { DarkModeTheme } from "./DarkModeTheme"; +export { LightModeTheme } from "./LightModeTheme"; export { TokensAccessor } from "./TokensAccessor"; export type { ThemeTokens, TokenSource } from "./types"; diff --git a/app/client/packages/design-system/theming/src/utils/index.ts b/app/client/packages/design-system/theming/src/utils/index.ts index fa8a178f2be4..a2fe97354fd6 100644 --- a/app/client/packages/design-system/theming/src/utils/index.ts +++ b/app/client/packages/design-system/theming/src/utils/index.ts @@ -1,4 +1,4 @@ -export { TokensAccessor } from "./TokensAccessor"; -export { ColorsAccessor } from "./ColorsAccessor"; +export * from "./TokensAccessor"; +export * from "./ColorsAccessor"; export type { ThemeTokens, TokenSource } from "./TokensAccessor"; diff --git a/app/client/packages/design-system/widgets/src/components/Button/Button.stories.mdx b/app/client/packages/design-system/widgets/src/components/Button/Button.stories.mdx index 71b8417f2b35..9b324a42cd69 100644 --- a/app/client/packages/design-system/widgets/src/components/Button/Button.stories.mdx +++ b/app/client/packages/design-system/widgets/src/components/Button/Button.stories.mdx @@ -4,17 +4,13 @@ import { Button } from "./"; <Meta title="Design-system/widgets/Button" component={Button} - parameters={{ - height: 32, - width: 180, - }} args={{ children: "Button", }} /> export const Template = (args, { globals: { fontFamily } }) => ( - <Button isFitContainer {...args} fontFamily={fontFamily} /> + <Button {...args} fontFamily={fontFamily} /> ); # Button diff --git a/app/client/packages/design-system/widgets/src/components/Button/Button.tsx b/app/client/packages/design-system/widgets/src/components/Button/Button.tsx index e278d6b8d9d1..a92fef88ecd1 100644 --- a/app/client/packages/design-system/widgets/src/components/Button/Button.tsx +++ b/app/client/packages/design-system/widgets/src/components/Button/Button.tsx @@ -29,7 +29,6 @@ export const Button = forwardRef( children, fontFamily, isFitContainer = false, - isFocused, isLoading, // eslint-disable-next-line -- TODO add onKeyUp when the bug is fixedhttps://github.com/adobe/react-spectrum/issues/4350 onKeyUp, @@ -52,7 +51,6 @@ export const Button = forwardRef( return ( <StyledButton data-fit-container={isFitContainer ? "" : undefined} - data-focused={isFocused} data-loading={isLoading ? "" : undefined} data-variant={variant} ref={ref} diff --git a/app/client/packages/design-system/widgets/src/components/Button/index.styled.tsx b/app/client/packages/design-system/widgets/src/components/Button/index.styled.tsx index cb667c7cd098..a2e0fa97594e 100644 --- a/app/client/packages/design-system/widgets/src/components/Button/index.styled.tsx +++ b/app/client/packages/design-system/widgets/src/components/Button/index.styled.tsx @@ -10,7 +10,7 @@ export const StyledButton = styled(HeadlessButton)<ButtonProps>` outline: 0; gap: var(--spacing-4); padding: var(--spacing-2) var(--spacing-4); - min-height: calc(var(--sizing-root-unit) * 8); + height: calc(var(--sizing-root-unit) * 8); border-radius: var(--border-radius-1); user-select: none; @@ -68,9 +68,7 @@ export const StyledButton = styled(HeadlessButton)<ButtonProps>` } } - // we don't use :focus-visible because not all browsers (safari) have it yet - &[data-focused]:not([data-loading]), - &[data-focus="true"] { + &[data-focused]:not([data-loading]) { box-shadow: 0 0 0 2px var(--color-bg), 0 0 0 4px var(--color-bd-focus); } diff --git a/app/client/packages/design-system/widgets/src/components/CheckboxGroup/CheckboxGroup.stories.mdx b/app/client/packages/design-system/widgets/src/components/CheckboxGroup/CheckboxGroup.stories.mdx index 1207b4ac443e..44daca2a05ef 100644 --- a/app/client/packages/design-system/widgets/src/components/CheckboxGroup/CheckboxGroup.stories.mdx +++ b/app/client/packages/design-system/widgets/src/components/CheckboxGroup/CheckboxGroup.stories.mdx @@ -6,9 +6,6 @@ import { Checkbox } from "../Checkbox"; <Meta title="Design-system/widgets/CheckboxGroup" component={CheckboxGroup} - parameters={{ - width: "200px", - }} args={{ label: "Checkbox Group", defaultValue: ["value-1"], @@ -21,9 +18,7 @@ import { Checkbox } from "../Checkbox"; }} /> -export const Template = (args, { globals: { fontFamily } }) => ( - <CheckboxGroup {...args} /> -); +export const Template = (args) => <CheckboxGroup {...args} />; # Checkbox Group diff --git a/app/client/packages/design-system/widgets/src/components/TestComponent/PrimaryButonTest.stories.mdx b/app/client/packages/design-system/widgets/src/components/TestComponent/PrimaryButonTest.stories.mdx deleted file mode 100644 index 0888d3154ce1..000000000000 --- a/app/client/packages/design-system/widgets/src/components/TestComponent/PrimaryButonTest.stories.mdx +++ /dev/null @@ -1,76 +0,0 @@ -import { Canvas, Meta, Story } from "@storybook/addon-docs"; -import { TestComponent } from "./TestComponent"; -import { Button } from "../Button"; - -<Meta - title="Design-system/widgets/TestComponent/Primary button test" - component={TestComponent} -/> - -export const Template = (args, { globals: { colorMode } }) => ( - <> - <h3>{args.title}</h3> - <div - style={{ - padding: "50px", - background: "#fff", - }} - > - <TestComponent colorMode={colorMode}> - <Button {...args}>Test</Button> - </TestComponent> - </div> - </> -); - -<Canvas> - <Story - name="primary" - args={{ - title: "Primary", - variant: "primary", - }} - > - {Template.bind({})} - </Story> - <Story - name="primary hover" - args={{ - title: "Primary hover", - variant: "primary", - isHover: true, - }} - > - {Template.bind({})} - </Story> - <Story - name="primary active" - args={{ - title: "Primary active", - variant: "primary", - isActive: true, - }} - > - {Template.bind({})} - </Story> - <Story - name="primary focus" - args={{ - title: "Primary active", - variant: "primary", - isFocused: true, - }} - > - {Template.bind({})} - </Story> - <Story - name="primary disabled" - args={{ - title: "Primary disabled", - variant: "primary", - isDisabled: true, - }} - > - {Template.bind({})} - </Story> -</Canvas> diff --git a/app/client/packages/design-system/widgets/src/components/TestComponent/SecondaryButonTest.stories.mdx b/app/client/packages/design-system/widgets/src/components/TestComponent/SecondaryButonTest.stories.mdx deleted file mode 100644 index dc129e44f93a..000000000000 --- a/app/client/packages/design-system/widgets/src/components/TestComponent/SecondaryButonTest.stories.mdx +++ /dev/null @@ -1,78 +0,0 @@ -import { Canvas, Meta, Story } from "@storybook/addon-docs"; -import { TestComponent } from "./TestComponent"; -import { Button } from "../Button"; - -<Meta - title="Design-system/widgets/TestComponent/Secondary button test" - component={TestComponent} -/> - -export const Template = (args, { globals: { colorMode } }) => { - return ( - <> - <h3>{args.title}</h3> - <div - style={{ - padding: "50px", - background: "#fff", - }} - > - <TestComponent colorMode={colorMode}> - <Button {...args}>Test</Button> - </TestComponent> - </div> - </> - ); -}; - -<Canvas> - <Story - name="secondary" - args={{ - title: "Secondary", - variant: "secondary", - }} - > - {Template.bind({})} - </Story> - <Story - name="secondary hover" - args={{ - title: "Secondary hover", - variant: "secondary", - isHover: true, - }} - > - {Template.bind({})} - </Story> - <Story - name="secondary active" - args={{ - title: "Secondary active", - variant: "secondary", - isActive: true, - }} - > - {Template.bind({})} - </Story> - <Story - name="secondary focus" - args={{ - title: "Secondary active", - variant: "secondary", - isFocused: true, - }} - > - {Template.bind({})} - </Story> - <Story - name="secondary disabled" - args={{ - title: "Secondary disabled", - variant: "secondary", - isDisabled: true, - }} - > - {Template.bind({})} - </Story> -</Canvas> diff --git a/app/client/packages/design-system/widgets/src/components/TestComponent/TertiaryButonTest.stories.mdx b/app/client/packages/design-system/widgets/src/components/TestComponent/TertiaryButonTest.stories.mdx deleted file mode 100644 index bb2421635746..000000000000 --- a/app/client/packages/design-system/widgets/src/components/TestComponent/TertiaryButonTest.stories.mdx +++ /dev/null @@ -1,76 +0,0 @@ -import { Canvas, Meta, Story } from "@storybook/addon-docs"; -import { TestComponent } from "./TestComponent"; -import { Button } from "../Button"; - -<Meta - title="Design-system/widgets/TestComponent/Tertiary button test" - component={TestComponent} -/> - -export const Template = (args, { globals: { colorMode } }) => ( - <> - <h3>{args.title}</h3> - <div - style={{ - padding: "50px", - background: "#fff", - }} - > - <TestComponent colorMode={colorMode}> - <Button {...args}>Test</Button> - </TestComponent> - </div> - </> -); - -<Canvas> - <Story - name="tertiary" - args={{ - title: "Tertiary", - variant: "tertiary", - }} - > - {Template.bind({})} - </Story> - <Story - name="tertiary hover" - args={{ - title: "Tertiary hover", - variant: "tertiary", - isHover: true, - }} - > - {Template.bind({})} - </Story> - <Story - name="tertiary active" - args={{ - title: "Tertiary active", - variant: "tertiary", - isActive: true, - }} - > - {Template.bind({})} - </Story> - <Story - name="tertiary focus" - args={{ - title: "Tertiary active", - variant: "tertiary", - isFocused: true, - }} - > - {Template.bind({})} - </Story> - <Story - name="tertiary disabled" - args={{ - title: "Tertiary disabled", - variant: "tertiary", - isDisabled: true, - }} - > - {Template.bind({})} - </Story> -</Canvas> diff --git a/app/client/packages/design-system/widgets/src/components/TestComponent/TestColorComponent.stories.mdx b/app/client/packages/design-system/widgets/src/components/TestComponent/TestColorComponent.stories.mdx new file mode 100644 index 000000000000..a4b48d20c130 --- /dev/null +++ b/app/client/packages/design-system/widgets/src/components/TestComponent/TestColorComponent.stories.mdx @@ -0,0 +1,57 @@ +import { Canvas, Meta, Story } from "@storybook/addon-docs"; +import { TestColorComponent } from "./TestColorComponent"; + +<Meta title="Design-system/widgets" component={TestColorComponent} /> + +export const Template = (args, { globals: { colorMode } }) => ( + <TestColorComponent {...args} colorMode={colorMode}> + {(color) => ( + <> + {color.seed} + <br /> + {color.derived} + </> + )} + </TestColorComponent> +); + +<Canvas> + <Story + name="Test Color Component" + args={{ + source: "oklch", + size: "small", + steps: 11, + colorSpace: "oklch", + variant: "primary", + isHovered: false, + isActive: false, + isFocused: false, + isDisabled: false, + }} + argTypes={{ + source: { + options: ["oklch", "hex", "appsmith"], + control: { type: "radio" }, + }, + size: { + options: ["small", "big"], + control: { type: "radio" }, + if: { arg: "source", neq: "appsmith" }, + }, + colorSpace: { + options: ["oklch", "hex"], + control: { type: "radio" }, + }, + steps: { + if: { arg: "source", neq: "appsmith" }, + }, + variant: { + options: ["primary", "secondary", "tertiary"], + control: { type: "radio" }, + }, + }} + > + {Template.bind({})} + </Story> +</Canvas> diff --git a/app/client/packages/design-system/widgets/src/components/TestComponent/TestColorComponent.tsx b/app/client/packages/design-system/widgets/src/components/TestComponent/TestColorComponent.tsx new file mode 100644 index 000000000000..305d2a9ef57f --- /dev/null +++ b/app/client/packages/design-system/widgets/src/components/TestComponent/TestColorComponent.tsx @@ -0,0 +1,199 @@ +import React from "react"; +import { + ThemeProvider, + TokensAccessor, + LightModeTheme, + DarkModeTheme, +} from "@design-system/theming"; +import Color from "colorjs.io"; +import { Text } from "../Text"; +import { StyledTestCmp } from "./index.styled"; +import { COLORS as appsmithColors } from "./colors"; + +const clean = (value: number) => { + return Math.round(parseFloat((value * 10 ** 3).toFixed(3))) / 10 ** 3; +}; + +const getColorString = (color: Color, colorSpace: "oklch" | "hex") => { + if (colorSpace === "oklch") { + const lch = color.oklch; + return `${clean(lch.l)} ${clean(lch.c)} ${clean(lch.h)}`; + } + + return color.toString({ format: "hex" }); +}; + +const getTestObj = (steps: number, source: "oklch" | "hex") => { + const obj = {}; + const LRatio = 1 / (steps - 1); + const CRatio = 0.4 / (steps - 1); + const HRatio = 360 / (steps - 1); + + for (let i = 0; i < steps; i++) { + // @ts-expect-error for some reason + obj[i] = {}; + for (let k = 0; k < steps; k++) { + const l = clean(k * LRatio); + const c = clean(k * CRatio); + const h = clean(i * HRatio); + + const color = new Color("#000") + .set("oklch.l", l) + .set("oklch.c", c) + .set("oklch.h", h); + // @ts-expect-error for some reason + obj[i][`${l} ${c} ${h}`] = + source === "oklch" ? color : color.toString({ format: "hex" }); + } + } + + return obj; +}; + +export const TestColorComponent = (props: any) => { + const { + children, + colorMode, + colorSpace, + isActive, + isDisabled, + isFocused, + isHovered, + size, + source, + steps, + variant, + } = props; + + const currentSize = source === "appsmith" ? "small" : size; + + const columns = () => { + return source === "appsmith" ? 10 : steps; + }; + + const COLORS = + source === "appsmith" ? appsmithColors : getTestObj(columns(), source); + + const secondColorName = () => { + if (variant === "primary") { + switch (true) { + case isActive: + return "bgAccentActive"; + case isHovered: + return "bgAccentHover"; + default: + return "bgAccent"; + } + } + + switch (true) { + case isActive: + return "bgAccentSubtleActive"; + case isHovered: + return "bgAccentSubtleHover"; + default: + return "bgAccent"; + } + }; + + return ( + <div> + first line — seedColor + <br /> + second line — {secondColorName()} + <div + style={{ + display: "grid", + gridTemplateColumns: `repeat(${columns()}, 1fr)`, + gap: `${currentSize === "small" ? "8px" : "20px"}`, + padding: `${currentSize === "small" ? "8px" : "20px"}`, + background: "#fff", + marginTop: "12px", + }} + > + {Object.keys(COLORS).map((colorKey) => { + // @ts-expect-error for some reason + return Object.keys(COLORS[colorKey]).map((colorNestedKey) => { + // @ts-expect-error for some reason + const seedColor = COLORS[colorKey][colorNestedKey]; + + const tokensAccessor = new TokensAccessor({ + seedColor, + colorMode: colorMode, + }); + + const tokens = + colorMode === "light" || colorMode === undefined + ? new LightModeTheme(seedColor) + : new DarkModeTheme(seedColor); + + const getSeed = () => { + // @ts-expect-error color is private + return getColorString(tokens.seedColor, colorSpace); + }; + + const getDerived = () => { + if (variant === "primary") { + switch (true) { + case isActive: + // @ts-expect-error color is private + return getColorString(tokens.bgAccentActive, colorSpace); + case isHovered: + // @ts-expect-error color is private + return getColorString(tokens.bgAccentHover, colorSpace); + default: + // @ts-expect-error color is private + return getColorString(tokens.bgAccent, colorSpace); + } + } + + switch (true) { + case isActive: + return getColorString( + // @ts-expect-error color is private + tokens.bgAccentSubtleActive, + colorSpace, + ); + case isHovered: + // @ts-expect-error color is private + return getColorString(tokens.bgAccentSubtleHover, colorSpace); + default: + // @ts-expect-error color is private + return getColorString(tokens.bgAccent, colorSpace); + } + }; + + return ( + <ThemeProvider + key={seedColor} + theme={tokensAccessor.getAllTokens()} + > + <div + style={{ + padding: `${currentSize === "small" ? "12px" : "90px"}`, + background: "var(--color-bg)", + }} + > + <StyledTestCmp + data-active={isActive ? "" : undefined} + data-disabled={isDisabled ? "" : undefined} + data-focused={isFocused ? "" : undefined} + data-hovered={isHovered ? "" : undefined} + data-variant={variant} + > + <Text capHeight={6.5} lineClamp={2}> + {children({ + seed: getSeed(), + derived: getDerived(), + })} + </Text> + </StyledTestCmp> + </div> + </ThemeProvider> + ); + }); + })} + </div> + </div> + ); +}; diff --git a/app/client/packages/design-system/widgets/src/components/TestComponent/TestComponent.tsx b/app/client/packages/design-system/widgets/src/components/TestComponent/TestComponent.tsx deleted file mode 100644 index be20017e8d50..000000000000 --- a/app/client/packages/design-system/widgets/src/components/TestComponent/TestComponent.tsx +++ /dev/null @@ -1,45 +0,0 @@ -import React from "react"; -import { ThemeProvider, TokensAccessor } from "@design-system/theming"; -import { COLORS } from "./colors"; - -export const TestComponent = (props: any) => { - const { children, colorMode } = props; - - return ( - <div - style={{ - display: "grid", - gridTemplateColumns: "repeat(10, 1fr)", - gap: "10px", - }} - > - {Object.keys(COLORS).map((colorKey) => { - // @ts-expect-error for some reason - return Object.keys(COLORS[colorKey]).map((colorNestedKey) => { - const tokensAccessor = new TokensAccessor({ - // @ts-expect-error for some reason - seedColor: COLORS[colorKey][colorNestedKey], - colorMode: colorMode, - }); - - return ( - <ThemeProvider - // @ts-expect-error for some reason - key={COLORS[colorKey][colorNestedKey]} - theme={tokensAccessor.getAllTokens()} - > - <div - style={{ - padding: "20px", - background: "var(--color-bg)", - }} - > - {children} - </div> - </ThemeProvider> - ); - }); - })} - </div> - ); -}; diff --git a/app/client/packages/design-system/widgets/src/components/TestComponent/index.styled.tsx b/app/client/packages/design-system/widgets/src/components/TestComponent/index.styled.tsx new file mode 100644 index 000000000000..8ceee0975601 --- /dev/null +++ b/app/client/packages/design-system/widgets/src/components/TestComponent/index.styled.tsx @@ -0,0 +1,71 @@ +import styled from "styled-components"; + +//Most of the styles are copied from the button for testing purposes +export const StyledTestCmp = styled.button` + font-size: 12px; + min-height: calc(var(--sizing-root-unit) * 10); + min-width: calc(var(--sizing-root-unit) * 27); + cursor: pointer; + border-radius: var(--border-radius-1); + outline: 0; + + &[data-variant="primary"] { + background-color: var(--color-bg-accent); + color: var(--color-fg-on-accent); + border-color: transparent; + + &[data-hovered], + &:hover { + background-color: var(--color-bg-accent-hover); + } + + &[data-active], + &:active { + background-color: var(--color-bg-accent-active); + } + } + + &[data-variant="secondary"] { + background-color: transparent; + color: var(--color-fg-accent); + border-color: var(--color-bd-accent); + border-width: var(--border-width-1); + + &[data-hovered], + &:hover { + background-color: var(--color-bg-accent-subtle-hover); + } + + &[data-active], + &:active { + background-color: var(--color-bg-accent-subtle-active); + } + } + + &[data-variant="tertiary"] { + background: transparent; + color: var(--color-fg-accent); + border-color: transparent; + border-width: 0; + + &[data-hovered], + &:hover { + background: var(--color-bg-accent-subtle-hover); + } + + &[data-active], + &:active { + background: var(--color-bg-accent-subtle-active); + } + } + + &[data-focused], + &:focus-visible { + box-shadow: 0 0 0 2px var(--color-bg), 0 0 0 4px var(--color-bd-focus); + } + + &[data-disabled] { + pointer-events: none; + opacity: var(--opacity-disabled); + } +`; diff --git a/app/client/packages/storybook/.storybook/decorators/resizor.js b/app/client/packages/storybook/.storybook/decorators/resizor.js deleted file mode 100644 index 1ff9d86e7f14..000000000000 --- a/app/client/packages/storybook/.storybook/decorators/resizor.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from "react"; - -export const resizor = (Story, args) => { - const { parameters } = args; - - return ( - <div - style={{ - width: parameters.width, - height: parameters.height, - }} - > - <Story /> - </div> - ); -}; diff --git a/app/client/packages/storybook/.storybook/decorators/theming.js b/app/client/packages/storybook/.storybook/decorators/theming.js index 434d57032a2e..17a631bdcc84 100644 --- a/app/client/packages/storybook/.storybook/decorators/theming.js +++ b/app/client/packages/storybook/.storybook/decorators/theming.js @@ -5,14 +5,14 @@ import { ThemeProvider, TokensAccessor, defaultTokens, - parse, } from "@design-system/theming"; import { createGlobalFontStack } from "@design-system/widgets"; +import Color from "colorjs.io"; const StyledThemeProvider = styled(ThemeProvider)` - display: flex; - width: 100%; - height: 100%; + display: inline-flex; + min-width: 100%; + min-height: 100%; padding: 16px; align-items: center; justify-content: center; @@ -49,7 +49,7 @@ export const theming = (Story, args) => { let color; try { - color = parse(args.globals.accentColor); + color = Color.parse(args.globals.accentColor); } catch (error) { console.error(error); } @@ -80,19 +80,6 @@ export const theming = (Story, args) => { } }, [args.globals.colorMode]); - useEffect(() => { - if (args.globals.colorScheme) { - tokensAccessor.updateColorScheme(args.globals.colorScheme); - - setTheme((prevState) => { - return { - ...prevState, - ...tokensAccessor.getColors(), - }; - }); - } - }, [args.globals.colorScheme]); - useEffect(() => { if (args.globals.borderRadius) { tokensAccessor.updateBorderRadius({ diff --git a/app/client/packages/storybook/.storybook/preview.js b/app/client/packages/storybook/.storybook/preview.js index fe88ae037f2b..d421ba81c37a 100644 --- a/app/client/packages/storybook/.storybook/preview.js +++ b/app/client/packages/storybook/.storybook/preview.js @@ -1,6 +1,4 @@ -import { resizor } from "./decorators/resizor"; import { theming } from "./decorators/theming"; - import "./styles.css"; export const parameters = { @@ -17,4 +15,4 @@ export const parameters = { layout: "centered", }; -export const decorators = [resizor, theming]; +export const decorators = [theming];
e805d5084b4203b07feea0c7e675e1fda65c69a9
2024-03-21 22:08:58
albinAppsmith
fix: OOM issue (#31995)
false
OOM issue (#31995)
fix
diff --git a/app/client/.fork-ts-checkerrc b/app/client/.fork-ts-checkerrc new file mode 100644 index 000000000000..2ba8f96d96f7 --- /dev/null +++ b/app/client/.fork-ts-checkerrc @@ -0,0 +1,5 @@ +{ + typescript: { + memoryLimit: 4096, + } +}
989086337a2f77191d925624d6bd55fa36294402
2022-02-23 15:36:40
f0c1s
chore: reformat code in rts/ service (#11309)
false
reformat code in rts/ service (#11309)
chore
diff --git a/app/rts/src/models.ts b/app/rts/src/models.ts index 435768e7c8f1..0b6ba58e8b12 100644 --- a/app/rts/src/models.ts +++ b/app/rts/src/models.ts @@ -10,37 +10,37 @@ export class AppUser { export class CurrentEditorsEvent { resourceId: string; - users: AppUser []; + users: AppUser[]; - constructor(resourceId: string, users: AppUser []) { + constructor(resourceId: string, users: AppUser[]) { this.resourceId = resourceId; this.users = users; } } export class MousePointerEvent { - pageId: string - socketId: string - user: AppUser - data: object + pageId: string; + socketId: string; + user: AppUser; + data: object; } export interface Policy { - permission: string - users: string[] - groups: string[] + permission: string; + users: string[]; + groups: string[]; } export interface CommentThread { - applicationId: string + applicationId: string; } export interface Comment { - threadId: string - policies: Policy[] - createdAt: string - updatedAt: string - creationTime: string - updationTime: string - deleted: boolean -} \ No newline at end of file + threadId: string; + policies: Policy[]; + createdAt: string; + updatedAt: string; + creationTime: string; + updationTime: string; + deleted: boolean; +} diff --git a/app/rts/src/server.ts b/app/rts/src/server.ts index ef1b23d11114..3b2ee647a98a 100644 --- a/app/rts/src/server.ts +++ b/app/rts/src/server.ts @@ -1,395 +1,394 @@ -import http from "http" -import path from "path" -import express from "express" -import { Server, Socket } from "socket.io" -import { MongoClient, ObjectId } from "mongodb" -import type mongodb from "mongodb" -import axios from "axios" -import { LogLevelDesc } from "loglevel"; -import log from "loglevel"; - -import { AppUser, CurrentEditorsEvent, Policy, Comment, CommentThread, MousePointerEvent } from "./models" -import { VERSION as buildVersion } from "./version" // release version of the api - -const RTS_BASE_PATH = "/rts" - -const APP_ROOM_PREFIX = "app:" -const PAGE_ROOM_PREFIX = "page:" -const ROOT_NAMESPACE = "/" -const PAGE_EDIT_NAMESPACE = "/page/edit" - -const EDITORS_EVENT_NAME = "collab:online_editors" -const START_EDIT_EVENT_NAME = "collab:start_edit" -const LEAVE_EDIT_EVENT_NAME = "collab:leave_edit" -const MOUSE_POINTER_EVENT_NAME = "collab:mouse_pointer" -const RELEASE_VERSION_EVENT_NAME = "info:release_version" +import http from "http"; +import path from "path"; +import express from "express"; +import {Server, Socket} from "socket.io"; +import type mongodb from "mongodb"; +import {MongoClient} from "mongodb"; +import axios from "axios"; +import log, {LogLevelDesc} from "loglevel"; + +import {AppUser, Comment, CommentThread, CurrentEditorsEvent, MousePointerEvent, Policy} from "./models"; +import {VERSION as buildVersion} from "./version"; // release version of the api + +const RTS_BASE_PATH = "/rts"; + +const APP_ROOM_PREFIX = "app:"; +const PAGE_ROOM_PREFIX = "page:"; +const ROOT_NAMESPACE = "/"; +const PAGE_EDIT_NAMESPACE = "/page/edit"; + +const EDITORS_EVENT_NAME = "collab:online_editors"; +const START_EDIT_EVENT_NAME = "collab:start_edit"; +const LEAVE_EDIT_EVENT_NAME = "collab:leave_edit"; +const MOUSE_POINTER_EVENT_NAME = "collab:mouse_pointer"; +const RELEASE_VERSION_EVENT_NAME = "info:release_version"; // Setting the logLevel for all log messages -const logLevel : LogLevelDesc = (process.env.APPSMITH_LOG_LEVEL || "debug") as LogLevelDesc +const logLevel: LogLevelDesc = (process.env.APPSMITH_LOG_LEVEL || "debug") as LogLevelDesc; log.setLevel(logLevel); -const MONGODB_URI = process.env.APPSMITH_MONGODB_URI +const MONGODB_URI = process.env.APPSMITH_MONGODB_URI; if (MONGODB_URI == null || MONGODB_URI === "" || !MONGODB_URI.startsWith("mongodb")) { - log.error("Please provide a valid value for `APPSMITH_MONGODB_URI`.") - process.exit(1) + log.error("Please provide a valid value for `APPSMITH_MONGODB_URI`."); + process.exit(1); } -const API_BASE_URL = process.env.APPSMITH_API_BASE_URL +const API_BASE_URL = process.env.APPSMITH_API_BASE_URL; if (API_BASE_URL == null || API_BASE_URL === "") { - log.error("Please provide a valid value for `APPSMITH_API_BASE_URL`.") - process.exit(1) + log.error("Please provide a valid value for `APPSMITH_API_BASE_URL`."); + process.exit(1); } -main() +main(); function main() { - const app = express() - //Disable x-powered-by header to prevent information disclosure - app.disable("x-powered-by"); - const server = new http.Server(app) - const io = new Server(server, { - path: RTS_BASE_PATH, - // TODO: Remove this CORS configuration. - cors: { - origin: "*", - }, - }) - - const port = 8091 - - app.get("/", (req, res) => { - res.redirect("/index.html") - }) - - io.on("connection", (socket: Socket) => { - socket.emit(RELEASE_VERSION_EVENT_NAME, buildVersion) - subscribeToEditEvents(socket, APP_ROOM_PREFIX) - onAppSocketConnected(socket) - .catch((error) => log.error("Error in socket connected handler", error)) - }) - - io.of(PAGE_EDIT_NAMESPACE).on("connection", (socket: Socket) => { - subscribeToEditEvents(socket, PAGE_ROOM_PREFIX); - onPageSocketConnected(socket, io) - .catch((error) => log.error("Error in socket connected handler", error)) - }); - - io.of(ROOT_NAMESPACE).adapter.on("leave-room", (room, id) => { - if(room.startsWith(APP_ROOM_PREFIX)) { - log.debug(`ns:${ROOT_NAMESPACE}# socket ${id} left the room ${room}`) - } - sendCurrentUsers(io, room, APP_ROOM_PREFIX); - }); - - io.of(ROOT_NAMESPACE).adapter.on("join-room", (room, id) => { - if(room.startsWith(APP_ROOM_PREFIX)) { - log.debug(`ns:${ROOT_NAMESPACE}# socket ${id} joined the room ${room}`) - } - sendCurrentUsers(io, room, APP_ROOM_PREFIX); - }); - - io.of(PAGE_EDIT_NAMESPACE).adapter.on("leave-room", (room, id) => { - if(room.startsWith(PAGE_ROOM_PREFIX)) { // someone left the page edit, notify others - log.debug(`ns:${PAGE_EDIT_NAMESPACE} # socket ${id} left the room ${room}`) - io.of(PAGE_EDIT_NAMESPACE).to(room).emit(LEAVE_EDIT_EVENT_NAME, id); - } - sendCurrentUsers(io.of(PAGE_EDIT_NAMESPACE), room, PAGE_ROOM_PREFIX); - }); - - io.of(PAGE_EDIT_NAMESPACE).adapter.on("join-room", (room, id) => { - if(room.startsWith(PAGE_ROOM_PREFIX)) { - log.debug(`ns:${PAGE_EDIT_NAMESPACE}# socket ${id} joined the room ${room}`) - } - sendCurrentUsers(io.of(PAGE_EDIT_NAMESPACE), room, PAGE_ROOM_PREFIX); - }); - - app.use(express.static(path.join(__dirname, "static"))) - - watchMongoDB(io).catch((error) => log.error("Error watching MongoDB", error)) - - // run the server - server.listen(port, () => { - log.info(`RTS version ${buildVersion} running at http://localhost:${port}`) - }) + const app = express(); + //Disable x-powered-by header to prevent information disclosure + app.disable("x-powered-by"); + const server = new http.Server(app); + const io = new Server(server, { + path: RTS_BASE_PATH, + // TODO: Remove this CORS configuration. + cors: { + origin: "*", + }, + }); + + const port = 8091; + + app.get("/", (req, res) => { + res.redirect("/index.html"); + }); + + io.on("connection", (socket: Socket) => { + socket.emit(RELEASE_VERSION_EVENT_NAME, buildVersion); + subscribeToEditEvents(socket, APP_ROOM_PREFIX); + onAppSocketConnected(socket) + .catch((error) => log.error("Error in socket connected handler", error)); + }); + + io.of(PAGE_EDIT_NAMESPACE).on("connection", (socket: Socket) => { + subscribeToEditEvents(socket, PAGE_ROOM_PREFIX); + onPageSocketConnected(socket, io) + .catch((error) => log.error("Error in socket connected handler", error)); + }); + + io.of(ROOT_NAMESPACE).adapter.on("leave-room", (room, id) => { + if (room.startsWith(APP_ROOM_PREFIX)) { + log.debug(`ns:${ROOT_NAMESPACE}# socket ${id} left the room ${room}`); + } + sendCurrentUsers(io, room, APP_ROOM_PREFIX); + }); + + io.of(ROOT_NAMESPACE).adapter.on("join-room", (room, id) => { + if (room.startsWith(APP_ROOM_PREFIX)) { + log.debug(`ns:${ROOT_NAMESPACE}# socket ${id} joined the room ${room}`); + } + sendCurrentUsers(io, room, APP_ROOM_PREFIX); + }); + + io.of(PAGE_EDIT_NAMESPACE).adapter.on("leave-room", (room, id) => { + if (room.startsWith(PAGE_ROOM_PREFIX)) { // someone left the page edit, notify others + log.debug(`ns:${PAGE_EDIT_NAMESPACE} # socket ${id} left the room ${room}`); + io.of(PAGE_EDIT_NAMESPACE).to(room).emit(LEAVE_EDIT_EVENT_NAME, id); + } + sendCurrentUsers(io.of(PAGE_EDIT_NAMESPACE), room, PAGE_ROOM_PREFIX); + }); + + io.of(PAGE_EDIT_NAMESPACE).adapter.on("join-room", (room, id) => { + if (room.startsWith(PAGE_ROOM_PREFIX)) { + log.debug(`ns:${PAGE_EDIT_NAMESPACE}# socket ${id} joined the room ${room}`); + } + sendCurrentUsers(io.of(PAGE_EDIT_NAMESPACE), room, PAGE_ROOM_PREFIX); + }); + + app.use(express.static(path.join(__dirname, "static"))); + + watchMongoDB(io).catch((error) => log.error("Error watching MongoDB", error)); + + // run the server + server.listen(port, () => { + log.info(`RTS version ${buildVersion} running at http://localhost:${port}`); + }); } -function joinEditRoom(socket:Socket, roomId:string, roomPrefix:string) { - // remove this socket from any other rooms with roomPrefix - if(socket.rooms) { - socket.rooms.forEach(roomName => { - if(roomName.startsWith(roomPrefix)) { - socket.leave(roomName); - } - }); - } - - // add this socket to room with application id - let roomName = roomPrefix + roomId; - socket.join(roomName); +function joinEditRoom(socket: Socket, roomId: string, roomPrefix: string) { + // remove this socket from any other rooms with roomPrefix + if (socket.rooms) { + socket.rooms.forEach(roomName => { + if (roomName.startsWith(roomPrefix)) { + socket.leave(roomName); + } + }); + } + + // add this socket to room with application id + let roomName = roomPrefix + roomId; + socket.join(roomName); } -function subscribeToEditEvents(socket:Socket, appRoomPrefix:string) { - socket.on(START_EDIT_EVENT_NAME, (resourceId) => { - if(socket.data.email) { // user is authenticated, join the room now - joinEditRoom(socket, resourceId, appRoomPrefix) - } else { // user not authenticated yet, save the resource id and room prefix to join later after auth - socket.data.pendingRoomId = resourceId - socket.data.pendingRoomPrefix = appRoomPrefix - } - }); - - socket.on(LEAVE_EDIT_EVENT_NAME, (resourceId) => { - let roomName = appRoomPrefix + resourceId; - socket.leave(roomName); // remove this socket from room - }); +function subscribeToEditEvents(socket: Socket, appRoomPrefix: string) { + socket.on(START_EDIT_EVENT_NAME, (resourceId) => { + if (socket.data.email) { // user is authenticated, join the room now + joinEditRoom(socket, resourceId, appRoomPrefix); + } else { // user not authenticated yet, save the resource id and room prefix to join later after auth + socket.data.pendingRoomId = resourceId; + socket.data.pendingRoomPrefix = appRoomPrefix; + } + }); + + socket.on(LEAVE_EDIT_EVENT_NAME, (resourceId) => { + let roomName = appRoomPrefix + resourceId; + socket.leave(roomName); // remove this socket from room + }); } -async function onAppSocketConnected(socket:Socket) { - let isAuthenticated = await tryAuth(socket) - if(isAuthenticated) { - socket.join("email:" + socket.data.email) - } +async function onAppSocketConnected(socket: Socket) { + let isAuthenticated = await tryAuth(socket); + if (isAuthenticated) { + socket.join("email:" + socket.data.email); + } } -async function onPageSocketConnected(socket:Socket, socketIo:Server) { - let isAuthenticated = await tryAuth(socket) - if(isAuthenticated) { - socket.on(MOUSE_POINTER_EVENT_NAME, (event:MousePointerEvent) => { - event.user = new AppUser(socket.data.name, socket.data.email) - event.socketId = socket.id - socketIo.of(PAGE_EDIT_NAMESPACE).to(PAGE_ROOM_PREFIX+event.pageId).emit(MOUSE_POINTER_EVENT_NAME, event); - }); - } +async function onPageSocketConnected(socket: Socket, socketIo: Server) { + let isAuthenticated = await tryAuth(socket); + if (isAuthenticated) { + socket.on(MOUSE_POINTER_EVENT_NAME, (event: MousePointerEvent) => { + event.user = new AppUser(socket.data.name, socket.data.email); + event.socketId = socket.id; + socketIo.of(PAGE_EDIT_NAMESPACE).to(PAGE_ROOM_PREFIX + event.pageId).emit(MOUSE_POINTER_EVENT_NAME, event); + }); + } } -async function tryAuth(socket:Socket) { - - /* ********************************************************* */ - // TODO: This change is not being used at the moment. Instead of using the environment variable API_BASE_URL - // we should be able to derive the API_BASE_URL from the host header. This will make configuration simpler - // for the user. The problem with this implementation is that Axios doesn't work for https endpoints currently. - // This needs to be debugged. - /* ********************************************************* */ - - // const host = socket.handshake.headers.host; - const connectionCookie = socket.handshake.headers.cookie; - if (connectionCookie !== null && connectionCookie !== "") { - const matchedCookie = connectionCookie.match(/\bSESSION=\S+/) - if(matchedCookie) { - const sessionCookie = matchedCookie[0] - let response - try { - response = await axios.request({ - method: "GET", - url: API_BASE_URL + "/users/me", - headers: { - Cookie: sessionCookie, - }, - }) - } catch (error) { - if (error.response?.status === 401) { - console.info("401 received when authenticating user with cookie: " + sessionCookie) - } else if(error.response) { - log.error("Error response received while authentication: ", error.response) - } else { - log.error("Error authenticating", error) - } - return false - } - - const email = response.data.data.email - const name = response.data.data.name ? response.data.data.name : email; - - // If the session check API succeeds & the email/name is anonymousUser, then the user is not authenticated - // and we should not allow them to join any rooms - if (email === "anonymousUser" || name === "anonymousUser") { - return false; - } - - socket.data.email = email - socket.data.name = name - - if(socket.data.pendingRoomId) { // an appId or pageId is pending for this socket, join now - joinEditRoom(socket, socket.data.pendingRoomId, socket.data.pendingRoomPrefix); - } - return true - } - } - return false +async function tryAuth(socket: Socket) { + + /* ********************************************************* */ + // TODO: This change is not being used at the moment. Instead of using the environment variable API_BASE_URL + // we should be able to derive the API_BASE_URL from the host header. This will make configuration simpler + // for the user. The problem with this implementation is that Axios doesn't work for https endpoints currently. + // This needs to be debugged. + /* ********************************************************* */ + + // const host = socket.handshake.headers.host; + const connectionCookie = socket.handshake.headers.cookie; + if (connectionCookie !== null && connectionCookie !== "") { + const matchedCookie = connectionCookie.match(/\bSESSION=\S+/); + if (matchedCookie) { + const sessionCookie = matchedCookie[0]; + let response; + try { + response = await axios.request({ + method: "GET", + url: API_BASE_URL + "/users/me", + headers: { + Cookie: sessionCookie, + }, + }); + } catch (error) { + if (error.response?.status === 401) { + console.info("401 received when authenticating user with cookie: " + sessionCookie); + } else if (error.response) { + log.error("Error response received while authentication: ", error.response); + } else { + log.error("Error authenticating", error); + } + return false; + } + + const email = response.data.data.email; + const name = response.data.data.name ? response.data.data.name : email; + + // If the session check API succeeds & the email/name is anonymousUser, then the user is not authenticated + // and we should not allow them to join any rooms + if (email === "anonymousUser" || name === "anonymousUser") { + return false; + } + + socket.data.email = email; + socket.data.name = name; + + if (socket.data.pendingRoomId) { // an appId or pageId is pending for this socket, join now + joinEditRoom(socket, socket.data.pendingRoomId, socket.data.pendingRoomPrefix); + } + return true; + } + } + return false; } async function watchMongoDB(io) { - const client = await MongoClient.connect(MONGODB_URI, { useUnifiedTopology: true }); - const db = client.db() - - const threadCollection: mongodb.Collection<CommentThread> = db.collection("commentThread") - - const commentChangeStream = db.collection("comment").watch( - [ - // Prevent server-internal fields from being sent to the client. - { - $unset: [ - "deletedAt", - "_class", - ].map(f => "fullDocument." + f) - }, - ], - { fullDocument: "updateLookup" } - ); - - commentChangeStream.on("change", async (event: mongodb.ChangeEventCR<Comment>) => { - let eventName = event.operationType + ":" + event.ns.coll - - const comment: Comment = event.fullDocument - if(comment.deleted) { - eventName = 'delete' + ":" + event.ns.coll // emit delete event if deleted=true - } - - comment.creationTime = comment.createdAt - comment.updationTime = comment.updatedAt - - delete comment.createdAt - delete comment.updatedAt - delete comment.deleted - - let target = io - let shouldEmit = false - - for (const email of findPolicyEmails(comment.policies, "read:comments")) { - shouldEmit = true - target = target.to("email:" + email) - } - - if (shouldEmit) { - target.emit(eventName, { comment }) - } - }) - - const threadChangeStream = threadCollection.watch( - [ - // Prevent server-internal fields from being sent to the client. - { - $unset: [ - "deletedAt", - "_class", - ].map(f => "fullDocument." + f) - }, - ], - { fullDocument: "updateLookup" } - ); - - threadChangeStream.on("change", async (event: mongodb.ChangeEventCR) => { - let eventName = event.operationType + ":" + event.ns.coll - - const thread = event.fullDocument - if(thread.deleted) { - eventName = 'delete' + ":" + event.ns.coll // emit delete event if deleted=true - } - - if (thread === null) { - // This happens when `event.operationType === "drop"`, when a comment is deleted. - log.error("Null document recieved for comment change event", event) - return - } - - thread.creationTime = thread.createdAt - thread.updationTime = thread.updatedAt - - delete thread.createdAt - delete thread.updatedAt - delete thread.deleted - - thread.isViewed = false - - let target = io - let shouldEmit = false - - for (const email of findPolicyEmails(thread.policies, "read:commentThreads")) { - shouldEmit = true - target = target.to("email:" + email) - } - - if (shouldEmit) { - target.emit(eventName, { thread }) - } - }) - - const notificationsStream = db.collection("notification").watch( - [ - // Prevent server-internal fields from being sent to the client. - { - $unset: [ - "deletedAt", - "deleted", - ].map(f => "fullDocument." + f) - }, - ], - { fullDocument: "updateLookup" } - ); - - notificationsStream.on("change", async (event: mongodb.ChangeEventCR) => { - const notification = event.fullDocument - - if (notification === null) { - // This happens when `event.operationType === "drop"`, when a notification is deleted. - log.error("Null document recieved for notification change event", event) - return - } - - // set the type from _class attribute - notification.type = notification._class.substr(notification._class.lastIndexOf(".") + 1) - delete notification._class - - const eventName = event.operationType + ":" + event.ns.coll - io.to("email:" + notification.forUsername).emit(eventName, { notification }) - }) - - process.on('uncaughtExceptionMonitor', (err, origin) => { - log.error(`Caught exception: ${err}\n` + `Exception origin: ${origin}`); - }); - - process.on('unhandledRejection', (reason, promise) => { - log.debug('Unhandled Rejection at:', promise, 'reason:', reason); - }); - - process.on("exit", () => { - (commentChangeStream != null ? commentChangeStream.close() : Promise.bind(client).resolve()) - .then(client.close.bind(client)) - .finally("Fin") - }) - - log.debug("Watching MongoDB") + const client = await MongoClient.connect(MONGODB_URI, {useUnifiedTopology: true}); + const db = client.db(); + + const threadCollection: mongodb.Collection<CommentThread> = db.collection("commentThread"); + + const commentChangeStream = db.collection("comment").watch( + [ + // Prevent server-internal fields from being sent to the client. + { + $unset: [ + "deletedAt", + "_class", + ].map(f => "fullDocument." + f) + }, + ], + {fullDocument: "updateLookup"} + ); + + commentChangeStream.on("change", async (event: mongodb.ChangeEventCR<Comment>) => { + let eventName = event.operationType + ":" + event.ns.coll; + + const comment: Comment = event.fullDocument; + if (comment.deleted) { + eventName = 'delete' + ":" + event.ns.coll; // emit delete event if deleted=true + } + + comment.creationTime = comment.createdAt; + comment.updationTime = comment.updatedAt; + + delete comment.createdAt; + delete comment.updatedAt; + delete comment.deleted; + + let target = io; + let shouldEmit = false; + + for (const email of findPolicyEmails(comment.policies, "read:comments")) { + shouldEmit = true; + target = target.to("email:" + email); + } + + if (shouldEmit) { + target.emit(eventName, {comment}); + } + }); + + const threadChangeStream = threadCollection.watch( + [ + // Prevent server-internal fields from being sent to the client. + { + $unset: [ + "deletedAt", + "_class", + ].map(f => "fullDocument." + f) + }, + ], + {fullDocument: "updateLookup"} + ); + + threadChangeStream.on("change", async (event: mongodb.ChangeEventCR) => { + let eventName = event.operationType + ":" + event.ns.coll; + + const thread = event.fullDocument; + if (thread.deleted) { + eventName = 'delete' + ":" + event.ns.coll; // emit delete event if deleted=true + } + + if (thread === null) { + // This happens when `event.operationType === "drop"`, when a comment is deleted. + log.error("Null document recieved for comment change event", event); + return; + } + + thread.creationTime = thread.createdAt; + thread.updationTime = thread.updatedAt; + + delete thread.createdAt; + delete thread.updatedAt; + delete thread.deleted; + + thread.isViewed = false; + + let target = io; + let shouldEmit = false; + + for (const email of findPolicyEmails(thread.policies, "read:commentThreads")) { + shouldEmit = true; + target = target.to("email:" + email); + } + + if (shouldEmit) { + target.emit(eventName, {thread}); + } + }); + + const notificationsStream = db.collection("notification").watch( + [ + // Prevent server-internal fields from being sent to the client. + { + $unset: [ + "deletedAt", + "deleted", + ].map(f => "fullDocument." + f) + }, + ], + {fullDocument: "updateLookup"} + ); + + notificationsStream.on("change", async (event: mongodb.ChangeEventCR) => { + const notification = event.fullDocument; + + if (notification === null) { + // This happens when `event.operationType === "drop"`, when a notification is deleted. + log.error("Null document recieved for notification change event", event); + return; + } + + // set the type from _class attribute + notification.type = notification._class.substr(notification._class.lastIndexOf(".") + 1); + delete notification._class; + + const eventName = event.operationType + ":" + event.ns.coll; + io.to("email:" + notification.forUsername).emit(eventName, {notification}); + }); + + process.on('uncaughtExceptionMonitor', (err, origin) => { + log.error(`Caught exception: ${err}\n` + `Exception origin: ${origin}`); + }); + + process.on('unhandledRejection', (reason, promise) => { + log.debug('Unhandled Rejection at:', promise, 'reason:', reason); + }); + + process.on("exit", () => { + (commentChangeStream != null ? commentChangeStream.close() : Promise.bind(client).resolve()) + .then(client.close.bind(client)) + .finally("Fin"); + }); + + log.debug("Watching MongoDB"); } function findPolicyEmails(policies: Policy[], permission: string): string[] { - const emails: string[] = [] - for (const policy of policies) { - if (policy.permission === permission) { - for (const email of policy.users) { - emails.push(email) - } - break - } - } - return emails + const emails: string[] = []; + for (const policy of policies) { + if (policy.permission === permission) { + for (const email of policy.users) { + emails.push(email); + } + break; + } + } + return emails; } -function sendCurrentUsers(socketIo, roomName:string, roomPrefix:string) { - if(roomName.startsWith(roomPrefix)) { - socketIo.in(roomName).fetchSockets().then(sockets => { - let onlineUsernames = new Set<string>(); - let onlineUsers = new Array<AppUser>(); - if(sockets) { - sockets.forEach(s => { - if(!onlineUsernames.has(s.data.email)) { - onlineUsers.push(new AppUser(s.data.name, s.data.email)); - } - onlineUsernames.add(s.data.email); - }); - } - let resourceId = roomName.replace(roomPrefix, "") // get resourceId from room name by removing the prefix - let response = new CurrentEditorsEvent(resourceId, onlineUsers); - socketIo.to(roomName).emit(EDITORS_EVENT_NAME, response); - }); - } +function sendCurrentUsers(socketIo, roomName: string, roomPrefix: string) { + if (roomName.startsWith(roomPrefix)) { + socketIo.in(roomName).fetchSockets().then(sockets => { + let onlineUsernames = new Set<string>(); + let onlineUsers = new Array<AppUser>(); + if (sockets) { + sockets.forEach(s => { + if (!onlineUsernames.has(s.data.email)) { + onlineUsers.push(new AppUser(s.data.name, s.data.email)); + } + onlineUsernames.add(s.data.email); + }); + } + let resourceId = roomName.replace(roomPrefix, ""); // get resourceId from room name by removing the prefix + let response = new CurrentEditorsEvent(resourceId, onlineUsers); + socketIo.to(roomName).emit(EDITORS_EVENT_NAME, response); + }); + } } diff --git a/app/rts/src/version.js b/app/rts/src/version.js index 5e0780e97438..009d8341d550 100644 --- a/app/rts/src/version.js +++ b/app/rts/src/version.js @@ -1 +1 @@ -export const VERSION = 'SNAPSHOT' +export const VERSION = "SNAPSHOT"; diff --git a/app/rts/tsconfig.json b/app/rts/tsconfig.json index 7f8cefa21cde..6537dc7618dd 100644 --- a/app/rts/tsconfig.json +++ b/app/rts/tsconfig.json @@ -1,12 +1,14 @@ { - "compilerOptions": { - "target": "es6", - "module": "commonjs", - "esModuleInterop": true, - "moduleResolution": "node", - "sourceMap": true, - "outDir": "dist", - "allowJs": true - }, - "lib": ["es2015"] + "compilerOptions": { + "target": "es6", + "module": "commonjs", + "esModuleInterop": true, + "moduleResolution": "node", + "sourceMap": true, + "outDir": "dist", + "allowJs": true + }, + "lib": [ + "es2015" + ] }
92993cccef3d3e1c2e023ee9663feeaee2299521
2024-01-23 05:43:16
Shrikant Sharat Kandula
chore: Remove unused services (#30292)
false
Remove unused services (#30292)
chore
diff --git a/.env.example b/.env.example index 6745c79a9c04..c67033888e8c 100644 --- a/.env.example +++ b/.env.example @@ -21,11 +21,6 @@ APPSMITH_SIGNUP_DISABLED= # Segment APPSMITH_SEGMENT_KEY= -# RapidAPI -APPSMITH_RAPID_API_KEY_VALUE= -APPSMITH_MARKETPLACE_ENABLED= - - # Algolia Search (Docs) APPSMITH_ALGOLIA_API_ID= APPSMITH_ALGOLIA_API_KEY= diff --git a/app/client/cypress/locators/apiWidgetslocator.json b/app/client/cypress/locators/apiWidgetslocator.json index 653f11c2d0f7..e6e04e1914e4 100644 --- a/app/client/cypress/locators/apiWidgetslocator.json +++ b/app/client/cypress/locators/apiWidgetslocator.json @@ -26,8 +26,6 @@ "createApiOnSideBar": "button:contains('Create new API')", "saveButton": "button:contains('Save')", "addHeader": ".t--addApiHeader svg", - "marketPlaceapi": ".t--eachProviderCard p", - "addPageButton": ".t--addToPageBtn", "apidocumentaionLink": ".t--apiDocumentationLink", "postbody": "(//div[contains(@class,'CodeMirror-wrap')]//textarea)[2]", "paginationTab": "//span[text()='Pagination']", diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js index 06f98facd584..68bfa3ae6110 100644 --- a/app/client/cypress/support/commands.js +++ b/app/client/cypress/support/commands.js @@ -923,10 +923,6 @@ Cypress.Commands.add("startServerAndRoutes", () => { "getAppPageEdit", ); cy.intercept("GET", "/api/v1/actions*").as("getActions"); - cy.intercept("GET", "api/v1/providers/categories").as("getCategories"); - cy.intercept("GET", "api/v1/import/templateCollections").as( - "getTemplateCollections", - ); cy.intercept("PUT", "/api/v1/pages/*").as("updatePage"); cy.intercept("PUT", "api/v1/applications/*/page/*/makeDefault").as( "makePageDefault", @@ -966,14 +962,6 @@ Cypress.Commands.add("startServerAndRoutes", () => { "curlImport", ); cy.intercept("DELETE", "/api/v1/actions/*").as("deleteAction"); - cy.intercept( - "GET", - "/api/v1/marketplace/providers?category=*&page=*&size=*", - ).as("get3PProviders"); - cy.intercept("GET", "/api/v1/marketplace/templates?providerId=*").as( - "get3PProviderTemplates", - ); - cy.intercept("POST", "/api/v1/items/addToPage").as("add3PApiToPage"); cy.intercept("GET", "/api/v1/plugins/*/form").as("getPluginForm"); cy.intercept("DELETE", "/api/v1/applications/*").as("deleteApplication"); diff --git a/app/client/docker/templates/nginx-app.conf.template b/app/client/docker/templates/nginx-app.conf.template index e262c8045c24..36ea3462c6a6 100644 --- a/app/client/docker/templates/nginx-app.conf.template +++ b/app/client/docker/templates/nginx-app.conf.template @@ -29,7 +29,6 @@ server { proxy_pass __APPSMITH_CLIENT_PROXY_PASS__; sub_filter __APPSMITH_SENTRY_DSN__ '${APPSMITH_SENTRY_DSN}'; sub_filter __APPSMITH_SMART_LOOK_ID__ '${APPSMITH_SMART_LOOK_ID}'; - sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '${APPSMITH_MARKETPLACE_ENABLED}'; sub_filter __APPSMITH_SEGMENT_KEY__ '${APPSMITH_SEGMENT_KEY}'; sub_filter __APPSMITH_ALGOLIA_API_ID__ '${APPSMITH_ALGOLIA_API_ID}'; sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME}'; diff --git a/app/client/jest.config.js b/app/client/jest.config.js index c3fdb861e14d..f054db071c04 100644 --- a/app/client/jest.config.js +++ b/app/client/jest.config.js @@ -78,7 +78,6 @@ module.exports = { smartLook: { id: parseConfig("__APPSMITH_SMART_LOOK_ID__"), }, - enableRapidAPI: parseConfig("__APPSMITH_MARKETPLACE_ENABLED__"), segment: { apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"), ceKey: parseConfig("__APPSMITH_SEGMENT_CE_KEY__"), diff --git a/app/client/public/index.html b/app/client/public/index.html index b6fb210eb8b8..16cfafaaf04a 100755 --- a/app/client/public/index.html +++ b/app/client/public/index.html @@ -27,14 +27,14 @@ config.indexOf("%") === 0 ) return ""; - + const result = config.trim(); if (result.toLowerCase() === "false" || result === "") { return false; } else if (result.toLowerCase() === "true") { return true; } - + return result; }; const CLOUD_HOSTING = parseConfig("__APPSMITH_CLOUD_HOSTING__"); @@ -44,7 +44,7 @@ NREUM = undefined </script> <script> - + const enableNewRelic=parseConfig("__APPSMITH_NEW_RELIC_ACCOUNT_ENABLE__"); //only when newRelic is enabled do we load the browser agent script if (!!enableNewRelic) { @@ -55,8 +55,8 @@ //we load the new relic browser agent script from our CDN. script.src = "https://assets.appsmith.com/newRelicBrowserAgent1.js"; script.onload = () => { - // we have defined and init function within the Browser agent script. - // This init fn gets assigned to a global var called NEW_RELIC_BROWSER_AGENT, when the script tag element loads + // we have defined and init function within the Browser agent script. + // This init fn gets assigned to a global var called NEW_RELIC_BROWSER_AGENT, when the script tag element loads // we call the init fn with all env vars. Through this step browser agent has the required license key to push telemetry info to new relic. NEW_RELIC_BROWSER_AGENT && NEW_RELIC_BROWSER_AGENT.init([accountId,applicationId,browserAgentlicenseKey]); }; @@ -265,7 +265,6 @@ smartLook: { id: parseConfig("__APPSMITH_SMART_LOOK_ID__"), }, - enableRapidAPI: parseConfig("__APPSMITH_MARKETPLACE_ENABLED__"), segment: { apiKey: parseConfig("__APPSMITH_SEGMENT_KEY__"), ceKey: parseConfig("__APPSMITH_SEGMENT_CE_KEY__"), @@ -278,7 +277,7 @@ otlpLicenseKey: parseConfig("__APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY__"), //OTLP following the naming convention of Sdk initialisation otlpServiceName: parseConfig("__APPSMITH_NEW_RELIC_OTEL_SERVICE_NAME__"), - otlpEndpoint:parseConfig("__APPSMITH_NEW_RELIC_OTEL_EXPORTER_OTLP_ENDPOINT__"), + otlpEndpoint:parseConfig("__APPSMITH_NEW_RELIC_OTEL_EXPORTER_OTLP_ENDPOINT__"), }, fusioncharts: { diff --git a/app/client/src/actions/collectionAction.ts b/app/client/src/actions/collectionAction.ts deleted file mode 100644 index 725f13dfc45e..000000000000 --- a/app/client/src/actions/collectionAction.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; - -export const fetchImportedCollections = () => { - return { - type: ReduxActionTypes.FETCH_IMPORTED_COLLECTIONS_INIT, - }; -}; diff --git a/app/client/src/actions/providerActions.ts b/app/client/src/actions/providerActions.ts deleted file mode 100644 index 3cf27844d14e..000000000000 --- a/app/client/src/actions/providerActions.ts +++ /dev/null @@ -1,61 +0,0 @@ -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; - -import type { - AddApiToPageRequest, - FetchProviderWithCategoryRequest, - SearchApiOrProviderRequest, -} from "api/ProvidersApi"; - -export const fetchProviders = () => { - return { - type: ReduxActionTypes.FETCH_PROVIDERS_INIT, - }; -}; - -export const searchApiOrProvider = (payload: SearchApiOrProviderRequest) => { - return { - type: ReduxActionTypes.SEARCH_APIORPROVIDERS_INIT, - payload, - }; -}; - -export const fetchProviderCategories = () => { - return { - type: ReduxActionTypes.FETCH_PROVIDERS_CATEGORIES_INIT, - }; -}; - -export const getProviderDetailsByProviderId = (providerId: string) => { - return { - type: ReduxActionTypes.FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_INIT, - payload: { providerId }, - }; -}; -export const fetchProviderTemplates = (providerId: string) => { - return { - type: ReduxActionTypes.FETCH_PROVIDER_TEMPLATES_INIT, - payload: { providerId }, - }; -}; - -export const addApiToPage = (payload: AddApiToPageRequest) => { - return { - type: ReduxActionTypes.ADD_API_TO_PAGE_INIT, - payload, - }; -}; - -export const fetchProvidersWithCategory = ( - payload: FetchProviderWithCategoryRequest, -) => { - return { - type: ReduxActionTypes.FETCH_PROVIDERS_WITH_CATEGORY_INIT, - payload, - }; -}; - -export const clearProviders = () => { - return { - type: ReduxActionTypes.CLEAR_PROVIDERS, - }; -}; diff --git a/app/client/src/api/CollectionApi.ts b/app/client/src/api/CollectionApi.ts deleted file mode 100644 index 31d2c2b07d6e..000000000000 --- a/app/client/src/api/CollectionApi.ts +++ /dev/null @@ -1,14 +0,0 @@ -import type { AxiosPromise } from "axios"; -import Api from "api/Api"; -import type { ImportedCollections } from "constants/collectionsConstants"; - -class ImportedCollectionsApi extends Api { - static importedCollectionsURL = "v1/import/templateCollections"; - static async fetchImportedCollections(): Promise< - AxiosPromise<ImportedCollections> - > { - return Api.get(ImportedCollectionsApi.importedCollectionsURL); - } -} - -export default ImportedCollectionsApi; diff --git a/app/client/src/api/PluginApi.ts b/app/client/src/api/PluginApi.ts index 06f6f56849f5..56428c182279 100644 --- a/app/client/src/api/PluginApi.ts +++ b/app/client/src/api/PluginApi.ts @@ -11,7 +11,6 @@ export enum UIComponentTypes { DbEditorForm = "DbEditorForm", UQIDbEditorForm = "UQIDbEditorForm", ApiEditorForm = "ApiEditorForm", - RapidApiEditorForm = "RapidApiEditorForm", JsEditorForm = "JsEditorForm", } diff --git a/app/client/src/api/ProvidersApi.ts b/app/client/src/api/ProvidersApi.ts deleted file mode 100644 index 0c50e4e77ef0..000000000000 --- a/app/client/src/api/ProvidersApi.ts +++ /dev/null @@ -1,118 +0,0 @@ -import type { AxiosPromise } from "axios"; -import Api from "api/Api"; -import type { ApiResponse } from "./ApiResponses"; -import type { - Providers, - ProviderTemplates, - SearchResultsProviders, - ProvidersDataArray, -} from "constants/providerConstants"; - -export type FetchProvidersResponse = ApiResponse<Providers>; - -export type FetchProviderDetailsResponse = ApiResponse<ProvidersDataArray>; - -export type FetchProviderCategoriesResponse = ApiResponse<string[]>; - -export type FetchProviderTemplateResponse = ApiResponse<ProviderTemplates[]>; - -export type SearchApiOrProviderResponse = ApiResponse<{ - providers: SearchResultsProviders[]; -}>; - -export interface FetchProviderTemplatesRequest { - providerId: string; -} - -export interface FetchProviderDetailsByProviderIdRequest { - providerId: string; -} - -export interface FetchProviderWithCategoryRequest { - category: string; - page: number; -} - -export interface SearchApiOrProviderRequest { - searchKey: string; -} - -export interface AddApiToPageRequest { - name: string; - pageId: string; - marketplaceElement: any; - workspaceId?: string; - // Added for analytics - source?: string; -} - -export class ProvidersApi extends Api { - static providersURL = "v1/providers"; - static providerCategoriesURL = "v1/providers/categories"; - - static providerDetailsByIdURL = (providerId: string) => { - return `v1/marketplace/providers/${providerId}`; - }; - - static providerTemplateURL = (providerId: string) => { - return `v1/marketplace/templates?providerId=${providerId}`; - }; - - static searchApiOrProviderUrl = (searchKey: string) => { - return `v1/marketplace/search?searchKey=${searchKey}`; - }; - - static providersWithCategoryURL = (category: string, page: number) => { - return `v1/marketplace/providers?category=${category}&page=${page}&size=50`; - }; - - static addApiToPageURL = `v1/items/addToPage`; - - static async fetchProviders(): Promise<AxiosPromise<FetchProvidersResponse>> { - return Api.get(ProvidersApi.providersURL); - } - - static async fetchProviderTemplates( - request: FetchProviderTemplatesRequest, - ): Promise<AxiosPromise<FetchProviderTemplateResponse>> { - const { providerId } = request; - return Api.get(ProvidersApi.providerTemplateURL(providerId)); - } - - static async seachApiOrProvider( - request: SearchApiOrProviderRequest, - ): Promise<AxiosPromise<SearchApiOrProviderResponse>> { - const { searchKey } = request; - return Api.get(ProvidersApi.searchApiOrProviderUrl(searchKey)); - } - - static async addApiToPage( - request: AddApiToPageRequest, - ): Promise<AxiosPromise<ApiResponse>> { - return Api.post(ProvidersApi.addApiToPageURL, request); - } - - static async fetchProvidersCategories(): Promise< - AxiosPromise<FetchProviderCategoriesResponse> - > { - return Api.get(ProvidersApi.providerCategoriesURL); - } - - static async fetchProvidersWithCategory( - request: FetchProviderWithCategoryRequest, - ): Promise<AxiosPromise<FetchProvidersResponse>> { - const { page } = request; - return Api.get( - ProvidersApi.providersWithCategoryURL(request.category, page), - ); - } - - static async fetchProviderDetailsByProviderId( - request: FetchProviderDetailsByProviderIdRequest, - ): Promise<AxiosPromise<FetchProviderDetailsResponse>> { - const { providerId } = request; - return Api.get(ProvidersApi.providerDetailsByIdURL(providerId)); - } -} - -export default ProvidersApi; diff --git a/app/client/src/ce/RouteBuilder.ts b/app/client/src/ce/RouteBuilder.ts index c87c206abc7b..a88977e49180 100644 --- a/app/client/src/ce/RouteBuilder.ts +++ b/app/client/src/ce/RouteBuilder.ts @@ -98,16 +98,6 @@ export const curlImportPageURL = (props: URLBuilderParams): string => suffix: "api/curl/curl-import", }); -export const providerTemplatesURL = ( - props: URLBuilderParams & { - providerId: string; - }, -): string => - urlBuilder.build({ - ...props, - suffix: `api/provider/${props.providerId}`, - }); - export const saasEditorDatasourceIdURL = ( props: URLBuilderParams & { pluginPackageName: string; diff --git a/app/client/src/ce/api/ApiUtils.ts b/app/client/src/ce/api/ApiUtils.ts index d888b0b5aba2..46586826f9d9 100644 --- a/app/client/src/ce/api/ApiUtils.ts +++ b/app/client/src/ce/api/ApiUtils.ts @@ -35,7 +35,6 @@ const appsmithConfig = getAppsmithConfigs(); export const BLOCKED_ROUTES = [ "v1/app-templates", - "v1/marketplace", "v1/datasources/mocks", "v1/usage-pulse", "v1/applications/releaseItems", diff --git a/app/client/src/ce/configs/index.ts b/app/client/src/ce/configs/index.ts index 13700ba11f2a..1f918e9040fa 100644 --- a/app/client/src/ce/configs/index.ts +++ b/app/client/src/ce/configs/index.ts @@ -12,7 +12,6 @@ export interface INJECTED_CONFIGS { smartLook: { id: string; }; - enableRapidAPI: boolean; segment: { apiKey: string; ceKey: string; @@ -103,9 +102,6 @@ export const getConfigsFromEnvVars = (): INJECTED_CONFIGS => { | "debug" | "error" | undefined) || "error", - enableRapidAPI: process.env.REACT_APP_MARKETPLACE_URL - ? process.env.REACT_APP_MARKETPLACE_URL.length > 0 - : false, cloudHosting: process.env.REACT_APP_CLOUD_HOSTING ? process.env.REACT_APP_CLOUD_HOSTING.length > 0 : false, @@ -284,10 +280,6 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => { enabled: googleRecaptchaSiteKey.enabled, apiKey: googleRecaptchaSiteKey.value, }, - enableRapidAPI: - ENV_CONFIG.enableRapidAPI || - APPSMITH_FEATURE_CONFIGS?.enableRapidAPI || - false, enableMixpanel: ENV_CONFIG.enableMixpanel || APPSMITH_FEATURE_CONFIGS?.enableMixpanel || diff --git a/app/client/src/ce/configs/types.ts b/app/client/src/ce/configs/types.ts index 7ea66108a106..55feb0ef30ea 100644 --- a/app/client/src/ce/configs/types.ts +++ b/app/client/src/ce/configs/types.ts @@ -46,7 +46,6 @@ export interface AppsmithUIConfigs { snippetIndex: string; }; - enableRapidAPI: boolean; enableMixpanel: boolean; cloudHosting: boolean; diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx index 6c6dda138e7b..7ae74a8bf557 100644 --- a/app/client/src/ce/constants/ReduxActionConstants.tsx +++ b/app/client/src/ce/constants/ReduxActionConstants.tsx @@ -448,26 +448,12 @@ const ActionTypes = { EXECUTE_PLUGIN_ACTION_REQUEST: "EXECUTE_PLUGIN_ACTION_REQUEST", EXECUTE_PLUGIN_ACTION_SUCCESS: "EXECUTE_PLUGIN_ACTION_SUCCESS", SET_ACTION_RESPONSE_DISPLAY_FORMAT: "SET_ACTION_RESPONSE_DISPLAY_FORMAT", - FETCH_IMPORTED_COLLECTIONS_INIT: "FETCH_IMPORTED_COLLECTIONS_INIT", - FETCH_IMPORTED_COLLECTIONS_SUCCESS: "FETCH_IMPORTED_COLLECTIONS_SUCCESS", - SEARCH_APIORPROVIDERS_INIT: "SEARCH_APIORPROVIDERS_INIT", - SEARCH_APIORPROVIDERS_SUCCESS: "SEARCH_APIORPROVIDERS_SUCCESS", - FETCH_PROVIDERS_INIT: "FETCH_PROVIDERS_INIT", - FETCH_PROVIDERS_SUCCESS: "FETCH_PROVIDERS_SUCCESS", SUBMIT_CURL_FORM_INIT: "SUBMIT_CURL_FORM_INIT", SUBMIT_CURL_FORM_SUCCESS: "SUBMIT_CURL_FORM_SUCCESS", SET_WIDGET_DYNAMIC_PROPERTY: "SET_WIDGET_DYNAMIC_PROPERTY", BATCH_SET_WIDGET_DYNAMIC_PROPERTY: "BATCH_SET_WIDGET_DYNAMIC_PROPERTY", - FETCH_PROVIDER_TEMPLATES_INIT: "FETCH_PROVIDER_TEMPLATES_INIT", - FETCH_PROVIDER_TEMPLATES_SUCCESS: "FETCH_PROVIDER_TEMPLATES_SUCCESS", - ADD_API_TO_PAGE_INIT: "ADD_API_TO_PAGE_INIT", ADD_API_TO_PAGE_SUCCESS: "ADD_API_TO_PAGE_SUCCESS", CLEAR_PREVIOUSLY_EXECUTED_QUERY: "CLEAR_PREVIOUSLY_EXECUTED_QUERY", - FETCH_PROVIDERS_CATEGORIES_INIT: "FETCH_PROVIDERS_CATEGORIES_INIT", - FETCH_PROVIDERS_CATEGORIES_SUCCESS: "FETCH_PROVIDERS_CATEGORIES_SUCCESS", - FETCH_PROVIDERS_WITH_CATEGORY_INIT: "FETCH_PROVIDERS_WITH_CATEGORY_INIT", - FETCH_PROVIDERS_WITH_CATEGORY_SUCCESS: - "FETCH_PROVIDERS_WITH_CATEGORY_SUCCESS", SHOW_MODAL: "SHOW_MODAL", SHOW_MODAL_BY_NAME: "SHOW_MODAL_BY_NAME", CLOSE_MODAL: "CLOSE_MODAL", @@ -475,7 +461,6 @@ const ActionTypes = { CREATE_MODAL_SUCCESS: "CREATE_MODAL_SUCCESS", UPDATE_CANVAS_SIZE: "UPDATE_CANVAS_SIZE", SWITCH_CURRENT_PAGE_ID: "SWITCH_CURRENT_PAGE_ID", - CLEAR_PROVIDERS: "CLEAR_PROVIDERS", BATCHED_UPDATE: "BATCHED_UPDATE", EXECUTE_BATCH: "EXECUTE_BATCH", FETCH_ALL_PUBLISHED_PAGES: "FETCH_ALL_PUBLISHED_PAGES", @@ -484,11 +469,6 @@ const ActionTypes = { SET_CURRENT_CATEGORY: "SET_CURRENT_CATEGORY", SET_LAST_USED_EDITOR_PAGE: "SET_LAST_USED_EDITOR_PAGE", SET_LAST_SELECTED_PAGE_PAGE: "SET_LAST_SELECTED_PAGE_PAGE", - FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_INIT: - "FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_INIT", - FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_SUCCESS: - "FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_SUCCESS", - SET_PROVIDERS_LENGTH: "SET_PROVIDERS_LENGTH", GET_ALL_APPLICATION_INIT: "GET_ALL_APPLICATION_INIT", FETCH_USER_APPLICATIONS_WORKSPACES_SUCCESS: "FETCH_USER_APPLICATIONS_WORKSPACES_SUCCESS", @@ -997,7 +977,6 @@ export const ReduxActionErrorTypes = { FETCH_DATASOURCES_ERROR: "FETCH_DATASOURCES_ERROR", FETCH_MOCK_DATASOURCES_ERROR: "FETCH_MOCK_DATASOURCES_ERROR", ADD_MOCK_DATASOURCES_ERROR: "ADD_MOCK_DATASOURCES_ERROR", - SEARCH_APIORPROVIDERS_ERROR: "SEARCH_APIORPROVIDERS_ERROR", UPDATE_DATASOURCE_ERROR: "UPDATE_DATASOURCE_ERROR", SAVE_DATASOURCE_NAME_ERROR: "SAVE_DATASOURCE_NAME_ERROR", UPDATE_DATASOURCE_NAME_ERROR: "UPDATE_DATASOURCE_NAME_ERROR", @@ -1044,16 +1023,9 @@ export const ReduxActionErrorTypes = { ADD_USER_TO_WORKSPACE_ERROR: "ADD_USER_TO_WORKSPACE_ERROR", UPDATE_WIDGET_NAME_ERROR: "UPDATE_WIDGET_NAME_ERROR", FETCH_ACTIONS_FOR_PAGE_ERROR: "FETCH_ACTIONS_FOR_PAGE_ERROR", - FETCH_IMPORTED_COLLECTIONS_ERROR: "FETCH_IMPORTED_COLLECTIONS_ERROR", - FETCH_PROVIDERS_ERROR: "FETCH_PROVIDERS_ERROR", SUBMIT_CURL_FORM_ERROR: "SUBMIT_CURL_FORM_ERROR", - FETCH_PROVIDER_TEMPLATES_ERROR: "FETCH_PROVIDER_TEMPLATES_ERROR", ADD_API_TO_PAGE_ERROR: "ADD_API_TO_PAGE_ERROR", - FETCH_PROVIDERS_CATEGORIES_ERROR: "FETCH_PROVIDERS_CATEGORIES_ERROR", - FETCH_PROVIDERS_WITH_CATEGORY_ERROR: "FETCH_PROVIDERS_WITH_CATEGORY_ERROR", CREATE_MODAL_ERROR: "CREATE_MODAL_ERROR", - FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_ERROR: - "FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_ERROR", SAVE_ACTION_NAME_ERROR: "SAVE_ACTION_NAME_ERROR", FETCH_USER_APPLICATIONS_WORKSPACES_ERROR: "FETCH_USER_APPLICATIONS_WORKSPACES_ERROR", diff --git a/app/client/src/ce/constants/routes/appRoutes.ts b/app/client/src/ce/constants/routes/appRoutes.ts index 92ccd5d95357..a88d5b221c86 100644 --- a/app/client/src/ce/constants/routes/appRoutes.ts +++ b/app/client/src/ce/constants/routes/appRoutes.ts @@ -58,7 +58,6 @@ export const DATA_SOURCES_EDITOR_ID_PATH = `/datasource/:datasourceId`; export const APP_LIBRARIES_EDITOR_PATH = `/libraries`; export const APP_SETTINGS_EDITOR_PATH = `/settings`; export const SAAS_GSHEET_EDITOR_ID_PATH = `/saas/google-sheets-plugin/datasources/:datasourceId`; -export const PROVIDER_TEMPLATE_PATH = `/provider/:providerId`; export const GEN_TEMPLATE_URL = "generate-page"; export const GENERATE_TEMPLATE_PATH = `/${GEN_TEMPLATE_URL}`; export const GEN_TEMPLATE_FORM_ROUTE = "/form"; @@ -138,11 +137,6 @@ export interface APIEditorRouteParams { apiId?: string; } -export interface ProviderViewerRouteParams { - pageId: string; - providerId: string; -} - export interface QueryEditorRouteParams { pageId: string; queryId?: string; diff --git a/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.ts b/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.ts index 86ad2757ead8..677e0b3a0729 100644 --- a/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.ts +++ b/app/client/src/ce/pages/Editor/IDE/MainPane/useRoutes.ts @@ -17,7 +17,6 @@ import { JS_COLLECTION_EDITOR_PATH, JS_COLLECTION_ID_PATH, LIST_PATH, - PROVIDER_TEMPLATE_PATH, QUERIES_EDITOR_BASE_PATH, QUERIES_EDITOR_ID_ADD_PATH, QUERIES_EDITOR_ID_PATH, @@ -41,7 +40,6 @@ import { import DatasourceForm from "pages/Editor/SaaSEditor/DatasourceForm"; import DataSourceEditor from "pages/Editor/DataSourceEditor"; import DatasourceBlankState from "pages/Editor/DataSourceEditor/DatasourceBlankState"; -import ProviderTemplates from "pages/Editor/APIEditor/ProviderTemplates"; import GeneratePage from "pages/Editor/GeneratePage"; import type { RouteProps } from "react-router"; import { useIsAppSidebarEnabled } from "navigation/featureFlagHooks"; @@ -130,12 +128,6 @@ function useRoutes(path: string): RouteReturnType[] { exact: true, path: `${path}${DATA_SOURCES_EDITOR_LIST_PATH}`, }, - { - key: "ProviderTemplates", - component: ProviderTemplates, - exact: true, - path: `${path}${PROVIDER_TEMPLATE_PATH}`, - }, { key: "GeneratePage", component: GeneratePage, @@ -263,12 +255,6 @@ function useRoutes(path: string): RouteReturnType[] { exact: true, path: `${path}${DATA_SOURCES_EDITOR_LIST_PATH}`, }, - { - key: "ProviderTemplates", - component: ProviderTemplates, - exact: true, - path: `${path}${PROVIDER_TEMPLATE_PATH}`, - }, { key: "GeneratePage", component: GeneratePage, diff --git a/app/client/src/ce/pages/Editor/routes.tsx b/app/client/src/ce/pages/Editor/routes.tsx index 1da9e0f61793..f40b56e73b9f 100644 --- a/app/client/src/ce/pages/Editor/routes.tsx +++ b/app/client/src/ce/pages/Editor/routes.tsx @@ -6,7 +6,6 @@ import IntegrationEditor from "pages/Editor/IntegrationEditor"; import QueryEditor from "pages/Editor/QueryEditor"; import JSEditor from "pages/Editor/JSEditor"; import GeneratePage from "pages/Editor/GeneratePage"; -import ProviderTemplates from "pages/Editor/APIEditor/ProviderTemplates"; import { API_EDITOR_ID_PATH, BUILDER_CHECKLIST_PATH, @@ -14,7 +13,6 @@ import { GENERATE_TEMPLATE_FORM_PATH, INTEGRATION_EDITOR_PATH, JS_COLLECTION_ID_PATH, - PROVIDER_TEMPLATE_PATH, QUERIES_EDITOR_ID_PATH, } from "constants/routes"; import PerformanceTracker, { @@ -95,11 +93,6 @@ function EditorRoutes() { path={`${path}${childPath}`} /> ))} - <SentryRoute - component={ProviderTemplates} - exact - path={`${path}${PROVIDER_TEMPLATE_PATH}`} - /> <SentryRoute component={GeneratePage} exact diff --git a/app/client/src/ce/reducers/index.tsx b/app/client/src/ce/reducers/index.tsx index 6213aed0eb7a..cb12e8ba52a4 100644 --- a/app/client/src/ce/reducers/index.tsx +++ b/app/client/src/ce/reducers/index.tsx @@ -21,8 +21,6 @@ import type { WorkspaceReduxState } from "@appsmith/reducers/uiReducers/workspac import type { UsersReduxState } from "reducers/uiReducers/usersReducer"; import type { ThemeState } from "reducers/uiReducers/themeReducer"; import type { WidgetDragResizeState } from "reducers/uiReducers/dragResizeReducer"; -import type { ImportedCollectionsReduxState } from "reducers/uiReducers/importedCollectionsReducer"; -import type { ProvidersReduxState } from "reducers/uiReducers/providerReducer"; import type { MetaState } from "reducers/entityReducers/metaReducer"; import type { ImportReduxState } from "reducers/uiReducers/importReducer"; import type { HelpReduxState } from "reducers/uiReducers/helpReducer"; @@ -107,8 +105,6 @@ export interface AppState { workspaces: WorkspaceReduxState; users: UsersReduxState; widgetDragResize: WidgetDragResizeState; - importedCollections: ImportedCollectionsReduxState; - providers: ProvidersReduxState; imports: ImportReduxState; queryPane: QueryPaneReduxState; datasourcePane: DatasourcePaneReduxState; diff --git a/app/client/src/ce/reducers/uiReducers/index.tsx b/app/client/src/ce/reducers/uiReducers/index.tsx index 54c116a6ecb8..ab0e1576f8e7 100644 --- a/app/client/src/ce/reducers/uiReducers/index.tsx +++ b/app/client/src/ce/reducers/uiReducers/index.tsx @@ -10,8 +10,6 @@ import workspaceReducer from "@appsmith/reducers/uiReducers/workspaceReducer"; import templateReducer from "reducers/uiReducers/templateReducer"; import usersReducer from "reducers/uiReducers/usersReducer"; import { widgetDraggingReducer } from "reducers/uiReducers/dragResizeReducer"; -import importedCollectionsReducer from "reducers/uiReducers/importedCollectionsReducer"; -import providersReducer from "reducers/uiReducers/providerReducer"; import importReducer from "reducers/uiReducers/importReducer"; import queryPaneReducer from "@appsmith/reducers/uiReducers/queryPaneReducer"; import helpReducer from "reducers/uiReducers/helpReducer"; @@ -65,8 +63,6 @@ export const uiReducerObject = { workspaces: workspaceReducer, users: usersReducer, widgetDragResize: widgetDraggingReducer, - importedCollections: importedCollectionsReducer, - providers: providersReducer, imports: importReducer, queryPane: queryPaneReducer, datasourcePane: datasourcePaneReducer, diff --git a/app/client/src/ce/sagas/index.tsx b/app/client/src/ce/sagas/index.tsx index c1d641229868..dda1e434d909 100644 --- a/app/client/src/ce/sagas/index.tsx +++ b/app/client/src/ce/sagas/index.tsx @@ -15,7 +15,6 @@ import batchSagas from "sagas/BatchSagas"; import autoLayoutDraggingSagas from "sagas/CanvasSagas/AutoLayoutDraggingSagas"; import draggingCanvasSagas from "sagas/CanvasSagas/DraggingCanvasSagas"; import selectionCanvasSagas from "sagas/CanvasSagas/SelectionCanvasSagas"; -import importedCollectionsSagas from "sagas/CollectionSagas"; import curlImportSagas from "sagas/CurlImportSagas"; import { watchDatasourcesSagas } from "sagas/DatasourcesSagas"; import debuggerSagas from "sagas/DebuggerSagas"; @@ -36,7 +35,6 @@ import onboardingSagas from "sagas/OnboardingSagas"; import pageSagas from "@appsmith/sagas/PageSagas"; import PageVisibilitySaga from "sagas/PageVisibilitySagas"; import pluginSagas from "sagas/PluginSagas"; -import providersSagas from "sagas/ProvidersSaga"; import queryPaneSagas from "sagas/QueryPaneSagas"; import replaySaga from "sagas/ReplaySaga"; import saaSPaneSagas from "sagas/SaaSPaneSagas"; @@ -73,8 +71,6 @@ export const sagas = [ templateSagas, pluginSagas, workspaceSagas, - importedCollectionsSagas, - providersSagas, curlImportSagas, snipingModeSagas, queryPaneSagas, diff --git a/app/client/src/ce/selectors/applicationSelectors.tsx b/app/client/src/ce/selectors/applicationSelectors.tsx index d3c90413a901..724a30e3af1b 100644 --- a/app/client/src/ce/selectors/applicationSelectors.tsx +++ b/app/client/src/ce/selectors/applicationSelectors.tsx @@ -87,17 +87,6 @@ export const getUserApplicationsWorkspaces = (state: AppState) => { return state.ui.applications.userWorkspaces; }; -export const getImportedCollections = (state: AppState) => - state.ui.importedCollections.importedCollections; - -export const getProviders = (state: AppState) => state.ui.providers.providers; -export const getProvidersLoadingState = (state: AppState) => - state.ui.providers.isFetchingProviders; -export const getProviderTemplates = (state: AppState) => - state.ui.providers.providerTemplates; -export const getProvidersTemplatesLoadingState = (state: AppState) => - state.ui.providers.isFetchingProviderTemplates; - export const getApplicationList = createSelector( getApplications, getApplicationSearchKeyword, diff --git a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts index 4b282884afbb..5650c1b36d85 100644 --- a/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts +++ b/app/client/src/components/editorComponents/PartialImportExport/PartialExportModal/unitTestUtils.ts @@ -12840,24 +12840,6 @@ export const defaultAppState = { isFetchingImportedCollections: false, importedCollections: [], }, - providers: { - isFetchingProviders: false, - providers: [], - providersTotal: 0, - providerTemplates: [], - isFetchingProviderTemplates: false, - providerCategories: [], - providerCategoriesErrorPayload: {}, - apiOrProviderSearchResults: { - providers: [], - }, - isSwitchingCategory: true, - isSearching: false, - lastUsedProviderId: "", - providerDetailsByProviderId: {}, - providerDetailsErrorPayload: {}, - fetchProvidersError: false, - }, imports: { isImportingCurl: false, errorPayload: {}, diff --git a/app/client/src/constants/collectionsConstants.ts b/app/client/src/constants/collectionsConstants.ts deleted file mode 100644 index 706caabdd053..000000000000 --- a/app/client/src/constants/collectionsConstants.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { ApiResponse } from "api/ApiResponses"; - -export interface TemplateList { - id: string; - delete: boolean; - name: string; - providerId: string; - publisher: string; - packageName: string; - versionId: string; -} - -export interface CollectionDataArray { - id: string; - deleted: boolean; - apiTemplateList: Array<TemplateList>; -} - -export type ImportedCollections = ApiResponse & { - data: Array<CollectionDataArray>; -}; diff --git a/app/client/src/constants/providerConstants.ts b/app/client/src/constants/providerConstants.ts deleted file mode 100644 index b910b77013af..000000000000 --- a/app/client/src/constants/providerConstants.ts +++ /dev/null @@ -1,98 +0,0 @@ -import type { ApiResponse } from "api/ApiResponses"; - -export type ProvidersDataArray = ApiResponse & { - id: string; - name: string; - description: string; - url: string; - imageUrl: string; -}; - -export type ProvidersCategoriesResponse = ApiResponse & { - data: string[]; -}; - -export type FetchProviderDetailsResponse = ApiResponse & { - data: ProvidersDataArray; -}; - -export type Providers = ApiResponse & { - providers: ProvidersDataArray[]; - total: number; -}; - -export type ProviderTemplates = ApiResponse & { - data: Array<ProviderTemplateArray>; - length: number; - templateId: string; -}; - -export interface ApiTemplates { - id: string; - deleted: boolean; - name: string; - providerId: string; - publisher: string; - packageName: string; - versionId: string; - apiTemplateConfiguration: { - documentation: string; - sampleResponse: { - body: string; - }; - }; - actionConfiguration: { - timeoutInMillisecond: number; - paginationType: string; - path: string; - httpMethod: string; - headers: any[]; - routeParameters: any[]; - }; - datasourceConfiguration: { - url: string; - }; -} - -export type ProviderTemplateArray = ApiResponse & { - templateData: { - id: string; - deleted: boolean; - name: string; - providerId: string; - publisher: string; - packageName: string; - versionId: string; - apiTemplateConfiguration: { - documentation: string; - sampleResponse: { - body: string; - }; - }; - actionConfiguration: { - timeoutInMillisecond: number; - paginationType: string; - path: string; - httpMethod: string; - headers: any[]; - routeParameters: any[]; - }; - datasourceConfiguration: { - url: string; - }; - }; - isOpen: boolean; - addToPageStatus: boolean; - addToPageLoading: boolean; -}; - -export interface SearchResultsProviders { - id: string; - name: string; - description: string; - imageUrl: string; - url: string; - documentationUrl: string; -} - -export const DEFAULT_TEMPLATE_TYPE = "TEMPLATE"; diff --git a/app/client/src/entities/Action/index.ts b/app/client/src/entities/Action/index.ts index a0ad208e5d13..283994eae0ac 100644 --- a/app/client/src/entities/Action/index.ts +++ b/app/client/src/entities/Action/index.ts @@ -92,14 +92,6 @@ export interface ActionConfig { selfReferencingData?: SelfReferencingData; } -export interface ActionProvider { - name: string; - imageUrl: string; - url: string; - description: string; - credentialSteps: string; -} - export interface Property { key: string; value: string; @@ -209,14 +201,6 @@ export interface StoredDatasourceApiAction extends BaseApiAction { export type ApiAction = EmbeddedApiAction | StoredDatasourceApiAction; -export type RapidApiAction = ApiAction & { - templateId: string; - proverId: string; - provider: ActionProvider; - pluginId: string; - documentation: { text: string }; -}; - export interface QueryAction extends BaseAction { pluginType: PluginType.DB; pluginName?: PluginName; diff --git a/app/client/src/pages/Editor/APIEditor/Editor.tsx b/app/client/src/pages/Editor/APIEditor/Editor.tsx index 1ee0455fc624..7ae389bc822f 100644 --- a/app/client/src/pages/Editor/APIEditor/Editor.tsx +++ b/app/client/src/pages/Editor/APIEditor/Editor.tsx @@ -2,7 +2,6 @@ import React from "react"; import { connect } from "react-redux"; import { submit } from "redux-form"; import RestApiEditorForm from "./RestAPIForm"; -import RapidApiEditorForm from "./RapidApiEditorForm"; import type { AppState } from "@appsmith/reducers"; import type { RouteComponentProps } from "react-router"; import type { @@ -17,7 +16,7 @@ import { getCurrentPageName, } from "selectors/editorSelectors"; import type { Plugin } from "api/PluginApi"; -import type { Action, PaginationType, RapidApiAction } from "entities/Action"; +import type { Action, PaginationType } from "entities/Action"; import { PluginPackageName } from "entities/Action"; import { getApiName } from "selectors/formSelectors"; import Spinner from "components/editorComponents/Spinner"; @@ -53,7 +52,7 @@ interface ReduxStateProps { pages: any; plugins: Plugin[]; pluginId: any; - apiAction: Action | ActionData | RapidApiAction | undefined; + apiAction: Action | ActionData | undefined; paginationType: PaginationType; applicationId: string; } @@ -202,23 +201,6 @@ class ApiEditor extends React.Component<Props> { settingsConfig={this.context.settingsConfig} /> )} - {formUiComponent === "RapidApiEditorForm" && ( - <RapidApiEditorForm - apiId={this.props.match.params.apiId || ""} - apiName={this.props.apiName} - appName={ - this.props.currentApplication - ? this.props.currentApplication.name - : "" - } - isDeleting={isDeleting} - isRunning={isRunning} - location={this.props.location} - onDeleteClick={this.context.handleDeleteClick} - onRunClick={this.context.handleRunClick} - paginationType={paginationType} - /> - )} {formUiComponent === "SaaSEditorForm" && history.push( saasEditorApiIdURL({ diff --git a/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx b/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx deleted file mode 100644 index 7f631f36b5ad..000000000000 --- a/app/client/src/pages/Editor/APIEditor/ProviderTemplates.tsx +++ /dev/null @@ -1,522 +0,0 @@ -import React from "react"; -import { connect } from "react-redux"; -import { Icon, Collapse } from "@blueprintjs/core"; -import type { RouteComponentProps } from "react-router-dom"; -import styled from "styled-components"; -import ReactJson from "react-json-view"; -import type { AppState } from "@appsmith/reducers"; -import Button from "components/editorComponents/Button"; -import type { ProviderViewerRouteParams } from "constants/routes"; -import { - getProviderTemplates, - getProvidersTemplatesLoadingState, -} from "@appsmith/selectors/applicationSelectors"; -import CenteredWrapper from "components/designSystems/appsmith/CenteredWrapper"; -import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; -import type { ProviderTemplateArray } from "constants/providerConstants"; -import { DEFAULT_TEMPLATE_TYPE } from "constants/providerConstants"; -import type { AddApiToPageRequest } from "api/ProvidersApi"; -import { - setLastUsedEditorPage, - setLastSelectedPage, -} from "actions/apiPaneActions"; -import { - getProviderDetailsByProviderId, - fetchProviderTemplates, - addApiToPage, -} from "actions/providerActions"; -import { getDuplicateName } from "utils/AppsmithUtils"; -import { INTEGRATION_TABS } from "constants/routes"; -import Spinner from "components/editorComponents/Spinner"; -import { getInitialsAndColorCode } from "utils/AppsmithUtils"; -import AnalyticsUtil from "utils/AnalyticsUtil"; -import { getAppCardColorPalette } from "selectors/themeSelectors"; -import { getCurrentApplicationId } from "selectors/editorSelectors"; -import { integrationEditorURL } from "@appsmith/RouteBuilder"; -import { getAssetUrl } from "@appsmith/utils/airgapHelpers"; - -const TEMPLATES_TOP_SECTION_HEIGHT = "83px"; - -const ProviderInfo = styled.div` - display: flex; - padding: 10px; - .providerImage { - height: 40px; - width: auto; - margin-right: 11px; - } - .providerName { - font-weight: 500; - font-size: 16px; - line-height: 32px; - } -`; - -const TemplateDetailPage = styled.div` - max-height: 95vh; - font-size: 20px; - padding: 20px; - - .ads-v2-tabs__list { - border-bottom-color: transparent; - color: #4e5d78; - font-size: 14px; - font-weight: 500; - } - - .react-tabs__tab--selected { - color: #2e3d49; - font-size: 14px; - font-weight: 500; - border-color: transparent; - border: transparent; - border-bottom: 3px solid #2e3d49; - border-radius: 0; - } - .backBtn { - padding-bottom: 3px; - cursor: pointer; - } - .backBtnText { - font-size: 16px; - font-weight: 500; - cursor: pointer; - } -`; - -const LoadingContainer = styled(CenteredWrapper)` - height: 50%; -`; - -const ProviderInfoTopSection = styled.div` - height: ${TEMPLATES_TOP_SECTION_HEIGHT}; -`; - -const TemplatesCardsContainer = styled.div` - height: calc( - 100vh - ${TEMPLATES_TOP_SECTION_HEIGHT} - - ${(props) => props.theme.headerHeight} - ); - overflow: auto; - .noProvidersMessage { - margin-top: 30px; - text-align: center; - color: #666666; - font-size: 14px; - line-height: 24px; - } -`; - -const TemplateCard = styled.div` - border: 1px solid #e8e8e8; - min-height: 150px; - padding: 17px; - display: block; - margin-bottom: 10px; - .extraDescription { - background: #363e44; - border-radius: 4px; - color: #fff; - } - .string-value { - word-break: break-word !important; - } - .variable-value { - word-break: break-word !important; - } -`; - -const CardTopContent = styled.div` - display: flex; -`; - -const TemplateCardLeftContent = styled.div` - width: 70%; - - .apiName { - font-size: 16px; - line-height: 24px; - } - - .desc { - font-size: 14px; - line-height: 24px; - } -`; - -const TemplateCardRightContent = styled.div` - width: 30%; - display: flex; - margin: auto; - justify-content: center; - .dropIcon { - margin-left: 50px; - color: #bcccd9; - cursor: pointer; - } - .addToPageBtn { - width: 100px !important; - height: 30px !important; - } -`; - -const URLContainer = styled.div` - background: #ebeef0; - padding: 1px; - align-self: center; - justify-content: center; - border-radius: 4px; - - .urlText { - color: #4e5d78; - font-size: 14px; - line-height: 24px; - padding-top: 10px !important; - padding-left: 11px; - display: flex; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - max-width: 98%; - } - .endpoint { - padding-left: 11px; - } -`; - -type ProviderTemplatesProps = { - providerTemplates: ProviderTemplateArray[]; - providerDetails: any; - actions: ActionDataState; - isFetchingProviderTemplates: boolean; - getProviderDetailsByProviderId: (providerId: string) => void; - getProviderTemplates: (providerId: string) => void; - setLastUsedEditorPage: (path: string) => void; - setLastSelectedPage: (selectedPageId: string) => void; - addApiToPage: (templateData: AddApiToPageRequest) => void; - appCardColors: string[]; - applicationId: string; -} & RouteComponentProps<ProviderViewerRouteParams>; - -class ProviderTemplates extends React.Component<ProviderTemplatesProps> { - public state = { - isOpen: false, - addedTemplates: Array<string>(), - toggeledTemplates: Array<string>(), - }; - - handleClick = () => { - this.setState({ isOpen: !this.state.isOpen }); - }; - - componentDidMount() { - const { pageId, providerId } = this.props.match.params; - let destinationPageId = new URLSearchParams(this.props.location.search).get( - "importTo", - ); - if (!destinationPageId) { - destinationPageId = pageId; - } - this.props.getProviderDetailsByProviderId(providerId); - this.props.getProviderTemplates(providerId); - this.props.setLastUsedEditorPage(this.props.match.url); - this.props.setLastSelectedPage(destinationPageId); - } - - addApiToPage = (templateData: ProviderTemplateArray) => { - const { pageId } = this.props.match.params; - let destinationPageId = new URLSearchParams(this.props.location.search).get( - "importTo", - ); - if (!destinationPageId) { - destinationPageId = pageId; - } - const pageApiNames = this.props.actions - .filter((a) => a.config.pageId === destinationPageId) - .map((a) => a.config.name); - let name = templateData.templateData.name.replace(/ /g, ""); - if (pageApiNames.indexOf(name) > -1) { - name = getDuplicateName(name, pageApiNames); - } - - const addApiRequestObject: AddApiToPageRequest = { - name, - pageId: destinationPageId, - marketplaceElement: { - type: DEFAULT_TEMPLATE_TYPE, - item: templateData.templateData, - }, - source: "BROWSE", - }; - const { addedTemplates } = this.state; - this.props.addApiToPage(addApiRequestObject); - this.setState({ addedTemplates }); - }; - - handleIsOpen = (templateId: string) => { - const { toggeledTemplates } = this.state; - - const toggleCheck = toggeledTemplates.includes(templateId); - if (toggleCheck) { - toggeledTemplates.splice(toggeledTemplates.indexOf(templateId), 1); - this.setState({ toggeledTemplates }); - } else { - toggeledTemplates.push(templateId); - this.setState({ toggeledTemplates }); - } - }; - - render() { - const { - history, - isFetchingProviderTemplates, - providerDetails, - providerTemplates, - } = this.props; - const { pageId } = this.props.match.params; - - let destinationPageId = new URLSearchParams(this.props.location.search).get( - "importTo", - ); - if (destinationPageId === null || destinationPageId === undefined) { - destinationPageId = pageId; - } - - if (isFetchingProviderTemplates) { - return ( - <LoadingContainer> - <Spinner size={30} /> - </LoadingContainer> - ); - } - return ( - <TemplateDetailPage> - <ProviderInfoTopSection> - <Icon - className="backBtn" - icon="chevron-left" - iconSize={16} - onClick={() => - history.push( - integrationEditorURL({ - pageId, - selectedTab: INTEGRATION_TABS.ACTIVE, - }), - ) - } - /> - <span - className="backBtnText" - onClick={() => - history.push( - integrationEditorURL({ - pageId, - selectedTab: INTEGRATION_TABS.ACTIVE, - }), - ) - } - > - {" Back"} - </span> - <br /> - <ProviderInfo> - {providerDetails.imageUrl ? ( - <img - alt="provider" - className="providerImage" - src={getAssetUrl(providerDetails.imageUrl)} - /> - ) : ( - <div> - {providerDetails.name && ( - <div - style={{ - backgroundColor: getInitialsAndColorCode( - providerDetails.name, - this.props.appCardColors, - )[1], - padding: 5, - margin: "auto", - width: 60, - color: "#fff", - borderRadius: 2, - fontSize: 18, - fontWeight: "bold", - textAlign: "center", - marginRight: 10, - }} - > - <span> - { - getInitialsAndColorCode( - providerDetails.name, - this.props.appCardColors, - )[0] - } - </span> - </div> - )} - </div> - )} - <p className="providerName">{providerDetails.name}</p> - </ProviderInfo> - </ProviderInfoTopSection> - <TemplatesCardsContainer> - {providerTemplates.length === 0 && !isFetchingProviderTemplates ? ( - <p className="noProvidersMessage"> - No API templates for this provider yet. - </p> - ) : ( - <> - {providerTemplates.map((template) => ( - <TemplateCard key={template.templateData.id}> - <CardTopContent> - <TemplateCardLeftContent> - <p className="apiName">{template.templateData.name}</p> - <p className="desc"> - { - template.templateData.apiTemplateConfiguration - .documentation - } - </p> - <URLContainer> - <p className="urlText"> - <strong> - { - template.templateData.actionConfiguration - .httpMethod - } - </strong>{" "} - <span - className="endpoint" - title={ - template.templateData.actionConfiguration.path - } - > - {template.templateData.actionConfiguration.path} - </span> - </p> - </URLContainer> - </TemplateCardLeftContent> - - <TemplateCardRightContent className="t--addToPageButtons"> - {template.addToPageStatus ? ( - <Button - className="addToPageBtn t--addToPageBtn" - disabled - filled - intent="none" - size="small" - text="Added" - /> - ) : ( - <Button - className="addToPageBtn t--addToPageBtn" - disabled={false} - filled - intent="primary" - loading={template.addToPageLoading} - onClick={() => this.addApiToPage(template)} - size="small" - text="Add to page" - /> - )} - <Icon - className="dropIcon" - icon="chevron-down" - iconSize={20} - onClick={() => { - AnalyticsUtil.logEvent("EXPAND_API", { - apiName: template.templateData.name, - }); - this.handleIsOpen(template.templateData.id); - }} - /> - </TemplateCardRightContent> - </CardTopContent> - - <Collapse - isOpen={this.state.toggeledTemplates.includes( - template.templateData.id, - )} - transitionDuration={0} - > - <ReactJson - displayDataTypes={false} - displayObjectSize={false} - enableClipboard={false} - name="Request header" - src={template.templateData.actionConfiguration.headers} - style={{ - marginTop: "12px", - fontSize: "14px", - padding: "15px", - borderTopLeftRadius: "4px", - borderTopRightRadius: "4px", - width: "90%", - wordWrap: "break-word", - }} - theme="grayscale" - /> - {template.templateData.apiTemplateConfiguration - .sampleResponse ? ( - <ReactJson - displayDataTypes={false} - displayObjectSize={false} - enableClipboard={false} - name="Response Body" - src={ - template.templateData.apiTemplateConfiguration - .sampleResponse - } - style={{ - fontSize: "14px", - padding: "15px", - borderBottomLeftRadius: "4px", - borderBottomRightRadius: "4px", - maxWidth: "90%", - wordWrap: "break-word", - }} - theme="grayscale" - /> - ) : ( - <p /> - )} - </Collapse> - </TemplateCard> - ))} - </> - )} - </TemplatesCardsContainer> - </TemplateDetailPage> - ); - } -} - -const mapStateToProps = (state: AppState) => ({ - providerTemplates: getProviderTemplates(state), - isFetchingProviderTemplates: getProvidersTemplatesLoadingState(state), - actions: state.entities.actions, - providerDetails: state.ui.providers.providerDetailsByProviderId, - appCardColors: getAppCardColorPalette(state), - applicationId: getCurrentApplicationId(state), -}); - -const mapDispatchToProps = (dispatch: any) => ({ - getProviderDetailsByProviderId: (providerId: string) => - dispatch(getProviderDetailsByProviderId(providerId)), - - getProviderTemplates: (providerId: string) => - dispatch(fetchProviderTemplates(providerId)), - - setLastUsedEditorPage: (path: string) => - dispatch(setLastUsedEditorPage(path)), - - setLastSelectedPage: (selectedPageId: string) => - dispatch(setLastSelectedPage(selectedPageId)), - - addApiToPage: (templateData: AddApiToPageRequest) => - dispatch(addApiToPage(templateData)), -}); - -export default connect(mapStateToProps, mapDispatchToProps)(ProviderTemplates); diff --git a/app/client/src/pages/Editor/APIEditor/RapidApiEditorForm.tsx b/app/client/src/pages/Editor/APIEditor/RapidApiEditorForm.tsx deleted file mode 100644 index 3dba7e603bef..000000000000 --- a/app/client/src/pages/Editor/APIEditor/RapidApiEditorForm.tsx +++ /dev/null @@ -1,363 +0,0 @@ -import React, { useContext } from "react"; -import { connect } from "react-redux"; -import type { RouteComponentProps } from "react-router"; -import type { InjectedFormProps } from "redux-form"; -import { reduxForm, formValueSelector } from "redux-form"; -import { POST_BODY_FORMAT_OPTIONS } from "constants/ApiEditorConstants/CommonApiConstants"; -import styled from "styled-components"; -import FormLabel from "components/editorComponents/FormLabel"; -import FormRow from "components/editorComponents/FormRow"; -import type { - PaginationField, - BodyFormData, - Property, - ActionResponse, -} from "api/ActionAPI"; -import DynamicTextField from "components/editorComponents/form/fields/DynamicTextField"; -import KeyValueFieldArray from "components/editorComponents/form/fields/KeyValueFieldArray"; -import ApiResponseView from "components/editorComponents/ApiResponseView"; -import { API_EDITOR_FORM_NAME } from "@appsmith/constants/forms"; -import CredentialsTooltip from "components/editorComponents/form/CredentialsTooltip"; -import { BaseTabbedView } from "components/designSystems/appsmith/TabbedView"; -import Pagination from "./Pagination"; -import type { PaginationType, Action } from "entities/Action"; -import ActionNameEditor from "components/editorComponents/ActionNameEditor"; -import { NameWrapper } from "./CommonEditorForm"; -import { BaseButton } from "components/designSystems/appsmith/BaseButton"; -import { getAction, getActionData } from "@appsmith/selectors/entitiesSelector"; -import type { AppState } from "@appsmith/reducers"; -import { Icon } from "design-system"; -import { showDebuggerFlag } from "selectors/debuggerSelectors"; -import { ApiEditorContext } from "./ApiEditorContext"; -import { actionResponseDisplayDataFormats } from "../utils"; - -const Form = styled.form` - display: flex; - flex-direction: column; - min-height: 95vh; - max-height: 95vh; - overflow: auto; - width: 100%; - ${FormLabel} { - padding: ${(props) => props.theme.spaces[3]}px; - } - ${FormRow} { - padding: ${(props) => props.theme.spaces[2]}px; - & > * { - margin-right: 10px; - } - ${FormLabel} { - padding: 0; - width: 100%; - } - } -`; - -const MainConfiguration = styled.div` - padding-top: 10px; - padding-left: 17px; - span.bp3-popover-target { - display: inline-block; - } -`; - -const SecondaryWrapper = styled.div` - display: flex; - height: calc(100% - 120px); - border-top: 1px solid #d0d7dd; - margin-top: 10px; -`; - -const RequestParamsWrapper = styled.div` - flex: 4; - border-right: 1px solid #d0d7dd; - height: 100%; - overflow-y: auto; - padding-top: 6px; - padding-left: 17px; - padding-right: 10px; -`; - -const ActionButtons = styled.div` - flex: 1; -`; - -const ActionButton = styled(BaseButton)` - &&& { - max-width: 72px; - margin: 0 5px; - min-height: 30px; - } -`; - -const PostbodyContainer = styled.div` - margin-top: 41px; -`; - -const HeadersSection = styled.div` - margin-bottom: 32px; -`; - -const TabbedViewContainer = styled.div` - flex: 1; - padding-top: 12px; -`; - -interface APIFormOwnProps { - apiId: string; - apiName: string; - appName: string; - isDeleting: boolean; - isRunning: boolean; - location: RouteComponentProps["location"]; - onDeleteClick: () => void; - onRunClick: (paginationField?: PaginationField) => void; - paginationType: PaginationType; -} - -interface APIFormProps { - actionData?: ActionResponse; - currentActionConfig?: Action; - templateId: string; - actionConfiguration?: any; - actionConfigurationHeaders?: Property[]; - displayFormat: string; - actionConfigurationBodyFormData: BodyFormData[]; - providerImage: string; - providerURL: string; - providerCredentialSteps: string; - dispatch: any; - responseDataTypes: { key: string; title: string }[]; - responseDisplayFormat: { title: string; value: string }; - showDebugger: boolean; -} - -type Props = APIFormProps & - InjectedFormProps<Action, APIFormProps & APIFormOwnProps> & - APIFormOwnProps; - -function RapidApiEditorForm(props: Props) { - const { - actionConfiguration, - actionConfigurationBodyFormData, - actionConfigurationHeaders, - handleSubmit, - isDeleting, - isRunning, - onDeleteClick, - onRunClick, - providerCredentialSteps, - providerImage, - providerURL, - responseDataTypes, - responseDisplayFormat, - showDebugger, - templateId, - } = props; - - const { saveActionName } = useContext(ApiEditorContext); - - const postbodyResponsePresent = - templateId && - actionConfiguration && - actionConfigurationBodyFormData && - actionConfigurationBodyFormData.length > 0; - - return ( - <Form - onSubmit={handleSubmit} - style={{ - height: "100%", - }} - > - <MainConfiguration> - <FormRow> - <NameWrapper> - <ActionNameEditor saveActionName={saveActionName} /> - <a - className="t--apiDocumentationLink" - href={providerURL && `http://${providerURL}`} - rel="noopener noreferrer" - style={{ - paddingTop: "7px", - }} - target="_blank" - > - API documentation - </a> - </NameWrapper> - - <ActionButtons> - <ActionButton - buttonStyle="DANGER" - loading={isDeleting} - onClick={onDeleteClick} - text="Delete" - /> - <ActionButton - buttonStyle="PRIMARY" - loading={isRunning} - onClick={() => { - onRunClick(); - }} - text="Run" - /> - </ActionButtons> - </FormRow> - <FormRow> - <DynamicTextField - disabled - leftImage={providerImage} - name="provider.name" - placeholder="Provider name" - /> - <DynamicTextField - disabled - leftIcon={<Icon name="slash" />} - name="actionConfiguration.path" - placeholder="v1/method" - /> - </FormRow> - {/* Display How to get Credentials info if it is present */} - {providerCredentialSteps && providerCredentialSteps !== "" && ( - <CredentialsTooltip - providerCredentialSteps={providerCredentialSteps} - /> - )} - </MainConfiguration> - <SecondaryWrapper> - <TabbedViewContainer> - <BaseTabbedView - tabs={[ - { - key: "apiInput", - title: "API Input", - panelComponent: ( - <RequestParamsWrapper> - <HeadersSection> - <KeyValueFieldArray - actionConfig={ - actionConfiguration && - actionConfigurationHeaders && - actionConfigurationHeaders - } - label="Headers" - name="actionConfiguration.headers" - pushFields={false} - /> - </HeadersSection> - <KeyValueFieldArray - label="Params" - name="actionConfiguration.queryParameters" - pushFields={false} - /> - {postbodyResponsePresent && ( - <PostbodyContainer> - <FormLabel>{"Body"}</FormLabel> - {typeof actionConfigurationBodyFormData === - "object" && ( - <KeyValueFieldArray - actionConfig={actionConfigurationBodyFormData} - addOrDeleteFields={false} - label="" - name="actionConfiguration.bodyFormData" - pushFields={false} - /* eslint-disable-next-line @typescript-eslint/ban-ts-comment */ - // @ts-ignore - rightIcon={<Icon name="info" />} - /> - )} - </PostbodyContainer> - )} - </RequestParamsWrapper> - ), - }, - { - key: "pagination", - title: "Pagination", - panelComponent: ( - <Pagination - actionName={props.apiName} - onTestClick={props.onRunClick} - paginationType={props.paginationType} - /> - ), - }, - ]} - /> - </TabbedViewContainer> - {showDebugger && ( - <ApiResponseView - actionResponse={props.actionData} - apiName={props.apiName} - currentActionConfig={props.currentActionConfig} - isRunning={props.isRunning} - onRunClick={onRunClick} - responseDataTypes={responseDataTypes} - responseDisplayFormat={responseDisplayFormat} - /> - )} - </SecondaryWrapper> - </Form> - ); -} - -const selector = formValueSelector(API_EDITOR_FORM_NAME); - -export default connect((state: AppState, ownProps: APIFormOwnProps) => { - const displayFormat = selector(state, "displayFormat"); - const providerImage = selector(state, "provider.imageUrl"); - const providerURL = selector(state, "provider.url"); - const providerCredentialSteps = selector(state, "provider.credentialSteps"); - const templateId = selector(state, "templateId"); - const actionConfiguration = selector(state, "actionConfiguration"); - let actionConfigurationBodyFormData = selector( - state, - "actionConfiguration.bodyFormData", - ); - const actionConfigurationHeaders = selector( - state, - "actionConfiguration.headers", - ); - - // Debugger render flag - const showDebugger = showDebuggerFlag(state); - - if ( - typeof actionConfigurationBodyFormData === "string" && - (displayFormat.value === POST_BODY_FORMAT_OPTIONS.JSON || - displayFormat.value === POST_BODY_FORMAT_OPTIONS.FORM_URLENCODED) - ) { - actionConfigurationBodyFormData = JSON.parse( - `${actionConfigurationBodyFormData}`, - ); - } - const currentActionConfig = getAction(state, ownProps.apiId); - const actionData = getActionData(state, actionConfiguration.id); - const { responseDataTypes, responseDisplayFormat } = - actionResponseDisplayDataFormats(actionData, { - title: "JSON", - value: "JSON", - }); - - return { - actionData, - currentActionConfig, - displayFormat, - actionConfiguration, - actionConfigurationHeaders, - actionConfigurationBodyFormData, - providerImage, - providerURL, - responseDataTypes, - responseDisplayFormat, - showDebugger, - templateId, - providerCredentialSteps, - }; -})( - reduxForm<Action, APIFormProps & APIFormOwnProps>({ - form: API_EDITOR_FORM_NAME, - destroyOnUnmount: false, - })(RapidApiEditorForm), -); diff --git a/app/client/src/pages/Editor/APIEditor/ResultPagination.tsx b/app/client/src/pages/Editor/APIEditor/ResultPagination.tsx deleted file mode 100644 index 933b609d6532..000000000000 --- a/app/client/src/pages/Editor/APIEditor/ResultPagination.tsx +++ /dev/null @@ -1,115 +0,0 @@ -import React from "react"; -import Pagination from "react-paginating"; -import styled from "styled-components"; -import { theme } from "constants/DefaultTheme"; - -interface ResultPaginationProps { - total: number; - handlePageChange: (page: number | undefined) => void; - currentPage: number | undefined; -} - -type Props = ResultPaginationProps; - -const PaginationContainer = styled.div` - display: flex; - justify-content: center; - margin-top: 10px; - - .item { - display: flex; - font-size: 14px; - justify-content: center; - background-color: white; - width: 30px; - align-items: center; - height: 30px; - border: 1.5px solid #dcdcdc; - margin: 0 5px; - cursor: pointer; - border-radius: 5px; - } -`; - -class ResultPagination extends React.Component<Props> { - render() { - const { currentPage = 1, handlePageChange, total } = this.props; - - return ( - <Pagination limit={40} pageCount={5} total={total}> - {({ - getPageItemProps, - hasNextPage, - hasPreviousPage, - nextPage, - pages, - previousPage, - totalPages, - }) => { - return ( - <PaginationContainer> - <div - className="item" - {...getPageItemProps({ - total: totalPages, - pageValue: previousPage, - onPageChange: hasPreviousPage ? handlePageChange : () => null, - style: !hasPreviousPage - ? { - backgroundColor: "#DCDCDC", - cursor: "not-allowed", - } - : {}, - })} - > - {"<"} - </div> - - {pages.map((page, index) => { - let activePage = undefined; - if (currentPage === page) { - activePage = { - borderColor: theme.colors.primaryOld, - }; - } - return ( - <div - className="item" - key={`marketPlace${index}`} - {...getPageItemProps({ - total: totalPages, - pageValue: page, - style: activePage, - onPageChange: handlePageChange, - })} - > - {page} - </div> - ); - })} - - <div - className="item" - {...getPageItemProps({ - total: totalPages, - pageValue: nextPage, - onPageChange: hasNextPage ? handlePageChange : () => null, - style: !hasNextPage - ? { - backgroundColor: "#DCDCDC", - cursor: "not-allowed", - } - : {}, - })} - > - {">"} - </div> - </PaginationContainer> - ); - }} - </Pagination> - ); - } -} - -export default ResultPagination; diff --git a/app/client/src/reducers/uiReducers/importedCollectionsReducer.ts b/app/client/src/reducers/uiReducers/importedCollectionsReducer.ts deleted file mode 100644 index 98c179b47672..000000000000 --- a/app/client/src/reducers/uiReducers/importedCollectionsReducer.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { createReducer } from "utils/ReducerUtils"; -import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants"; -import { - ReduxActionTypes, - ReduxActionErrorTypes, -} from "@appsmith/constants/ReduxActionConstants"; - -import type { - TemplateList, - CollectionDataArray, -} from "constants/collectionsConstants"; - -const initialState: ImportedCollectionsReduxState = { - isFetchingImportedCollections: false, - importedCollections: [], -}; - -const importedCollectionsReducer = createReducer(initialState, { - [ReduxActionTypes.FETCH_IMPORTED_COLLECTIONS_INIT]: ( - state: ImportedCollectionsReduxState, - ) => ({ ...state, isFetchingImportedCollections: true }), - [ReduxActionTypes.FETCH_IMPORTED_COLLECTIONS_SUCCESS]: ( - state: ImportedCollectionsReduxState, - action: ReduxAction<Array<CollectionDataArray>>, - ) => ({ - ...state, - importedCollections: action.payload[0].apiTemplateList, - isFetchingImportedCollections: false, - }), - [ReduxActionErrorTypes.FETCH_IMPORTED_COLLECTIONS_ERROR]: ( - state: ImportedCollectionsReduxState, - ) => { - return { ...state, isFetchingImportedCollections: false }; - }, -}); - -export interface ImportedCollectionsReduxState { - isFetchingImportedCollections: boolean; - importedCollections: TemplateList[]; -} - -export default importedCollectionsReducer; diff --git a/app/client/src/reducers/uiReducers/providerReducer.ts b/app/client/src/reducers/uiReducers/providerReducer.ts deleted file mode 100644 index e404cf885f59..000000000000 --- a/app/client/src/reducers/uiReducers/providerReducer.ts +++ /dev/null @@ -1,231 +0,0 @@ -/* eslint-disable @typescript-eslint/ban-types */ -import { createReducer } from "utils/ReducerUtils"; -import type { ReduxAction } from "@appsmith/constants/ReduxActionConstants"; -import { - ReduxActionTypes, - ReduxActionErrorTypes, -} from "@appsmith/constants/ReduxActionConstants"; - -import type { - Providers, - ProvidersDataArray, - ProviderTemplates, - ProviderTemplateArray, - ProvidersCategoriesResponse, - SearchResultsProviders, - FetchProviderDetailsResponse, -} from "constants/providerConstants"; -import type { SearchApiOrProviderResponse } from "api/ProvidersApi"; - -const initialState: ProvidersReduxState = { - isFetchingProviders: false, - providers: [], - providersTotal: 0, - providerTemplates: [], - isFetchingProviderTemplates: false, - providerCategories: [], - providerCategoriesErrorPayload: {}, - apiOrProviderSearchResults: { - providers: [], - }, - isSwitchingCategory: true, - isSearching: false, - lastUsedProviderId: "", - providerDetailsByProviderId: {}, - providerDetailsErrorPayload: {}, - fetchProvidersError: false, -}; - -const providersReducer = createReducer(initialState, { - [ReduxActionTypes.FETCH_PROVIDERS_INIT]: (state: ProvidersReduxState) => ({ - ...state, - isFetchingProviders: true, - }), - [ReduxActionTypes.SEARCH_APIORPROVIDERS_INIT]: ( - state: ProvidersReduxState, - ) => ({ - ...state, - isSearching: true, - }), - [ReduxActionTypes.FETCH_PROVIDERS_WITH_CATEGORY_INIT]: ( - state: ProvidersReduxState, - ) => ({ - ...state, - isFetchingProviders: true, - }), - [ReduxActionTypes.ADD_API_TO_PAGE_INIT]: ( - state: ProvidersReduxState, - action: any, - ) => { - const updatedProviderTemplates = state.providerTemplates.map((item) => { - if (item.templateData.id === action.payload.marketplaceElement.item.id) { - item.addToPageLoading = true; - return item; - } - return item; - }); - return { ...state, providerTemplates: updatedProviderTemplates }; - }, - [ReduxActionTypes.FETCH_PROVIDERS_SUCCESS]: ( - state: ProvidersReduxState, - action: ReduxAction<Providers>, - ) => { - if (state.providers.length === 0) { - return { - ...state, - providers: action.payload.providers, - providersTotal: action.payload.total, - isFetchingProviders: false, - isSwitchingCategory: false, - fetchProvidersError: false, - }; - } else { - return { - ...state, - providers: [...state.providers, ...action.payload.providers], - isFetchingProviders: false, - }; - } - }, - [ReduxActionTypes.SET_PROVIDERS_LENGTH]: (state: ProvidersReduxState) => ({ - ...state, - providersTotal: state.providers.length, - }), - [ReduxActionTypes.SEARCH_APIORPROVIDERS_SUCCESS]: ( - state: ProvidersReduxState, - action: ReduxAction<SearchApiOrProviderResponse>, - ) => ({ - ...state, - isSearching: false, - apiOrProviderSearchResults: action.payload, - }), - [ReduxActionErrorTypes.FETCH_PROVIDERS_ERROR]: ( - state: ProvidersReduxState, - ) => { - return { - ...state, - isFetchingProviders: false, - isSwitchingCategory: false, - fetchProvidersError: true, - }; - }, - [ReduxActionErrorTypes.SEARCH_APIORPROVIDERS_ERROR]: ( - state: ProvidersReduxState, - ) => { - return { ...state, isSearching: false }; - }, - [ReduxActionTypes.FETCH_PROVIDER_TEMPLATES_INIT]: ( - state: ProvidersReduxState, - action: any, - ) => { - return { - ...state, - isFetchingProviderTemplates: true, - lastUsedProviderId: action.payload.providerId, - }; - }, - [ReduxActionTypes.CLEAR_PROVIDERS]: (state: ProvidersReduxState) => ({ - ...state, - providers: [], - isSwitchingCategory: true, - }), - [ReduxActionTypes.FETCH_PROVIDER_TEMPLATES_SUCCESS]: ( - state: ProvidersReduxState, - action: ReduxAction<ProviderTemplates[]>, - ) => { - const templates = action.payload.map((payload) => ({ - isOpen: false, - templateData: payload, - addToPageStatus: false, - })); - return { - ...state, - providerTemplates: templates, - isFetchingProviderTemplates: false, - }; - }, - [ReduxActionErrorTypes.FETCH_PROVIDER_TEMPLATES_ERROR]: ( - state: ProvidersReduxState, - ) => { - return { ...state, isFetchingProviderTemplates: false }; - }, - [ReduxActionTypes.ADD_API_TO_PAGE_SUCCESS]: ( - state: ProvidersReduxState, - action: ProviderTemplates, - ) => { - const updatedProviderTemplates = state.providerTemplates.map((item) => { - // @ts-expect-error: type mismatch template id does not exists on ProviderTemplateArray[] - if (item.templateData.id === action.data.templateId) { - item.addToPageStatus = true; - item.addToPageLoading = false; - return item; - } - return item; - }); - return { ...state, providerTemplates: updatedProviderTemplates }; - }, - [ReduxActionErrorTypes.ADD_API_TO_PAGE_ERROR]: ( - state: ProvidersReduxState, - action: any, - ) => { - const updatedProviderTemplates = state.providerTemplates.map((item) => { - if (item.templateData.id === action.payload.templateId) { - item.addToPageLoading = false; - return item; - } - return item; - }); - return { ...state, providerTemplates: updatedProviderTemplates }; - }, - [ReduxActionTypes.FETCH_PROVIDERS_CATEGORIES_SUCCESS]: ( - state: ProvidersReduxState, - action: ReduxAction<ProvidersCategoriesResponse>, - ) => { - return { - ...state, - providerCategories: action.payload, - }; - }, - [ReduxActionErrorTypes.FETCH_PROVIDERS_CATEGORIES_ERROR]: ( - state: ProvidersReduxState, - action: ReduxAction<{ providerCategoriesErrorPayload: string }>, - ) => { - return { ...state, providerCategoriesErrorPayload: action.payload }; - }, - [ReduxActionTypes.FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_SUCCESS]: ( - state: ProvidersReduxState, - action: ReduxAction<FetchProviderDetailsResponse>, - ) => { - return { - ...state, - providerDetailsByProviderId: action.payload, - }; - }, - [ReduxActionErrorTypes.FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_ERROR]: ( - state: ProvidersReduxState, - action: ReduxAction<{ providerDetailsErrorPayload: string }>, - ) => { - return { ...state, providerDetailsErrorPayload: action.payload }; - }, -}); - -export interface ProvidersReduxState { - isFetchingProviders: boolean; - providers: ProvidersDataArray[]; - providersTotal: number; - providerTemplates: ProviderTemplateArray[]; - isFetchingProviderTemplates: boolean; - providerCategories: string[]; - providerCategoriesErrorPayload: {}; - isSwitchingCategory: boolean; - isSearching: boolean; - apiOrProviderSearchResults: { - providers: SearchResultsProviders[]; - }; - lastUsedProviderId: string; - providerDetailsByProviderId: {}; - providerDetailsErrorPayload: {}; - fetchProvidersError: boolean; -} - -export default providersReducer; diff --git a/app/client/src/sagas/CollectionSagas.ts b/app/client/src/sagas/CollectionSagas.ts deleted file mode 100644 index 60b7dcbc9f71..000000000000 --- a/app/client/src/sagas/CollectionSagas.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { call, takeLatest, put, all } from "redux-saga/effects"; -import { - ReduxActionTypes, - ReduxActionErrorTypes, -} from "@appsmith/constants/ReduxActionConstants"; -import { validateResponse } from "sagas/ErrorSagas"; -import ImportedCollectionsApi from "api/CollectionApi"; -import type { ImportedCollections } from "constants/collectionsConstants"; - -export function* fetchImportedCollectionsSaga() { - try { - const response: ImportedCollections = yield call( - ImportedCollectionsApi.fetchImportedCollections, - ); - const isValidResponse: boolean = yield validateResponse(response); - if (isValidResponse) { - yield put({ - type: ReduxActionTypes.FETCH_IMPORTED_COLLECTIONS_SUCCESS, - payload: response.data, - }); - } - } catch (error) { - yield put({ - type: ReduxActionErrorTypes.FETCH_IMPORTED_COLLECTIONS_ERROR, - payload: { - error, - }, - }); - } -} - -export default function* importedCollectionsSagas() { - yield all([ - takeLatest( - ReduxActionTypes.FETCH_IMPORTED_COLLECTIONS_INIT, - fetchImportedCollectionsSaga, - ), - ]); -} diff --git a/app/client/src/sagas/ProvidersSaga.ts b/app/client/src/sagas/ProvidersSaga.ts deleted file mode 100644 index a9bd13e6cf87..000000000000 --- a/app/client/src/sagas/ProvidersSaga.ts +++ /dev/null @@ -1,256 +0,0 @@ -import { - call, - takeLatest, - put, - all, - select, - debounce, -} from "redux-saga/effects"; -import type { - ReduxActionWithPromise, - ReduxAction, - Page, -} from "@appsmith/constants/ReduxActionConstants"; -import { - ReduxActionTypes, - ReduxActionErrorTypes, -} from "@appsmith/constants/ReduxActionConstants"; -import { validateResponse } from "sagas/ErrorSagas"; -import type { - FetchProviderTemplateResponse, - FetchProviderTemplatesRequest, - AddApiToPageRequest, - FetchProviderCategoriesResponse, - SearchApiOrProviderResponse, - SearchApiOrProviderRequest, - FetchProviderDetailsByProviderIdRequest, - FetchProviderDetailsResponse, -} from "api/ProvidersApi"; -import ProvidersApi from "api/ProvidersApi"; -import type { Providers } from "constants/providerConstants"; -import type { FetchProviderWithCategoryRequest } from "api/ProvidersApi"; -import { fetchActions } from "actions/pluginActionActions"; -import { - getCurrentApplicationId, - getPageList, -} from "selectors/editorSelectors"; -import { - ADD_API_TO_PAGE_SUCCESS_MESSAGE, - createMessage, -} from "@appsmith/constants/messages"; -import AnalyticsUtil from "utils/AnalyticsUtil"; -import { getCurrentWorkspaceId } from "@appsmith/selectors/workspaceSelectors"; -import { toast } from "design-system"; -import { isAirgapped } from "@appsmith/utils/airgapHelpers"; - -const isAirgappedInstance = isAirgapped(); - -export function* fetchProviderTemplatesSaga( - action: ReduxActionWithPromise<FetchProviderTemplatesRequest>, -) { - const { providerId } = action.payload; - try { - const request: FetchProviderTemplatesRequest = { providerId }; - - const response: FetchProviderTemplateResponse = - yield ProvidersApi.fetchProviderTemplates(request); - - const isValidResponse: boolean = yield validateResponse(response); - - if (isValidResponse) { - yield put({ - type: ReduxActionTypes.FETCH_PROVIDER_TEMPLATES_SUCCESS, - payload: response.data, - }); - } - } catch (error) { - yield put({ - type: ReduxActionErrorTypes.FETCH_PROVIDER_TEMPLATES_ERROR, - payload: { - error, - }, - }); - } -} - -export function* addApiToPageSaga( - action: ReduxActionWithPromise<AddApiToPageRequest>, -) { - const workspaceId: string = yield select(getCurrentWorkspaceId); - const request: AddApiToPageRequest = { - ...action.payload, - workspaceId, - }; - try { - const response: FetchProviderTemplateResponse = - yield ProvidersApi.addApiToPage(request); - - const isValidResponse: boolean = yield validateResponse(response); - - if (isValidResponse) { - const { payload } = action; - const pageList: Page[] = yield select(getPageList); - const page = pageList.find((page) => page.pageId === payload.pageId); - AnalyticsUtil.logEvent("ADD_API_PAGE", { - apiName: payload.name, - providerName: payload.marketplaceElement.item.name, - pageName: page?.pageName, - source: payload.source, - }); - toast.show(createMessage(ADD_API_TO_PAGE_SUCCESS_MESSAGE, payload.name), { - kind: "success", - }); - yield put({ - type: ReduxActionTypes.ADD_API_TO_PAGE_SUCCESS, - data: response.data, - }); - - const applicationId: string = yield select(getCurrentApplicationId); - yield put(fetchActions({ applicationId }, [])); - } - } catch (error) { - yield put({ - type: ReduxActionErrorTypes.ADD_API_TO_PAGE_ERROR, - payload: { - error, - templateId: request.marketplaceElement.id, - }, - }); - } -} - -export function* fetchProvidersWithCategorySaga( - action: ReduxAction<FetchProviderWithCategoryRequest>, -) { - try { - const request: FetchProviderWithCategoryRequest = action.payload; - const response: Providers = - yield ProvidersApi.fetchProvidersWithCategory(request); - - const isValidResponse: boolean = yield validateResponse(response); - - if (isValidResponse) { - // @ts-expect-error: response is of type unknown - if (response.data.providers.length === 0) { - yield put({ - type: ReduxActionTypes.SET_PROVIDERS_LENGTH, - }); - } - - yield put({ - type: ReduxActionTypes.FETCH_PROVIDERS_SUCCESS, - payload: response.data, - }); - } - } catch (error) { - yield put({ - type: ReduxActionErrorTypes.FETCH_PROVIDERS_ERROR, - payload: { - error, - }, - }); - } -} - -export function* fetchProvidersCategoriesSaga() { - try { - const response: FetchProviderCategoriesResponse = yield call( - ProvidersApi.fetchProvidersCategories, - ); - yield put({ - type: ReduxActionTypes.FETCH_PROVIDERS_CATEGORIES_SUCCESS, - payload: response.data, - }); - } catch (error) { - yield put({ - type: ReduxActionErrorTypes.FETCH_PROVIDERS_CATEGORIES_ERROR, - payload: { - error, - }, - }); - } -} - -export function* fetchProviderDetailsByProviderIdSaga( - action: ReduxActionWithPromise<FetchProviderTemplatesRequest>, -) { - const { providerId } = action.payload; - try { - const request: FetchProviderDetailsByProviderIdRequest = { providerId }; - - const response: FetchProviderDetailsResponse = - yield ProvidersApi.fetchProviderDetailsByProviderId(request); - - const isValidResponse: boolean = yield validateResponse(response); - - if (isValidResponse) { - yield put({ - type: ReduxActionTypes.FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_SUCCESS, - payload: response.data, - }); - } - } catch (error) { - yield put({ - type: ReduxActionErrorTypes.FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_ERROR, - payload: { - error, - }, - }); - } -} - -export function* searchApiOrProviderSaga( - action: ReduxAction<SearchApiOrProviderRequest>, -) { - try { - const response: SearchApiOrProviderResponse = yield call( - ProvidersApi.seachApiOrProvider, - action.payload, - ); - - const isValidResponse: boolean = yield validateResponse(response); - - if (isValidResponse) { - yield put({ - type: ReduxActionTypes.SEARCH_APIORPROVIDERS_SUCCESS, - payload: response.data, - }); - } - } catch (error) { - yield put({ - type: ReduxActionErrorTypes.SEARCH_APIORPROVIDERS_ERROR, - payload: { - error, - }, - }); - } -} - -export default function* providersSagas() { - if (!isAirgappedInstance) { - yield all([ - takeLatest( - ReduxActionTypes.FETCH_PROVIDER_TEMPLATES_INIT, - fetchProviderTemplatesSaga, - ), - takeLatest(ReduxActionTypes.ADD_API_TO_PAGE_INIT, addApiToPageSaga), - takeLatest( - ReduxActionTypes.FETCH_PROVIDERS_CATEGORIES_INIT, - fetchProvidersCategoriesSaga, - ), - debounce( - 300, - ReduxActionTypes.SEARCH_APIORPROVIDERS_INIT, - searchApiOrProviderSaga, - ), - takeLatest( - ReduxActionTypes.FETCH_PROVIDERS_WITH_CATEGORY_INIT, - fetchProvidersWithCategorySaga, - ), - takeLatest( - ReduxActionTypes.FETCH_PROVIDER_DETAILS_BY_PROVIDER_ID_INIT, - fetchProviderDetailsByProviderIdSaga, - ), - ]); - } -} diff --git a/app/client/src/selectors/editorSelectors.tsx b/app/client/src/selectors/editorSelectors.tsx index d1922fbe15f9..3bd14090919d 100644 --- a/app/client/src/selectors/editorSelectors.tsx +++ b/app/client/src/selectors/editorSelectors.tsx @@ -71,9 +71,6 @@ const getIsResizing = (state: AppState) => state.ui.widgetDragResize.isResizing; const getPageListState = (state: AppState) => state.entities.pageList; -export const getProviderCategories = (state: AppState) => - state.ui.providers.providerCategories; - const getWidgets = (state: AppState): CanvasWidgetsReduxState => state.entities.canvasWidgets; diff --git a/app/client/src/serviceWorker.js b/app/client/src/serviceWorker.js index c3c0cd716869..e47f767146ab 100644 --- a/app/client/src/serviceWorker.js +++ b/app/client/src/serviceWorker.js @@ -6,7 +6,6 @@ import { NetworkOnly, StaleWhileRevalidate, } from "workbox-strategies"; -import { ExpirationPlugin } from "workbox-expiration"; setCacheNameDetails({ prefix: "appsmith", @@ -23,7 +22,6 @@ const regexMap = { ), shims: new RegExp(/shims\/.*.js/), profile: new RegExp(/v1\/(users\/profile|workspaces)/), - providers: new RegExp(/v1\/marketplace\/(providers|templates)/), }; /* eslint-disable no-restricted-globals */ @@ -53,17 +51,6 @@ registerRoute(({ url }) => { return regexMap.appViewPage.test(url.pathname); }, new StaleWhileRevalidate()); -registerRoute( - ({ url }) => regexMap.providers.test(url.pathname), - new CacheFirst({ - plugins: [ - new ExpirationPlugin({ - maxAgeSeconds: 1 * 60 * 60, - }), - ], - }), -); - registerRoute( new Route(({ request, sameOrigin }) => { return sameOrigin && request.destination === "document"; diff --git a/app/client/start-https.sh b/app/client/start-https.sh index 39de94f9c4af..46938964e88e 100755 --- a/app/client/start-https.sh +++ b/app/client/start-https.sh @@ -277,7 +277,6 @@ $(if [[ $use_https == 1 ]]; then echo " proxy_pass $frontend; sub_filter __APPSMITH_SENTRY_DSN__ '${APPSMITH_SENTRY_DSN-}'; sub_filter __APPSMITH_SMART_LOOK_ID__ '${APPSMITH_SMART_LOOK_ID-}'; - sub_filter __APPSMITH_MARKETPLACE_ENABLED__ '${APPSMITH_MARKETPLACE_ENABLED-}'; sub_filter __APPSMITH_SEGMENT_KEY__ '${APPSMITH_SEGMENT_KEY-}'; sub_filter __APPSMITH_ALGOLIA_API_ID__ '${APPSMITH_ALGOLIA_API_ID-}'; sub_filter __APPSMITH_ALGOLIA_SEARCH_INDEX_NAME__ '${APPSMITH_ALGOLIA_SEARCH_INDEX_NAME-}'; diff --git a/app/client/test/sagas.ts b/app/client/test/sagas.ts index a889cbd565ac..14bdfc4ce70a 100644 --- a/app/client/test/sagas.ts +++ b/app/client/test/sagas.ts @@ -10,7 +10,6 @@ import applicationSagas from "@appsmith/sagas/ApplicationSagas"; import batchSagas from "../src/sagas/BatchSagas"; import draggingCanvasSagas from "../src/sagas/CanvasSagas/DraggingCanvasSagas"; import selectionCanvasSagas from "../src/sagas/CanvasSagas/SelectionCanvasSagas"; -import importedCollectionsSagas from "../src/sagas/CollectionSagas"; import curlImportSagas from "../src/sagas/CurlImportSagas"; import debuggerSagas from "../src/sagas/DebuggerSagas"; import formEvaluationChangeListener from "../src/sagas/FormEvaluationSaga"; @@ -21,7 +20,6 @@ import jsPaneSagas from "../src/sagas/JSPaneSagas"; import LintingSaga from "../src/sagas/LintingSagas"; import modalSagas from "../src/sagas/ModalSagas"; import pluginSagas from "../src/sagas/PluginSagas"; -import providersSagas from "../src/sagas/ProvidersSaga"; import queryPaneSagas from "../src/sagas/QueryPaneSagas"; import saaSPaneSagas from "../src/sagas/SaaSPaneSagas"; import snipingModeSagas from "../src/sagas/SnipingModeSagas"; @@ -44,8 +42,6 @@ export const sagasToRunForTests = [ userSagas, pluginSagas, workspaceSagas, - importedCollectionsSagas, - providersSagas, curlImportSagas, snipingModeSagas, queryPaneSagas, diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionProvider.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionProvider.java deleted file mode 100644 index d2d449266588..000000000000 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionProvider.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.appsmith.external.models; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -public class ActionProvider { - String name; - - String imageUrl; - - String url; - - String description; - - String credentialSteps; -} diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApiTemplate.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApiTemplate.java deleted file mode 100644 index ab2aa60f5200..000000000000 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApiTemplate.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.appsmith.external.models; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.springframework.data.mongodb.core.mapping.Document; - -@Getter -@Setter -@ToString -@NoArgsConstructor -@Document -public class ApiTemplate extends BaseDomain { - - // ApiTemplate fields below : - String name; // API name here - String providerId; // Providers, e.g. Salesforce should exist in the db and its id should come here. - String publisher; // e.g. RapidAPI - String packageName; // Plugin package name used to execute the final action created by this template - String versionId; - ApiTemplateConfiguration apiTemplateConfiguration; - ActionConfiguration actionConfiguration; - DatasourceConfiguration datasourceConfiguration; - String hashValue; - String scraperId; -} diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApiTemplateConfiguration.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApiTemplateConfiguration.java deleted file mode 100644 index 6bb175e7180a..000000000000 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ApiTemplateConfiguration.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.appsmith.external.models; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -@Getter -@Setter -@ToString -@NoArgsConstructor -public class ApiTemplateConfiguration implements AppsmithDomain { - String documentation; // Documentation for this particular API comes here - String documentationUrl; // URL for this particular api's documentation comes here - ActionExecutionResult sampleResponse; -} diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Category.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Category.java deleted file mode 100644 index fd8e4e8d6746..000000000000 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Category.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.appsmith.external.models; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; - -@Getter -@Setter -@ToString -@NoArgsConstructor -@Document -public class Category extends BaseDomain { - - @Indexed(unique = true) - String name; // Category name here -} diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/CommandParams.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/CommandParams.java deleted file mode 100644 index dd13dcd5b4fd..000000000000 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/CommandParams.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.appsmith.external.models; - -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -public class CommandParams { - List<Param> queryParams; - - List<Param> headerParams; -} diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Provider.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Provider.java deleted file mode 100644 index edac2fd259dc..000000000000 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Provider.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.appsmith.external.models; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; - -import java.util.List; - -@Getter -@Setter -@ToString -@NoArgsConstructor -@Document -public class Provider extends BaseDomain { - - @Indexed(unique = true) - String name; // Provider name here - - String description; // Provider company's description here - - String url; - - String imageUrl; - - String documentationUrl; // URL which points to the homepage of the documentations here - - String credentialSteps; // How to generate/get the credentials to run the APIs which belong to this provider - - List<String> categories; // Category names here - - Statistics statistics; // Cumulative statistics for all the APIs for this provider - - DatasourceConfiguration datasourceConfiguration; - - List<PricingPlan> pricingPlans; - - String planSubscribed; - - /** - * TODO : Once the marketplace is up, remove the default values from here. Let the Marketplace handle the defaults. - */ - Boolean isVisible = true; - - Integer sortOrder = 1000; -} diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Statistics.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Statistics.java deleted file mode 100644 index 94bee9bca3cb..000000000000 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Statistics.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.appsmith.external.models; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -@Getter -@Setter -@ToString -@NoArgsConstructor -public class Statistics { - Long imports; // No of times any of the provider's apis have been imported - Long averageLatency; // Average latency of the APIs provided by this provider in milli second - Double successRate; // Percentage of successful responses. -} diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/TemplateCollection.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/TemplateCollection.java deleted file mode 100644 index 454490decc2d..000000000000 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/TemplateCollection.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.appsmith.external.models; - -import com.appsmith.external.views.Views; -import com.fasterxml.jackson.annotation.JsonView; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; -import org.springframework.data.annotation.CreatedBy; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.annotation.Id; -import org.springframework.data.annotation.LastModifiedBy; -import org.springframework.data.annotation.LastModifiedDate; -import org.springframework.data.annotation.Transient; -import org.springframework.data.annotation.Version; -import org.springframework.data.domain.Persistable; -import org.springframework.data.mongodb.core.index.Indexed; -import org.springframework.data.mongodb.core.mapping.Document; - -import java.time.Instant; -import java.util.List; - -@Getter -@Setter -@ToString -@NoArgsConstructor -@Document -public class TemplateCollection implements Persistable<String> { - private static final long serialVersionUID = 7459916000501322517L; - - @Id - @JsonView(Views.Public.class) - private String id; - - @JsonView(Views.Internal.class) - @Indexed - @CreatedDate - protected Instant createdAt; - - @JsonView(Views.Internal.class) - @LastModifiedDate - protected Instant updatedAt; - - @CreatedBy - @JsonView(Views.Public.class) - protected String createdBy; - - @LastModifiedBy - @JsonView(Views.Public.class) - protected String modifiedBy; - - @JsonView(Views.Public.class) - protected Boolean deleted = false; - - @JsonView(Views.Internal.class) - @Version - protected Long documentVersion; - - @JsonView(Views.Internal.class) - @Override - public boolean isNew() { - return this.getId() == null; - } - - // TemplateCollection fields below : - @JsonView(Views.Public.class) - String name; - - @JsonView(Views.Internal.class) - List<String> apiTemplateIds; - - @Transient - @JsonView(Views.Public.class) - List<ApiTemplate> apiTemplateList; -} diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java index 029fb47e694d..e43f18012f1a 100644 --- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java +++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ce/ActionCE_DTO.java @@ -5,7 +5,6 @@ import com.appsmith.external.exceptions.ErrorDTO; import com.appsmith.external.helpers.Identifiable; import com.appsmith.external.models.ActionConfiguration; -import com.appsmith.external.models.ActionProvider; import com.appsmith.external.models.AnalyticsInfo; import com.appsmith.external.models.CreatorContextType; import com.appsmith.external.models.Datasource; @@ -126,18 +125,6 @@ public class ActionCE_DTO implements Identifiable, Executable { @JsonView(Views.Internal.class) String cacheResponse; - @Transient - @JsonView(Views.Public.class) - String templateId; // If action is created via a template, store the id here. - - @Transient - @JsonView(Views.Public.class) - String providerId; // If action is created via a template, store the template's provider id here. - - @Transient - @JsonView(Views.Public.class) - ActionProvider provider; - @JsonView(Views.Internal.class) Boolean userSetOnLoad = false; @@ -312,9 +299,6 @@ protected void resetTransientFields() { this.setPluginType(null); this.setErrorReports(null); // this.setMessages(null); - this.setTemplateId(null); - this.setProvider(null); - this.setProviderId(null); this.setDocumentation(null); } } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/FieldNameCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/FieldNameCE.java index c36ec7803f22..de3e1f24676e 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/FieldNameCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/FieldNameCE.java @@ -40,7 +40,6 @@ public class FieldNameCE { public static String CHILDREN = "children"; public static String ORIGIN = "origin"; public static String USER = "user"; - public static String PROVIDER_ID = "providerId"; public static String CATEGORY = "category"; public static String PAGE = "page"; public static String PAGES = "pages"; diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/UrlCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/UrlCE.java index c9c8c262d10b..08f65c8013db 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/UrlCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/UrlCE.java @@ -21,13 +21,7 @@ public class UrlCE { public static final String COLLECTION_URL = BASE_URL + VERSION + "/collections"; public static final String ACTION_COLLECTION_URL = COLLECTION_URL + "/actions"; public static final String IMPORT_URL = BASE_URL + VERSION + "/import"; - public static final String PROVIDER_URL = BASE_URL + VERSION + "/providers"; - public static final String MARKETPLACE_URL = BASE_URL + VERSION + "/marketplace"; - public static final String API_TEMPLATE_URL = BASE_URL + VERSION + "/templates"; - public static final String MARKETPLACE_ITEM_URL = BASE_URL + VERSION + "/items"; public static final String ASSET_URL = BASE_URL + VERSION + "/assets"; - public static final String COMMENT_URL = BASE_URL + VERSION + "/comments"; - public static final String NOTIFICATION_URL = BASE_URL + VERSION + "/notifications"; public static final String INSTANCE_ADMIN_URL = BASE_URL + VERSION + "/admin"; public static final String GIT_URL = BASE_URL + VERSION + "/git"; public static final String THEME_URL = BASE_URL + VERSION + "/themes"; diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApiTemplateController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApiTemplateController.java deleted file mode 100644 index 30984533ce9d..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ApiTemplateController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.appsmith.server.controllers; - -import com.appsmith.server.constants.Url; -import com.appsmith.server.controllers.ce.ApiTemplateControllerCE; -import com.appsmith.server.services.ApiTemplateService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping(Url.API_TEMPLATE_URL) -@Slf4j -public class ApiTemplateController extends ApiTemplateControllerCE { - - public ApiTemplateController(ApiTemplateService service) { - super(service); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ItemController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ItemController.java deleted file mode 100644 index d080019b3dd4..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ItemController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.appsmith.server.controllers; - -import com.appsmith.server.constants.Url; -import com.appsmith.server.controllers.ce.ItemControllerCE; -import com.appsmith.server.services.ItemService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Slf4j -@RestController -@RequestMapping(Url.MARKETPLACE_ITEM_URL) -public class ItemController extends ItemControllerCE { - - public ItemController(ItemService service) { - super(service); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/MarketplaceController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/MarketplaceController.java deleted file mode 100644 index 00e29c1de471..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/MarketplaceController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.appsmith.server.controllers; - -import com.appsmith.server.constants.Url; -import com.appsmith.server.controllers.ce.MarketplaceControllerCE; -import com.appsmith.server.services.MarketplaceService; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping(Url.MARKETPLACE_URL) -@Slf4j -public class MarketplaceController extends MarketplaceControllerCE { - - public MarketplaceController(ObjectMapper objectMapper, MarketplaceService marketplaceService) { - - super(objectMapper, marketplaceService); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/NotificationController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/NotificationController.java deleted file mode 100644 index 5fc93478470b..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/NotificationController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.appsmith.server.controllers; - -import com.appsmith.server.constants.Url; -import com.appsmith.server.controllers.ce.NotificationControllerCE; -import com.appsmith.server.services.NotificationService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Slf4j -@RestController -@RequestMapping(Url.NOTIFICATION_URL) -public class NotificationController extends NotificationControllerCE { - - public NotificationController(NotificationService service) { - super(service); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ProviderController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ProviderController.java deleted file mode 100644 index 5875d04ca9cb..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ProviderController.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.appsmith.server.controllers; - -import com.appsmith.server.constants.Url; -import com.appsmith.server.controllers.ce.ProviderControllerCE; -import com.appsmith.server.services.ProviderService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping(Url.PROVIDER_URL) -@Slf4j -public class ProviderController extends ProviderControllerCE { - - public ProviderController(ProviderService service) { - super(service); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java index 6db54a2ff01c..ca2bdaaf6bdc 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/RestApiImportController.java @@ -3,7 +3,6 @@ import com.appsmith.server.constants.Url; import com.appsmith.server.controllers.ce.RestApiImportControllerCE; import com.appsmith.server.services.CurlImporterService; -import com.appsmith.server.services.PostmanImporterService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -13,9 +12,7 @@ @Slf4j public class RestApiImportController extends RestApiImportControllerCE { - public RestApiImportController( - CurlImporterService curlImporterService, PostmanImporterService postmanImporterService) { - - super(curlImporterService, postmanImporterService); + public RestApiImportController(CurlImporterService curlImporterService) { + super(curlImporterService); } } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApiTemplateControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApiTemplateControllerCE.java deleted file mode 100644 index 41baca854160..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApiTemplateControllerCE.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.appsmith.server.controllers.ce; - -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.server.constants.Url; -import com.appsmith.server.services.ApiTemplateService; -import org.springframework.web.bind.annotation.RequestMapping; - -@RequestMapping(Url.API_TEMPLATE_URL) -public class ApiTemplateControllerCE extends BaseController<ApiTemplateService, ApiTemplate, String> { - public ApiTemplateControllerCE(ApiTemplateService service) { - super(service); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ItemControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ItemControllerCE.java deleted file mode 100644 index ebec2abd5ec5..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ItemControllerCE.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.appsmith.server.controllers.ce; - -import com.appsmith.external.models.ActionDTO; -import com.appsmith.external.views.Views; -import com.appsmith.server.constants.Url; -import com.appsmith.server.dtos.AddItemToPageDTO; -import com.appsmith.server.dtos.ItemDTO; -import com.appsmith.server.dtos.ResponseDTO; -import com.appsmith.server.services.ItemService; -import com.fasterxml.jackson.annotation.JsonView; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.util.MultiValueMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import reactor.core.publisher.Mono; - -import java.util.List; - -@Slf4j -@RequestMapping(Url.MARKETPLACE_ITEM_URL) -public class ItemControllerCE { - private final ItemService service; - - public ItemControllerCE(ItemService service) { - this.service = service; - } - - @JsonView(Views.Public.class) - @GetMapping("") - public Mono<ResponseDTO<List<ItemDTO>>> getAll(@RequestParam MultiValueMap<String, String> params) { - log.debug("Going to get all items by parameters " + params); - return service.get(params) - .collectList() - .map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null)); - } - - @JsonView(Views.Public.class) - @PostMapping("/addToPage") - public Mono<ResponseDTO<ActionDTO>> addItemToPage(@RequestBody AddItemToPageDTO addItemToPageDTO) { - log.debug( - "Going to add item {} to page {} with new name {}", - addItemToPageDTO.getMarketplaceElement().getItem().getName(), - addItemToPageDTO.getPageId(), - addItemToPageDTO.getName()); - return service.addItemToPage(addItemToPageDTO) - .map(action -> new ResponseDTO<>(HttpStatus.CREATED.value(), action, null)); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/MarketplaceControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/MarketplaceControllerCE.java deleted file mode 100644 index c7783ad2e0dc..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/MarketplaceControllerCE.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.appsmith.server.controllers.ce; - -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.external.models.Provider; -import com.appsmith.external.views.Views; -import com.appsmith.server.constants.Url; -import com.appsmith.server.dtos.ProviderPaginatedDTO; -import com.appsmith.server.dtos.ResponseDTO; -import com.appsmith.server.dtos.SearchResponseDTO; -import com.appsmith.server.services.MarketplaceService; -import com.fasterxml.jackson.annotation.JsonView; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.util.MultiValueMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import reactor.core.publisher.Mono; - -import java.util.List; - -@RequestMapping(Url.MARKETPLACE_URL) -@Slf4j -public class MarketplaceControllerCE { - private final MarketplaceService marketplaceService; - - public MarketplaceControllerCE(ObjectMapper objectMapper, MarketplaceService marketplaceService) { - this.marketplaceService = marketplaceService; - } - - @JsonView(Views.Public.class) - @GetMapping("/search") - Mono<ResponseDTO<SearchResponseDTO>> searchAPIOrProviders( - @RequestParam String searchKey, @RequestParam(required = false) Integer limit) { - - return marketplaceService.searchProviderByName(searchKey).map(result -> { - SearchResponseDTO searchResponseDTO = new SearchResponseDTO(); - searchResponseDTO.setProviders(result); - return new ResponseDTO<>(HttpStatus.OK.value(), searchResponseDTO, null); - }); - } - - @JsonView(Views.Public.class) - @GetMapping("/templates") - public Mono<ResponseDTO<List<ApiTemplate>>> getAllTemplatesFromMarketplace( - @RequestParam MultiValueMap<String, String> params) { - log.debug("Going to get all templates from Marketplace"); - return marketplaceService - .getTemplates(params) - .map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null)); - } - - @JsonView(Views.Public.class) - @GetMapping("/providers") - public Mono<ResponseDTO<ProviderPaginatedDTO>> getAllProvidersFromMarketplace( - @RequestParam MultiValueMap<String, String> params) { - log.debug("Going to get all providers from Marketplace"); - return marketplaceService - .getProviders(params) - .map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null)); - } - - @JsonView(Views.Public.class) - @GetMapping("/providers/{id}") - public Mono<ResponseDTO<Provider>> getProviderByIdFromMarketplace(@PathVariable String id) { - log.debug("Going to get provider from Marketplace with id {}", id); - return marketplaceService - .getProviderById(id) - .map(resource -> new ResponseDTO<>(HttpStatus.OK.value(), resource, null)); - } - - @JsonView(Views.Public.class) - @GetMapping("/categories") - public Mono<ResponseDTO<List<String>>> getAllCategoriesFromMarketplace() { - log.debug("Going to get all categories from Marketplace"); - return marketplaceService - .getCategories() - .map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null)); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/NotificationControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/NotificationControllerCE.java deleted file mode 100644 index a23b94dd0de7..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/NotificationControllerCE.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.appsmith.server.controllers.ce; - -import com.appsmith.external.views.Views; -import com.appsmith.server.constants.Url; -import com.appsmith.server.domains.Notification; -import com.appsmith.server.dtos.ResponseDTO; -import com.appsmith.server.dtos.UpdateIsReadNotificationByIdDTO; -import com.appsmith.server.dtos.UpdateIsReadNotificationDTO; -import com.appsmith.server.exceptions.AppsmithException; -import com.appsmith.server.services.NotificationService; -import com.fasterxml.jackson.annotation.JsonView; -import jakarta.validation.Valid; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PatchMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Mono; - -import static com.appsmith.server.exceptions.AppsmithError.UNSUPPORTED_OPERATION; - -@Slf4j -@RequestMapping(Url.NOTIFICATION_URL) -public class NotificationControllerCE extends BaseController<NotificationService, Notification, String> { - - public NotificationControllerCE(NotificationService service) { - super(service); - } - - @JsonView(Views.Public.class) - @GetMapping("count/unread") - public Mono<ResponseDTO<Long>> getUnreadCount() { - return service.getUnreadCount().map(response -> new ResponseDTO<>(HttpStatus.OK.value(), response, null)); - } - - @JsonView(Views.Public.class) - @PatchMapping("isRead") - public Mono<ResponseDTO<UpdateIsReadNotificationByIdDTO>> updateIsRead( - @RequestBody @Valid UpdateIsReadNotificationByIdDTO body) { - log.debug("Going to set isRead to notifications by id"); - return service.updateIsRead(body).map(dto -> new ResponseDTO<>(HttpStatus.OK.value(), dto, null, true)); - } - - @JsonView(Views.Public.class) - @PatchMapping("isRead/all") - public Mono<ResponseDTO<UpdateIsReadNotificationDTO>> updateIsRead( - @RequestBody @Valid UpdateIsReadNotificationDTO body) { - log.debug("Going to set isRead to all notifications"); - return service.updateIsRead(body).map(dto -> new ResponseDTO<>(HttpStatus.OK.value(), dto, null, true)); - } - - @Override - public Mono<ResponseDTO<Notification>> create( - Notification resource, String originHeader, ServerWebExchange exchange) { - return Mono.error(new AppsmithException(UNSUPPORTED_OPERATION)); - } - - @Override - public Mono<ResponseDTO<Notification>> update(String s, Notification resource, String ignoreBranchName) { - return Mono.error(new AppsmithException(UNSUPPORTED_OPERATION)); - } - - @Override - public Mono<ResponseDTO<Notification>> delete(String s, String ignoreBranchName) { - return Mono.error(new AppsmithException(UNSUPPORTED_OPERATION)); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ProviderControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ProviderControllerCE.java deleted file mode 100644 index 94703b218308..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ProviderControllerCE.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.appsmith.server.controllers.ce; - -import com.appsmith.external.models.Provider; -import com.appsmith.external.views.Views; -import com.appsmith.server.constants.Url; -import com.appsmith.server.dtos.ResponseDTO; -import com.appsmith.server.services.ProviderService; -import com.fasterxml.jackson.annotation.JsonView; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import reactor.core.publisher.Mono; - -import java.util.List; - -@RequestMapping(Url.PROVIDER_URL) -@Slf4j -public class ProviderControllerCE extends BaseController<ProviderService, Provider, String> { - public ProviderControllerCE(ProviderService service) { - super(service); - } - - @JsonView(Views.Public.class) - @GetMapping("/categories") - public Mono<ResponseDTO<List<String>>> getAllCategories() { - return service.getAllCategories().map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null)); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/RestApiImportControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/RestApiImportControllerCE.java index dcdc2e0447eb..3042d5f54737 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/RestApiImportControllerCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/RestApiImportControllerCE.java @@ -1,7 +1,6 @@ package com.appsmith.server.controllers.ce; import com.appsmith.external.models.ActionDTO; -import com.appsmith.external.models.TemplateCollection; import com.appsmith.external.views.Views; import com.appsmith.server.constants.FieldName; import com.appsmith.server.constants.Url; @@ -9,13 +8,9 @@ import com.appsmith.server.dtos.ResponseDTO; import com.appsmith.server.services.ApiImporter; import com.appsmith.server.services.CurlImporterService; -import com.appsmith.server.services.PostmanImporterService; import com.fasterxml.jackson.annotation.JsonView; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -24,19 +19,14 @@ import org.springframework.web.bind.annotation.ResponseStatus; import reactor.core.publisher.Mono; -import java.util.List; - @RequestMapping(Url.IMPORT_URL) @Slf4j public class RestApiImportControllerCE { private final CurlImporterService curlImporterService; - private final PostmanImporterService postmanImporterService; - public RestApiImportControllerCE( - CurlImporterService curlImporterService, PostmanImporterService postmanImporterService) { + public RestApiImportControllerCE(CurlImporterService curlImporterService) { this.curlImporterService = curlImporterService; - this.postmanImporterService = postmanImporterService; } @JsonView(Views.Public.class) @@ -64,27 +54,4 @@ public Mono<ResponseDTO<ActionDTO>> create( return service.importAction(input, pageId, name, workspaceId, branchName) .map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null)); } - - @JsonView(Views.Public.class) - @PostMapping("/postman") - @ResponseStatus(HttpStatus.CREATED) - public Mono<ResponseDTO<TemplateCollection>> importPostmanCollection( - @RequestBody Object input, @RequestParam String type) { - return Mono.just(postmanImporterService.importPostmanCollection(input)) - .map(created -> new ResponseDTO<>(HttpStatus.CREATED.value(), created, null)); - } - - @JsonView(Views.Public.class) - @GetMapping("/templateCollections") - public Mono<ResponseDTO<List<TemplateCollection>>> fetchImportedCollections() { - return Mono.just(postmanImporterService.fetchPostmanCollections()) - .map(resources -> new ResponseDTO<>(HttpStatus.OK.value(), resources, null)); - } - - @JsonView(Views.Public.class) - @DeleteMapping("/templateCollections/{id}") - public Mono<ResponseDTO<TemplateCollection>> deletePostmanCollection(@PathVariable String id) { - return Mono.just(postmanImporterService.deletePostmanCollection(id)) - .map(deleted -> new ResponseDTO<>(HttpStatus.OK.value(), deleted, null)); - } } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Action.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Action.java index 074e32114c3a..44c197ad4f00 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Action.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Action.java @@ -1,7 +1,6 @@ package com.appsmith.server.domains; import com.appsmith.external.models.ActionConfiguration; -import com.appsmith.external.models.ActionProvider; import com.appsmith.external.models.BaseDomain; import com.appsmith.external.models.Datasource; import com.appsmith.external.models.Documentation; @@ -87,10 +86,6 @@ public class Action extends BaseDomain { @JsonView(Views.Public.class) String providerId; // If action is created via a template, store the template's provider id here. - @Transient - @JsonView(Views.Public.class) - ActionProvider provider; - @Transient @JsonView(Views.Public.class) String pluginId; diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Notification.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Notification.java deleted file mode 100644 index 824a30c17c61..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Notification.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.appsmith.server.domains; - -import com.appsmith.external.models.BaseDomain; -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springframework.data.mongodb.core.mapping.Document; - -import static com.appsmith.server.helpers.DateUtils.ISO_FORMATTER; - -@Data -@EqualsAndHashCode(callSuper = true) -@Document -public class Notification extends BaseDomain { - - // TODO: This class extends BaseDomain, so it has policies. Should we use information from policies instead of this - // field? - String forUsername; - - /** - * Read status for this notification. If it is `true`, then this notification is read. If `false` or `null`, it's unread. - */ - Boolean isRead; - - public String getType() { - return getClass().getSimpleName(); - } - - /** - * This method has been added because the createdAt property in base domain has @JsonIgnore annotation - * - * @return created time as a string - */ - @JsonProperty(value = "createdAt", access = JsonProperty.Access.READ_ONLY) - public String getCreationTime() { - return ISO_FORMATTER.format(createdAt); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OldProperty.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OldProperty.java deleted file mode 100644 index f4e6b44e515c..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/OldProperty.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.appsmith.server.domains; - -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -public class OldProperty { - - String key; - - String value; - - Boolean editable; - - Boolean internal; -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Plugin.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Plugin.java index 8a22851fe886..4ddc27bb6b28 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Plugin.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Plugin.java @@ -65,7 +65,6 @@ public enum ResponseType { @JsonView(Views.Public.class) String version; - // Legacy field to find which form to use (RapidAPI hack) @JsonView(Views.Public.class) String uiComponent; diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/NewActionCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/NewActionCE.java index 792752ee9ce4..d72302c295ad 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/NewActionCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/ce/NewActionCE.java @@ -28,12 +28,6 @@ public class NewActionCE extends BranchAwareDomain { @JsonView(Views.Public.class) String pluginId; - @JsonView(Views.Public.class) - String templateId; // If action is created via a template, store the id here. - - @JsonView(Views.Public.class) - String providerId; // If action is created via a template, store the template's provider id here. - @JsonView(Views.Public.class) Documentation documentation; // Documentation for the template using which this action was created @@ -46,10 +40,8 @@ public class NewActionCE extends BranchAwareDomain { @Override public void sanitiseToExportDBObject() { - this.setTemplateId(null); this.setApplicationId(null); this.setWorkspaceId(null); - this.setProviderId(null); this.setDocumentation(null); ActionDTO unpublishedAction = this.getUnpublishedAction(); if (unpublishedAction != null) { diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/AddItemToPageDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/AddItemToPageDTO.java deleted file mode 100644 index b7299d33a701..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/AddItemToPageDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.appsmith.server.dtos; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -public class AddItemToPageDTO { - String name; - String pageId; - String workspaceId; - ItemDTO marketplaceElement; -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ItemDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ItemDTO.java deleted file mode 100644 index 46d5dec6484e..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ItemDTO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.appsmith.server.dtos; - -import com.appsmith.external.models.ApiTemplate; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -@Getter -@Setter -@NoArgsConstructor -public class ItemDTO { - ItemType type; - ApiTemplate item; -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ProviderPaginatedDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ProviderPaginatedDTO.java deleted file mode 100644 index cd1310ee6ffc..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ProviderPaginatedDTO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.appsmith.server.dtos; - -import com.appsmith.external.models.Provider; -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -public class ProviderPaginatedDTO { - List<Provider> providers; - Long total; -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/SearchResponseDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/SearchResponseDTO.java deleted file mode 100644 index bbb891c1501b..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/SearchResponseDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.appsmith.server.dtos; - -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.external.models.Provider; -import com.appsmith.server.domains.Action; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -import java.util.List; - -@Getter -@Setter -@ToString -@NoArgsConstructor -@AllArgsConstructor -public class SearchResponseDTO { - List<Provider> providers; - List<ApiTemplate> apiTemplates; - List<Action> actions; -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java index ef358d220219..e61037435784 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java @@ -515,14 +515,6 @@ public enum AppsmithError { "I/O error", ErrorType.INTERNAL_ERROR, null), - MARKETPLACE_TIMEOUT( - 504, - AppsmithErrorCode.MARKETPLACE_TIMEOUT.getCode(), - "Marketplace is responding too slowly. Please try again later", - AppsmithErrorAction.DEFAULT, - "Timeout in marketplace", - ErrorType.CONNECTIVITY_ERROR, - null), DATASOURCE_HAS_ACTIONS( 409, AppsmithErrorCode.DATASOURCE_HAS_ACTIONS.getCode(), @@ -555,14 +547,6 @@ public enum AppsmithError { "Unsupported login method", ErrorType.BAD_REQUEST, null), - MARKETPLACE_NOT_CONFIGURED( - 500, - AppsmithErrorCode.MARKETPLACE_NOT_CONFIGURED.getCode(), - "Marketplace is not configured.", - AppsmithErrorAction.DEFAULT, - "Marketplace not configured", - ErrorType.CONFIGURATION_ERROR, - null), PAYLOAD_TOO_LARGE( 413, AppsmithErrorCode.PAYLOAD_TOO_LARGE.getCode(), diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java index 64b50e4a5058..e6936aea5d5b 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithErrorCode.java @@ -47,7 +47,6 @@ public enum AppsmithErrorCode { PLUGIN_LOAD_FORM_JSON_FAIL("AE-APP-5004", "Plugin load form json fail"), PLUGIN_LOAD_TEMPLATES_FAIL("AE-APP-5005", "Plugin load templates fail"), OAUTH_NOT_AVAILABLE("AE-APP-5006", "Oauth not available"), - MARKETPLACE_NOT_CONFIGURED("AE-APP-5007", "Marketplace not configured"), FAIL_UPDATE_USER_IN_SESSION("AE-APP-5008", "Fail update user in session"), UNKNOWN_ACTION_RESULT_DATA_TYPE("AE-APP-5009", "Unknown action result data type"), AUTHENTICATION_FAILURE("AE-APP-5010", "Authentication failure"), @@ -64,7 +63,6 @@ public enum AppsmithErrorCode { SERVER_NOT_READY("AE-APP-5024", "Appsmith server is not ready"), SESSION_BAD_STATE("AE-APP-5025", "Invalid user session"), PLUGIN_EXECUTION_TIMEOUT("AE-APP-5040", "Plugin execution timeout"), - MARKETPLACE_TIMEOUT("AE-APP-5041", "Marketplace timeout"), GOOGLE_RECAPTCHA_TIMEOUT("AE-APP-5042", "Google recaptcha timeout"), MIGRATION_FAILED("AE-APP-5043", "Migration failed"), INVALID_PROPERTIES_CONFIGURATION("AE-APP-5044", "Property configuration is wrong or malformed"), diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java index 0570fd8c8fc5..7057acec1db0 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java @@ -6,7 +6,6 @@ import com.appsmith.external.helpers.MustacheHelper; import com.appsmith.external.models.ActionConfiguration; import com.appsmith.external.models.ActionDTO; -import com.appsmith.external.models.ActionProvider; import com.appsmith.external.models.CreatorContextType; import com.appsmith.external.models.Datasource; import com.appsmith.external.models.DatasourceConfiguration; @@ -16,7 +15,6 @@ import com.appsmith.external.models.PluginType; import com.appsmith.external.models.Policy; import com.appsmith.external.models.Property; -import com.appsmith.external.models.Provider; import com.appsmith.external.plugins.PluginExecutor; import com.appsmith.server.acl.AclPermission; import com.appsmith.server.acl.PolicyGenerator; @@ -51,7 +49,6 @@ import com.appsmith.server.services.AnalyticsService; import com.appsmith.server.services.BaseService; import com.appsmith.server.services.ConfigService; -import com.appsmith.server.services.MarketplaceService; import com.appsmith.server.services.PermissionGroupService; import com.appsmith.server.solutions.ActionPermission; import com.appsmith.server.solutions.ApplicationPermission; @@ -119,7 +116,6 @@ public class NewActionServiceCEImpl extends BaseService<NewActionRepository, New private final DatasourceService datasourceService; private final PluginService pluginService; private final PluginExecutorHelper pluginExecutorHelper; - private final MarketplaceService marketplaceService; private final PolicyGenerator policyGenerator; private final NewPageService newPageService; private final ApplicationService applicationService; @@ -150,7 +146,6 @@ public NewActionServiceCEImpl( DatasourceService datasourceService, PluginService pluginService, PluginExecutorHelper pluginExecutorHelper, - MarketplaceService marketplaceService, PolicyGenerator policyGenerator, NewPageService newPageService, ApplicationService applicationService, @@ -173,7 +168,6 @@ public NewActionServiceCEImpl( this.datasourceService = datasourceService; this.pluginService = pluginService; this.pluginExecutorHelper = pluginExecutorHelper; - this.marketplaceService = marketplaceService; this.policyGenerator = policyGenerator; this.newPageService = newPageService; this.applicationService = applicationService; @@ -199,8 +193,6 @@ protected void setCommonFieldsFromNewActionIntoAction(NewAction newAction, Actio action.setApplicationId(newAction.getApplicationId()); action.setPluginType(newAction.getPluginType()); action.setPluginId(newAction.getPluginId()); - action.setTemplateId(newAction.getTemplateId()); - action.setProviderId(newAction.getProviderId()); action.setDocumentation(newAction.getDocumentation()); action.setId(newAction.getId()); @@ -224,8 +216,6 @@ public void setCommonFieldsFromActionDTOIntoNewAction(ActionDTO action, NewActio newAction.setWorkspaceId(action.getWorkspaceId()); newAction.setPluginType(action.getPluginType()); newAction.setPluginId(action.getPluginId()); - newAction.setTemplateId(action.getTemplateId()); - newAction.setProviderId(action.getProviderId()); newAction.setDocumentation(action.getDocumentation()); newAction.setApplicationId(action.getApplicationId()); } @@ -573,30 +563,7 @@ private Mono<ActionDTO> setTransientFieldsInUnpublishedAction(NewAction newActio return Mono.empty(); } - // In case of an action which was imported from a 3P API, fill in the extra information of the provider required - // by the front end UI. - Mono<ActionDTO> providerUpdateMono; - if ((action.getTemplateId() != null) && (action.getProviderId() != null)) { - - providerUpdateMono = marketplaceService - .getProviderById(action.getProviderId()) - .switchIfEmpty(Mono.just(new Provider())) - .map(provider -> { - ActionProvider actionProvider = new ActionProvider(); - actionProvider.setName(provider.getName()); - actionProvider.setCredentialSteps(provider.getCredentialSteps()); - actionProvider.setDescription(provider.getDescription()); - actionProvider.setImageUrl(provider.getImageUrl()); - actionProvider.setUrl(provider.getUrl()); - - action.setProvider(actionProvider); - return action; - }); - } else { - providerUpdateMono = Mono.just(action); - } - - return providerUpdateMono + return Mono.just(action) .map(actionDTO -> { DefaultResources defaults = newAction.getDefaultResources(); if (defaults == null) { diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceImpl.java index ba20b5167fe3..feb1afa0c4c7 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceImpl.java @@ -14,7 +14,6 @@ import com.appsmith.server.repositories.NewActionRepository; import com.appsmith.server.services.AnalyticsService; import com.appsmith.server.services.ConfigService; -import com.appsmith.server.services.MarketplaceService; import com.appsmith.server.services.PermissionGroupService; import com.appsmith.server.solutions.ActionPermission; import com.appsmith.server.solutions.ApplicationPermission; @@ -44,7 +43,6 @@ public NewActionServiceImpl( DatasourceService datasourceService, PluginService pluginService, PluginExecutorHelper pluginExecutorHelper, - MarketplaceService marketplaceService, PolicyGenerator policyGenerator, NewPageService newPageService, ApplicationService applicationService, @@ -71,7 +69,6 @@ public NewActionServiceImpl( datasourceService, pluginService, pluginExecutorHelper, - marketplaceService, policyGenerator, newPageService, applicationService, diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ApiTemplateRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ApiTemplateRepository.java deleted file mode 100644 index cc589ae8cae4..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ApiTemplateRepository.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.appsmith.server.repositories; - -import com.appsmith.server.repositories.ce.ApiTemplateRepositoryCE; - -public interface ApiTemplateRepository extends ApiTemplateRepositoryCE, CustomApiTemplateRepository {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApiTemplateRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApiTemplateRepository.java deleted file mode 100644 index 82bd2c4dfcc4..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApiTemplateRepository.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.appsmith.server.repositories; - -import com.appsmith.server.repositories.ce.CustomApiTemplateRepositoryCE; - -public interface CustomApiTemplateRepository extends CustomApiTemplateRepositoryCE {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApiTemplateRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApiTemplateRepositoryImpl.java deleted file mode 100644 index 366c74ac7176..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomApiTemplateRepositoryImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.appsmith.server.repositories; - -import com.appsmith.server.repositories.ce.CustomApiTemplateRepositoryCEImpl; -import org.springframework.data.mongodb.core.ReactiveMongoOperations; -import org.springframework.data.mongodb.core.convert.MongoConverter; -import org.springframework.stereotype.Component; - -@Component -public class CustomApiTemplateRepositoryImpl extends CustomApiTemplateRepositoryCEImpl - implements CustomApiTemplateRepository { - - public CustomApiTemplateRepositoryImpl( - ReactiveMongoOperations mongoOperations, - MongoConverter mongoConverter, - CacheableRepositoryHelper cacheableRepositoryHelper) { - super(mongoOperations, mongoConverter, cacheableRepositoryHelper); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepository.java deleted file mode 100644 index 138b2c696d3f..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepository.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.appsmith.server.repositories; - -import com.appsmith.server.repositories.ce.CustomNotificationRepositoryCE; - -public interface CustomNotificationRepository extends CustomNotificationRepositoryCE {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepositoryImpl.java deleted file mode 100644 index 8ed54cfea885..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomNotificationRepositoryImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.appsmith.server.repositories; - -import com.appsmith.server.repositories.ce.CustomNotificationRepositoryCEImpl; -import org.springframework.data.mongodb.core.ReactiveMongoOperations; -import org.springframework.data.mongodb.core.convert.MongoConverter; -import org.springframework.stereotype.Component; - -@Component -public class CustomNotificationRepositoryImpl extends CustomNotificationRepositoryCEImpl - implements CustomNotificationRepository { - - public CustomNotificationRepositoryImpl( - ReactiveMongoOperations mongoOperations, - MongoConverter mongoConverter, - CacheableRepositoryHelper cacheableRepositoryHelper) { - super(mongoOperations, mongoConverter, cacheableRepositoryHelper); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomProviderRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomProviderRepository.java deleted file mode 100644 index 6037f68973cf..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomProviderRepository.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.appsmith.server.repositories; - -import com.appsmith.server.repositories.ce.CustomProviderRepositoryCE; - -public interface CustomProviderRepository extends CustomProviderRepositoryCE {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomProviderRepositoryImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomProviderRepositoryImpl.java deleted file mode 100644 index e75f78ced6cc..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/CustomProviderRepositoryImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.appsmith.server.repositories; - -import com.appsmith.server.repositories.ce.CustomProviderRepositoryCEImpl; -import org.springframework.data.mongodb.core.ReactiveMongoOperations; -import org.springframework.data.mongodb.core.convert.MongoConverter; -import org.springframework.stereotype.Component; - -@Component -public class CustomProviderRepositoryImpl extends CustomProviderRepositoryCEImpl implements CustomProviderRepository { - - public CustomProviderRepositoryImpl( - ReactiveMongoOperations mongoOperations, - MongoConverter mongoConverter, - CacheableRepositoryHelper cacheableRepositoryHelper) { - super(mongoOperations, mongoConverter, cacheableRepositoryHelper); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/NotificationRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/NotificationRepository.java deleted file mode 100644 index d49a581cd005..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/NotificationRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.appsmith.server.repositories; - -import com.appsmith.server.repositories.ce.NotificationRepositoryCE; -import org.springframework.stereotype.Repository; - -@Repository -public interface NotificationRepository extends NotificationRepositoryCE, CustomNotificationRepository {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ProviderRepository.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ProviderRepository.java deleted file mode 100644 index 519e51de0969..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ProviderRepository.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.appsmith.server.repositories; - -import com.appsmith.server.repositories.ce.ProviderRepositoryCE; - -public interface ProviderRepository extends ProviderRepositoryCE, CustomProviderRepository {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApiTemplateRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApiTemplateRepositoryCE.java deleted file mode 100644 index 12227bce5008..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApiTemplateRepositoryCE.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.appsmith.server.repositories.ce; - -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.server.repositories.BaseRepository; -import com.appsmith.server.repositories.CustomApiTemplateRepository; - -public interface ApiTemplateRepositoryCE extends BaseRepository<ApiTemplate, String>, CustomApiTemplateRepository {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApiTemplateRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApiTemplateRepositoryCE.java deleted file mode 100644 index 38feaac190c8..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApiTemplateRepositoryCE.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.appsmith.server.repositories.ce; - -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.server.repositories.AppsmithRepository; - -public interface CustomApiTemplateRepositoryCE extends AppsmithRepository<ApiTemplate> {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApiTemplateRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApiTemplateRepositoryCEImpl.java deleted file mode 100644 index 645c4c719697..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApiTemplateRepositoryCEImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.appsmith.server.repositories.ce; - -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.server.repositories.BaseAppsmithRepositoryImpl; -import com.appsmith.server.repositories.CacheableRepositoryHelper; -import org.springframework.data.mongodb.core.ReactiveMongoOperations; -import org.springframework.data.mongodb.core.convert.MongoConverter; - -public class CustomApiTemplateRepositoryCEImpl extends BaseAppsmithRepositoryImpl<ApiTemplate> - implements CustomApiTemplateRepositoryCE { - - public CustomApiTemplateRepositoryCEImpl( - ReactiveMongoOperations mongoOperations, - MongoConverter mongoConverter, - CacheableRepositoryHelper cacheableRepositoryHelper) { - super(mongoOperations, mongoConverter, cacheableRepositoryHelper); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNotificationRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNotificationRepositoryCE.java deleted file mode 100644 index 3318a753d352..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNotificationRepositoryCE.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.appsmith.server.repositories.ce; - -import com.appsmith.server.domains.Notification; -import com.appsmith.server.repositories.AppsmithRepository; -import com.mongodb.client.result.UpdateResult; -import reactor.core.publisher.Mono; - -import java.util.List; - -public interface CustomNotificationRepositoryCE extends AppsmithRepository<Notification> { - Mono<UpdateResult> updateIsReadByForUsernameAndIdList(String forUsername, List<String> idList, boolean isRead); - - Mono<UpdateResult> updateIsReadByForUsername(String forUsername, boolean isRead); -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNotificationRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNotificationRepositoryCEImpl.java deleted file mode 100644 index e8abc79f8b19..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNotificationRepositoryCEImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.appsmith.server.repositories.ce; - -import com.appsmith.server.domains.Notification; -import com.appsmith.server.domains.QNotification; -import com.appsmith.server.repositories.BaseAppsmithRepositoryImpl; -import com.appsmith.server.repositories.CacheableRepositoryHelper; -import com.mongodb.client.result.UpdateResult; -import org.springframework.data.mongodb.core.ReactiveMongoOperations; -import org.springframework.data.mongodb.core.convert.MongoConverter; -import org.springframework.data.mongodb.core.query.Update; -import reactor.core.publisher.Mono; - -import java.util.List; - -import static org.springframework.data.mongodb.core.query.Criteria.where; -import static org.springframework.data.mongodb.core.query.Query.query; - -public class CustomNotificationRepositoryCEImpl extends BaseAppsmithRepositoryImpl<Notification> - implements CustomNotificationRepositoryCE { - - public CustomNotificationRepositoryCEImpl( - ReactiveMongoOperations mongoOperations, - MongoConverter mongoConverter, - CacheableRepositoryHelper cacheableRepositoryHelper) { - super(mongoOperations, mongoConverter, cacheableRepositoryHelper); - } - - @Override - public Mono<UpdateResult> updateIsReadByForUsernameAndIdList( - String forUsername, List<String> idList, boolean isRead) { - return mongoOperations.updateMulti( - query(where(fieldName(QNotification.notification.forUsername)) - .is(forUsername) - .and(fieldName(QNotification.notification.id)) - .in(idList)), - new Update().set(fieldName(QNotification.notification.isRead), isRead), - Notification.class); - } - - @Override - public Mono<UpdateResult> updateIsReadByForUsername(String forUsername, boolean isRead) { - return mongoOperations.updateMulti( - query(where(fieldName(QNotification.notification.forUsername)).is(forUsername)), - new Update().set(fieldName(QNotification.notification.isRead), isRead), - Notification.class); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomProviderRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomProviderRepositoryCE.java deleted file mode 100644 index f19475b6b0f6..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomProviderRepositoryCE.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.appsmith.server.repositories.ce; - -import com.appsmith.external.models.Provider; -import com.appsmith.server.repositories.AppsmithRepository; - -public interface CustomProviderRepositoryCE extends AppsmithRepository<Provider> {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomProviderRepositoryCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomProviderRepositoryCEImpl.java deleted file mode 100644 index ba970b44ea0a..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomProviderRepositoryCEImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.appsmith.server.repositories.ce; - -import com.appsmith.external.models.Provider; -import com.appsmith.server.repositories.BaseAppsmithRepositoryImpl; -import com.appsmith.server.repositories.CacheableRepositoryHelper; -import org.springframework.data.mongodb.core.ReactiveMongoOperations; -import org.springframework.data.mongodb.core.convert.MongoConverter; - -public class CustomProviderRepositoryCEImpl extends BaseAppsmithRepositoryImpl<Provider> - implements CustomProviderRepositoryCE { - - public CustomProviderRepositoryCEImpl( - ReactiveMongoOperations mongoOperations, - MongoConverter mongoConverter, - CacheableRepositoryHelper cacheableRepositoryHelper) { - super(mongoOperations, mongoConverter, cacheableRepositoryHelper); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NotificationRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NotificationRepositoryCE.java deleted file mode 100644 index d16845d83911..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NotificationRepositoryCE.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.appsmith.server.repositories.ce; - -import com.appsmith.server.domains.Notification; -import com.appsmith.server.repositories.BaseRepository; -import com.appsmith.server.repositories.CustomNotificationRepository; -import org.springframework.data.domain.Pageable; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -import java.time.Instant; - -public interface NotificationRepositoryCE extends BaseRepository<Notification, String>, CustomNotificationRepository { - - Flux<Notification> findByForUsernameAndCreatedAtBefore(String userId, Instant instant, Pageable pageable); - - Mono<Long> countByForUsername(String userId); - - Mono<Long> countByForUsernameAndIsReadIsFalse(String userId); -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ProviderRepositoryCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ProviderRepositoryCE.java deleted file mode 100644 index 41ec94e130a7..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ProviderRepositoryCE.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.appsmith.server.repositories.ce; - -import com.appsmith.external.models.Provider; -import com.appsmith.server.repositories.BaseRepository; -import com.appsmith.server.repositories.CustomProviderRepository; -import reactor.core.publisher.Flux; - -public interface ProviderRepositoryCE extends BaseRepository<Provider, String>, CustomProviderRepository { - Flux<Provider> findByName(String name); -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApiTemplateService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApiTemplateService.java deleted file mode 100644 index 76692ca6b46f..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApiTemplateService.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.services.ce.ApiTemplateServiceCE; - -public interface ApiTemplateService extends ApiTemplateServiceCE {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApiTemplateServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApiTemplateServiceImpl.java deleted file mode 100644 index 5cec9bfbd231..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ApiTemplateServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.repositories.ApiTemplateRepository; -import com.appsmith.server.services.ce.ApiTemplateServiceCEImpl; -import jakarta.validation.Validator; -import lombok.extern.slf4j.Slf4j; -import org.springframework.data.mongodb.core.ReactiveMongoTemplate; -import org.springframework.data.mongodb.core.convert.MongoConverter; -import org.springframework.stereotype.Service; -import reactor.core.scheduler.Scheduler; - -@Service -@Slf4j -public class ApiTemplateServiceImpl extends ApiTemplateServiceCEImpl implements ApiTemplateService { - - public ApiTemplateServiceImpl( - Scheduler scheduler, - Validator validator, - MongoConverter mongoConverter, - ReactiveMongoTemplate reactiveMongoTemplate, - ApiTemplateRepository repository, - AnalyticsService analyticsService) { - - super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemService.java deleted file mode 100644 index 7e881d8998e6..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemService.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.services.ce.ItemServiceCE; - -public interface ItemService extends ItemServiceCE {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemServiceImpl.java deleted file mode 100644 index fd12f36bebe1..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ItemServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.newactions.base.NewActionService; -import com.appsmith.server.plugins.base.PluginService; -import com.appsmith.server.services.ce.ItemServiceCEImpl; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class ItemServiceImpl extends ItemServiceCEImpl implements ItemService { - - public ItemServiceImpl( - ApiTemplateService apiTemplateService, - PluginService pluginService, - MarketplaceService marketplaceService, - NewActionService newActionService, - LayoutActionService layoutActionService) { - - super(apiTemplateService, pluginService, marketplaceService, newActionService, layoutActionService); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MarketplaceService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MarketplaceService.java deleted file mode 100644 index bb3d33374876..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MarketplaceService.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.services.ce.MarketplaceServiceCE; - -public interface MarketplaceService extends MarketplaceServiceCE {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MarketplaceServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MarketplaceServiceImpl.java deleted file mode 100644 index d7260f1b2288..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/MarketplaceServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.configurations.CloudServicesConfig; -import com.appsmith.server.services.ce.MarketplaceServiceCEImpl; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.web.reactive.function.client.WebClient; - -@Slf4j -@Service -public class MarketplaceServiceImpl extends MarketplaceServiceCEImpl implements MarketplaceService { - - public MarketplaceServiceImpl( - WebClient.Builder webClientBuilder, CloudServicesConfig cloudServicesConfig, ObjectMapper objectMapper) { - - super(webClientBuilder, cloudServicesConfig, objectMapper); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationService.java deleted file mode 100644 index ad7e918b28ef..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationService.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.services.ce.NotificationServiceCE; - -public interface NotificationService extends NotificationServiceCE {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationServiceImpl.java deleted file mode 100644 index 6316bbddec8f..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NotificationServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.helpers.ResponseUtils; -import com.appsmith.server.repositories.NotificationRepository; -import com.appsmith.server.services.ce.NotificationServiceCEImpl; -import jakarta.validation.Validator; -import lombok.extern.slf4j.Slf4j; -import org.springframework.data.mongodb.core.ReactiveMongoTemplate; -import org.springframework.data.mongodb.core.convert.MongoConverter; -import org.springframework.stereotype.Service; -import reactor.core.scheduler.Scheduler; - -@Slf4j -@Service -public class NotificationServiceImpl extends NotificationServiceCEImpl implements NotificationService { - - public NotificationServiceImpl( - Scheduler scheduler, - Validator validator, - MongoConverter mongoConverter, - ReactiveMongoTemplate reactiveMongoTemplate, - NotificationRepository repository, - AnalyticsService analyticsService, - SessionUserService sessionUserService, - ResponseUtils responseUtils) { - - super( - scheduler, - validator, - mongoConverter, - reactiveMongoTemplate, - repository, - analyticsService, - sessionUserService, - responseUtils); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PostmanImporterService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PostmanImporterService.java deleted file mode 100644 index 420f33cd14d1..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PostmanImporterService.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.services.ce.PostmanImporterServiceCE; - -public interface PostmanImporterService extends PostmanImporterServiceCE {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PostmanImporterServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PostmanImporterServiceImpl.java deleted file mode 100644 index d511ea21e271..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/PostmanImporterServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.helpers.ResponseUtils; -import com.appsmith.server.newpages.base.NewPageService; -import com.appsmith.server.services.ce.PostmanImporterServiceCEImpl; -import com.appsmith.server.solutions.PagePermission; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -public class PostmanImporterServiceImpl extends PostmanImporterServiceCEImpl implements PostmanImporterService { - - public PostmanImporterServiceImpl( - NewPageService newPageService, ResponseUtils responseUtils, PagePermission pagePermission) { - super(newPageService, responseUtils, pagePermission); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ProviderService.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ProviderService.java deleted file mode 100644 index 19a5496ccb7e..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ProviderService.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.services.ce.ProviderServiceCE; - -public interface ProviderService extends ProviderServiceCE {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ProviderServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ProviderServiceImpl.java deleted file mode 100644 index 9714a8cb542b..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ProviderServiceImpl.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.repositories.ProviderRepository; -import com.appsmith.server.services.ce.ProviderServiceCEImpl; -import jakarta.validation.Validator; -import lombok.extern.slf4j.Slf4j; -import org.springframework.data.mongodb.core.ReactiveMongoTemplate; -import org.springframework.data.mongodb.core.convert.MongoConverter; -import org.springframework.stereotype.Service; -import reactor.core.scheduler.Scheduler; - -@Service -@Slf4j -public class ProviderServiceImpl extends ProviderServiceCEImpl implements ProviderService { - - public ProviderServiceImpl( - Scheduler scheduler, - Validator validator, - MongoConverter mongoConverter, - ReactiveMongoTemplate reactiveMongoTemplate, - ProviderRepository repository, - AnalyticsService analyticsService) { - super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApiTemplateServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApiTemplateServiceCE.java deleted file mode 100644 index fb389b44043b..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApiTemplateServiceCE.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.server.services.CrudService; - -public interface ApiTemplateServiceCE extends CrudService<ApiTemplate, String> {} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApiTemplateServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApiTemplateServiceCEImpl.java deleted file mode 100644 index a17f7d5b4dfc..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApiTemplateServiceCEImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.server.constants.FieldName; -import com.appsmith.server.repositories.ApiTemplateRepository; -import com.appsmith.server.services.AnalyticsService; -import com.appsmith.server.services.BaseService; -import jakarta.validation.Validator; -import lombok.extern.slf4j.Slf4j; -import org.springframework.data.domain.Example; -import org.springframework.data.domain.Sort; -import org.springframework.data.mongodb.core.ReactiveMongoTemplate; -import org.springframework.data.mongodb.core.convert.MongoConverter; -import org.springframework.util.MultiValueMap; -import reactor.core.publisher.Flux; -import reactor.core.scheduler.Scheduler; - -@Slf4j -public class ApiTemplateServiceCEImpl extends BaseService<ApiTemplateRepository, ApiTemplate, String> - implements ApiTemplateServiceCE { - - public ApiTemplateServiceCEImpl( - Scheduler scheduler, - Validator validator, - MongoConverter mongoConverter, - ReactiveMongoTemplate reactiveMongoTemplate, - ApiTemplateRepository repository, - AnalyticsService analyticsService) { - - super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService); - } - - @Override - public Flux<ApiTemplate> get(MultiValueMap<String, String> params) { - ApiTemplate apiTemplateExample = new ApiTemplate(); - Sort sort = Sort.by(FieldName.NAME); - - if (params.getFirst(FieldName.ID) != null) { - apiTemplateExample.setId(params.getFirst(FieldName.ID)); - } - - if (params.getFirst(FieldName.NAME) != null) { - apiTemplateExample.setName(params.getFirst(FieldName.NAME)); - } - - if (params.getFirst("providerId") != null) { - apiTemplateExample.setProviderId(params.getFirst("providerId")); - } - - if (params.getFirst("versionId") != null) { - apiTemplateExample.setVersionId(params.getFirst("versionId")); - } - - return repository.findAll(Example.of(apiTemplateExample), sort); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCE.java deleted file mode 100644 index cf6758ff8cc4..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCE.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.external.models.ActionDTO; -import com.appsmith.server.dtos.AddItemToPageDTO; -import com.appsmith.server.dtos.ItemDTO; -import org.springframework.util.MultiValueMap; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -public interface ItemServiceCE { - - Flux<ItemDTO> get(MultiValueMap<String, String> params); - - Mono<ActionDTO> addItemToPage(AddItemToPageDTO addItemToPageDTO); -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCEImpl.java deleted file mode 100644 index c077ad3ace98..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ItemServiceCEImpl.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.external.models.ActionDTO; -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.external.models.Datasource; -import com.appsmith.external.models.Documentation; -import com.appsmith.server.constants.FieldName; -import com.appsmith.server.dtos.AddItemToPageDTO; -import com.appsmith.server.dtos.ItemDTO; -import com.appsmith.server.dtos.ItemType; -import com.appsmith.server.exceptions.AppsmithError; -import com.appsmith.server.exceptions.AppsmithException; -import com.appsmith.server.newactions.base.NewActionService; -import com.appsmith.server.plugins.base.PluginService; -import com.appsmith.server.services.ApiTemplateService; -import com.appsmith.server.services.LayoutActionService; -import com.appsmith.server.services.MarketplaceService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.util.MultiValueMap; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -@Slf4j -public class ItemServiceCEImpl implements ItemServiceCE { - - private final ApiTemplateService apiTemplateService; - private final PluginService pluginService; - private final MarketplaceService marketplaceService; - private final NewActionService newActionService; - private final LayoutActionService layoutActionService; - private static final String RAPID_API_PLUGIN = "rapidapi-plugin"; - - public ItemServiceCEImpl( - ApiTemplateService apiTemplateService, - PluginService pluginService, - MarketplaceService marketplaceService, - NewActionService newActionService, - LayoutActionService layoutActionService) { - this.apiTemplateService = apiTemplateService; - this.pluginService = pluginService; - this.marketplaceService = marketplaceService; - this.newActionService = newActionService; - this.layoutActionService = layoutActionService; - } - - @Override - public Flux<ItemDTO> get(MultiValueMap<String, String> params) { - - if ((params.getFirst(FieldName.APPLICATION_ID) != null) && (params.getFirst(FieldName.PROVIDER_ID) != null)) { - // Both application id is set and provider id is set. This implies that we are fetching items from both - // templates and actions. That is not supported. Error out here. - return Flux.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION)); - } else if (params.getFirst(FieldName.APPLICATION_ID) != null) { - return Flux.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION)); - } else if (params.getFirst(FieldName.PROVIDER_ID) != null) { - return apiTemplateService.get(params).map(apiTemplate -> { - ItemDTO itemDTO = new ItemDTO(); - itemDTO.setItem(apiTemplate); - itemDTO.setType(ItemType.TEMPLATE); - - return itemDTO; - }); - } - - return Flux.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION)); - } - - @Override - public Mono<ActionDTO> addItemToPage(AddItemToPageDTO addItemToPageDTO) { - if (!addItemToPageDTO.getMarketplaceElement().getType().equals(ItemType.TEMPLATE)) { - log.debug("Only templates can currently be added to the page. Any other type is unsupported."); - return Mono.error(new AppsmithException(AppsmithError.UNSUPPORTED_OPERATION)); - } - - if (addItemToPageDTO.getWorkspaceId() == null) { - return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.WORKSPACE_ID)); - } - - ApiTemplate apiTemplate = addItemToPageDTO.getMarketplaceElement().getItem(); - - ActionDTO action = new ActionDTO(); - action.setName(addItemToPageDTO.getName()); - action.setPageId(addItemToPageDTO.getPageId()); - action.setTemplateId(apiTemplate.getId()); - action.setProviderId(apiTemplate.getProviderId()); - - Documentation documentation = new Documentation(); - documentation.setText(apiTemplate.getApiTemplateConfiguration().getDocumentation()); - documentation.setUrl(apiTemplate.getApiTemplateConfiguration().getDocumentationUrl()); - action.setDocumentation(documentation); - - // Set Action Fields - action.setActionConfiguration(apiTemplate.getActionConfiguration()); - if (apiTemplate.getApiTemplateConfiguration().getSampleResponse() != null - && apiTemplate.getApiTemplateConfiguration().getSampleResponse().getBody() != null) { - action.setCacheResponse(apiTemplate - .getApiTemplateConfiguration() - .getSampleResponse() - .getBody() - .toString()); - } - - log.debug("Going to subscribe marketplace provider : {} and then create action", apiTemplate.getProviderId()); - return marketplaceService - // First hit the marketplace to update the statistics and to subscribe to the provider in case it hasn't - .subscribeAndUpdateStatisticsOfProvider(apiTemplate.getProviderId()) - - // Assume that we are only adding rapid api templates right now. Set the package to rapid-api forcibly - .then(pluginService.findByPackageName(RAPID_API_PLUGIN)) - .map(plugin -> { - // Set Datasource - Datasource datasource = new Datasource(); - datasource.setDatasourceConfiguration(apiTemplate.getDatasourceConfiguration()); - datasource.setName(apiTemplate.getDatasourceConfiguration().getUrl()); - datasource.setPluginId(plugin.getId()); - datasource.setWorkspaceId(addItemToPageDTO.getWorkspaceId()); - action.setDatasource(datasource); - action.setPluginType(plugin.getType()); - return action; - }) - .flatMap(action1 -> layoutActionService.createSingleAction(action1, Boolean.FALSE)); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/MarketplaceServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/MarketplaceServiceCE.java deleted file mode 100644 index 2cd03cc1dd91..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/MarketplaceServiceCE.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.external.models.Provider; -import com.appsmith.server.dtos.ProviderPaginatedDTO; -import org.springframework.util.MultiValueMap; -import reactor.core.publisher.Mono; - -import java.util.List; - -public interface MarketplaceServiceCE { - - Mono<ProviderPaginatedDTO> getProviders(MultiValueMap<String, String> params); - - Mono<List<ApiTemplate>> getTemplates(MultiValueMap<String, String> params); - - Mono<List<String>> getCategories(); - - Mono<Boolean> subscribeAndUpdateStatisticsOfProvider(String providerId); - - Mono<Provider> getProviderById(String id); - - Mono<List<Provider>> searchProviderByName(String id); -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/MarketplaceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/MarketplaceServiceCEImpl.java deleted file mode 100644 index 9b3a9a13a027..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/MarketplaceServiceCEImpl.java +++ /dev/null @@ -1,228 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.external.models.Provider; -import com.appsmith.server.configurations.CloudServicesConfig; -import com.appsmith.server.dtos.ProviderPaginatedDTO; -import com.appsmith.server.exceptions.AppsmithError; -import com.appsmith.server.exceptions.AppsmithException; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import org.springframework.util.StringUtils; -import org.springframework.web.reactive.function.client.WebClient; -import org.springframework.web.util.UriComponentsBuilder; -import reactor.core.publisher.Mono; - -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.ArrayList; -import java.util.List; - -@Slf4j -public class MarketplaceServiceCEImpl implements MarketplaceServiceCE { - private final WebClient webClient; - - private final CloudServicesConfig cloudServicesConfig; - - private static String PROVIDER_PATH = "/providers"; - - private static String TEMPLATE_PATH = "/templates"; - - private static String CATEGORIES_PATH = PROVIDER_PATH + "/categories"; - - private static String USE_PROVIDER_API = PROVIDER_PATH + "/use"; - - private final ObjectMapper objectMapper; - - private final Long timeoutInMillis = Long.valueOf(10000); - - @Autowired - public MarketplaceServiceCEImpl( - WebClient.Builder webClientBuilder, CloudServicesConfig cloudServicesConfig, ObjectMapper objectMapper) { - this.cloudServicesConfig = cloudServicesConfig; - this.webClient = webClientBuilder - .defaultHeaders(header -> - header.setBasicAuth(cloudServicesConfig.getUsername(), cloudServicesConfig.getPassword())) - .baseUrl(cloudServicesConfig.getBaseUrl()) - .build(); - this.objectMapper = objectMapper; - } - - @Override - public Mono<ProviderPaginatedDTO> getProviders(MultiValueMap<String, String> params) { - URI uri = buildFullURI(params, PROVIDER_PATH); - - if (uri == null) { - return Mono.error(new AppsmithException(AppsmithError.MARKETPLACE_NOT_CONFIGURED)); - } - - return webClient - .get() - .uri(uri) - .retrieve() - .bodyToMono(String.class) - .flatMap(stringBody -> { - ProviderPaginatedDTO providersPaginated = null; - try { - providersPaginated = objectMapper.readValue(stringBody, ProviderPaginatedDTO.class); - } catch (JsonProcessingException e) { - return Mono.error(new AppsmithException(AppsmithError.JSON_PROCESSING_ERROR, e)); - } - return Mono.just(providersPaginated); - }) - .timeout(Duration.ofMillis(timeoutInMillis)) - .doOnError(error -> Mono.error(new AppsmithException(AppsmithError.MARKETPLACE_TIMEOUT))); - } - - @Override - public Mono<List<ApiTemplate>> getTemplates(MultiValueMap<String, String> params) { - URI uri = buildFullURI(params, TEMPLATE_PATH); - - if (uri == null) { - return Mono.error(new AppsmithException(AppsmithError.MARKETPLACE_NOT_CONFIGURED)); - } - - return webClient - .get() - .uri(uri) - .retrieve() - .bodyToMono(String.class) - .flatMap(stringBody -> { - List<ApiTemplate> templates = null; - try { - templates = objectMapper.readValue(stringBody, ArrayList.class); - } catch (JsonProcessingException e) { - return Mono.error(new AppsmithException(AppsmithError.JSON_PROCESSING_ERROR, e)); - } - return Mono.just(templates); - }) - .timeout(Duration.ofMillis(timeoutInMillis)) - .doOnError(error -> Mono.error(new AppsmithException(AppsmithError.MARKETPLACE_TIMEOUT))); - } - - @Override - public Mono<List<String>> getCategories() { - URI uri = buildFullURI(null, CATEGORIES_PATH); - - if (uri == null) { - return Mono.error(new AppsmithException(AppsmithError.MARKETPLACE_NOT_CONFIGURED)); - } - - return webClient - .get() - .uri(uri) - .retrieve() - .bodyToMono(String.class) - .flatMap(stringBody -> { - List<String> categories = null; - try { - categories = objectMapper.readValue(stringBody, ArrayList.class); - } catch (JsonProcessingException e) { - return Mono.error(new AppsmithException(AppsmithError.JSON_PROCESSING_ERROR, e)); - } - return Mono.just(categories); - }) - .timeout(Duration.ofMillis(timeoutInMillis)) - .doOnError(error -> Mono.error(new AppsmithException(AppsmithError.MARKETPLACE_TIMEOUT))); - } - - @Override - public Mono<Boolean> subscribeAndUpdateStatisticsOfProvider(String providerId) { - MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); - params.add("id", providerId); - URI uri = buildFullURI(params, USE_PROVIDER_API); - - if (uri == null) { - return Mono.error(new AppsmithException(AppsmithError.MARKETPLACE_NOT_CONFIGURED)); - } - - return webClient.put().uri(uri).retrieve().bodyToMono(Boolean.class); - } - - @Override - public Mono<Provider> getProviderById(String id) { - URI uri = buildFullURI(null, PROVIDER_PATH + "/" + id); - - if (uri == null) { - return Mono.error(new AppsmithException(AppsmithError.MARKETPLACE_NOT_CONFIGURED)); - } - - return webClient - .get() - .uri(uri) - .retrieve() - .bodyToMono(String.class) - .flatMap(stringBody -> { - Provider provider = null; - try { - provider = objectMapper.readValue(stringBody, Provider.class); - } catch (JsonProcessingException e) { - return Mono.error(new AppsmithException(AppsmithError.JSON_PROCESSING_ERROR, e)); - } - return Mono.just(provider); - }) - .timeout(Duration.ofMillis(timeoutInMillis)) - .doOnError(error -> Mono.error(new AppsmithException(AppsmithError.MARKETPLACE_TIMEOUT))); - } - - @Override - /** - * This function searches for providers and returns the providers with exact match in name. - * In the future the search should support 'like' for providers and search could expand to include - * the actions used in the workspace (across all applications) and templates as well. - */ - public Mono<List<Provider>> searchProviderByName(String name) { - URI uri = buildFullURI(null, PROVIDER_PATH + "/name/" + URLEncoder.encode(name, StandardCharsets.UTF_8)); - - if (uri == null) { - return Mono.error(new AppsmithException(AppsmithError.MARKETPLACE_NOT_CONFIGURED)); - } - - return webClient - .get() - .uri(uri) - .retrieve() - .bodyToMono(String.class) - .flatMap(stringBody -> { - List<Provider> providers = null; - try { - providers = objectMapper.readValue(stringBody, ArrayList.class); - } catch (JsonProcessingException e) { - return Mono.error(new AppsmithException(AppsmithError.JSON_PROCESSING_ERROR, e)); - } - return Mono.just(providers); - }) - .timeout(Duration.ofMillis(timeoutInMillis)) - .doOnError(error -> Mono.error(new AppsmithException(AppsmithError.MARKETPLACE_TIMEOUT))); - } - - private URI buildFullURI(MultiValueMap<String, String> params, String path) { - final String baseUrl = cloudServicesConfig.getBaseUrl(); - if (!StringUtils.hasText(baseUrl)) { - return null; - } - - UriComponentsBuilder uriBuilder = UriComponentsBuilder.newInstance(); - try { - uriBuilder.uri(new URI(baseUrl + path)); - } catch (URISyntaxException e) { - log.error(e.getMessage()); - return null; - } - - if (params != null) { - for (String key : params.keySet()) { - uriBuilder.queryParam(key, URLEncoder.encode(params.getFirst(key), StandardCharsets.UTF_8)); - } - } - - return uriBuilder.build(true).toUri(); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NotificationServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NotificationServiceCE.java deleted file mode 100644 index ce803a7eb8dc..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NotificationServiceCE.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.server.domains.Notification; -import com.appsmith.server.dtos.UpdateIsReadNotificationByIdDTO; -import com.appsmith.server.dtos.UpdateIsReadNotificationDTO; -import com.appsmith.server.services.CrudService; -import reactor.core.publisher.Mono; - -public interface NotificationServiceCE extends CrudService<Notification, String> { - - Mono<UpdateIsReadNotificationByIdDTO> updateIsRead(UpdateIsReadNotificationByIdDTO dto); - - Mono<UpdateIsReadNotificationDTO> updateIsRead(UpdateIsReadNotificationDTO dto); - - Mono<Long> getUnreadCount(); -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NotificationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NotificationServiceCEImpl.java deleted file mode 100644 index ecd49610e791..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NotificationServiceCEImpl.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.server.constants.FieldName; -import com.appsmith.server.domains.Notification; -import com.appsmith.server.domains.QNotification; -import com.appsmith.server.dtos.UpdateIsReadNotificationByIdDTO; -import com.appsmith.server.dtos.UpdateIsReadNotificationDTO; -import com.appsmith.server.exceptions.AppsmithError; -import com.appsmith.server.exceptions.AppsmithException; -import com.appsmith.server.helpers.NumberUtils; -import com.appsmith.server.helpers.ResponseUtils; -import com.appsmith.server.repositories.NotificationRepository; -import com.appsmith.server.services.AnalyticsService; -import com.appsmith.server.services.BaseService; -import com.appsmith.server.services.SessionUserService; -import jakarta.validation.Validator; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Sort; -import org.springframework.data.mongodb.core.ReactiveMongoTemplate; -import org.springframework.data.mongodb.core.convert.MongoConverter; -import org.springframework.util.MultiValueMap; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.scheduler.Scheduler; - -import java.time.Instant; -import java.time.format.DateTimeParseException; - -@Slf4j -public class NotificationServiceCEImpl extends BaseService<NotificationRepository, Notification, String> - implements NotificationServiceCE { - - private final SessionUserService sessionUserService; - private final ResponseUtils responseUtils; - - public NotificationServiceCEImpl( - Scheduler scheduler, - Validator validator, - MongoConverter mongoConverter, - ReactiveMongoTemplate reactiveMongoTemplate, - NotificationRepository repository, - AnalyticsService analyticsService, - SessionUserService sessionUserService, - ResponseUtils responseUtils) { - - super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService); - this.sessionUserService = sessionUserService; - this.responseUtils = responseUtils; - } - - @Override - public Mono<Notification> create(Notification notification) { - Mono<Notification> notificationWithUsernameMono; - if (StringUtils.isEmpty(notification.getForUsername())) { - notificationWithUsernameMono = sessionUserService.getCurrentUser().map(user -> { - notification.setForUsername(user.getUsername()); - return notification; - }); - } else { - notificationWithUsernameMono = Mono.just(notification); - } - - return notificationWithUsernameMono.flatMap(super::create); - } - - @Override - public Flux<Notification> get(MultiValueMap<String, String> params) { - // results will be sorted in descending order of createdAt - Sort sort = Sort.by( - Sort.Direction.DESC, - QNotification.notification.createdAt.getMetadata().getName()); - // Remove branch name as notifications are not shared across branches - params.remove(FieldName.DEFAULT_RESOURCES + "." + FieldName.BRANCH_NAME); - // get page size from query params, default is 10 if param not present - int pageSize = 10; - if (params.containsKey("pageSize")) { - String param = params.get("pageSize").get(0); - pageSize = NumberUtils.parseInteger(param, 1, 10); - } - PageRequest pageRequest = PageRequest.of(0, pageSize, sort); - - // get the beforeDate parameter from query param - final Instant instant; - String paramKey = "beforeDate"; - if (params.containsKey(paramKey)) { - String beforeParam = params.get(paramKey).get(0); - try { - instant = Instant.parse(beforeParam); - } catch (DateTimeParseException e) { - return Flux.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, "as " + paramKey)); - } - } else { - instant = Instant.now(); // param not present, use current time - } - - return sessionUserService - .getCurrentUser() - .flatMapMany(user -> - repository.findByForUsernameAndCreatedAtBefore(user.getUsername(), instant, pageRequest)) - .map(notification -> { - return notification; - }); - } - - @Override - public Mono<Notification> findByIdAndBranchName(String id, String branchName) { - // Ignore branch name as notifications are independent of branchNames - return repository.findById(id).map(notification -> { - return notification; - }); - } - - @Override - public Mono<UpdateIsReadNotificationByIdDTO> updateIsRead(UpdateIsReadNotificationByIdDTO dto) { - return sessionUserService.getCurrentUser().flatMap(user -> repository - .updateIsReadByForUsernameAndIdList(user.getUsername(), dto.getIdList(), dto.getIsRead()) - .thenReturn(dto)); - } - - @Override - public Mono<UpdateIsReadNotificationDTO> updateIsRead(UpdateIsReadNotificationDTO dto) { - return sessionUserService.getCurrentUser().flatMap(user -> repository - .updateIsReadByForUsername(user.getUsername(), dto.getIsRead()) - .thenReturn(dto)); - } - - @Override - public Mono<Long> getUnreadCount() { - return sessionUserService - .getCurrentUser() - .flatMap(user -> repository.countByForUsernameAndIsReadIsFalse(user.getUsername())); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCE.java deleted file mode 100644 index f224992e3f3f..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCE.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.external.models.TemplateCollection; - -import java.util.List; - -public interface PostmanImporterServiceCE extends ApiImporterCE { - - TemplateCollection importPostmanCollection(Object input); - - List<TemplateCollection> fetchPostmanCollections(); - - TemplateCollection deletePostmanCollection(String id); -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCEImpl.java deleted file mode 100644 index eca4fd13c328..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PostmanImporterServiceCEImpl.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.external.models.ActionConfiguration; -import com.appsmith.external.models.ActionDTO; -import com.appsmith.external.models.ApiTemplate; -import com.appsmith.external.models.Datasource; -import com.appsmith.external.models.DatasourceConfiguration; -import com.appsmith.external.models.Property; -import com.appsmith.external.models.TemplateCollection; -import com.appsmith.server.helpers.ResponseUtils; -import com.appsmith.server.newpages.base.NewPageService; -import com.appsmith.server.services.BaseApiImporter; -import com.appsmith.server.solutions.PagePermission; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpMethod; -import reactor.core.publisher.Mono; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -public class PostmanImporterServiceCEImpl extends BaseApiImporter implements PostmanImporterServiceCE { - - private final NewPageService newPageService; - private final ResponseUtils responseUtils; - private final PagePermission pagePermission; - - public PostmanImporterServiceCEImpl( - NewPageService newPageService, ResponseUtils responseUtils, PagePermission pagePermission) { - this.newPageService = newPageService; - this.responseUtils = responseUtils; - this.pagePermission = pagePermission; - } - - @Override - public Mono<ActionDTO> importAction( - Object input, String pageId, String name, String workspaceId, String branchName) { - ActionDTO action = new ActionDTO(); - ActionConfiguration actionConfiguration = new ActionConfiguration(); - Datasource datasource = new Datasource(); - DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration(); - datasource.setDatasourceConfiguration(datasourceConfiguration); - action.setDatasource(datasource); - action.setActionConfiguration(actionConfiguration); - action.setPageId(pageId); - action.setName(name); - return newPageService - .findByBranchNameAndDefaultPageId(branchName, pageId, pagePermission.getActionCreatePermission()) - .map(branchedPage -> { - action.setDefaultResources(branchedPage.getDefaultResources()); - return action; - }) - .map(responseUtils::updateActionDTOWithDefaultResources); - } - - public TemplateCollection importPostmanCollection(Object input) { - TemplateCollection templateCollection = createTemplateCollection("RandomCollectionIdAfterStoring"); - return templateCollection; - } - - public List<TemplateCollection> fetchPostmanCollections() { - TemplateCollection templateCollection = createTemplateCollection("RandomCollectionIdAfterStoring"); - - List<TemplateCollection> templateCollectionList = new ArrayList<>(); - templateCollectionList.add(templateCollection); - return templateCollectionList; - } - - public TemplateCollection deletePostmanCollection(String id) { - TemplateCollection templateCollection = createTemplateCollection(id); - - return templateCollection; - } - - private ApiTemplate createApiTemplate() { - ApiTemplate apiTemplate = new ApiTemplate(); - ActionConfiguration actionConfiguration = new ActionConfiguration(); - actionConfiguration.setPath("/viewSomething"); - actionConfiguration.setHttpMethod(HttpMethod.GET); - List<Property> headers = new ArrayList<>(); - Property header = new Property(); - header.setKey("key"); - header.setValue("value"); - headers.add(header); - actionConfiguration.setHeaders(headers); - - DatasourceConfiguration datasourceConfiguration = new DatasourceConfiguration(); - datasourceConfiguration.setUrl("http://google.com"); - - apiTemplate.setName("templateName"); - apiTemplate.setProviderId("providerId"); - apiTemplate.setPublisher("RapidApi"); - apiTemplate.setVersionId("VersionId"); - - apiTemplate.setActionConfiguration(actionConfiguration); - apiTemplate.setDatasourceConfiguration(datasourceConfiguration); - apiTemplate.setPackageName("restapi-plugin"); - apiTemplate.setId("RandomIdAfterStoring"); - - return apiTemplate; - } - - private TemplateCollection createTemplateCollection(String id) { - ApiTemplate apiTemplate = createApiTemplate(); - TemplateCollection templateCollection = new TemplateCollection(); - List<String> apiTemplateIds; - apiTemplateIds = new ArrayList<>(); - List<ApiTemplate> apiTemplateList; - apiTemplateList = new ArrayList<>(); - apiTemplateIds.add(apiTemplate.getId()); - apiTemplateList.add(apiTemplate); - templateCollection.setApiTemplateIds(apiTemplateIds); - templateCollection.setApiTemplateList(apiTemplateList); - templateCollection.setId(id); - - return templateCollection; - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ProviderServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ProviderServiceCE.java deleted file mode 100644 index 52c19668f015..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ProviderServiceCE.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.external.models.Provider; -import com.appsmith.server.services.CrudService; -import reactor.core.publisher.Mono; - -import java.util.List; - -public interface ProviderServiceCE extends CrudService<Provider, String> { - - public Mono<List<String>> getAllCategories(); -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ProviderServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ProviderServiceCEImpl.java deleted file mode 100644 index 2466c6026205..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ProviderServiceCEImpl.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.appsmith.server.services.ce; - -import com.appsmith.external.models.Provider; -import com.appsmith.server.constants.FieldName; -import com.appsmith.server.repositories.ProviderRepository; -import com.appsmith.server.services.AnalyticsService; -import com.appsmith.server.services.BaseService; -import jakarta.validation.Validator; -import lombok.extern.slf4j.Slf4j; -import org.springframework.data.domain.Example; -import org.springframework.data.domain.Sort; -import org.springframework.data.mongodb.core.ReactiveMongoTemplate; -import org.springframework.data.mongodb.core.convert.MongoConverter; -import org.springframework.util.MultiValueMap; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.scheduler.Scheduler; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -@Slf4j -public class ProviderServiceCEImpl extends BaseService<ProviderRepository, Provider, String> - implements ProviderServiceCE { - - private static final List<String> CATEGORIES = Arrays.asList( - "Business", - "Visual Recognition", - "Location", - "Science", - "Food", - "Travel, Transportation", - "Music", - "Tools", - "Text Analysis", - "Weather", - "Gaming", - "SMS", - "Events", - "Health, Fitness", - "Payments", - "Financial", - "Translation", - "Storage", - "Logistics", - "Database", - "Search", - "Reward", - "Mapping", - "Machine Learning", - "Email", - "News, Media", - "Video, Images", - "eCommerce", - "Medical", - "Devices", - "Business Software", - "Advertising", - "Education", - "Media", - "Social", - "Commerce", - "Communication", - "Other", - "Monitoring", - "Energy"); - - private static final String DEFAULT_CATEGORY = "Business Software"; - - public ProviderServiceCEImpl( - Scheduler scheduler, - Validator validator, - MongoConverter mongoConverter, - ReactiveMongoTemplate reactiveMongoTemplate, - ProviderRepository repository, - AnalyticsService analyticsService) { - super(scheduler, validator, mongoConverter, reactiveMongoTemplate, repository, analyticsService); - } - - @Override - public Flux<Provider> get(MultiValueMap<String, String> params) { - - // Remove branch name as providers are not shared across branches - params.remove(FieldName.DEFAULT_RESOURCES + "." + FieldName.BRANCH_NAME); - - Provider providerExample = new Provider(); - Sort sort = Sort.by("sortOrder"); - - if (params.getFirst(FieldName.NAME) != null) { - providerExample.setName(params.getFirst(FieldName.NAME)); - } - - List<String> categories = new ArrayList<>(); - if (params.getFirst(FieldName.CATEGORY) != null) { - categories.add(params.getFirst(FieldName.CATEGORY)); - - } else { - // No category has been provided. Set the default category. - categories.add(DEFAULT_CATEGORY); - } - providerExample.setCategories(categories); - - providerExample.setSortOrder(null); - - return repository.findAll(Example.of(providerExample), sort); - } - - @Override - public Mono<List<String>> getAllCategories() { - return Mono.just(CATEGORIES); - } -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserChangedHandlerImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserChangedHandlerImpl.java index fa85635e66ed..f9728eb44bc2 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserChangedHandlerImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/UserChangedHandlerImpl.java @@ -1,6 +1,5 @@ package com.appsmith.server.solutions; -import com.appsmith.server.repositories.NotificationRepository; import com.appsmith.server.repositories.WorkspaceRepository; import com.appsmith.server.solutions.ce.UserChangedHandlerCEImpl; import lombok.extern.slf4j.Slf4j; @@ -12,10 +11,8 @@ public class UserChangedHandlerImpl extends UserChangedHandlerCEImpl implements UserChangedHandler { public UserChangedHandlerImpl( - ApplicationEventPublisher applicationEventPublisher, - NotificationRepository notificationRepository, - WorkspaceRepository workspaceRepository) { + ApplicationEventPublisher applicationEventPublisher, WorkspaceRepository workspaceRepository) { - super(applicationEventPublisher, notificationRepository, workspaceRepository); + super(applicationEventPublisher, workspaceRepository); } } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserChangedHandlerCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserChangedHandlerCEImpl.java index 8cc83a2e92a6..2f3c445e9f25 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserChangedHandlerCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserChangedHandlerCEImpl.java @@ -2,7 +2,6 @@ import com.appsmith.server.domains.User; import com.appsmith.server.events.UserChangedEvent; -import com.appsmith.server.repositories.NotificationRepository; import com.appsmith.server.repositories.WorkspaceRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -17,7 +16,6 @@ public class UserChangedHandlerCEImpl implements UserChangedHandlerCE { private final ApplicationEventPublisher applicationEventPublisher; - private final NotificationRepository notificationRepository; private final WorkspaceRepository workspaceRepository; public User publish(User user) { diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/refactors/ce/RefactoringServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/refactors/ce/RefactoringServiceCETest.java index b58250228c6b..0178353b157f 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/refactors/ce/RefactoringServiceCETest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/refactors/ce/RefactoringServiceCETest.java @@ -566,8 +566,6 @@ public void refactorDuplicateActionName() { duplicateNameCompleteAction.setWorkspaceId(duplicateName.getWorkspaceId()); duplicateNameCompleteAction.setPluginType(duplicateName.getPluginType()); duplicateNameCompleteAction.setPluginId(duplicateName.getPluginId()); - duplicateNameCompleteAction.setTemplateId(duplicateName.getTemplateId()); - duplicateNameCompleteAction.setProviderId(duplicateName.getProviderId()); duplicateNameCompleteAction.setDocumentation(duplicateName.getDocumentation()); duplicateNameCompleteAction.setApplicationId(duplicateName.getApplicationId()); duplicateNameCompleteAction.setDefaultResources(new DefaultResources()); diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomNotificationRepositoryImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomNotificationRepositoryImplTest.java deleted file mode 100644 index e4257f87f6b0..000000000000 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/repositories/CustomNotificationRepositoryImplTest.java +++ /dev/null @@ -1,181 +0,0 @@ -package com.appsmith.server.repositories; - -import com.appsmith.server.domains.Notification; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit.jupiter.SpringExtension; -import reactor.core.publisher.Mono; -import reactor.test.StepVerifier; -import reactor.util.function.Tuple2; -import reactor.util.function.Tuple3; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -@ExtendWith(SpringExtension.class) -@SpringBootTest -@Slf4j -public class CustomNotificationRepositoryImplTest { - - @Autowired - private NotificationRepository notificationRepository; - - @AfterEach - public void afterTest() { - notificationRepository.deleteAll(); - } - - private Notification createNotification(String forUsername, boolean isRead) { - Notification notification = new Notification(); - notification.setForUsername(forUsername); - notification.setIsRead(isRead); - return notification; - } - - @Test - public void updateIsReadByForUsernameAndIdList_WhenUsernameNotMatched_UpdatesNone() { - Mono<Notification> saveMono1 = notificationRepository.save(createNotification("abc", false)); - Mono<Notification> saveMono2 = notificationRepository.save(createNotification("efg", false)); - - // create the notifications and then try to update them by different username - Mono<Tuple2<Notification, Notification>> tuple2Mono = Mono.zip(saveMono1, saveMono2) - .flatMap(objects -> { - Notification n1 = objects.getT1(); - Notification n2 = objects.getT2(); - return notificationRepository - .updateIsReadByForUsernameAndIdList("123", List.of(n1.getId(), n2.getId()), true) - .thenReturn(objects); - }); - - // now get the notifications we created - Mono<List<Notification>> listMono = tuple2Mono.flatMap(objects -> { - Notification n1 = objects.getT1(); - Notification n2 = objects.getT2(); - return notificationRepository - .findAllById(List.of(n1.getId(), n2.getId())) - .collectList(); - }); - - // check that fetched notifications have isRead=false - StepVerifier.create(listMono) - .assertNext(notifications -> { - assertEquals(2, notifications.size()); - assertEquals(false, notifications.get(0).getIsRead()); - assertEquals(false, notifications.get(1).getIsRead()); - }) - .verifyComplete(); - } - - @Test - public void updateIsReadByForUsernameAndIdList_WhenUsernameMatched_Updated() { - Mono<Notification> saveMono1 = notificationRepository.save(createNotification("abc", false)); - Mono<Notification> saveMono2 = notificationRepository.save(createNotification("abc", false)); - - // create the notifications and then try to update them by same username - Mono<Tuple2<Notification, Notification>> tuple2Mono = Mono.zip(saveMono1, saveMono2) - .flatMap(objects -> { - Notification n1 = objects.getT1(); - Notification n2 = objects.getT2(); - return notificationRepository - .updateIsReadByForUsernameAndIdList("abc", List.of(n1.getId(), n2.getId()), true) - .thenReturn(objects); - }); - - // now get the notifications we created - Mono<List<Notification>> listMono = tuple2Mono.flatMap(objects -> { - Notification n1 = objects.getT1(); - Notification n2 = objects.getT2(); - return notificationRepository - .findAllById(List.of(n1.getId(), n2.getId())) - .collectList(); - }); - - // check that fetched notifications have isRead=true - StepVerifier.create(listMono) - .assertNext(notifications -> { - assertEquals(2, notifications.size()); - assertEquals(true, notifications.get(0).getIsRead()); - assertEquals(true, notifications.get(1).getIsRead()); - }) - .verifyComplete(); - } - - @Test - public void updateIsReadByForUsernameAndIdList_WhenIdNotMatched_UpdatesNone() { - Mono<Notification> saveMono1 = notificationRepository.save(createNotification("abc", false)); - Mono<Notification> saveMono2 = notificationRepository.save(createNotification("abc", false)); - - // create the notifications and then try to update them by different username - Mono<Tuple2<Notification, Notification>> tuple2Mono = Mono.zip(saveMono1, saveMono2) - .flatMap(objects -> { - Notification n1 = objects.getT1(); - Notification n2 = objects.getT2(); - return notificationRepository - .updateIsReadByForUsernameAndIdList("abc", List.of("test-id-1", "test-id-2"), true) - .thenReturn(objects); - }); - - // now get the notifications we created - Mono<List<Notification>> listMono = tuple2Mono.flatMap(objects -> { - Notification n1 = objects.getT1(); - Notification n2 = objects.getT2(); - return notificationRepository - .findAllById(List.of(n1.getId(), n2.getId())) - .collectList(); - }); - - // check that fetched notifications have isRead=true - StepVerifier.create(listMono) - .assertNext(notifications -> { - assertEquals(2, notifications.size()); - assertEquals(false, notifications.get(0).getIsRead()); - assertEquals(false, notifications.get(1).getIsRead()); - }) - .verifyComplete(); - } - - @Test - public void updateIsReadByForUsername_WhenForUsernameMatched_UpdatesMatchedOnes() { - Mono<Notification> saveMono1 = notificationRepository.save(createNotification("abc", false)); - Mono<Notification> saveMono2 = notificationRepository.save(createNotification("abc", false)); - Mono<Notification> saveMono3 = notificationRepository.save(createNotification("efg", false)); - - // create the notifications and then try to update them by same username - Mono<Tuple3<Notification, Notification, Notification>> tuple2Mono = Mono.zip(saveMono1, saveMono2, saveMono3) - .flatMap(objects -> notificationRepository - .updateIsReadByForUsername("abc", true) - .thenReturn(objects)); - - // now get the notifications we created - Mono<Map<String, Collection<Notification>>> mapMono = tuple2Mono.flatMap(objects -> { - Notification n1 = objects.getT1(); - Notification n2 = objects.getT2(); - Notification n3 = objects.getT3(); - return notificationRepository - .findAllById(List.of(n1.getId(), n2.getId(), n3.getId())) - .collectMultimap(Notification::getForUsername); - }); - - // check that fetched notifications have isRead=true - StepVerifier.create(mapMono) - .assertNext(notificationCollectionMap -> { - assertEquals(2, notificationCollectionMap.size()); // should contain map of two keys - - Notification forEfg = - notificationCollectionMap.get("efg").iterator().next(); - assertEquals(false, forEfg.getIsRead()); // this should be still unread - - notificationCollectionMap.get("abc").iterator().forEachRemaining(notification -> { - assertEquals(true, notification.getIsRead()); - }); - }) - .verifyComplete(); - } -} diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/NotificationServiceImplTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/NotificationServiceImplTest.java deleted file mode 100644 index b306f413552c..000000000000 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/NotificationServiceImplTest.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.appsmith.server.services; - -import com.appsmith.server.domains.Notification; -import com.appsmith.server.domains.User; -import com.appsmith.server.dtos.UpdateIsReadNotificationByIdDTO; -import com.appsmith.server.dtos.UpdateIsReadNotificationDTO; -import com.appsmith.server.exceptions.AppsmithError; -import com.appsmith.server.helpers.ResponseUtils; -import com.appsmith.server.repositories.NotificationRepository; -import com.mongodb.client.result.UpdateResult; -import jakarta.validation.Validator; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mockito; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.data.domain.Pageable; -import org.springframework.data.mongodb.core.ReactiveMongoTemplate; -import org.springframework.data.mongodb.core.convert.MongoConverter; -import org.springframework.test.context.junit.jupiter.SpringExtension; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import reactor.core.scheduler.Scheduler; -import reactor.test.StepVerifier; - -import java.time.Instant; -import java.util.ArrayList; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.eq; - -@ExtendWith(SpringExtension.class) -public class NotificationServiceImplTest { - NotificationService notificationService; - - @MockBean - private Scheduler scheduler; - - @MockBean - private Validator validator; - - @MockBean - private MongoConverter mongoConverter; - - @MockBean - private ReactiveMongoTemplate reactiveMongoTemplate; - - @MockBean - private NotificationRepository repository; - - @MockBean - private AnalyticsService analyticsService; - - @MockBean - private SessionUserService sessionUserService; - - @MockBean - private ResponseUtils responseUtils; - - private User currentUser; - - @BeforeEach - public void setUp() { - notificationService = new NotificationServiceImpl( - scheduler, - validator, - mongoConverter, - reactiveMongoTemplate, - repository, - analyticsService, - sessionUserService, - responseUtils); - currentUser = new User(); - currentUser.setEmail("sample-email"); - - Mockito.when(sessionUserService.getCurrentUser()).thenReturn(Mono.just(currentUser)); - // mock the repository to return count as 100 - Mockito.when(repository.countByForUsername(currentUser.getUsername())).thenReturn(Mono.just(100L)); - // mock the repository to return unread count as 5 - Mockito.when(repository.countByForUsernameAndIsReadIsFalse(currentUser.getUsername())) - .thenReturn(Mono.just(5L)); - } - - private List<Notification> createSampleNotificationList() { - // create some sample notification - List<Notification> notificationList = new ArrayList<>(); - for (int i = 1; i <= 5; i++) { - Notification notification = new Notification(); - notification.setId("test-id-" + i); - notificationList.add(notification); - } - return notificationList; - } - - @Test - public void get_WhenNoBeforeParamProvided_ReturnsData() { - List<Notification> notificationList = createSampleNotificationList(); - - // mock the repository to return the sample list of notification when called with current time - Mockito.when(repository.findByForUsernameAndCreatedAtBefore( - eq(currentUser.getUsername()), Mockito.any(Instant.class), Mockito.any(Pageable.class))) - .thenReturn(Flux.fromIterable(notificationList)); - - Flux<Notification> notificationFlux = notificationService.get(new LinkedMultiValueMap<>()); - StepVerifier.create(notificationFlux.collectList()) - .assertNext(listResponseDTO -> { - assertThat(listResponseDTO.size()).isEqualTo(notificationList.size()); - }) - .verifyComplete(); - } - - @Test - public void get_WhenValidBeforeParamExists_ReturnsData() { - List<Notification> notificationList = createSampleNotificationList(); - - Instant instant = Instant.now(); - - // mock the repository to return the sample list of notification - Mockito.when(repository.findByForUsernameAndCreatedAtBefore( - eq(currentUser.getUsername()), eq(instant), Mockito.any(Pageable.class))) - .thenReturn(Flux.fromIterable(notificationList)); - - // add the sample pagination parameters - MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); - params.put("beforeDate", List.of(instant.toString())); - - Flux<Notification> notificationFlux = notificationService.get(params); - - StepVerifier.create(notificationFlux.collectList()) - .assertNext(listResponseDTO -> { - assertThat(listResponseDTO.size()).isEqualTo(notificationList.size()); - }) - .verifyComplete(); - } - - @Test - public void get_WhenInvalidValidBeforeParam_ThrowsException() { - // add the sample pagination parameters - MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); - params.put("beforeDate", List.of("abcd")); - - Flux<Notification> notificationFlux = notificationService.get(params); - - StepVerifier.create(notificationFlux.collectList()) - .expectErrorMessage(AppsmithError.INVALID_PARAMETER.getMessage("as beforeDate")) - .verify(); - } - - @Test - public void updateIsRead_WhenUpdateAll_ReturnSuccessfully() { - UpdateIsReadNotificationDTO dto = new UpdateIsReadNotificationDTO(); - dto.setIsRead(true); - - Mockito.when(repository.updateIsReadByForUsername(currentUser.getUsername(), true)) - .thenReturn(Mono.just(Mockito.mock(UpdateResult.class))); - - StepVerifier.create(notificationService.updateIsRead(dto)) - .assertNext(responseDTO -> { - assertThat(responseDTO.getIsRead()).isTrue(); - }) - .verifyComplete(); - } - - @Test - public void updateIsRead_WhenUpdateById_ReturnSuccessfully() { - UpdateIsReadNotificationByIdDTO dto = new UpdateIsReadNotificationByIdDTO(); - dto.setIsRead(true); - dto.setIdList(List.of("sample-id-1", "sample-id-2", "sample-id-3")); - - Mockito.when(repository.updateIsReadByForUsernameAndIdList(currentUser.getUsername(), dto.getIdList(), true)) - .thenReturn(Mono.just(Mockito.mock(UpdateResult.class))); - - StepVerifier.create(notificationService.updateIsRead(dto)) - .assertNext(responseDTO -> { - assertThat(responseDTO.getIsRead()).isTrue(); - assertThat(responseDTO.getIdList()).isEqualTo(dto.getIdList()); - }) - .verifyComplete(); - } -} diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/NewActionServiceUnitTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/NewActionServiceUnitTest.java index 68d4f5396d7b..c0e928c42af6 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/NewActionServiceUnitTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/NewActionServiceUnitTest.java @@ -18,7 +18,6 @@ import com.appsmith.server.repositories.NewActionRepository; import com.appsmith.server.services.AnalyticsService; import com.appsmith.server.services.ConfigService; -import com.appsmith.server.services.MarketplaceService; import com.appsmith.server.services.PermissionGroupService; import com.appsmith.server.solutions.ActionPermission; import com.appsmith.server.solutions.ActionPermissionImpl; @@ -77,9 +76,6 @@ public class NewActionServiceUnitTest { @MockBean PluginExecutorHelper pluginExecutorHelper; - @MockBean - MarketplaceService marketplaceService; - @MockBean PolicyGenerator policyGenerator; @@ -142,7 +138,6 @@ public void setup() { datasourceService, pluginService, pluginExecutorHelper, - marketplaceService, policyGenerator, newPageService, applicationService, diff --git a/app/server/envs/docker.env.example b/app/server/envs/docker.env.example index bf8089f4b5d5..e9d2238d9b78 100644 --- a/app/server/envs/docker.env.example +++ b/app/server/envs/docker.env.example @@ -15,9 +15,6 @@ # APPSMITH_MAIL_SMTP_AUTH=true # APPSMITH_MAIL_SMTP_TLS_ENABLED=true -# APPSMITH_MARKETPLACE_USERNAME="" -# APPSMITH_MARKETPLACE_PASSWORD="" - APPSMITH_ENCRYPTION_PASSWORD="abcd" APPSMITH_ENCRYPTION_SALT="abcd" diff --git a/deploy/docker/fs/opt/appsmith/templates/docker.env.sh b/deploy/docker/fs/opt/appsmith/templates/docker.env.sh index 9f6716b028eb..3aff309e73eb 100644 --- a/deploy/docker/fs/opt/appsmith/templates/docker.env.sh +++ b/deploy/docker/fs/opt/appsmith/templates/docker.env.sh @@ -29,10 +29,6 @@ APPSMITH_SIGNUP_DISABLED= # Segment APPSMITH_SEGMENT_KEY= -# RapidAPI -APPSMITH_RAPID_API_KEY_VALUE= -APPSMITH_MARKETPLACE_ENABLED= - # Algolia Search (Docs) APPSMITH_ALGOLIA_API_ID= APPSMITH_ALGOLIA_API_KEY=
d967cfe713c6a7c848b583a1709a6df44103e1a7
2024-06-04 12:13:18
ashit-rath
chore: Enable entity tern server to lookup fnParams in entity definition to autocomplete function params (#33726)
false
Enable entity tern server to lookup fnParams in entity definition to autocomplete function params (#33726)
chore
diff --git a/app/client/src/utils/autocomplete/CodemirrorTernService.ts b/app/client/src/utils/autocomplete/CodemirrorTernService.ts index 19059ebec2ec..63b8b037a48e 100644 --- a/app/client/src/utils/autocomplete/CodemirrorTernService.ts +++ b/app/client/src/utils/autocomplete/CodemirrorTernService.ts @@ -112,6 +112,25 @@ export function isCustomKeywordType( ); } +// Define the regex for extracting the final object path +const FINAL_OBJECT_PATH_REGEX = /(?:\w+\.)*\w+$/; + +/** + * Extracts the final object path from a given input string. + * The final object path is the rightmost dot-separated path in the string. + * + * @param {string} input - The input string from which to extract the object path. + * @returns {string|null} - The extracted object path or null if no match is found. + * + * Example: + * Input: '\tconst k = PageQuery.run' + * Output: 'PageQuery.run' + */ +export function extractFinalObjectPath(input: string) { + const match = (input || "")?.trim().match(FINAL_OBJECT_PATH_REGEX); + return match ? match[0] : null; +} + export function getDataType(type: string): AutocompleteDataType { if (type === "?") return AutocompleteDataType.UNKNOWN; else if (type === "number") return AutocompleteDataType.NUMBER; @@ -177,12 +196,14 @@ class CodeMirrorTernService { string, DataTreeDefEntityInformation >(); + entityDef: Def; options: { async: boolean }; recentEntities: string[] = []; constructor(options: { async: boolean }) { this.options = options; this.server = new TernWorkerServer(this); + this.entityDef = {}; } resetServer = () => { @@ -397,6 +418,7 @@ class CodeMirrorTernService { this.server.deleteDefs(name); } + this.entityDef = def || {}; if (entityInfo) this.defEntityInformation = entityInfo; } @@ -455,9 +477,21 @@ class CodeMirrorTernService { completion.origin === "DATA_TREE" && this.defEntityInformation.has(completion.name); let completionText = completion.name + after; + const completedLine = lineValue.substring(0, from.ch) + completion.name; + const entityPath = extractFinalObjectPath(completedLine); + if (dataType === "FUNCTION" && !completion.origin?.startsWith("LIB/")) { if (token.type !== "string" && token.string !== "[") { - completionText = completionText + "()"; + const entityDef = entityPath && this.entityDef[entityPath]; + if ( + entityDef && + typeof entityDef === "object" && + "!fnParams" in entityDef + ) { + completionText = completionText + `(${entityDef["!fnParams"]})`; + } else { + completionText = completionText + "()"; + } } } const codeMirrorCompletion: Completion<TernCompletionResult> = { @@ -1204,7 +1238,10 @@ export default new CodeMirrorTernService({ function dotToBracketNotationAtToken(token: CodeMirror.Token) { return (cm: CodeMirror.Editor, hints: Hints, curr: Hint) => { let completion = curr.text; - if (token.type === "string") { + if ( + token.type === "string" || + ("type" in curr && curr.type === AutocompleteDataType.FUNCTION) + ) { // | represents the cursor // Cases like JSObject1["myV|"] cm.replaceRange(completion, hints.from, hints.to); diff --git a/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts b/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts index 93cafbb4ee5c..5f240c19737b 100644 --- a/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts +++ b/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts @@ -4,6 +4,7 @@ import type { } from "../CodemirrorTernService"; import CodemirrorTernService, { createCompletionHeader, + extractFinalObjectPath, } from "../CodemirrorTernService"; import { AutocompleteDataType } from "../AutocompleteDataType"; import { MockCodemirrorEditor } from "../../../../test/__mocks__/CodeMirrorEditorMock"; @@ -11,6 +12,8 @@ import { ENTITY_TYPE } from "entities/DataTree/dataTreeFactory"; import _ from "lodash"; import { AutocompleteSorter, ScoredCompletion } from "../AutocompleteSortRules"; import type CodeMirror from "codemirror"; +import type { Def } from "tern"; +import type { Doc } from "codemirror"; jest.mock("utils/getCodeMirrorNamespace", () => { const actual = jest.requireActual("utils/getCodeMirrorNamespace"); @@ -421,3 +424,304 @@ describe("Tern server sorting", () => { expect(scoredCompletion3.score).toBe(2 ** 8 + 2 ** 4 + 2 ** 3); }); }); + +describe("Tern server completion", () => { + beforeEach(() => { + jest.resetAllMocks(); + }); + it("identifies fnParams for the current line and applies to the completion list", () => { + const entityDef: Def = { + "!name": "DATA_TREE", + QueryModule11: { + "!doc": + "Object that contains the properties required to run queries and access the query data.", + "!url": + "https://docs.appsmith.com/reference/appsmith-framework/query-object", + data: { + "!doc": + "A read-only property that contains the response body from the last successful execution of this query.", + "!url": + "https://docs.appsmith.com/reference/appsmith-framework/query-object#data-array", + "!type": "?", + }, + run: { + "!type": "fn(inputs: {gender: any, limit: any}) -> +Promise", + "!fnParams": '{ gender: "male", limit: "5" }', + "!url": + "https://docs.appsmith.com/reference/appsmith-framework/query-object#queryrun", + "!doc": "Executes the query with the given input values.", + }, + }, + "QueryModule11.data": { + "!doc": + "A read-only property that contains the response body from the last successful execution of this query.", + "!url": + "https://docs.appsmith.com/reference/appsmith-framework/query-object#data-array", + "!type": "?", + }, + "QueryModule11.run": { + "!type": "fn(inputs: {gender: any, limit: any}) -> +Promise", + "!fnParams": '{ gender: "male", limit: "5" }', + "!url": + "https://docs.appsmith.com/reference/appsmith-framework/query-object#queryrun", + "!doc": "Executes the query with the given input values.", + }, + "!define": {}, + }; + const data = { + start: { + line: 10, + ch: 22, + }, + end: { + line: 10, + ch: 30, + }, + isProperty: false, + isObjectKey: false, + completions: [ + { + name: "QueryModule11", + type: "QueryModule11", + doc: "Object that contains the properties required to run queries and access the query data.", + url: "https://docs.appsmith.com/reference/appsmith-framework/query-object", + origin: "DATA_TREE", + }, + { + name: "QueryModule11.data", + type: "?", + doc: "A read-only property that contains the response body from the last successful execution of this query.", + url: "https://docs.appsmith.com/reference/appsmith-framework/query-object#data-array", + origin: "DATA_TREE", + }, + { + name: "QueryModule11.run", + type: "fn(inputs: {gender: ?, limit: ?}) -> Promise", + doc: "Executes the query with the given input values.", + url: "https://docs.appsmith.com/reference/appsmith-framework/query-object#queryrun", + origin: "DATA_TREE", + }, + ], + }; + + const expectedValue = [ + { + text: "QueryModule11.data", + displayText: "QueryModule11.data", + className: + "CodeMirror-Tern-completion CodeMirror-Tern-completion-unknown", + data: { + name: "QueryModule11.data", + type: "?", + doc: "A read-only property that contains the response body from the last successful execution of this query.", + url: "https://docs.appsmith.com/reference/appsmith-framework/query-object#data-array", + origin: "DATA_TREE", + }, + origin: "DATA_TREE", + type: "UNKNOWN", + isHeader: false, + recencyWeight: 0, + isEntityName: false, + }, + { + text: "QueryModule11", + displayText: "QueryModule11", + className: + "CodeMirror-Tern-completion CodeMirror-Tern-completion-object", + data: { + name: "QueryModule11", + type: "QueryModule11", + doc: "Object that contains the properties required to run queries and access the query data.", + url: "https://docs.appsmith.com/reference/appsmith-framework/query-object", + origin: "DATA_TREE", + }, + origin: "DATA_TREE", + type: "OBJECT", + isHeader: false, + recencyWeight: 0, + isEntityName: true, + }, + { + text: 'QueryModule11.run({ gender: "male", limit: "5" })', + displayText: "QueryModule11.run", + className: "CodeMirror-Tern-completion CodeMirror-Tern-completion-fn", + data: { + name: "QueryModule11.run", + type: "fn(inputs: {gender: ?, limit: ?}) -> Promise", + doc: "Executes the query with the given input values.", + url: "https://docs.appsmith.com/reference/appsmith-framework/query-object#queryrun", + origin: "DATA_TREE", + }, + origin: "DATA_TREE", + type: "FUNCTION", + isHeader: false, + recencyWeight: 0, + isEntityName: false, + }, + ]; + + // The current cursor location that is being written in the code mirror editor + MockCodemirrorEditor.getCursor.mockResolvedValue({ + line: 10, + ch: 30, + sticky: null, + }); + MockCodemirrorEditor.getTokenAt.mockResolvedValue({ + start: 22, + end: 30, + string: "QueryMod", + type: "variable", + state: { + lastType: "variable", + cc: [ + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + ], + lexical: { + indented: 4, + column: 4, + type: "vardef", + prev: { + indented: 2, + column: 18, + type: "}", + prev: { + indented: 0, + column: 15, + type: "}", + prev: { + indented: 0, + column: 0, + type: "stat", + prev: { + indented: -2, + column: 0, + type: "block", + align: false, + }, + align: true, + }, + info: null, + align: false, + }, + align: false, + }, + info: "const", + align: true, + }, + localVars: { + name: "users", + next: null, + }, + context: { + prev: { + block: false, + }, + vars: { + name: "this", + next: { + name: "arguments", + next: null, + }, + }, + block: true, + }, + indented: 4, + }, + }); + + CodemirrorTernService.entityDef = entityDef; + + // The current line that is being written in the code mirror editor + jest + .spyOn(CodemirrorTernService, "lineValue") + .mockReturnValue("\t\tconst users = await QueryMod"); + jest + .spyOn(CodemirrorTernService, "getFocusedDocValueAndPos") + .mockReturnValue({ + extraChars: 0, + value: "", + end: { + line: 10, + ch: 30, + }, + }); + jest.spyOn(CodemirrorTernService, "findDoc").mockReturnValue({ + doc: {} as Doc, + name: "", + changed: null, + }); + jest + .spyOn(AutocompleteSorter, "sort") + .mockImplementation((completions) => completions); + + CodemirrorTernService.defEntityInformation = new Map([ + [ + "QueryModule11", + { + type: "MODULE_INSTANCE", + subType: "QUERY_MODULE", + }, + ], + ]); + + const result = CodemirrorTernService.requestCallback( + null, + data, + MockCodemirrorEditor as unknown as CodeMirror.Editor, + jest.fn, + )!; + + const expectedContainingItems = _.sortBy(expectedValue, "text").map( + (item) => expect.objectContaining(item), + ); + expect(_.sortBy(result.list, "text")).toEqual(expectedContainingItems); + }); +}); + +describe("extractFinalObjectPath", () => { + it("should extract the last dot-separated path from a string", () => { + expect(extractFinalObjectPath("user.profile.name")).toEqual( + "user.profile.name", + ); + expect(extractFinalObjectPath("app.data")).toEqual("app.data"); + }); + + it("should return the last path in a code line", () => { + expect(extractFinalObjectPath("const users = GetUsers.run")).toEqual( + "GetUsers.run", + ); + }); + + it("should return the input if there are no dots", () => { + expect(extractFinalObjectPath("username")).toEqual("username"); + }); + + it("should return null for empty or whitespace-only strings", () => { + expect(extractFinalObjectPath("")).toBeNull(); + expect(extractFinalObjectPath(" ")).toBeNull(); + }); + + it("should handle strings with leading and trailing whitespace", () => { + expect(extractFinalObjectPath(" user.profile.name ")).toEqual( + "user.profile.name", + ); + }); + + it("should return null if no valid path is found", () => { + expect(extractFinalObjectPath("This is a valid code string path")).toEqual( + "path", + ); + }); +});
f29cefaf0b2ebd098d9da57028b9922cb3657574
2023-09-22 12:27:31
ashit-rath
chore: refactor workspace homepage loading state (#27433)
false
refactor workspace homepage loading state (#27433)
chore
diff --git a/app/client/src/ce/pages/Applications/ApplicationCardList.tsx b/app/client/src/ce/pages/Applications/ApplicationCardList.tsx index 5d0f95ba997b..a6fbfcd626f7 100644 --- a/app/client/src/ce/pages/Applications/ApplicationCardList.tsx +++ b/app/client/src/ce/pages/Applications/ApplicationCardList.tsx @@ -3,13 +3,8 @@ import { Button } from "design-system"; import { importSvg } from "design-system-old"; import { useSelector } from "react-redux"; -import { - CardListContainer, - CardListWrapper, - PaddingWrapper, - ResourceHeading, - Space, -} from "pages/Applications/CommonElements"; +import CardList from "pages/Applications/CardList"; +import { PaddingWrapper } from "pages/Applications/CommonElements"; import { getIsCreatingApplicationByWorkspaceId, getIsFetchingApplications, @@ -55,51 +50,51 @@ function ApplicationCardList({ const isFetchingApplications = useSelector(getIsFetchingApplications); return ( - <CardListContainer isMobile={isMobile}> - <ResourceHeading isLoading={isFetchingApplications}>Apps</ResourceHeading> - <Space /> - <CardListWrapper isMobile={isMobile} key={workspaceId}> - {applications.map((application: any) => { - return ( - <PaddingWrapper isMobile={isMobile} key={application.id}> - <ApplicationCard - application={application} - delete={deleteApplication} - enableImportExport={enableImportExport} - isFetchingApplications={isFetchingApplications} - isMobile={isMobile} - key={application.id} - permissions={{ - hasCreateNewApplicationPermission, - hasManageWorkspacePermissions, - canInviteToWorkspace, - }} - update={updateApplicationDispatch} - workspaceId={workspaceId} - /> - </PaddingWrapper> - ); - })} - {applications.length === 0 && ( - <NoAppsFound> - <NoAppsFoundIcon /> - <span>There’s nothing inside this workspace</span> - {/* below component is duplicate. This is because of cypress test were failing */} - {hasCreateNewApplicationPermission && ( - <Button - className="t--new-button createnew" - isLoading={isCreatingApplication} - onClick={() => onClickAddNewButton(workspaceId)} - size="md" - startIcon={"plus"} - > - New - </Button> - )} - </NoAppsFound> - )} - </CardListWrapper> - </CardListContainer> + <CardList + isLoading={isFetchingApplications} + isMobile={isMobile} + title="Apps" + > + {applications.map((application: any) => { + return ( + <PaddingWrapper isMobile={isMobile} key={application.id}> + <ApplicationCard + application={application} + delete={deleteApplication} + enableImportExport={enableImportExport} + isFetchingApplications={isFetchingApplications} + isMobile={isMobile} + key={application.id} + permissions={{ + hasCreateNewApplicationPermission, + hasManageWorkspacePermissions, + canInviteToWorkspace, + }} + update={updateApplicationDispatch} + workspaceId={workspaceId} + /> + </PaddingWrapper> + ); + })} + {applications.length === 0 && ( + <NoAppsFound> + <NoAppsFoundIcon /> + <span>There’s nothing inside this workspace</span> + {/* below component is duplicate. This is because of cypress test were failing */} + {hasCreateNewApplicationPermission && ( + <Button + className="t--new-button createnew" + isLoading={isCreatingApplication} + onClick={() => onClickAddNewButton(workspaceId)} + size="md" + startIcon={"plus"} + > + New + </Button> + )} + </NoAppsFound> + )} + </CardList> ); } diff --git a/app/client/src/ce/pages/Applications/ResourceListLoader.tsx b/app/client/src/ce/pages/Applications/ResourceListLoader.tsx new file mode 100644 index 000000000000..86462f596f9f --- /dev/null +++ b/app/client/src/ce/pages/Applications/ResourceListLoader.tsx @@ -0,0 +1,58 @@ +import React from "react"; +import { noop } from "lodash"; + +import Card from "components/common/Card"; +import CardList from "pages/Applications/CardList"; +import { Button } from "design-system"; +import { PaddingWrapper } from "pages/Applications/CommonElements"; +import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants"; + +type ResourcesLoaderProps = { + isMobile: boolean; + resources: ApplicationPayload[]; +}; + +const DEFAULT_BACKGROUND_COLOR = "#9747FF1A"; +const DEFAULT_ICON = "book"; + +function ResourceListLoader({ isMobile, resources }: ResourcesLoaderProps) { + return ( + <CardList isLoading isMobile={isMobile} title="Apps"> + {resources.map((resource: any) => { + return ( + <PaddingWrapper isMobile={isMobile} key={resource.id}> + <Card + backgroundColor={DEFAULT_BACKGROUND_COLOR} + contextMenu={null} + editedByText="" + hasReadPermission + icon={DEFAULT_ICON} + isContextMenuOpen={false} + isFetching + isMobile={isMobile} + moreActionItems={[]} + primaryAction={noop} + setShowOverlay={noop} + showGitBadge={false} + showOverlay={false} + testId="t--package-card" + title={resource.name} + titleTestId="t--app-card-name" + > + <Button + className="t--package-edit-link" + href={"/"} + size="md" + startIcon={"pencil-line"} + > + Edit + </Button> + </Card> + </PaddingWrapper> + ); + })} + </CardList> + ); +} + +export default ResourceListLoader; diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx index ec5c7da24845..8e47b64d55bb 100644 --- a/app/client/src/ce/pages/Applications/index.tsx +++ b/app/client/src/ce/pages/Applications/index.tsx @@ -98,6 +98,7 @@ import ApplicationCardList from "@appsmith/pages/Applications/ApplicationCardLis import { usePackage } from "@appsmith/pages/Applications/helpers"; import PackageCardList from "@appsmith/pages/Applications/PackageCardList"; import WorkspaceAction from "@appsmith/pages/Applications/WorkspaceAction"; +import ResourceListLoader from "@appsmith/pages/Applications/ResourceListLoader"; export const { cloudHosting } = getAppsmithConfigs(); @@ -710,20 +711,28 @@ export function ApplicationsSection(props: any) { </WorkspaceShareUsers> )} </WorkspaceDropDown> - <ApplicationCardList - applications={applications} - canInviteToWorkspace={canInviteToWorkspace} - deleteApplication={deleteApplication} - enableImportExport={enableImportExport} - hasCreateNewApplicationPermission={ - hasCreateNewApplicationPermission - } - hasManageWorkspacePermissions={hasManageWorkspacePermissions} - isMobile={isMobile} - onClickAddNewButton={onClickAddNewAppButton} - updateApplicationDispatch={updateApplicationDispatch} - workspaceId={workspace.id} - /> + {isLoadingResources && ( + <ResourceListLoader + isMobile={isMobile} + resources={applications} + /> + )} + {!isLoadingResources && ( + <ApplicationCardList + applications={applications} + canInviteToWorkspace={canInviteToWorkspace} + deleteApplication={deleteApplication} + enableImportExport={enableImportExport} + hasCreateNewApplicationPermission={ + hasCreateNewApplicationPermission + } + hasManageWorkspacePermissions={hasManageWorkspacePermissions} + isMobile={isMobile} + onClickAddNewButton={onClickAddNewAppButton} + updateApplicationDispatch={updateApplicationDispatch} + workspaceId={workspace.id} + /> + )} {!isLoadingResources && ( <PackageCardList isMobile={isMobile} diff --git a/app/client/src/ee/pages/Applications/ResourceListLoader.tsx b/app/client/src/ee/pages/Applications/ResourceListLoader.tsx new file mode 100644 index 000000000000..8ca45c4d2eaf --- /dev/null +++ b/app/client/src/ee/pages/Applications/ResourceListLoader.tsx @@ -0,0 +1,3 @@ +export * from "ce/pages/Applications/ResourceListLoader"; +import { default as CE_ResourceListLoader } from "ce/pages/Applications/ResourceListLoader"; +export default CE_ResourceListLoader; diff --git a/app/client/src/pages/Applications/CardList.tsx b/app/client/src/pages/Applications/CardList.tsx new file mode 100644 index 000000000000..550bd70ec842 --- /dev/null +++ b/app/client/src/pages/Applications/CardList.tsx @@ -0,0 +1,26 @@ +import React from "react"; + +import { + CardListContainer, + CardListWrapper, + ResourceHeading, + Space, +} from "pages/Applications/CommonElements"; + +type CardListProps = React.PropsWithChildren<{ + isLoading?: boolean; + isMobile?: boolean; + title: string; +}>; + +function CardList({ children, isLoading, isMobile, title }: CardListProps) { + return ( + <CardListContainer isMobile={isMobile}> + <ResourceHeading isLoading={isLoading}>{title}</ResourceHeading> + <Space /> + <CardListWrapper isMobile={isMobile}>{children}</CardListWrapper> + </CardListContainer> + ); +} + +export default CardList;
3868224993e915d8525de628f37ed2015087f617
2023-09-12 22:49:30
Vijetha-Kaja
test: Cypress - Flaky Fix (#27189)
false
Cypress - Flaky Fix (#27189)
test
diff --git a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25894_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25894_spec.ts index 56521756c510..18ea0cf9aff0 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25894_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/BugTests/Bug25894_spec.ts @@ -1,10 +1,13 @@ -import * as _ from "../../../../support/Objects/ObjectsCore"; - -const { entityExplorer, propPane } = _; +import { + entityExplorer, + propPane, + draggableWidgets, + agHelper, +} from "../../../../support/Objects/ObjectsCore"; describe("Bug 25894 - Moustache brackets should be highlighted", () => { it("1. should show {{ }} in bold", () => { - entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.BUTTON, 200, 200); + entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON); entityExplorer.SelectEntityByName("Button1", "Widgets"); @@ -17,8 +20,11 @@ describe("Bug 25894 - Moustache brackets should be highlighted", () => { Query1.run(); }).catch(() => {});const a = { a: "key"} }}`, ); - - cy.get("span").contains("{{").should("have.class", "cm-binding-brackets"); - cy.get("span").contains("}}").should("have.class", "cm-binding-brackets"); + agHelper + .GetNAssertContains("span", "{{") + .should("have.class", "cm-binding-brackets"); + agHelper + .GetNAssertContains("span", "}}") + .should("have.class", "cm-binding-brackets"); }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts index 9f85a8f646bb..fe4b548ca794 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts @@ -235,6 +235,8 @@ describe("Import and validate older app (app created in older versions of Appsmi agHelper.ClickButton("Confirm"); agHelper.WaitUntilToastDisappear("Delete customer successful!"); agHelper.ClickButton("Close"); + agHelper.AssertElementAbsence(locators._modal); + agHelper.Sleep(2000); }); it("4. Edit JSObject & Check Updated Data ", () => { diff --git a/app/client/cypress/e2e/Regression/ClientSide/Linting/EntityPropertiesLint_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Linting/EntityPropertiesLint_spec.ts index 1e039e1cb75d..7686f7e24e3b 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Linting/EntityPropertiesLint_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Linting/EntityPropertiesLint_spec.ts @@ -33,11 +33,10 @@ describe("Linting of entity properties", () => { cy.wait(200); cy.focused().blur(); propPane.UpdatePropertyFieldValue("Label", `{{Api1.${invalidProperty}}}`); - cy.get(locators._lintErrorElement) - .should("have.length", 2) - .first() - .trigger("mouseover"); + agHelper.AssertElementLength(locators._lintErrorElement, 2); + agHelper.HoverElement(locators._lintErrorElement); agHelper.AssertContains(`"${invalidProperty}" doesn't exist in Api1`); + agHelper.GetNClick(locators._canvas); }); it("2. Shows correct lint error when wrong JSObject property is binded", () => { @@ -70,10 +69,8 @@ describe("Linting of entity properties", () => { `{{JSObject1.${invalidProperty}}}`, ); // Assert lint errors - cy.get(locators._lintErrorElement) - .should("have.length", 2) - .first() - .trigger("mouseover"); + agHelper.AssertElementLength(locators._lintErrorElement, 2); + agHelper.HoverElement(locators._lintErrorElement); agHelper.AssertContains(`"${invalidProperty}" doesn't exist in JSObject1`); // Edit JS Object and add "unknown" function @@ -94,10 +91,8 @@ describe("Linting of entity properties", () => { }); // select button, and assert that lint error is present entityExplorer.SelectEntityByName("Button1", "Widgets"); - cy.get(locators._lintErrorElement) - .should("have.length", 2) - .first() - .trigger("mouseover"); + agHelper.AssertElementLength(locators._lintErrorElement, 2); + agHelper.HoverElement(locators._lintErrorElement); agHelper.AssertContains(`'JSObject1' is not defined`); // create js object jsEditor.CreateJSObject( diff --git a/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_Existing_app_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_Existing_app_spec.js index 4968bc183f84..30ce81f8c5a3 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_Existing_app_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Templates/Fork_Template_Existing_app_spec.js @@ -52,9 +52,14 @@ describe( it("2. Add selected page of template from page section", () => { entityExplorer.AddNewPage("Add page from template"); agHelper.AssertElementVisibility(template.templateDialogBox); - agHelper.Sleep(4000); - cy.xpath("//h1[text()='Meeting Scheduler']").click(); - agHelper.WaitUntilEleDisappear("//*[text()='Loading template details']"); + agHelper.AssertElementVisibility( + templates.locators._templateCard, + true, + 0, + 30000, + ); + agHelper.GetNClick(template.meetingSchedulerDashboard); + //agHelper.WaitUntilEleDisappear("//*[text()='Loading template details']"); cy.wait("@getTemplatePages").should( "have.nested.property", "response.body.responseMeta.status", @@ -80,6 +85,12 @@ describe( //agHelper.RefreshPage(); entityExplorer.AddNewPage("Add page from template"); + agHelper.AssertElementVisibility( + templates.locators._templateCard, + true, + 0, + 30000, + ); agHelper.GetNClick(templates.locators._templateCard); agHelper.Sleep(2000); agHelper.AssertElementVisibility(template.templateViewForkButton); diff --git a/app/client/cypress/locators/TemplatesLocators.json b/app/client/cypress/locators/TemplatesLocators.json index c9790dc18c76..a35b0ce37d58 100644 --- a/app/client/cypress/locators/TemplatesLocators.json +++ b/app/client/cypress/locators/TemplatesLocators.json @@ -8,5 +8,6 @@ "templateDialogBox": "[data-testid=t--templates-dialog-component]", "selectCheckbox": ".ads-v2-checkbox", "closeButton": "//button[@aria-label='Close']//span", - "marketingDashboard": "//h1[text()='Marketing Dashboard']" + "marketingDashboard": "//h1[text()='Marketing Dashboard']", + "meetingSchedulerDashboard": "//h1[text()='Meeting Scheduler']" } diff --git a/app/client/cypress/support/Pages/JSEditor.ts b/app/client/cypress/support/Pages/JSEditor.ts index 36e1015a316b..db8ce9be06f1 100644 --- a/app/client/cypress/support/Pages/JSEditor.ts +++ b/app/client/cypress/support/Pages/JSEditor.ts @@ -230,7 +230,7 @@ export class JSEditor { public RunJSObj() { this.agHelper.GetNClick(this._runButton); this.agHelper.Sleep(); //for function to run - this.agHelper.AssertElementAbsence(this.locator._btnSpinner, 10000); + this.agHelper.AssertElementAbsence(this.locator._btnSpinner, 15000); this.agHelper.AssertElementAbsence(this.locator._empty, 5000); }
841b9f95c890dcf2b2b7a1035bde3a69ebf8ec82
2024-05-01 18:47:05
Apeksha Bhosale
fix: setting up linter engine after consolidated API is finished (#33049)
false
setting up linter engine after consolidated API is finished (#33049)
fix
diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx index 207f545bc49e..5b6e68104c3b 100644 --- a/app/client/src/ce/constants/ReduxActionConstants.tsx +++ b/app/client/src/ce/constants/ReduxActionConstants.tsx @@ -933,6 +933,7 @@ const ActionTypes = { SET_BUILDING_BLOCK_DRAG_START_TIME: "SET_BUILDING_BLOCK_DRAG_START_TIME", RESET_BUILDING_BLOCK_DRAG_START_TIME: "RESET_BUILDING_BLOCK_DRAG_START_TIME", CLOSE_QUERY_ACTION_TAB_SUCCESS: "CLOSE_QUERY_ACTION_TAB_SUCCESS", + LINT_SETUP: "LINT_SETUP", }; export const ReduxActionTypes = { diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts index 2a2dd3af5117..7598b4d4a66d 100644 --- a/app/client/src/sagas/InitSagas.ts +++ b/app/client/src/sagas/InitSagas.ts @@ -294,6 +294,7 @@ export function* startAppEngine(action: ReduxAction<AppEnginePayload>) { const allResponses: InitConsolidatedApi = yield call(getInitResponses, { ...action.payload, }); + yield put({ type: ReduxActionTypes.LINT_SETUP }); const { applicationId, toLoadPageId } = yield call( engine.loadAppData, action.payload, diff --git a/app/client/src/sagas/LintingSagas.ts b/app/client/src/sagas/LintingSagas.ts index b2a44292ecef..7e0947d215e7 100644 --- a/app/client/src/sagas/LintingSagas.ts +++ b/app/client/src/sagas/LintingSagas.ts @@ -125,7 +125,7 @@ export function* initiateLinting( export default function* lintTreeSagaWatcher() { yield takeEvery(ReduxActionTypes.UPDATE_LINT_GLOBALS, updateLintGlobals); - yield takeEvery(ReduxActionTypes.START_EVALUATION, setupSaga); + yield takeEvery(ReduxActionTypes.LINT_SETUP, setupSaga); } export function* setupSaga(): any { diff --git a/app/client/src/sagas/__tests__/initSagas.test.ts b/app/client/src/sagas/__tests__/initSagas.test.ts index 548bcbe604a4..1a8883cefbd6 100644 --- a/app/client/src/sagas/__tests__/initSagas.test.ts +++ b/app/client/src/sagas/__tests__/initSagas.test.ts @@ -58,6 +58,8 @@ describe("tests the sagas in initSagas", () => { .next() .call(getInitResponses, { ...action.payload }) .next(mockResponse.data) + .put({ type: ReduxActionTypes.LINT_SETUP }) + .next() .call(engine.loadAppData, action.payload, mockResponse.data) .next({ applicationId: action.payload.applicationId,
daeaf44facd12d36d25d287bc41e762d49f7ce29
2021-10-08 23:04:04
abhishek nayak
chore: Improve product copy by removing improper character capitalization (#7911)
false
Improve product copy by removing improper character capitalization (#7911)
chore
diff --git a/app/client/src/constants/messages.ts b/app/client/src/constants/messages.ts index 81e8bb41b3dc..c995bc94690c 100644 --- a/app/client/src/constants/messages.ts +++ b/app/client/src/constants/messages.ts @@ -37,7 +37,7 @@ export const FORM_VALIDATION_PASSWORD_RULE = () => export const FORM_VALIDATION_INVALID_PASSWORD = FORM_VALIDATION_PASSWORD_RULE; export const LOGIN_PAGE_SUBTITLE = () => `Use your organization email`; -export const LOGIN_PAGE_TITLE = () => `Sign In to your account`; +export const LOGIN_PAGE_TITLE = () => `Sign in to your account`; export const LOGIN_PAGE_EMAIL_INPUT_LABEL = () => `Email`; export const LOGIN_PAGE_PASSWORD_INPUT_LABEL = () => `Password`; export const LOGIN_PAGE_EMAIL_INPUT_PLACEHOLDER = () => @@ -62,7 +62,7 @@ export const SIGNUP_PAGE_NAME_INPUT_PLACEHOLDER = () => `Name`; export const SIGNUP_PAGE_NAME_INPUT_LABEL = () => `Name`; export const SIGNUP_PAGE_PASSWORD_INPUT_LABEL = () => `Password`; export const SIGNUP_PAGE_PASSWORD_INPUT_PLACEHOLDER = () => `Password`; -export const SIGNUP_PAGE_LOGIN_LINK_TEXT = () => `Sign In`; +export const SIGNUP_PAGE_LOGIN_LINK_TEXT = () => `Sign in`; export const SIGNUP_PAGE_NAME_INPUT_SUBTEXT = () => `How should we call you?`; export const SIGNUP_PAGE_SUBMIT_BUTTON_TEXT = () => `Sign Up`; export const ALREADY_HAVE_AN_ACCOUNT = () => `Already have an account?`; @@ -71,11 +71,11 @@ export const SIGNUP_PAGE_SUCCESS = () => `Awesome! You have successfully registered.`; export const SIGNUP_PAGE_SUCCESS_LOGIN_BUTTON_TEXT = () => `Login`; -export const RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL = () => `New Password`; +export const RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL = () => `New password`; export const RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER = () => `New Password`; -export const RESET_PASSWORD_LOGIN_LINK_TEXT = () => `Back to Sign In`; -export const RESET_PASSWORD_PAGE_TITLE = () => `Reset Password`; +export const RESET_PASSWORD_LOGIN_LINK_TEXT = () => `Back to sign in`; +export const RESET_PASSWORD_PAGE_TITLE = () => `Reset password`; export const RESET_PASSWORD_SUBMIT_BUTTON_TEXT = () => `Reset`; export const RESET_PASSWORD_PAGE_SUBTITLE = () => `Create a new password for your account `; @@ -88,22 +88,22 @@ export const RESET_PASSWORD_EXPIRED_TOKEN = () => `The password reset link has expired. Please try generating a new link`; export const RESET_PASSWORD_INVALID_TOKEN = () => `The password reset link is invalid. Please try generating a new link`; -export const RESET_PASSWORD_FORGOT_PASSWORD_LINK = () => `Forgot Password`; +export const RESET_PASSWORD_FORGOT_PASSWORD_LINK = () => `Forgot password`; export const FORGOT_PASSWORD_PAGE_EMAIL_INPUT_LABEL = () => `Email`; export const FORGOT_PASSWORD_PAGE_EMAIL_INPUT_PLACEHOLDER = () => `Email`; -export const FORGOT_PASSWORD_PAGE_TITLE = () => `Reset Password`; +export const FORGOT_PASSWORD_PAGE_TITLE = () => `Reset password`; export const FORGOT_PASSWORD_PAGE_SUBTITLE = () => `We will send a reset link to the email below`; export const FORGOT_PASSWORD_PAGE_SUBMIT_BUTTON_TEXT = () => `Reset`; export const FORGOT_PASSWORD_SUCCESS_TEXT = () => `A password reset link has been sent to`; -export const PRIVACY_POLICY_LINK = () => `Privacy Policy`; -export const TERMS_AND_CONDITIONS_LINK = () => `Terms and Conditions`; +export const PRIVACY_POLICY_LINK = () => `Privacy policy`; +export const TERMS_AND_CONDITIONS_LINK = () => `Terms and conditions`; export const ERROR_500 = () => - `We apologize, Something went wrong. We're working to fix things.`; + `We apologize, something went wrong. We're trying to fix things.`; export const ERROR_0 = () => `We could not connect to our servers. Please check your network connection`; export const ERROR_401 = () => @@ -123,11 +123,11 @@ export const INVITE_USERS_VALIDATION_ROLE_EMPTY = () => `Please select a role`; export const INVITE_USERS_EMAIL_LIST_PLACEHOLDER = () => `Comma separated emails`; -export const INVITE_USERS_ROLE_SELECT_PLACEHOLDER = () => `Select Role`; +export const INVITE_USERS_ROLE_SELECT_PLACEHOLDER = () => `Select role`; export const INVITE_USERS_ROLE_SELECT_LABEL = () => `Role`; export const INVITE_USERS_EMAIL_LIST_LABEL = () => `User emails`; export const INVITE_USERS_ADD_EMAIL_LIST_FIELD = () => `Add more`; -export const INVITE_USERS_SUBMIT_BUTTON_TEXT = () => `Invite Users`; +export const INVITE_USERS_SUBMIT_BUTTON_TEXT = () => `Invite users`; export const INVITE_USERS_SUBMIT_ERROR = () => `We were unable to invite the users, please try again later`; export const INVITE_USERS_SUBMIT_SUCCESS = () => @@ -137,12 +137,12 @@ export const INVITE_USER_SUBMIT_SUCCESS = () => export const INVITE_USERS_VALIDATION_EMAILS_EMPTY = () => `Please enter the user emails`; -export const CREATE_PASSWORD_PAGE_PASSWORD_INPUT_LABEL = () => `New Password`; +export const CREATE_PASSWORD_PAGE_PASSWORD_INPUT_LABEL = () => `New password`; export const CREATE_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER = () => `New Password`; export const CREATE_PASSWORD_LOGIN_LINK_TEXT = () => `Already know the password? Login`; -export const CREATE_PASSWORD_PAGE_TITLE = () => `Set Password`; +export const CREATE_PASSWORD_PAGE_TITLE = () => `Set password`; export const CREATE_PASSWORD_SUBMIT_BUTTON_TEXT = () => `Create`; export const CREATE_PASSWORD_PAGE_SUBTITLE = () => `Set a new password for your account `; @@ -159,7 +159,7 @@ export const DELETING_APPLICATION = () => `Deleting application...`; export const DUPLICATING_APPLICATION = () => `Duplicating application...`; export const CURL_IMPORT_SUCCESS = () => `Curl command imported successfully`; -export const FORGOT_PASSWORD_PAGE_LOGIN_LINK = () => `Back to Sign In`; +export const FORGOT_PASSWORD_PAGE_LOGIN_LINK = () => `Back to sign in`; export const ADD_API_TO_PAGE_SUCCESS_MESSAGE = (actionName: string) => `${actionName} API added to page`; export const INPUT_WIDGET_DEFAULT_VALIDATION_ERROR = () => `Invalid input`; @@ -175,10 +175,10 @@ export const ENABLE_TIME = () => `Enable Time`; export const EDIT_APP = () => `Edit App`; export const FORK_APP = () => `Fork App`; -export const SIGN_IN = () => `Sign In`; +export const SIGN_IN = () => `Sign in`; // Homepage -export const CREATE_NEW_APPLICATION = () => `Create New`; +export const CREATE_NEW_APPLICATION = () => `Create new`; export const SEARCH_APPS = () => `Search for apps...`; export const GETTING_STARTED = () => `GETTING STARTED`; export const ORGANIZATIONS_HEADING = () => `ORGANIZATIONS`; @@ -188,9 +188,9 @@ export const NO_APPS_FOUND = () => // Lightning menu export const LIGHTNING_MENU_DATA_API = () => `Use data from an API`; -export const LIGHTNING_MENU_DATA_QUERY = () => `Use data from a Query`; +export const LIGHTNING_MENU_DATA_QUERY = () => `Use data from a query`; export const LIGHTNING_MENU_DATA_TOOLTIP = () => `Quick start data binding`; -export const LIGHTNING_MENU_DATA_WIDGET = () => `Use data from a Widget`; +export const LIGHTNING_MENU_DATA_WIDGET = () => `Use data from a widget`; export const LIGHTNING_MENU_QUERY_CREATE_NEW = () => `Create new Query`; export const LIGHTNING_MENU_API_CREATE_NEW = () => `Create new API`; @@ -212,9 +212,9 @@ export const WIDGET_SIDEBAR_TITLE = () => `Widgets`; export const WIDGET_SIDEBAR_CAPTION = () => `Drag a widget and drop it on the canvas`; export const GOOGLE_RECAPTCHA_KEY_ERROR = () => - `Google Re-Captcha Token Generation failed! Please check the Re-captcha Site Key.`; + `Google Re-Captcha token generation failed! Please check the Re-captcha site key.`; export const GOOGLE_RECAPTCHA_DOMAIN_ERROR = () => - `Google Re-Captcha Token Generation failed! Please check the allowed domains.`; + `Google Re-Captcha token generation failed! Please check the allowed domains.`; export const SERVER_API_TIMEOUT_ERROR = () => `Appsmith server is taking too long to respond. Please try again after some time`; @@ -303,9 +303,9 @@ export const LOCAL_STORAGE_NOT_SUPPORTED_APP_MIGHT_NOT_WORK_AS_EXPECTED = () => export const OMNIBAR_PLACEHOLDER = () => `Search Widgets, Queries, Documentation`; -export const OMNIBAR_PLACEHOLDER_SNIPPETS = () => "Search Snippets"; -export const OMNIBAR_PLACEHOLDER_NAV = () => "Search Widgets and Queries"; -export const OMNIBAR_PLACEHOLDER_DOC = () => "Search Documentation"; +export const OMNIBAR_PLACEHOLDER_SNIPPETS = () => "Search code snippets"; +export const OMNIBAR_PLACEHOLDER_NAV = () => "Search widgets and queries"; +export const OMNIBAR_PLACEHOLDER_DOC = () => "Search documentation"; export const HELPBAR_PLACEHOLDER = () => "Quick search & navigation"; export const NO_SEARCH_DATA_TEXT = () => "No results found"; @@ -321,15 +321,15 @@ export const UNRESOLVE = () => "Unresolve"; // comments export const ADD_COMMENT_PLACEHOLDER = () => "Add a comment. Use @ to mention"; -export const PIN_COMMENT = () => "Pin Comment"; -export const UNPIN_COMMENT = () => "Unpin Comment"; -export const COPY_LINK = () => "Copy Link"; -export const DELETE_COMMENT = () => "Delete Comment"; +export const PIN_COMMENT = () => "Pin comment"; +export const UNPIN_COMMENT = () => "Unpin comment"; +export const COPY_LINK = () => "Copy link"; +export const DELETE_COMMENT = () => "Delete comment"; export const COMMENT_HAS_BEEN_DELETED = () => "Comment not found"; -export const DELETE_THREAD = () => "Delete Thread"; -export const EDIT_COMMENT = () => "Edit Comment"; +export const DELETE_THREAD = () => "Delete thread"; +export const EDIT_COMMENT = () => "Edit comment"; export const COMMENTS = () => "Comments"; -export const VIEW_LATEST = () => "View Latest"; +export const VIEW_LATEST = () => "View latest"; export const POST = () => "Post"; export const CANCEL = () => "Cancel"; export const NO_COMMENTS_CLICK_ON_CANVAS_TO_ADD = () => @@ -369,7 +369,7 @@ export const NO_LOGS = () => "No logs to show"; export const NO_ERRORS = () => "No signs of trouble here!"; export const DEBUGGER_ERRORS = () => "Errors"; export const DEBUGGER_LOGS = () => "Logs"; -export const INSPECT_ENTITY = () => "Inspect Entity"; +export const INSPECT_ENTITY = () => "Inspect entity"; export const INSPECT_ENTITY_BLANK_STATE = () => "Select an entity to inspect"; export const VALUE_IS_INVALID = (propertyPath: string) => `The value at ${propertyPath} is invalid`; @@ -386,22 +386,22 @@ export const DEBUGGER_TRIGGER_ERROR = (propertyName: string) => export const TROUBLESHOOT_ISSUE = () => "Troubleshoot issue"; export const DEBUGGER_SEARCH_GOOGLE = () => "Ask Google"; export const DEBUGGER_COPY_MESSAGE = () => "Copy"; -export const DEBUGGER_OPEN_DOCUMENTATION = () => "Open Documentation"; -export const DEBUGGER_SEARCH_SNIPPET = () => "Browse Code Snippets"; -export const DEBUGGER_APPSMITH_SUPPORT = () => "Get Appsmith Support"; +export const DEBUGGER_OPEN_DOCUMENTATION = () => "Open documentation"; +export const DEBUGGER_SEARCH_SNIPPET = () => "Browse code snippets"; +export const DEBUGGER_APPSMITH_SUPPORT = () => "Get Appsmith support"; //action creator menu -export const NO_ACTION = () => `No Action`; -export const EXECUTE_A_QUERY = () => `Execute a Query`; -export const NAVIGATE_TO = () => `Navigate To`; -export const SHOW_MESSAGE = () => `Show Message`; -export const OPEN_MODAL = () => `Open Modal`; -export const CLOSE_MODAL = () => `Close Modal`; -export const STORE_VALUE = () => `Store Value`; +export const NO_ACTION = () => `No action`; +export const EXECUTE_A_QUERY = () => `Execute a query`; +export const NAVIGATE_TO = () => `Navigate to`; +export const SHOW_MESSAGE = () => `Show message`; +export const OPEN_MODAL = () => `Open modal`; +export const CLOSE_MODAL = () => `Close modal`; +export const STORE_VALUE = () => `Store value`; export const DOWNLOAD = () => `Download`; -export const COPY_TO_CLIPBOARD = () => `Copy to Clipboard`; -export const RESET_WIDGET = () => `Reset Widget`; -export const EXECUTE_JS_FUNCTION = () => `Execute a JS Function`; +export const COPY_TO_CLIPBOARD = () => `Copy to clipboard`; +export const RESET_WIDGET = () => `Reset widget`; +export const EXECUTE_JS_FUNCTION = () => `Execute a JS function`; //js actions export const JS_ACTION_COPY_SUCCESS = (actionName: string, pageName: string) => `${actionName} copied to page ${pageName} successfully`; @@ -431,7 +431,7 @@ export const JS_EXECUTION_FAILURE_TOASTER = () => "There was an error while executing function"; // Import/Export Application features -export const IMPORT_APPLICATION_MODAL_TITLE = () => "Import Application"; +export const IMPORT_APPLICATION_MODAL_TITLE = () => "Import application"; export const DELETE_CONFIRMATION_MODAL_TITLE = () => `Are you sure?`; export const DELETE_CONFIRMATION_MODAL_SUBTITLE = (name?: string | null) => `You want to remove ${name} from this organization`; @@ -466,21 +466,21 @@ export const UNSUPPORTED_PLUGIN_DIALOG_TITLE = () => `Couldn't auto generate a page from this datasource.`; export const UNSUPPORTED_PLUGIN_DIALOG_SUBTITLE = () => - `You can continue building your app with it using our Drag & Drop - Builder`; -export const UNSUPPORTED_PLUGIN_DIALOG_MAIN_HEADING = () => `Heads Up`; + `You can continue building your app with it using our drag & Drop + builder`; +export const UNSUPPORTED_PLUGIN_DIALOG_MAIN_HEADING = () => `Heads up`; export const BUILD_FROM_SCRATCH_ACTION_SUBTITLE = () => "Start from scratch and create your custom UI"; -export const BUILD_FROM_SCRATCH_ACTION_TITLE = () => "Build with Drag & Drop"; +export const BUILD_FROM_SCRATCH_ACTION_TITLE = () => "Build with drag & drop"; -export const GENERATE_PAGE_ACTION_TITLE = () => "Generate from a Data Table"; +export const GENERATE_PAGE_ACTION_TITLE = () => "Generate from a data table"; export const GENERATE_PAGE_ACTION_SUBTITLE = () => "Start with a simple CRUD UI and customize it"; -export const GENERATE_PAGE_FORM_TITLE = () => "Generate from Data"; +export const GENERATE_PAGE_FORM_TITLE = () => "Generate from data"; export const GEN_CRUD_SUCCESS_MESSAGE = () => "Hurray! Your application is ready to use."; @@ -489,10 +489,10 @@ export const GEN_CRUD_SUCCESS_DESC = () => export const GEN_CRUD_INFO_DIALOG_TITLE = () => "How it works?"; export const GEN_CRUD_INFO_DIALOG_SUBTITLE = () => "CRUD page is generated from selected datasource. You can use the Form to modify the data. Since all your data is already connected you can add more queries and modify the bindings"; -export const GEN_CRUD_COLUMN_HEADER_TITLE = () => "Column Headers Fetched"; +export const GEN_CRUD_COLUMN_HEADER_TITLE = () => "Column headers fetched"; export const GEN_CRUD_NO_COLUMNS = () => "No columns found"; -export const GEN_CRUD_DATASOURCE_DROPDOWN_LABEL = () => "Select Datasource"; -export const GEN_CRUD_TABLE_HEADER_LABEL = () => "Table Header Index"; +export const GEN_CRUD_DATASOURCE_DROPDOWN_LABEL = () => "Select datasource"; +export const GEN_CRUD_TABLE_HEADER_LABEL = () => "Table header index"; export const GEN_CRUD_TABLE_HEADER_TOOLTIP_DESC = () => "Row index of the column headers in the sheet table"; // Actions Right pane @@ -505,10 +505,10 @@ export const NO_CONNECTIONS = () => "No connections to show here"; export const BACK_TO_CANVAS = () => "Back to canvas"; export const SUGGESTED_WIDGET_DESCRIPTION = () => "This will add a new widget to the canvas."; -export const ADD_NEW_WIDGET = () => "Add New Widget"; +export const ADD_NEW_WIDGET = () => "Add new widget"; export const SUGGESTED_WIDGETS = () => "Suggested widgets"; export const SUGGESTED_WIDGET_TOOLTIP = () => "Add to canvas"; -export const WELCOME_TOUR_STICKY_BUTTON_TEXT = () => "Next Mission"; +export const WELCOME_TOUR_STICKY_BUTTON_TEXT = () => "Next mission"; // Data Sources pane export const EMPTY_ACTIVE_DATA_SOURCES = () => "No active datasources found."; @@ -523,18 +523,18 @@ export const SNIPPET_EXECUTE = () => `Hit ⏎ to run`; export const APPLY_SEARCH_CATEGORY = () => `⏎ Jump`; // Git sync -export const GIT_CONNECTION = () => "Git Connection"; +export const GIT_CONNECTION = () => "Git connection"; export const DEPLOY = () => "Deploy"; export const MERGE = () => "Merge"; -export const CONNECT_TO_GIT = () => "Connect to Git Repository"; +export const CONNECT_TO_GIT = () => "Connect to git repository"; export const CONNECT_TO_GIT_SUBTITLE = () => - "Checkout branches, Make commits, add deploy your application"; + "Checkout branches, make commits, add deploy your application"; export const REMOTE_URL_VIA = () => "Remote URL via"; -export const USER_PROFILE_SETTINGS_TITLE = () => "User Settings"; +export const USER_PROFILE_SETTINGS_TITLE = () => "User settings"; -export const AUTHOR_NAME = () => "Author Name"; -export const AUTHOR_EMAIL = () => "Author Email"; +export const AUTHOR_NAME = () => "Author name"; +export const AUTHOR_EMAIL = () => "Author email"; export const NAME_YOUR_NEW_BRANCH = () => "Name your new branch"; export const SWITCH_BRANCHES = () => "Switch branches"; @@ -542,7 +542,7 @@ export const SWITCH_BRANCHES = () => "Switch branches"; export const DOCUMENTATION = () => "Documentation"; export const DOCUMENTATION_TOOLTIP = () => "Open Docs in Omnibar"; export const CONNECT = () => "Connect"; -export const LATEST_DP_TITLE = () => "Latest Deployed Preview"; +export const LATEST_DP_TITLE = () => "Latest deployed preview"; export const LATEST_DP_SUBTITLE = () => "See your application in action after successful push"; export const CHECK_DP = () => "CHECK"; @@ -561,7 +561,7 @@ export const PUSH_CHANGES_IMMEDIATELY_TO = () => "Push changes immediately to"; export const COMMIT_AND_PUSH = () => "Commit and push"; export const COMMITTED_AND_PUSHED_SUCCESSFULLY = () => "Committed and pushed Successfully"; -export const COMMITTED_SUCCESSFULLY = () => "Committed Successfully"; +export const COMMITTED_SUCCESSFULLY = () => "Committed successfully"; export const DEPLOY_KEY_TITLE = () => "Deployed Key"; export const DEPLOY_KEY_USAGE_GUIDE_MESSAGE = () => "Copy this deploy key to your Git Repository setting."; @@ -576,7 +576,7 @@ export const SUBMIT = () => "SUBMIT"; export const GIT_USER_UPDATED_SUCCESSFULLY = () => "Git user updated successfully"; -// Js Snippets +// JS Snippets export const SNIPPET_DESCRIPTION = () => `Search and insert code snippets to perform complex actions quickly.`; export const DOC_DESCRIPTION = () => @@ -663,13 +663,13 @@ export const ONBOARDING_INTRO_FOOTER = () => export const BUILD_APP_TOGETHER = () => "build an app together."; //Statusbar -export const ONBOARDING_STATUS_STEPS_FIRST = () => "First: Add a Datasource"; -export const ONBOARDING_STATUS_STEPS_FIRST_ALT = () => "Next: Add a Datasource"; -export const ONBOARDING_STATUS_STEPS_SECOND = () => "Next: Create a Query"; -export const ONBOARDING_STATUS_STEPS_THIRD = () => "Next: Add a Widget"; -export const ONBOARDING_STATUS_STEPS_THIRD_ALT = () => "First: Add a Widget"; +export const ONBOARDING_STATUS_STEPS_FIRST = () => "First: Add a datasource"; +export const ONBOARDING_STATUS_STEPS_FIRST_ALT = () => "Next: Add a datasource"; +export const ONBOARDING_STATUS_STEPS_SECOND = () => "Next: Create a query"; +export const ONBOARDING_STATUS_STEPS_THIRD = () => "Next: Add a widget"; +export const ONBOARDING_STATUS_STEPS_THIRD_ALT = () => "First: Add a widget"; export const ONBOARDING_STATUS_STEPS_FOURTH = () => - "Next: Connect data to Widget"; + "Next: Connect data to widget"; export const ONBOARDING_STATUS_STEPS_FIVETH = () => "Next: Deploy your application"; export const ONBOARDING_STATUS_STEPS_SIXTH = () => "Completed 🎉"; @@ -680,34 +680,34 @@ export const ONBOARDING_STATUS_GET_STARTED = () => "GET STARTED"; export const ONBOARDING_TASK_DATASOURCE_HEADER = () => "Start by adding your first Datasource"; export const ONBOARDING_TASK_DATASOURCE_BODY = () => - "Adding a datasource makes creating applications more powerful. Don’t worry if you don’t have any data on hand, we have a sample data you can use."; + "Adding a datasource makes creating applications more powerful. Don’t worry if you don’t have any data on hand, we have a sample dataset that you can use."; export const ONBOARDING_TASK_DATASOURCE_BUTTON = () => "+ Add a datasource"; -export const ONBOARDING_TASK_DATASOURCE_FOOTER_ACTION = () => "add a widget"; -export const ONBOARDING_TASK_DATASOURCE_FOOTER = () => "first."; +export const ONBOARDING_TASK_DATASOURCE_FOOTER_ACTION = () => "Add a widget"; +export const ONBOARDING_TASK_DATASOURCE_FOOTER = () => "First."; //2. query export const ONBOARDING_TASK_QUERY_HEADER = () => "Next, create a query"; export const ONBOARDING_TASK_QUERY_BODY = () => "Great job adding a datasource! The next thing you can do is create a query on your data."; -export const ONBOARDING_TASK_QUERY_BUTTON = () => "+ create a query"; -export const ONBOARDING_TASK_QUERY_FOOTER_ACTION = () => "add a widget"; +export const ONBOARDING_TASK_QUERY_BUTTON = () => "+ Create a query"; +export const ONBOARDING_TASK_QUERY_FOOTER_ACTION = () => "Add a widget"; //2. widget export const ONBOARDING_TASK_WIDGET_HEADER = () => "Next, add a widget to start displaying data"; export const ONBOARDING_TASK_WIDGET_BODY = () => - "Great job adding a datasource! The next thing you can do is add widget to start start making your data visual."; -export const ONBOARDING_TASK_WIDGET_BUTTON = () => "+ Add a Widget"; + "Great job adding a datasource! The next thing you can do is add widget to start visualizing your data."; +export const ONBOARDING_TASK_WIDGET_BUTTON = () => "+ Add a widget"; export const ONBOARDING_TASK_WIDGET_FOOTER_ACTION = () => "deploy your application"; export const ONBOARDING_TASK_FOOTER = () => "Alternatively, you can also"; export const USE_SNIPPET = () => "Snippet"; -export const SNIPPET_TOOLTIP = () => "Search Snippets"; +export const SNIPPET_TOOLTIP = () => "Search code snippets"; //Welcome page export const WELCOME_HEADER = () => "Welcome!"; export const WELCOME_BODY = () => "Let us setup your account so you can make awesome applications!"; -export const WELCOME_ACTION = () => "Get Started"; +export const WELCOME_ACTION = () => "Get started"; // API Editor export const API_EDITOR_TAB_TITLES = {
dbbae79aec1933d7c4d21e59f8b5a872c9b694c5
2022-08-17 11:00:47
Ankita Kinger
feat: refactor invite modal UI (#15957)
false
refactor invite modal UI (#15957)
feat
diff --git a/app/client/src/ce/pages/AdminSettings/config/authentication/AuthPage.tsx b/app/client/src/ce/pages/AdminSettings/config/authentication/AuthPage.tsx index 7775cb664429..f9ba282f8d24 100644 --- a/app/client/src/ce/pages/AdminSettings/config/authentication/AuthPage.tsx +++ b/app/client/src/ce/pages/AdminSettings/config/authentication/AuthPage.tsx @@ -212,7 +212,7 @@ export function AuthPage({ authMethods }: { authMethods: AuthMethodType[] }) { {method.calloutBanner && ( <Callout actionLabel={method.calloutBanner.actionLabel} - title={method.calloutBanner.title} + desc={method.calloutBanner.title} type={method.calloutBanner.type} /> )} diff --git a/app/client/src/components/ads/Button.tsx b/app/client/src/components/ads/Button.tsx index 5a0c8c63921e..f529034aa941 100644 --- a/app/client/src/components/ads/Button.tsx +++ b/app/client/src/components/ads/Button.tsx @@ -495,12 +495,12 @@ const getButtonContent = (props: ButtonProps) => { }; function ButtonComponent(props: ButtonProps) { - const omitProps = ["fill"]; + const filteredProps = _.omit(props, ["fill"]); return ( <StyledButton className={props.className} data-cy={props.cypressSelector} - {..._.omit(props, omitProps)} + {...filteredProps} onClick={(e: React.MouseEvent<HTMLElement>) => props.onClick && !props.isLoading && props.onClick(e) } @@ -516,7 +516,7 @@ function LinkButtonComponent(props: ButtonProps) { className={props.className} data-cy={props.cypressSelector} href={props.href} - {...props} + {..._.omit(props, ["fill"])} onClick={(e: React.MouseEvent<HTMLElement>) => props.onClick && props.onClick(e) } diff --git a/app/client/src/components/ads/Callout.tsx b/app/client/src/components/ads/Callout.tsx index 3b0eb764aa83..3040124391b1 100644 --- a/app/client/src/components/ads/Callout.tsx +++ b/app/client/src/components/ads/Callout.tsx @@ -17,7 +17,7 @@ export type CalloutProps = CommonComponentProps & { const CalloutContainer = styled.div<{ variant: Variant; - fill?: boolean; + fillUp?: boolean; addMarginTop?: boolean; }>` position: relative; @@ -32,7 +32,7 @@ const CalloutContainer = styled.div<{ `} ${(props) => - props.fill + props.fillUp ? ` display: flex; align-items: center; @@ -83,7 +83,7 @@ function Callout(props: CalloutProps) { <CalloutContainer addMarginTop={props.addMarginTop} className={props.className} - fill={props.fill} + fillUp={props.fill} variant={props.variant || Variant.info} > {props.text && props.variant !== Variant.info ? ( diff --git a/app/client/src/components/ads/CalloutV2.tsx b/app/client/src/components/ads/CalloutV2.tsx index 95e2ac8f2947..df9542c475bf 100644 --- a/app/client/src/components/ads/CalloutV2.tsx +++ b/app/client/src/components/ads/CalloutV2.tsx @@ -1,12 +1,12 @@ import styled from "styled-components"; -import React from "react"; +import React, { useState } from "react"; import { ReduxAction } from "@appsmith/constants/ReduxActionConstants"; import { Dispatch } from "react"; import { useDispatch } from "react-redux"; import Icon, { IconSize } from "components/ads/Icon"; import { Colors } from "constants/Colors"; -export type CalloutType = "Warning" | "Info"; +export type CalloutType = "Warning" | "Info" | "Notify"; export const Wrapper = styled.div<{ type?: CalloutType }>` display: flex; @@ -14,18 +14,38 @@ export const Wrapper = styled.div<{ type?: CalloutType }>` width: 100%; padding: 8px 16px; ${(props) => - props.type !== "Warning" + props.type === "Info" ? `border-left: 5px solid ${Colors.CURIOUS_BLUE}; - color: #00407d; - background: ${Colors.PALE_BLUE};` - : `color: #c91818; background: ${Colors.FAIR_PINK}; - `} + color: ${Colors.ENTERPRISE_DARK}; + background: ${Colors.PALE_BLUE};` + : props.type === "Warning" + ? `color: ${Colors.NOTIFICATION_BANNER_ERROR_TEXT}; + background: ${Colors.FAIR_PINK};` + : `border-left: 5px solid var(--appsmith-color-black-800); + color: var(--appsmith-color-black-800); + background: var(--appsmith-color-black-100);`} margin: 16px 0; .warning-icon { margin-right: 16px; } + .help-icon { + margin-right: 16px; + border-radius: 50%; + border: 2px solid var(--appsmith-color-black-800); + align-self: baseline; + } + .cross-icon { + align-self: baseline; + } + h3 { + font-weight: 600; + font-size: 13px; + line-height: 1.31; + letter-spacing: -0.24px; + } + h4 { font-style: normal; font-weight: normal; @@ -46,21 +66,32 @@ export const Wrapper = styled.div<{ type?: CalloutType }>` text-decoration: none; margin: 5px 0; ${(props) => - props.type !== "Warning" ? `color: #00407d;` : `color: #c91818;`} + props.type === "Info" + ? `color: ${Colors.ENTERPRISE_DARK};` + : props.type === "Warning" + ? `color: ${Colors.NOTIFICATION_BANNER_ERROR_TEXT};` + : `color: var(--appsmith-color-black-800);`} +`; + +const ContentWrapper = styled.div` + flex: 1; `; export function Callout(props: { + desc: string; type: CalloutType; - title: string; + title?: string; actionLabel?: string; action?: ( dispatch: Dispatch<ReduxAction<any>>, settings?: Record<string, any>, ) => void; url?: string; + showCrossIcon?: boolean; }) { const dispatch = useDispatch(); const linkProps: Record<string, string | (() => any)> = {}; + const [show, setShow] = useState(true); if (props.url) { linkProps.href = props.url; @@ -73,7 +104,11 @@ export function Callout(props: { }; } - return ( + const handleClick = () => { + setShow(false); + }; + + return show ? ( <Wrapper type={props.type}> {props.type === "Warning" && ( <Icon @@ -82,15 +117,27 @@ export function Callout(props: { size={IconSize.XXXXL} /> )} - <div> - <h4>{props.title}</h4> + {props.type === "Notify" && ( + <Icon className="help-icon" name="help" size={IconSize.LARGE} /> + )} + <ContentWrapper> + {props.title && <h3>{props.title}</h3>} + <h4>{props.desc}</h4> {props.actionLabel && ( <a {...linkProps}> {props.actionLabel}&nbsp;&nbsp; <Icon name="right-arrow" size={IconSize.LARGE} /> </a> )} - </div> + </ContentWrapper> + {props.showCrossIcon && ( + <Icon + className="cross-icon" + name="cross" + onClick={handleClick} + size={IconSize.SMALL} + /> + )} </Wrapper> - ); + ) : null; } diff --git a/app/client/src/components/ads/Dropdown.tsx b/app/client/src/components/ads/Dropdown.tsx index 4017ffb02eaf..0595e778fde5 100644 --- a/app/client/src/components/ads/Dropdown.tsx +++ b/app/client/src/components/ads/Dropdown.tsx @@ -49,6 +49,7 @@ export type DropdownOption = { disabled?: boolean; disabledTooltipText?: string; hasCustomBadge?: boolean; + link?: string; }; export interface DropdownSearchProps { enableSearch?: boolean; @@ -190,6 +191,7 @@ const SquareBox = styled.div<{ if (props.borderColor) return props.borderColor; props.checked ? Colors.GRAY_900 : Colors.GRAY_400; }}; + flex: 0 0 auto; & svg { display: ${(props) => (props.checked ? "block" : "none")}; diff --git a/app/client/src/components/ads/TagInputComponent.tsx b/app/client/src/components/ads/TagInputComponent.tsx index 5f497b825503..d80b1f54ce61 100644 --- a/app/client/src/components/ads/TagInputComponent.tsx +++ b/app/client/src/components/ads/TagInputComponent.tsx @@ -8,9 +8,13 @@ import { } from "@appsmith/constants/messages"; import { isEmail } from "utils/formhelpers"; import { Colors } from "constants/Colors"; +import { HighlightText } from "design-system"; const TagInputWrapper = styled.div<{ intent?: Intent }>` margin-right: 8px; + display: flex; + flex-direction: column; + position: relative; &&& { .${Classes.TAG_INPUT} { @@ -43,6 +47,29 @@ const TagInputWrapper = styled.div<{ intent?: Intent }>` } } `; + +const SuggestionsWrapper = styled.div` + margin-top: 4px; + position: relative; + left: 4px; + width: 100%; + + > div { + position: absolute; + border: 1px solid var(--appsmith-color-black-250); + width: 100%; + background: var(--appsmith-color-black-0); + } +`; + +const Suggestion = styled.div` + padding: 8px; + cursor: pointer; + &:hover { + background: var(--appsmith-color-black-100); + } +`; + type TagInputProps = { autofocus?: boolean; /** TagInput Placeholder */ @@ -59,9 +86,14 @@ type TagInputProps = { /** Intent of the tags, which defines their color */ intent?: Intent; hasError?: boolean; - customError?: (values: any) => void; + customError?: (error: any, values?: any) => void; + suggestions?: { id: string; name: string; icon?: string }[]; }; +function getValues(inputValues: any) { + return inputValues && inputValues.length > 0 ? inputValues.split(",") : []; +} + /** * TagInputComponent * Takes in a comma separated set of values (input.value prop) to display in tags @@ -69,22 +101,28 @@ type TagInputProps = { * @param props : TagInputProps */ function TagInputComponent(props: TagInputProps) { - const inputValues = - props.input.value && props.input.value.length > 0 - ? props.input.value.split(",") - : []; - - const [values, setValues] = useState<string[]>(inputValues || []); + const [values, setValues] = useState<string[]>( + getValues(props?.input?.value), + ); const [currentValue, setCurrentValue] = useState<string>(""); + const [showSuggestions, setShowSuggestions] = useState<boolean>(false); + const [suggestions, setSuggestions] = useState< + { id: string; name: string }[] + >(props?.suggestions || []); + const mappedSuggestions = (showSuggestions ? suggestions : []).map( + (each: any) => ( + <Suggestion + key={each.id} + onClick={() => handleSuggestionClick(each.name)} + > + <HighlightText highlight={currentValue} text={each.name} /> + </Suggestion> + ), + ); useEffect(() => { - if (inputValues.length === 0 && values.length > 0) { - setValues([]); - } - if (inputValues.length > 0 && values.length === 0) { - setValues(inputValues); - } - }, [inputValues, values]); + setValues(getValues(props?.input?.value)); + }, [props.input.value]); const validateEmail = (newValues: string[]) => { if (newValues && newValues.length > 0) { @@ -94,7 +132,7 @@ function TagInputComponent(props: TagInputProps) { error = createMessage(INVITE_USERS_VALIDATION_EMAIL_LIST); } }); - props.customError?.(error); + props.customError?.(error, newValues); } else { props.customError?.(""); } @@ -104,15 +142,20 @@ function TagInputComponent(props: TagInputProps) { setValues(newValues); props.input.onChange && props.input.onChange(newValues.filter(Boolean).join(",")); + props.customError?.("", newValues); props.type === "email" && validateEmail(newValues); }; const onTagsChange = (values: React.ReactNode[]) => { const _values = values as string[]; + if (props?.suggestions) { + setSuggestions(props.suggestions); + } commitValues(_values); }; const onKeyDown = (e: any) => { + let resetSuggestions = false; // Add new values to the tags on comma, return key, space and Tab press // only if user has typed something on input if ( @@ -125,12 +168,18 @@ function TagInputComponent(props: TagInputProps) { const newValues = [...values, e.target.value]; commitValues(newValues); setCurrentValue(""); + resetSuggestions = true; e.preventDefault(); } else if (e.key === "Backspace") { if (e.target.value.length === 0) { const newValues = values.slice(0, -1); commitValues(newValues); } + resetSuggestions = true; + } + + if (resetSuggestions && props?.suggestions) { + setSuggestions(props.suggestions); } }; @@ -139,13 +188,26 @@ function TagInputComponent(props: TagInputProps) { const handleInputChange = (e: any) => { if ([",", " ", "Enter"].indexOf(e.target.value) === -1) { setCurrentValue(e.target.value); + if (props?.suggestions) { + const results = + suggestions && + suggestions.filter((s) => s.name?.includes(e.target.value)); + setSuggestions(results); + setShowSuggestions(true); + } } else { setCurrentValue(""); + if (props?.suggestions) { + setSuggestions(props.suggestions); + } } }; const handleInputBlur = (e: any) => { - if (e.target.value.trim()) { + if ( + (e?.target?.value?.trim() && !showSuggestions && !suggestions.length) || + isEmail(e.target.value) + ) { const newValues = [...values, e.target.value]; commitValues(newValues); setCurrentValue(""); @@ -153,6 +215,15 @@ function TagInputComponent(props: TagInputProps) { } }; + const handleSuggestionClick = (value: string) => { + setCurrentValue(""); + setSuggestions(props?.suggestions || []); + setShowSuggestions(false); + props?.input?.onChange?.( + [props?.input?.value, value].filter(Boolean).join(","), + ); + }; + return ( <TagInputWrapper intent={props.intent}> <TagInput @@ -170,11 +241,16 @@ function TagInputComponent(props: TagInputProps) { placeholder={props.placeholder} separator={props.separator || ","} tagProps={(tag) => ({ - className: tag + "_tag", + className: `${tag}_tag`, round: true, })} - values={inputValues || [""]} + values={values || [""]} /> + {showSuggestions && ( + <SuggestionsWrapper> + <div>{mappedSuggestions}</div> + </SuggestionsWrapper> + )} </TagInputWrapper> ); } diff --git a/app/client/src/pages/Settings/DisconnectService.tsx b/app/client/src/pages/Settings/DisconnectService.tsx index a82c195ea9ce..9093daedade9 100644 --- a/app/client/src/pages/Settings/DisconnectService.tsx +++ b/app/client/src/pages/Settings/DisconnectService.tsx @@ -67,7 +67,7 @@ export function DisconnectService(props: { <Container> <HeaderDanger>{createMessage(DANGER_ZONE)}</HeaderDanger> <Info>{props.subHeader}</Info> - <Callout title={props.warning} type="Warning" /> + <Callout desc={props.warning} type="Warning" /> <DisconnectButton data-testid="disconnect-service-button" onClick={() => diff --git a/app/client/src/pages/Settings/FormGroup/group.tsx b/app/client/src/pages/Settings/FormGroup/group.tsx index 5d5b5960bd5b..211f36e12be8 100644 --- a/app/client/src/pages/Settings/FormGroup/group.tsx +++ b/app/client/src/pages/Settings/FormGroup/group.tsx @@ -150,7 +150,7 @@ export default function Group({ <Callout action={setting.action} actionLabel="READ MORE" - title={createMessage(() => setting.label || "")} + desc={createMessage(() => setting.label || "")} type={setting.calloutType || "Info"} url={setting.url} />
cb2473492444a05922374fb30b6e8370c9722a7b
2024-01-04 12:39:54
arunvjn
chore: Lazy load autocomplete and linting services (#29669)
false
Lazy load autocomplete and linting services (#29669)
chore
diff --git a/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts b/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts index b80d5ec00ccf..a0e2117590f5 100644 --- a/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts +++ b/app/client/src/components/editorComponents/CodeEditor/hintHelpers.ts @@ -1,6 +1,6 @@ import type { Hints } from "codemirror"; import CodeMirror from "codemirror"; -import CodemirrorTernService from "utils/autocomplete/CodemirrorTernService"; +import { getCodeMirrorTernService } from "utils/autocomplete/CodemirrorTernService"; import KeyboardShortcuts from "constants/KeyboardShortcuts"; import type { HintHelper } from "components/editorComponents/CodeEditor/EditorConfig"; import { EditorModes } from "components/editorComponents/CodeEditor/EditorConfig"; @@ -17,16 +17,17 @@ import { import { isAISlashCommand } from "@appsmith/components/editorComponents/GPT/trigger"; export const bindingHintHelper: HintHelper = (editor: CodeMirror.Editor) => { + const codeMirrorTernService = getCodeMirrorTernService(); editor.setOption("extraKeys", { // @ts-expect-error: Types are not available ...editor.options.extraKeys, [KeyboardShortcuts.CodeEditor.OpenAutocomplete]: (cm: CodeMirror.Editor) => - checkIfCursorInsideBinding(cm) && CodemirrorTernService.complete(cm), + checkIfCursorInsideBinding(cm) && codeMirrorTernService.complete(cm), [KeyboardShortcuts.CodeEditor.ShowTypeAndInfo]: (cm: CodeMirror.Editor) => { - CodemirrorTernService.showType(cm); + codeMirrorTernService.showType(cm); }, [KeyboardShortcuts.CodeEditor.OpenDocsLink]: (cm: CodeMirror.Editor) => { - CodemirrorTernService.showDocs(cm); + codeMirrorTernService.showDocs(cm); }, }); return { @@ -36,12 +37,12 @@ export const bindingHintHelper: HintHelper = (editor: CodeMirror.Editor) => { additionalData, ): boolean => { if (additionalData && additionalData.blockCompletions) { - CodemirrorTernService.setEntityInformation(editor, { + codeMirrorTernService.setEntityInformation(editor, { ...entityInformation, blockCompletions: additionalData.blockCompletions, }); } else { - CodemirrorTernService.setEntityInformation(editor, entityInformation); + codeMirrorTernService.setEntityInformation(editor, entityInformation); } let shouldShow = false; @@ -57,7 +58,7 @@ export const bindingHintHelper: HintHelper = (editor: CodeMirror.Editor) => { } if (shouldShow) { - CodemirrorTernService.complete(editor); + codeMirrorTernService.complete(editor); return true; } diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx index 9421ab96b15b..088459ff1f2a 100644 --- a/app/client/src/components/editorComponents/CodeEditor/index.tsx +++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx @@ -164,7 +164,7 @@ import { resetActiveEditorField, setActiveEditorField, } from "actions/activeFieldActions"; -import CodeMirrorTernService from "utils/autocomplete/CodemirrorTernService"; +import { getCodeMirrorTernService } from "utils/autocomplete/CodemirrorTernService"; type ReduxStateProps = ReturnType<typeof mapStateToProps>; type ReduxDispatchProps = ReturnType<typeof mapDispatchToProps>; @@ -548,7 +548,7 @@ class CodeEditor extends Component<Props, State> { debouncedArgHints = _.debounce(() => { this.setState({ - ternToolTipActive: CodeMirrorTernService.updateArgHints(this.editor), + ternToolTipActive: getCodeMirrorTernService().updateArgHints(this.editor), }); }, 200); @@ -686,7 +686,7 @@ class CodeEditor extends Component<Props, State> { }); if (this.state.ternToolTipActive) { - CodeMirrorTernService.closeArgHints(); + getCodeMirrorTernService().closeArgHints(); } AnalyticsUtil.logEvent("PEEK_OVERLAY_OPENED", { property: expression, @@ -704,7 +704,9 @@ class CodeEditor extends Component<Props, State> { } if (this.state.ternToolTipActive) { this.setState({ - ternToolTipActive: CodeMirrorTernService.updateArgHints(this.editor), + ternToolTipActive: getCodeMirrorTernService().updateArgHints( + this.editor, + ), }); } }; @@ -913,7 +915,7 @@ class CodeEditor extends Component<Props, State> { // @ts-expect-error: Types are not available this.editor.closeHint(); - CodeMirrorTernService.closeArgHints(); + getCodeMirrorTernService().closeArgHints(); } private handleKeydown = (e: KeyboardEvent) => { diff --git a/app/client/src/entities/Engine/AppEditorEngine.ts b/app/client/src/entities/Engine/AppEditorEngine.ts index ddb46f18e916..c4e8e9f8f13e 100644 --- a/app/client/src/entities/Engine/AppEditorEngine.ts +++ b/app/client/src/entities/Engine/AppEditorEngine.ts @@ -51,7 +51,7 @@ import AppEngine, { PluginsNotFoundError, } from "."; import { fetchJSLibraries } from "actions/JSLibraryActions"; -import CodemirrorTernService from "utils/autocomplete/CodemirrorTernService"; +import { getCodeMirrorTernService } from "utils/autocomplete/CodemirrorTernService"; import { waitForSegmentInit, waitForFetchUserSuccess, @@ -97,7 +97,7 @@ export default class AppEditorEngine extends AppEngine { public *setupEngine(payload: AppEnginePayload): any { yield* super.setupEngine.call(this, payload); yield put(resetEditorSuccess()); - CodemirrorTernService.resetServer(); + getCodeMirrorTernService().resetServer(); } public startPerformanceTracking() { diff --git a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/JSEditor.tsx b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/JSEditor.tsx index aa86f29fdc22..2f2f7bcf4167 100644 --- a/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/JSEditor.tsx +++ b/app/client/src/pages/Editor/CustomWidgetBuilder/Editor/CodeEditors/JSEditor.tsx @@ -11,10 +11,7 @@ import { import { CustomWidgetBuilderContext } from "../.."; import LazyCodeEditor from "components/editorComponents/LazyCodeEditor"; import { getAppsmithScriptSchema } from "widgets/CustomWidget/component/constants"; -// import { DebuggerLogType } from "../../types"; -// import { PropertyEvaluationErrorType } from "utils/DynamicBindingUtils"; -// import { Severity } from "entities/AppsmithConsole"; -import CodemirrorTernService from "utils/autocomplete/CodemirrorTernService"; +import { getCodeMirrorTernService } from "utils/autocomplete/CodemirrorTernService"; import { Spinner } from "design-system"; import { CUSTOM_WIDGET_FEATURE, @@ -53,7 +50,7 @@ export default function JSEditor(props: ContentProps) { useEffect(() => { ["LIB/node-forge", "LIB/moment", "base64-js", "LIB/lodash"].forEach((d) => { - CodemirrorTernService.removeDef(d); + getCodeMirrorTernService().removeDef(d); }); }, []); diff --git a/app/client/src/sagas/EvaluationsSaga.ts b/app/client/src/sagas/EvaluationsSaga.ts index 3dcf99bbd2df..d5f48c23fcff 100644 --- a/app/client/src/sagas/EvaluationsSaga.ts +++ b/app/client/src/sagas/EvaluationsSaga.ts @@ -85,7 +85,7 @@ import { } from "@appsmith/selectors/entitiesSelector"; import type { WidgetEntityConfig } from "@appsmith/entities/DataTree/types"; import type { DataTree, UnEvalTree } from "entities/DataTree/dataTreeTypes"; -import { initiateLinting, lintWorker } from "./LintingSagas"; +import { initiateLinting } from "./LintingSagas"; import type { EvalTreeRequestData, EvalTreeResponseData, @@ -582,11 +582,8 @@ function* evalAndLintingHandler( function* evaluationChangeListenerSaga(): any { // Explicitly shutdown old worker if present - yield all([call(evalWorker.shutdown), call(lintWorker.shutdown)]); - const [evalWorkerListenerChannel] = yield all([ - call(evalWorker.start), - call(lintWorker.start), - ]); + yield all([call(evalWorker.shutdown)]); + const [evalWorkerListenerChannel] = yield all([call(evalWorker.start)]); const isFFFetched = yield select(getFeatureFlagsFetched); if (!isFFFetched) { diff --git a/app/client/src/sagas/JSLibrarySaga.ts b/app/client/src/sagas/JSLibrarySaga.ts index e2a08b7dca37..6c0621935966 100644 --- a/app/client/src/sagas/JSLibrarySaga.ts +++ b/app/client/src/sagas/JSLibrarySaga.ts @@ -21,7 +21,7 @@ import { takeLatest, } from "redux-saga/effects"; import { getCurrentApplicationId } from "selectors/editorSelectors"; -import CodemirrorTernService from "utils/autocomplete/CodemirrorTernService"; +import { getCodeMirrorTernService } from "utils/autocomplete/CodemirrorTernService"; import { EVAL_WORKER_ACTIONS } from "@appsmith/workers/Evaluation/evalWorkerActions"; import { validateResponse } from "./ErrorSagas"; import { EvalWorker } from "./EvaluationsSaga"; @@ -171,7 +171,7 @@ export function* installLibrarySaga(lib: Partial<JSLibrary>) { } try { - CodemirrorTernService.updateDef(defs["!name"], defs); + getCodeMirrorTernService().updateDef(defs["!name"], defs); AnalyticsUtil.logEvent("DEFINITIONS_GENERATION", { url, success: true }); } catch (e) { toast.show( @@ -281,7 +281,9 @@ function* uninstallLibrarySaga(action: ReduxAction<JSLibrary>) { } try { - CodemirrorTernService.removeDef(`LIB/${accessor[accessor.length - 1]}`); + getCodeMirrorTernService().removeDef( + `LIB/${accessor[accessor.length - 1]}`, + ); } catch (e) { log.debug(`Failed to remove definitions for ${name}`, e); } @@ -367,7 +369,7 @@ function* fetchJSLibraries(action: ReduxAction<string>) { for (const lib of libraries) { try { const defs = JSON.parse(lib.defs); - CodemirrorTernService.updateDef(defs["!name"], defs); + getCodeMirrorTernService().updateDef(defs["!name"], defs); } catch (e) { toast.show( createMessage( diff --git a/app/client/src/sagas/LintingSagas.ts b/app/client/src/sagas/LintingSagas.ts index b2a44292ecef..28e1e7457063 100644 --- a/app/client/src/sagas/LintingSagas.ts +++ b/app/client/src/sagas/LintingSagas.ts @@ -26,7 +26,7 @@ import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors"; const APPSMITH_CONFIGS = getAppsmithConfigs(); -export const lintWorker = new Linter(); +export let lintWorker: Linter; function* updateLintGlobals( action: ReduxAction<{ add?: boolean; libs: JSLibrary[] }>, @@ -129,6 +129,12 @@ export default function* lintTreeSagaWatcher() { } export function* setupSaga(): any { + const mode = yield select(getAppMode); + if (mode === APP_MODE.PUBLISHED) return; + if (!lintWorker) { + lintWorker = new Linter(); + yield call(lintWorker.start); + } const featureFlags = yield select(selectFeatureFlags); yield call(lintWorker.setup, featureFlags); } diff --git a/app/client/src/sagas/PostEvaluationSagas.ts b/app/client/src/sagas/PostEvaluationSagas.ts index 383c17e8ddfc..007b98ffd22a 100644 --- a/app/client/src/sagas/PostEvaluationSagas.ts +++ b/app/client/src/sagas/PostEvaluationSagas.ts @@ -32,7 +32,6 @@ import log from "loglevel"; import { getAppMode } from "@appsmith/selectors/applicationSelectors"; import { APP_MODE } from "entities/App"; import { dataTreeTypeDefCreator } from "utils/autocomplete/dataTreeTypeDefCreator"; -import CodemirrorTernService from "utils/autocomplete/CodemirrorTernService"; import type { JSAction, JSCollection } from "entities/JSCollection"; import { isWidgetPropertyNamePath } from "utils/widgetEvalUtils"; import type { ActionEntityConfig } from "@appsmith/entities/DataTree/types"; @@ -46,6 +45,7 @@ import type { JSVarMutatedEvents, } from "workers/Evaluation/types"; import { endSpan, startRootSpan } from "UITelemetry/generateTraces"; +import { getCodeMirrorTernService } from "utils/autocomplete/CodemirrorTernService"; let successfulBindingsMap: SuccessfulBindingMap | undefined; @@ -233,7 +233,7 @@ export function* updateTernDefinitions( jsData, configTree, ); - CodemirrorTernService.updateDef("DATA_TREE", def, entityInfo); + getCodeMirrorTernService().updateDef("DATA_TREE", def, entityInfo); const end = performance.now(); log.debug("Tern", { updates }); log.debug("Tern definitions updated took ", (end - start).toFixed(2)); diff --git a/app/client/src/sagas/TernSaga.ts b/app/client/src/sagas/TernSaga.ts index 78de77fae491..09e0e68f6cfe 100644 --- a/app/client/src/sagas/TernSaga.ts +++ b/app/client/src/sagas/TernSaga.ts @@ -11,7 +11,7 @@ import { get } from "lodash"; import { FocusEntity } from "navigation/FocusEntity"; import { select, takeLatest } from "redux-saga/effects"; import { getWidgets } from "./selectors"; -import CodemirrorTernService from "utils/autocomplete/CodemirrorTernService"; +import { getCodeMirrorTernService } from "utils/autocomplete/CodemirrorTernService"; function* handleSetTernRecentEntities(action: ReduxAction<RecentEntity[]>) { const recentEntities = action.payload || []; @@ -59,10 +59,12 @@ function* handleSetTernRecentEntities(action: ReduxAction<RecentEntity[]>) { } } - CodemirrorTernService.updateRecentEntities(Array.from(recentEntityNames)); + getCodeMirrorTernService().updateRecentEntities( + Array.from(recentEntityNames), + ); } function* handleResetTernRecentEntities() { - CodemirrorTernService.updateRecentEntities([]); + getCodeMirrorTernService().updateRecentEntities([]); } export default function* ternSagas() { yield takeLatest( diff --git a/app/client/src/utils/autocomplete/CodemirrorTernService.ts b/app/client/src/utils/autocomplete/CodemirrorTernService.ts index 714c4920b004..a927b0326a3d 100644 --- a/app/client/src/utils/autocomplete/CodemirrorTernService.ts +++ b/app/client/src/utils/autocomplete/CodemirrorTernService.ts @@ -1205,10 +1205,6 @@ export const createCompletionHeader = (name: string): Completion<any> => ({ isHeader: true, }); -export default new CodeMirrorTernService({ - async: true, -}); - function dotToBracketNotationAtToken(token: CodeMirror.Token) { return (cm: CodeMirror.Editor, hints: Hints, curr: Hint) => { let completion = curr.text; @@ -1235,3 +1231,14 @@ function dotToBracketNotationAtToken(token: CodeMirror.Token) { cm.replaceRange(completion, hints.from, hints.to); }; } + +let codeMirrorTernService: CodeMirrorTernService; + +export function getCodeMirrorTernService() { + if (!codeMirrorTernService) { + codeMirrorTernService = new CodeMirrorTernService({ + async: true, + }); + } + return codeMirrorTernService; +} diff --git a/app/client/src/utils/autocomplete/TernWorkerService.ts b/app/client/src/utils/autocomplete/TernWorkerService.ts index 371acf979ba3..bb21972fc36c 100644 --- a/app/client/src/utils/autocomplete/TernWorkerService.ts +++ b/app/client/src/utils/autocomplete/TernWorkerService.ts @@ -2,15 +2,7 @@ import type { Def, Server } from "tern"; import type { CallbackFn } from "./types"; import { TernWorkerAction } from "./types"; -const ternWorker = new Worker( - new URL("../../workers/Tern/tern.worker.ts", import.meta.url), - { - // Note: the `Worker` part of the name is slightly important – LinkRelPreload_spec.js - // relies on it to find workers in the list of all requests. - name: "TernWorker", - type: "module", - }, -); +let ternWorker: Worker; function getFile(ts: any, name: string, c: CallbackFn) { const buf = ts.docs[name]; @@ -25,6 +17,17 @@ interface TernWorkerServerConstructor { } function TernWorkerServer(this: any, ts: any) { + if (!ternWorker) { + ternWorker = new Worker( + new URL("../../workers/Tern/tern.worker.ts", import.meta.url), + { + // Note: the `Worker` part of the name is slightly important – LinkRelPreload_spec.js + // relies on it to find workers in the list of all requests. + name: "TernWorker", + type: "module", + }, + ); + } const worker = (ts.worker = ternWorker); worker.postMessage({ type: TernWorkerAction.INIT, diff --git a/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts b/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts index 93cafbb4ee5c..aab08ddeb1d3 100644 --- a/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts +++ b/app/client/src/utils/autocomplete/__tests__/TernServer.test.ts @@ -2,7 +2,8 @@ import type { Completion, DataTreeDefEntityInformation, } from "../CodemirrorTernService"; -import CodemirrorTernService, { +import { + getCodeMirrorTernService, createCompletionHeader, } from "../CodemirrorTernService"; import { AutocompleteDataType } from "../AutocompleteDataType"; @@ -84,7 +85,7 @@ describe("Tern server", () => { ]; testCases.forEach((testCase) => { - const { value } = CodemirrorTernService.getFocusedDocValueAndPos( + const { value } = getCodeMirrorTernService().getFocusedDocValueAndPos( testCase.input, ); expect(value).toBe(testCase.expectedOutput); @@ -152,7 +153,10 @@ describe("Tern server", () => { type: "string", string: "", }); - const request = CodemirrorTernService.buildRequest(testCase.input, {}); + const request = getCodeMirrorTernService().buildRequest( + testCase.input, + {}, + ); expect(request.query.end).toEqual(testCase.expectedOutput); }); }); @@ -219,9 +223,9 @@ describe("Tern server", () => { }); const mockAddFile = jest.fn(); - CodemirrorTernService.server.addFile = mockAddFile; + getCodeMirrorTernService().server.addFile = mockAddFile; - const value: any = CodemirrorTernService.requestCallback( + const value: any = getCodeMirrorTernService().requestCallback( null, testCase.input.requestCallbackData as any, MockCodemirrorEditor as unknown as CodeMirror.Editor, @@ -359,7 +363,7 @@ describe("Tern server sorting", () => { ]; it("shows best match results", () => { - CodemirrorTernService.setEntityInformation( + getCodeMirrorTernService().setEntityInformation( MockCodemirrorEditor as unknown as CodeMirror.Editor, { entityName: "sameEntity", @@ -367,7 +371,7 @@ describe("Tern server sorting", () => { expectedType: AutocompleteDataType.OBJECT, }, ); - CodemirrorTernService.defEntityInformation = defEntityInformation; + getCodeMirrorTernService().defEntityInformation = defEntityInformation; const sortedCompletions = AutocompleteSorter.sort( _.shuffle(completions), { diff --git a/app/client/src/utils/autocomplete/customDefUtils.ts b/app/client/src/utils/autocomplete/customDefUtils.ts index c775d42db737..b599ba7e41ef 100644 --- a/app/client/src/utils/autocomplete/customDefUtils.ts +++ b/app/client/src/utils/autocomplete/customDefUtils.ts @@ -3,18 +3,18 @@ import { isEmpty } from "lodash"; import { debug } from "loglevel"; import type { AdditionalDynamicDataTree } from "./customTreeTypeDefCreator"; import { customTreeTypeDefCreator } from "./customTreeTypeDefCreator"; -import CodemirrorTernService from "./CodemirrorTernService"; +import { getCodeMirrorTernService } from "./CodemirrorTernService"; class CustomDef { private static lastCustomDataDef: AdditionalDynamicDataTree | undefined; update(customData?: AdditionalDynamicDataTree) { + const codeMirrorTernService = getCodeMirrorTernService(); if (customData && !isEmpty(customData)) { const customDataDef = customTreeTypeDefCreator(customData); if (!equal(CustomDef.lastCustomDataDef, customDataDef)) { const start = performance.now(); - - CodemirrorTernService.updateDef("customDataTree", customDataDef); + codeMirrorTernService.updateDef("customDataTree", customDataDef); debug( "Tern: updateDef for customDataTree took", @@ -26,7 +26,7 @@ class CustomDef { } } else if (CustomDef.lastCustomDataDef) { const start = performance.now(); - CodemirrorTernService.removeDef("customDataTree"); + codeMirrorTernService.removeDef("customDataTree"); debug( "Tern: removeDef for customDataTree took", (performance.now() - start).toFixed(),
7489c71f0ba4b66f94b94273b9f86d102e839fbb
2023-09-25 13:31:23
balajisoundar
fix: [Airgapped] use local assets url in one click binding (#27584)
false
[Airgapped] use local assets url in one click binding (#27584)
fix
diff --git a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useDatasource.tsx b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useDatasource.tsx index 95aeacf40904..842781346574 100644 --- a/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useDatasource.tsx +++ b/app/client/src/components/editorComponents/WidgetQueryGeneratorForm/CommonControls/DatasourceDropdown/useDatasource.tsx @@ -43,6 +43,7 @@ import { import type { ActionDataState } from "@appsmith/reducers/entityReducers/actionsReducer"; import { getDatatype } from "utils/AppsmithUtils"; import { getCurrentEnvironmentId } from "@appsmith/selectors/environmentSelectors"; +import { getAssetUrl } from "@appsmith/utils/airgapHelpers"; enum SortingWeights { alphabetical = 1, @@ -161,7 +162,7 @@ export function useDatasource(searchText: string) { <DatasourceImage alt="" className="dataSourceImage" - src={pluginImages[datasource.pluginId]} + src={getAssetUrl(pluginImages[datasource.pluginId])} /> </ImageWrapper> ), @@ -253,13 +254,13 @@ export function useDatasource(searchText: string) { <DatasourceImage alt="" className="dataSourceImage" - src={ + src={getAssetUrl( pluginImages[ invert(pluginsPackageNamesMap)[ datasource.packageName as string ] - ] - } + ], + )} /> </ImageWrapper> ), @@ -394,7 +395,7 @@ export function useDatasource(searchText: string) { <DatasourceImage alt="" className="dataSourceImage" - src={pluginImages[query.config.pluginId]} + src={getAssetUrl(pluginImages[query.config.pluginId])} /> </ImageWrapper> ),
04bae5477b11b79f65486d58c4bf20b42ae96cbd
2021-11-02 09:47:49
Confidence Okoghenun
feat: Updates widget default state (#8562)
false
Updates widget default state (#8562)
feat
diff --git a/app/client/cypress/fixtures/audioWidgetDsl.json b/app/client/cypress/fixtures/audioWidgetDsl.json index f6cef469ebb4..9fe7f566444a 100644 --- a/app/client/cypress/fixtures/audioWidgetDsl.json +++ b/app/client/cypress/fixtures/audioWidgetDsl.json @@ -22,7 +22,7 @@ { "isVisible": true, "widgetName": "Audio1", - "url": "https://cdn.simplecast.com/audio/10488ddf-3ca4-4300-9391-c2967d806334/episodes/8c8341f0-0a3a-4f2c-bfe0-0abb6b3c1c87/audio/03e2e3d8-e703-4953-adc0-e72687f31178/default_tc.mp3", + "url": "https://assets.appsmith.com/widgets/birds_chirping.mp3", "autoPlay": false, "version": 1, "type": "AUDIO_WIDGET", diff --git a/app/client/cypress/fixtures/testdata.json b/app/client/cypress/fixtures/testdata.json index e83cde082300..79451cae1770 100644 --- a/app/client/cypress/fixtures/testdata.json +++ b/app/client/cypress/fixtures/testdata.json @@ -69,7 +69,7 @@ "input2": "(//div[@class='bp3-input-group']//input)[1]", "input3": "(//div[@class='bp3-input-group']//input)[2]", "videoUrl": "https://www.youtube.com/watch?v=S5musXykVs0", - "audioUrl": "https://cdn.simplecast.com/audio/10488ddf-3ca4-4300-9391-c2967d806334/episodes/8c8341f0-0a3a-4f2c-bfe0-0abb6b3c1c87/audio/03e2e3d8-e703-4953-adc0-e72687f31178/default_tc.mp3", + "audioUrl": "https://assets.appsmith.com/widgets/birds_chirping.mp3", "TablePagination": [ { "id": 2381224, diff --git a/app/client/cypress/fixtures/videoWidgetDsl.json b/app/client/cypress/fixtures/videoWidgetDsl.json index 3d64417f550f..f9eec3659499 100644 --- a/app/client/cypress/fixtures/videoWidgetDsl.json +++ b/app/client/cypress/fixtures/videoWidgetDsl.json @@ -22,7 +22,7 @@ { "isVisible": true, "widgetName": "Video1", - "url": "https://www.youtube.com/watch?v=mzqK0QIZRLs", + "url": "https://assets.appsmith.com/widgets/bird.mp4", "autoPlay": false, "type": "VIDEO_WIDGET", "isLoading": false, diff --git a/app/client/src/comments/dsl.json b/app/client/src/comments/dsl.json index 93fda3c3948c..d1ec3cf4e145 100644 --- a/app/client/src/comments/dsl.json +++ b/app/client/src/comments/dsl.json @@ -811,7 +811,7 @@ "bmyc9rnkyv":{ "isVisible":true, "widgetName":"Video1", - "url":"https://www.youtube.com/watch?v=mzqK0QIZRLs", + "url":"https://assets.appsmith.com/widgets/bird.mp4", "autoPlay":false, "version":1, "type":"VIDEO_WIDGET", diff --git a/app/client/src/utils/WidgetPropsUtils.test.tsx b/app/client/src/utils/WidgetPropsUtils.test.tsx index 239f91d6a3f5..a8494489f8ad 100644 --- a/app/client/src/utils/WidgetPropsUtils.test.tsx +++ b/app/client/src/utils/WidgetPropsUtils.test.tsx @@ -549,7 +549,7 @@ describe("Initial value migration test", () => { renderMode: RenderModes.CANVAS, version: 1, onPlay: "", - url: "https://www.youtube.com/watch?v=mzqK0QIZRLs", + url: "https://assets.appsmith.com/widgets/bird.mp4", parentId: "0", isLoading: false, parentColumnSpace: 67.375, @@ -574,7 +574,7 @@ describe("Initial value migration test", () => { renderMode: RenderModes.CANVAS, version: 1, onPlay: "", - url: "https://www.youtube.com/watch?v=mzqK0QIZRLs", + url: "https://assets.appsmith.com/widgets/bird.mp4", parentId: "0", isLoading: false, parentColumnSpace: 67.375, diff --git a/app/client/src/utils/validation/common.ts b/app/client/src/utils/validation/common.ts index 655b0c4e62e3..f2fba0303a1a 100644 --- a/app/client/src/utils/validation/common.ts +++ b/app/client/src/utils/validation/common.ts @@ -153,7 +153,7 @@ export function getExpectedValue( case ValidationTypes.SAFE_URL: return { type: "URL", - example: `https://wikipedia.org`, + example: `https://www.example.com`, autocompleteDataType: AutocompleteDataType.STRING, }; } diff --git a/app/client/src/widgets/AudioWidget/index.tsx b/app/client/src/widgets/AudioWidget/index.tsx index 7339f63b739e..3b47879e9dcb 100644 --- a/app/client/src/widgets/AudioWidget/index.tsx +++ b/app/client/src/widgets/AudioWidget/index.tsx @@ -11,8 +11,7 @@ export const CONFIG = { rows: 1 * GRID_DENSITY_MIGRATION_V1, columns: 7 * GRID_DENSITY_MIGRATION_V1, widgetName: "Audio", - url: - "https://cdn.simplecast.com/audio/10488ddf-3ca4-4300-9391-c2967d806334/episodes/8c8341f0-0a3a-4f2c-bfe0-0abb6b3c1c87/audio/03e2e3d8-e703-4953-adc0-e72687f31178/default_tc.mp3", + url: "https://assets.appsmith.com/widgets/birds_chirping.mp3", autoPlay: false, version: 1, }, diff --git a/app/client/src/widgets/AudioWidget/widget/index.tsx b/app/client/src/widgets/AudioWidget/widget/index.tsx index 4c30801a90f8..86037d3d3ae5 100644 --- a/app/client/src/widgets/AudioWidget/widget/index.tsx +++ b/app/client/src/widgets/AudioWidget/widget/index.tsx @@ -38,7 +38,7 @@ class AudioWidget extends BaseWidget<AudioWidgetProps, WidgetState> { expected: { type: "Audio URL", example: - "https://cdn.simplecast.com/audio/10488ddf-3ca4-4300-9391-c2967d806334/episodes/8c8341f0-0a3a-4f2c-bfe0-0abb6b3c1c87/audio/03e2e3d8-e703-4953-adc0-e72687f31178/default_tc.mp3", + "https://assets.appsmith.com/widgets/birds_chirping.mp3", autocompleteDataType: AutocompleteDataType.STRING, }, }, diff --git a/app/client/src/widgets/IframeWidget/index.ts b/app/client/src/widgets/IframeWidget/index.ts index 4949241b3b81..bb9231c20496 100644 --- a/app/client/src/widgets/IframeWidget/index.ts +++ b/app/client/src/widgets/IframeWidget/index.ts @@ -8,7 +8,7 @@ export const CONFIG = { iconSVG: IconSVG, needsMeta: true, defaults: { - source: "https://www.wikipedia.org/", + source: "https://www.example.com", borderOpacity: 100, borderWidth: 1, rows: 8 * GRID_DENSITY_MIGRATION_V1, diff --git a/app/client/src/widgets/IframeWidget/widget/index.tsx b/app/client/src/widgets/IframeWidget/widget/index.tsx index a773067398ca..48287294d257 100644 --- a/app/client/src/widgets/IframeWidget/widget/index.tsx +++ b/app/client/src/widgets/IframeWidget/widget/index.tsx @@ -21,7 +21,7 @@ class IframeWidget extends BaseWidget<IframeWidgetProps, WidgetState> { validation: { type: ValidationTypes.SAFE_URL, params: { - default: "https://wikipedia.org", + default: "https://www.example.com", }, }, }, diff --git a/app/client/src/widgets/ListWidget/index.ts b/app/client/src/widgets/ListWidget/index.ts index d946ae92d844..51fc2323153e 100644 --- a/app/client/src/widgets/ListWidget/index.ts +++ b/app/client/src/widgets/ListWidget/index.ts @@ -78,18 +78,18 @@ export const CONFIG = { listData: [ { id: "001", - name: "Bulbasaur", - img: "http://www.serebii.net/pokemongo/pokemon/001.png", + name: "Blue", + img: "https://assets.appsmith.com/widgets/default.png", }, { id: "002", - name: "Ivysaur", - img: "http://www.serebii.net/pokemongo/pokemon/002.png", + name: "Green", + img: "https://assets.appsmith.com/widgets/default.png", }, { id: "003", - name: "Venusaur", - img: "http://www.serebii.net/pokemongo/pokemon/003.png", + name: "Red", + img: "https://assets.appsmith.com/widgets/default.png", }, ], widgetName: "List", diff --git a/app/client/src/widgets/VideoWidget/index.ts b/app/client/src/widgets/VideoWidget/index.ts index 5c05f4b1a3eb..0b3c6b45fcf5 100644 --- a/app/client/src/widgets/VideoWidget/index.ts +++ b/app/client/src/widgets/VideoWidget/index.ts @@ -11,7 +11,7 @@ export const CONFIG = { rows: 7 * GRID_DENSITY_MIGRATION_V1, columns: 6 * GRID_DENSITY_MIGRATION_V1, widgetName: "Video", - url: "https://www.youtube.com/watch?v=mzqK0QIZRLs", + url: "https://assets.appsmith.com/widgets/bird.mp4", autoPlay: false, version: 1, }, diff --git a/app/client/src/widgets/VideoWidget/widget/index.tsx b/app/client/src/widgets/VideoWidget/widget/index.tsx index e252ed6158a6..c5313e0aad9e 100644 --- a/app/client/src/widgets/VideoWidget/widget/index.tsx +++ b/app/client/src/widgets/VideoWidget/widget/index.tsx @@ -37,7 +37,7 @@ class VideoWidget extends BaseWidget<VideoWidgetProps, WidgetState> { regex: /(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/, expected: { type: "Video URL", - example: "https://www.youtube.com/watch?v=mzqK0QIZRLs", + example: "https://assets.appsmith.com/widgets/bird.mp4", autocompleteDataType: AutocompleteDataType.STRING, }, }, diff --git a/app/client/src/workers/validations.test.ts b/app/client/src/workers/validations.test.ts index 27c90d851b41..70e0ece61fdb 100644 --- a/app/client/src/workers/validations.test.ts +++ b/app/client/src/workers/validations.test.ts @@ -942,11 +942,11 @@ describe("Validate Validators", () => { const config = { type: ValidationTypes.SAFE_URL, params: { - default: "https://wikipedia.org", + default: "https://www.example.com", }, }; const inputs = [ - "https://wikipedia.org", + "https://www.example.com", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==", "javascript:alert(document.cookie)", "data:text/html,<svg onload=alert(1)>", @@ -954,7 +954,7 @@ describe("Validate Validators", () => { const expected = [ { isValid: true, - parsed: "https://wikipedia.org", + parsed: "https://www.example.com", }, { isValid: true, @@ -964,12 +964,12 @@ describe("Validate Validators", () => { { isValid: false, messages: [`${WIDGET_TYPE_VALIDATION_ERROR}: URL`], - parsed: "https://wikipedia.org", + parsed: "https://www.example.com", }, { isValid: false, messages: [`${WIDGET_TYPE_VALIDATION_ERROR}: URL`], - parsed: "https://wikipedia.org", + parsed: "https://www.example.com", }, ]; diff --git a/app/client/test/factories/Widgets/VideoFactory.ts b/app/client/test/factories/Widgets/VideoFactory.ts index d0662eada291..f749be65865d 100644 --- a/app/client/test/factories/Widgets/VideoFactory.ts +++ b/app/client/test/factories/Widgets/VideoFactory.ts @@ -4,7 +4,7 @@ import { WidgetProps } from "widgets/BaseWidget"; export const VideoFactory = Factory.Sync.makeFactory<WidgetProps>({ isVisible: true, - url: "https://www.youtube.com/watch?v=mzqK0QIZRLs", + url: "https://assets.appsmith.com/widgets/bird.mp4", autoPlay: false, type: "VIDEO_WIDGET", isLoading: false,
981e720f77243c2c2256444b8160bbc60cd9da1b
2024-06-12 17:45:19
Shrikant Sharat Kandula
fix: DB URL override fails in some cases (#34206)
false
DB URL override fails in some cases (#34206)
fix
diff --git a/deploy/docker/fs/opt/appsmith/entrypoint.sh b/deploy/docker/fs/opt/appsmith/entrypoint.sh index b4ab103504f1..e2e5cf83d423 100644 --- a/deploy/docker/fs/opt/appsmith/entrypoint.sh +++ b/deploy/docker/fs/opt/appsmith/entrypoint.sh @@ -45,6 +45,11 @@ init_env_file() { ENV_PATH="$CONF_PATH/docker.env" TEMPLATES_PATH="/opt/appsmith/templates" + if [[ -n "$APPSMITH_MONGODB_URI" ]]; then + export APPSMITH_DB_URL="$APPSMITH_MONGODB_URI" + unset APPSMITH_MONGODB_URI + fi + # Build an env file with current env variables. We single-quote the values, as well as escaping any single-quote characters. printenv | grep -E '^APPSMITH_|^MONGO_' | sed "s/'/'\\\''/g; s/=/='/; s/$/'/" > "$TMP/pre-define.env" @@ -75,8 +80,19 @@ init_env_file() { tlog "Load environment configuration" + + # Load the ones in `docker.env` in the stacks folder. set -o allexport . "$ENV_PATH" + set +o allexport + + if [[ -n "$APPSMITH_MONGODB_URI" ]]; then + export APPSMITH_DB_URL="$APPSMITH_MONGODB_URI" + unset APPSMITH_MONGODB_URI + fi + + # Load the ones set from outside, should take precedence, and so will overwrite anything from `docker.env` above. + set -o allexport . "$TMP/pre-define.env" set +o allexport } @@ -172,11 +188,6 @@ configure_database_connection_url() { tlog "Configuring database connection URL" isPostgresUrl=0 isMongoUrl=0 - # Check if APPSMITH_DB_URL is not set - if [[ -z "${APPSMITH_DB_URL}" ]]; then - # If APPSMITH_DB_URL is not set, fall back to APPSMITH_MONGODB_URI - export APPSMITH_DB_URL="${APPSMITH_MONGODB_URI}" - fi if [[ "${APPSMITH_DB_URL}" == "postgresql:"* ]]; then isPostgresUrl=1 diff --git a/deploy/docker/fs/opt/appsmith/utils/bin/index.js b/deploy/docker/fs/opt/appsmith/utils/bin/index.js index cc9b2f6c2ec2..9764a2d3ae26 100755 --- a/deploy/docker/fs/opt/appsmith/utils/bin/index.js +++ b/deploy/docker/fs/opt/appsmith/utils/bin/index.js @@ -10,12 +10,19 @@ const mongo_shell_utils = require("./mongo_shell_utils.js"); const APPLICATION_CONFIG_PATH = "/appsmith-stacks/configuration/docker.env"; +// Check if APPSMITH_DB_URL is set, if not set, fall back to APPSMITH_MONGODB_URI +if (!process.env.APPSMITH_DB_URL) { + process.env.APPSMITH_DB_URL = process.env.APPSMITH_MONGODB_URI; + delete process.env.APPSMITH_MONGODB_URI; +} + // Loading latest application configuration require("dotenv").config({ path: APPLICATION_CONFIG_PATH }); -// Check if APPSMITH_DB_URL is set, if not set, fall back to APPSMITH_MONGODB_URI +// AGAIN: Check if APPSMITH_DB_URL is set, if not set, fall back to APPSMITH_MONGODB_URI if (!process.env.APPSMITH_DB_URL) { process.env.APPSMITH_DB_URL = process.env.APPSMITH_MONGODB_URI; + delete process.env.APPSMITH_MONGODB_URI; } const command = process.argv[2];
536ea5d08f931984ddd0aed440184fe443d2dc86
2025-02-26 22:39:55
Ankita Kinger
fix: Adding a style to update the width of App settings (#39456)
false
Adding a style to update the width of App settings (#39456)
fix
diff --git a/app/client/src/pages/AppIDE/layouts/routers/LeftPane.tsx b/app/client/src/pages/AppIDE/layouts/routers/LeftPane.tsx index 59ef226148cd..039d834e8c36 100644 --- a/app/client/src/pages/AppIDE/layouts/routers/LeftPane.tsx +++ b/app/client/src/pages/AppIDE/layouts/routers/LeftPane.tsx @@ -48,6 +48,7 @@ const LeftPane = () => { <Flex backgroundColor="var(--ads-v2-color-bg)" borderRight="1px solid var(--ads-v2-color-border)" + flexDirection="column" height="100%" overflow="hidden" >
daa9886a690a2911ca86335da2e2490d0f842e1d
2022-10-21 10:48:30
f0c1s
fix: upgrade page for audit logs with correct data (#17697)
false
upgrade page for audit logs with correct data (#17697)
fix
diff --git a/app/client/cypress/integration/Smoke_TestSuite_Fat/ClientSideTests/AuditLogs/Audit_logs_spec.js b/app/client/cypress/integration/Smoke_TestSuite_Fat/ClientSideTests/AuditLogs/Audit_logs_spec.js index 917155ce4236..b13f673e600d 100644 --- a/app/client/cypress/integration/Smoke_TestSuite_Fat/ClientSideTests/AuditLogs/Audit_logs_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite_Fat/ClientSideTests/AuditLogs/Audit_logs_spec.js @@ -44,12 +44,12 @@ describe("Audit logs", () => { cy.get(locators.Heading) .should("be.visible") - .should("have.text", "Audit Logs"); + .should("have.text", "Introducing Audit Logs"); cy.get(locators.SubHeadings) .should("be.visible") .should( "have.text", - "Your workspace audit log gives Workspace owners access to detailed information about security and safety-related activity.", + "See a timestamped trail of events in your workspace. Filter by type of event, user, resource ID, and time. Drill down into each event to investigate further.", ); cy.get(locators.Left) diff --git a/app/client/src/assets/svg/upgrade/audit-logs/debugging.svg b/app/client/src/assets/svg/upgrade/audit-logs/debugging.svg index ad5ff54b773e..ec913a76db27 100644 --- a/app/client/src/assets/svg/upgrade/audit-logs/debugging.svg +++ b/app/client/src/assets/svg/upgrade/audit-logs/debugging.svg @@ -1,149 +1,92 @@ <svg width="725" height="537" viewBox="0 0 725 537" fill="none" xmlns="http://www.w3.org/2000/svg"> <g clip-path="url(#clip0_625_11712)"> <g filter="url(#filter0_d_625_11712)"> -<path d="M91 33H730V504H91V33Z" fill="white"/> +<rect x="88" y="41" width="639" height="471" fill="white"/> +<rect x="88.5" y="41.5" width="638" height="470" stroke="#E7E7E7"/> </g> -<g filter="url(#filter1_d_625_11712)"> -<path fill-rule="evenodd" clip-rule="evenodd" d="M729 34H92V503H729V34ZM91 33V504H730V33H91Z" fill="#E7E7E7"/> -</g> -<path d="M151 137C151 141.971 146.971 146 142 146C137.029 146 133 141.971 133 137C133 132.029 137.029 128 142 128C146.971 128 151 132.029 151 137Z" fill="#FFDEDE"/> +<circle cx="139" cy="145" r="9" fill="#FFDEDE"/> <g opacity="0.7"> -<path d="M181 133H332.334V141.294H181V133Z" fill="#D9D9D9"/> -<path d="M354.83 133H571.606V141.294H354.83V133Z" fill="#D9D9D9"/> -<path d="M650 133H594.102V141.294H650V133Z" fill="#D9D9D9"/> +<rect x="178" y="141" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="351.83" y="141" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 647 141)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M181 205H332.334V213.294H181V205Z" fill="#D9D9D9"/> -<path d="M354.83 205H571.606V213.294H354.83V205Z" fill="#D9D9D9"/> -<path d="M650 205H594.102V213.294H650V205Z" fill="#D9D9D9"/> +<rect x="178" y="213" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="351.83" y="213" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 647 213)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M181 242H332.334V250.294H181V242Z" fill="#D9D9D9"/> -<path d="M354.83 242H571.606V250.294H354.83V242Z" fill="#D9D9D9"/> -<path d="M650 242H594.102V250.294H650V242Z" fill="#D9D9D9"/> -</g> -<path d="M150 244C150 248.971 145.971 253 141 253C136.029 253 132 248.971 132 244C132 239.029 136.029 235 141 235C145.971 235 150 239.029 150 244Z" fill="#FFDEDE"/> -<path d="M150 285C150 289.971 145.971 294 141 294C136.029 294 132 289.971 132 285C132 280.029 136.029 276 141 276C145.971 276 150 280.029 150 285Z" fill="#FFDEDE"/> -<path d="M150 322C150 326.971 145.971 331 141 331C136.029 331 132 326.971 132 322C132 317.029 136.029 313 141 313C145.971 313 150 317.029 150 322Z" fill="#FFDEDE"/> -<path d="M150 359C150 363.971 145.971 368 141 368C136.029 368 132 363.971 132 359C132 354.029 136.029 350 141 350C145.971 350 150 354.029 150 359Z" fill="#FFDEDE"/> -<path d="M150 396C150 400.971 145.971 405 141 405C136.029 405 132 400.971 132 396C132 391.029 136.029 387 141 387C145.971 387 150 391.029 150 396Z" fill="#FFDEDE"/> -<path d="M150 433C150 437.971 145.971 442 141 442C136.029 442 132 437.971 132 433C132 428.029 136.029 424 141 424C145.971 424 150 428.029 150 433Z" fill="#FFDEDE"/> -<path d="M150 470C150 474.971 145.971 479 141 479C136.029 479 132 474.971 132 470C132 465.029 136.029 461 141 461C145.971 461 150 465.029 150 470Z" fill="#FFDEDE"/> +<rect x="178" y="250" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="351.83" y="250" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 647 250)" fill="#D9D9D9"/> +</g> +<circle cx="138" cy="252" r="9" fill="#FFDEDE"/> +<circle cx="138" cy="293" r="9" fill="#FFDEDE"/> +<circle cx="138" cy="330" r="9" fill="#FFDEDE"/> +<circle cx="138" cy="367" r="9" fill="#FFDEDE"/> +<circle cx="138" cy="404" r="9" fill="#FFDEDE"/> +<circle cx="138" cy="441" r="9" fill="#FFDEDE"/> +<circle cx="138" cy="478" r="9" fill="#FFDEDE"/> <g opacity="0.7"> -<path d="M181 281H332.334V289.294H181V281Z" fill="#D9D9D9"/> -<path d="M354.83 281H571.606V289.294H354.83V281Z" fill="#D9D9D9"/> -<path d="M650 281H594.102V289.294H650V281Z" fill="#D9D9D9"/> +<rect x="178" y="289" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="351.83" y="289" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 647 289)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M181 318H332.334V326.294H181V318Z" fill="#D9D9D9"/> -<path d="M354.83 318H571.606V326.294H354.83V318Z" fill="#D9D9D9"/> -<path d="M650 318H594.102V326.294H650V318Z" fill="#D9D9D9"/> +<rect x="178" y="326" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="351.83" y="326" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 647 326)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M181 355H332.334V363.294H181V355Z" fill="#D9D9D9"/> -<path d="M354.83 355H571.606V363.294H354.83V355Z" fill="#D9D9D9"/> -<path d="M650 355H594.102V363.294H650V355Z" fill="#D9D9D9"/> +<rect x="178" y="363" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="351.83" y="363" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 647 363)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M181 392H332.334V400.294H181V392Z" fill="#D9D9D9"/> -<path d="M354.83 392H571.606V400.294H354.83V392Z" fill="#D9D9D9"/> -<path d="M650 392H594.102V400.294H650V392Z" fill="#D9D9D9"/> +<rect x="178" y="400" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="351.83" y="400" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 647 400)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M181 429H332.334V437.294H181V429Z" fill="#D9D9D9"/> -<path d="M354.83 429H571.606V437.294H354.83V429Z" fill="#D9D9D9"/> -<path d="M650 429H594.102V437.294H650V429Z" fill="#D9D9D9"/> +<rect x="178" y="437" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="351.83" y="437" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 647 437)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M181 466H332.334V474.294H181V466Z" fill="#D9D9D9"/> -<path d="M354.83 466H571.606V474.294H354.83V466Z" fill="#D9D9D9"/> -<path d="M650 466H594.102V474.294H650V466Z" fill="#D9D9D9"/> -</g> -<path d="M137.128 89.0002H133.613L140.013 70.8184H144.08L150.489 89.0002H146.974L142.118 74.5471H141.975L137.128 89.0002ZM137.244 81.8713H146.832V84.5169H137.244V81.8713Z" fill="#393939"/> -<path d="M161.433 83.2651V75.3638H164.647V89.0002H161.531V86.5765H161.389C161.081 87.34 160.575 87.9644 159.871 88.4498C159.173 88.9351 158.311 89.1777 157.288 89.1777C156.394 89.1777 155.604 88.9795 154.917 88.5829C154.237 88.1805 153.704 87.5975 153.319 86.834C152.934 86.0646 152.742 85.1354 152.742 84.0463V75.3638H155.956V83.5492C155.956 84.4133 156.193 85.0998 156.666 85.6088C157.14 86.1178 157.761 86.3723 158.53 86.3723C159.004 86.3723 159.463 86.2569 159.906 86.0261C160.35 85.7953 160.714 85.452 160.998 84.9963C161.288 84.5346 161.433 83.9576 161.433 83.2651Z" fill="#393939"/> -<path d="M173.012 89.2399C171.941 89.2399 170.982 88.9647 170.136 88.4142C169.29 87.8638 168.621 87.0648 168.13 86.0172C167.638 84.9696 167.393 83.6971 167.393 82.1998C167.393 80.6846 167.641 79.4062 168.138 78.3645C168.642 77.3169 169.319 76.5268 170.171 75.9941C171.024 75.4556 171.974 75.1863 173.021 75.1863C173.82 75.1863 174.477 75.3224 174.992 75.5946C175.507 75.861 175.915 76.1835 176.217 76.5623C176.519 76.9352 176.753 77.2873 176.919 77.6188H177.052V70.8184H180.274V89.0002H177.114V86.8517H176.919C176.753 87.1832 176.513 87.5353 176.2 87.9082C175.886 88.2752 175.472 88.5888 174.957 88.8493C174.442 89.1097 173.794 89.2399 173.012 89.2399ZM173.909 86.6032C174.59 86.6032 175.17 86.4197 175.649 86.0527C176.129 85.6799 176.493 85.162 176.741 84.4991C176.99 83.8362 177.114 83.0639 177.114 82.182C177.114 81.3001 176.99 80.5337 176.741 79.8826C176.498 79.2316 176.137 78.7256 175.658 78.3645C175.185 78.0035 174.602 77.823 173.909 77.823C173.193 77.823 172.595 78.0094 172.116 78.3823C171.636 78.7551 171.275 79.2701 171.033 79.927C170.79 80.584 170.669 81.3356 170.669 82.182C170.669 83.0343 170.79 83.7948 171.033 84.4636C171.281 85.1265 171.645 85.6503 172.125 86.035C172.61 86.4138 173.205 86.6032 173.909 86.6032Z" fill="#393939"/> -<path d="M183.699 89.0002V75.3638H186.913V89.0002H183.699ZM185.315 73.4284C184.806 73.4284 184.368 73.2598 184.001 72.9224C183.634 72.5791 183.451 72.1678 183.451 71.6884C183.451 71.2031 183.634 70.7917 184.001 70.4544C184.368 70.1111 184.806 69.9395 185.315 69.9395C185.83 69.9395 186.268 70.1111 186.629 70.4544C186.996 70.7917 187.179 71.2031 187.179 71.6884C187.179 72.1678 186.996 72.5791 186.629 72.9224C186.268 73.2598 185.83 73.4284 185.315 73.4284Z" fill="#393939"/> -<path d="M197.027 75.3638V77.8496H189.188V75.3638H197.027ZM191.123 72.0968H194.337V84.8986C194.337 85.3307 194.402 85.6621 194.532 85.8929C194.668 86.1178 194.846 86.2717 195.065 86.3546C195.284 86.4374 195.527 86.4789 195.793 86.4789C195.994 86.4789 196.178 86.4641 196.343 86.4345C196.515 86.4049 196.645 86.3783 196.734 86.3546L197.276 88.867C197.104 88.9262 196.858 88.9913 196.539 89.0623C196.225 89.1333 195.84 89.1748 195.385 89.1866C194.58 89.2103 193.855 89.089 193.209 88.8226C192.564 88.5504 192.052 88.1302 191.674 87.562C191.301 86.9938 191.117 86.2836 191.123 85.4313V72.0968Z" fill="#393939"/> -<path d="M206.058 89.0002V70.8184H209.352V86.2392H217.359V89.0002H206.058Z" fill="#393939"/> -<path d="M226.024 89.2665C224.693 89.2665 223.538 88.9735 222.562 88.3876C221.585 87.8017 220.828 86.9819 220.289 85.9284C219.756 84.8749 219.49 83.6439 219.49 82.2353C219.49 80.8266 219.756 79.5926 220.289 78.5332C220.828 77.4738 221.585 76.6511 222.562 76.0652C223.538 75.4792 224.693 75.1863 226.024 75.1863C227.356 75.1863 228.51 75.4792 229.487 76.0652C230.463 76.6511 231.218 77.4738 231.75 78.5332C232.289 79.5926 232.558 80.8266 232.558 82.2353C232.558 83.6439 232.289 84.8749 231.75 85.9284C231.218 86.9819 230.463 87.8017 229.487 88.3876C228.51 88.9735 227.356 89.2665 226.024 89.2665ZM226.042 86.6919C226.764 86.6919 227.368 86.4937 227.853 86.0971C228.338 85.6947 228.699 85.1561 228.936 84.4814C229.179 83.8066 229.3 83.055 229.3 82.2264C229.3 81.3919 229.179 80.6373 228.936 79.9625C228.699 79.2819 228.338 78.7404 227.853 78.3379C227.368 77.9354 226.764 77.7342 226.042 77.7342C225.302 77.7342 224.687 77.9354 224.195 78.3379C223.71 78.7404 223.346 79.2819 223.103 79.9625C222.867 80.6373 222.748 81.3919 222.748 82.2264C222.748 83.055 222.867 83.8066 223.103 84.4814C223.346 85.1561 223.71 85.6947 224.195 86.0971C224.687 86.4937 225.302 86.6919 226.042 86.6919Z" fill="#393939"/> -<path d="M241.216 94.3979C240.062 94.3979 239.071 94.2411 238.242 93.9274C237.414 93.6196 236.748 93.2053 236.245 92.6845C235.742 92.1636 235.393 91.5866 235.197 90.9533L238.091 90.252C238.222 90.5183 238.411 90.7817 238.66 91.0421C238.908 91.3084 239.243 91.5274 239.663 91.699C240.089 91.8766 240.625 91.9654 241.27 91.9654C242.181 91.9654 242.936 91.7434 243.534 91.2995C244.131 90.8616 244.43 90.1395 244.43 89.1333V86.5499H244.27C244.105 86.8813 243.862 87.2217 243.542 87.5708C243.229 87.92 242.811 88.213 242.291 88.4498C241.776 88.6865 241.128 88.8049 240.346 88.8049C239.299 88.8049 238.349 88.5592 237.497 88.068C236.65 87.5708 235.976 86.831 235.472 85.8485C234.975 84.8601 234.727 83.6232 234.727 82.1376C234.727 80.6402 234.975 79.3766 235.472 78.3468C235.976 77.311 236.653 76.5268 237.505 75.9941C238.358 75.4556 239.308 75.1863 240.355 75.1863C241.154 75.1863 241.811 75.3224 242.326 75.5946C242.847 75.861 243.261 76.1835 243.569 76.5623C243.877 76.9352 244.111 77.2873 244.27 77.6188H244.448V75.3638H247.617V89.2221C247.617 90.3881 247.339 91.3528 246.783 92.1163C246.226 92.8798 245.466 93.4509 244.501 93.8297C243.536 94.2085 242.442 94.3979 241.216 94.3979ZM241.243 86.2836C241.924 86.2836 242.504 86.1178 242.983 85.7864C243.463 85.455 243.827 84.9785 244.075 84.3571C244.324 83.7356 244.448 82.9899 244.448 82.1199C244.448 81.2617 244.324 80.51 244.075 79.8649C243.832 79.2198 243.471 78.7196 242.992 78.3645C242.519 78.0035 241.936 77.823 241.243 77.823C240.527 77.823 239.929 78.0094 239.45 78.3823C238.97 78.7551 238.609 79.2671 238.367 79.9181C238.124 80.5633 238.003 81.2972 238.003 82.1199C238.003 82.9544 238.124 83.6853 238.367 84.3127C238.615 84.9341 238.979 85.4194 239.459 85.7686C239.944 86.1119 240.539 86.2836 241.243 86.2836Z" fill="#393939"/> -<path d="M261.689 78.9682L258.759 79.2878C258.676 78.9919 258.531 78.7137 258.324 78.4533C258.123 78.1929 257.851 77.9828 257.507 77.823C257.164 77.6632 256.744 77.5833 256.247 77.5833C255.578 77.5833 255.016 77.7283 254.56 78.0183C254.11 78.3083 253.888 78.6841 253.894 79.1458C253.888 79.5423 254.033 79.8649 254.329 80.1135C254.631 80.362 255.128 80.5662 255.82 80.726L258.146 81.2232C259.437 81.5014 260.396 81.9423 261.023 82.546C261.656 83.1497 261.976 83.9398 261.982 84.9164C261.976 85.7746 261.724 86.5321 261.227 87.1891C260.736 87.8401 260.052 88.3491 259.176 88.7161C258.3 89.083 257.294 89.2665 256.158 89.2665C254.489 89.2665 253.145 88.9173 252.127 88.2189C251.109 87.5146 250.503 86.5351 250.307 85.2804L253.441 84.9785C253.583 85.594 253.885 86.0587 254.347 86.3723C254.808 86.686 255.409 86.8429 256.149 86.8429C256.912 86.8429 257.525 86.686 257.987 86.3723C258.454 86.0587 258.688 85.671 258.688 85.2093C258.688 84.8187 258.537 84.4962 258.235 84.2417C257.939 83.9872 257.478 83.7918 256.85 83.6557L254.524 83.1674C253.216 82.8952 252.249 82.4365 251.621 81.7914C250.994 81.1403 250.683 80.3176 250.689 79.3233C250.683 78.4829 250.911 77.7549 251.373 77.1394C251.84 76.5179 252.488 76.0385 253.317 75.7012C254.151 75.3579 255.113 75.1863 256.202 75.1863C257.8 75.1863 259.058 75.5266 259.975 76.2072C260.899 76.8878 261.47 77.8082 261.689 78.9682Z" fill="#393939"/> -<path d="M151 207C151 211.971 146.971 216 142 216C137.029 216 133 211.971 133 207C133 202.029 137.029 198 142 198C146.971 198 151 202.029 151 207Z" fill="#FFDEDE"/> -<g filter="url(#filter2_d_625_11712)"> -<rect width="679" height="95" transform="translate(49 113)" fill="white"/> -<g opacity="0.5"> -<rect x="68.0286" y="154.062" width="151.913" height="33.7906" fill="white"/> -<path d="M205.03 171.254L207.748 168.536L208.524 169.313L205.03 172.807L201.535 169.313L202.312 168.536L205.03 171.254Z" fill="#575757"/> -<rect x="68.0286" y="154.062" width="151.913" height="33.7906" stroke="#B3B3B3" stroke-width="0.83"/> +<rect x="178" y="474" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="351.83" y="474" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 647 474)" fill="#D9D9D9"/> </g> +<path d="M134.128 97H130.613L137.013 78.8182H141.08L147.489 97H143.974L139.118 82.5469H138.975L134.128 97ZM134.244 89.8711H143.832V92.5167H134.244V89.8711ZM158.434 91.2649V83.3636H161.647V97H158.531V94.5763H158.389C158.081 95.3398 157.575 95.9643 156.871 96.4496C156.173 96.9349 155.311 97.1776 154.288 97.1776C153.394 97.1776 152.604 96.9793 151.917 96.5827C151.237 96.1803 150.704 95.5973 150.319 94.8338C149.934 94.0644 149.742 93.1352 149.742 92.0462V83.3636H152.956V91.549C152.956 92.4131 153.193 93.0997 153.666 93.6087C154.14 94.1177 154.761 94.3722 155.53 94.3722C156.004 94.3722 156.463 94.2567 156.907 94.0259C157.35 93.7951 157.714 93.4518 157.998 92.9961C158.289 92.5344 158.434 91.9574 158.434 91.2649ZM170.012 97.2397C168.941 97.2397 167.982 96.9645 167.136 96.4141C166.29 95.8636 165.621 95.0646 165.13 94.017C164.638 92.9695 164.393 91.697 164.393 90.1996C164.393 88.6844 164.641 87.406 165.138 86.3643C165.642 85.3168 166.319 84.5266 167.172 83.994C168.024 83.4554 168.974 83.1861 170.021 83.1861C170.82 83.1861 171.477 83.3222 171.992 83.5945C172.507 83.8608 172.915 84.1834 173.217 84.5621C173.519 84.935 173.753 85.2872 173.919 85.6186H174.052V78.8182H177.275V97H174.114V94.8516H173.919C173.753 95.183 173.513 95.5352 173.2 95.908C172.886 96.275 172.472 96.5887 171.957 96.8491C171.442 97.1095 170.794 97.2397 170.012 97.2397ZM170.909 94.603C171.59 94.603 172.17 94.4195 172.649 94.0526C173.129 93.6797 173.493 93.1618 173.741 92.4989C173.99 91.8361 174.114 91.0637 174.114 90.1818C174.114 89.3 173.99 88.5335 173.741 87.8825C173.498 87.2314 173.137 86.7254 172.658 86.3643C172.185 86.0033 171.602 85.8228 170.909 85.8228C170.193 85.8228 169.595 86.0092 169.116 86.3821C168.636 86.755 168.275 87.2699 168.033 87.9268C167.79 88.5838 167.669 89.3355 167.669 90.1818C167.669 91.0341 167.79 91.7946 168.033 92.4634C168.281 93.1263 168.645 93.6501 169.125 94.0348C169.61 94.4136 170.205 94.603 170.909 94.603ZM180.699 97V83.3636H183.913V97H180.699ZM182.315 81.4283C181.806 81.4283 181.368 81.2596 181.001 80.9222C180.634 80.579 180.451 80.1676 180.451 79.6882C180.451 79.2029 180.634 78.7915 181.001 78.4542C181.368 78.1109 181.806 77.9393 182.315 77.9393C182.83 77.9393 183.268 78.1109 183.629 78.4542C183.996 78.7915 184.179 79.2029 184.179 79.6882C184.179 80.1676 183.996 80.579 183.629 80.9222C183.268 81.2596 182.83 81.4283 182.315 81.4283ZM194.027 83.3636V85.8494H186.188V83.3636H194.027ZM188.123 80.0966H191.337V92.8984C191.337 93.3305 191.402 93.6619 191.532 93.8928C191.668 94.1177 191.846 94.2715 192.065 94.3544C192.284 94.4373 192.527 94.4787 192.793 94.4787C192.994 94.4787 193.178 94.4639 193.343 94.4343C193.515 94.4047 193.645 94.3781 193.734 94.3544L194.276 96.8668C194.104 96.926 193.858 96.9911 193.539 97.0621C193.225 97.1332 192.84 97.1746 192.385 97.1864C191.58 97.2101 190.855 97.0888 190.21 96.8224C189.564 96.5502 189.052 96.13 188.674 95.5618C188.301 94.9936 188.117 94.2834 188.123 93.4311V80.0966ZM203.058 97V78.8182H206.352V94.239H214.359V97H203.058ZM223.024 97.2663C221.693 97.2663 220.538 96.9734 219.562 96.3874C218.585 95.8015 217.828 94.9818 217.289 93.9283C216.756 92.8748 216.49 91.6437 216.49 90.2351C216.49 88.8265 216.756 87.5924 217.289 86.533C217.828 85.4736 218.585 84.6509 219.562 84.065C220.538 83.479 221.693 83.1861 223.024 83.1861C224.356 83.1861 225.51 83.479 226.487 84.065C227.463 84.6509 228.218 85.4736 228.75 86.533C229.289 87.5924 229.558 88.8265 229.558 90.2351C229.558 91.6437 229.289 92.8748 228.75 93.9283C228.218 94.9818 227.463 95.8015 226.487 96.3874C225.51 96.9734 224.356 97.2663 223.024 97.2663ZM223.042 94.6918C223.764 94.6918 224.368 94.4935 224.853 94.0969C225.338 93.6945 225.699 93.1559 225.936 92.4812C226.179 91.8065 226.3 91.0548 226.3 90.2262C226.3 89.3917 226.179 88.6371 225.936 87.9624C225.699 87.2817 225.338 86.7402 224.853 86.3377C224.368 85.9353 223.764 85.734 223.042 85.734C222.302 85.734 221.687 85.9353 221.195 86.3377C220.71 86.7402 220.346 87.2817 220.103 87.9624C219.867 88.6371 219.748 89.3917 219.748 90.2262C219.748 91.0548 219.867 91.8065 220.103 92.4812C220.346 93.1559 220.71 93.6945 221.195 94.0969C221.687 94.4935 222.302 94.6918 223.042 94.6918ZM238.216 102.398C237.062 102.398 236.071 102.241 235.242 101.927C234.414 101.619 233.748 101.205 233.245 100.684C232.742 100.163 232.393 99.5864 232.197 98.9531L235.091 98.2518C235.222 98.5181 235.411 98.7815 235.66 99.0419C235.908 99.3082 236.243 99.5272 236.663 99.6989C237.089 99.8764 237.625 99.9652 238.27 99.9652C239.181 99.9652 239.936 99.7433 240.534 99.2994C241.131 98.8614 241.43 98.1393 241.43 97.1332V94.5497H241.27C241.105 94.8812 240.862 95.2215 240.542 95.5707C240.229 95.9199 239.811 96.2128 239.291 96.4496C238.776 96.6863 238.128 96.8047 237.346 96.8047C236.299 96.8047 235.349 96.5591 234.497 96.0678C233.65 95.5707 232.976 94.8308 232.472 93.8484C231.975 92.86 231.727 91.623 231.727 90.1374C231.727 88.64 231.975 87.3764 232.472 86.3466C232.976 85.3108 233.653 84.5266 234.506 83.994C235.358 83.4554 236.308 83.1861 237.355 83.1861C238.154 83.1861 238.811 83.3222 239.326 83.5945C239.847 83.8608 240.261 84.1834 240.569 84.5621C240.877 84.935 241.111 85.2872 241.27 85.6186H241.448V83.3636H244.617V97.2219C244.617 98.3879 244.339 99.3526 243.783 100.116C243.227 100.88 242.466 101.451 241.501 101.83C240.537 102.208 239.442 102.398 238.216 102.398ZM238.243 94.2834C238.924 94.2834 239.504 94.1177 239.983 93.7862C240.463 93.4548 240.827 92.9783 241.075 92.3569C241.324 91.7354 241.448 90.9897 241.448 90.1197C241.448 89.2615 241.324 88.5098 241.075 87.8647C240.832 87.2196 240.471 86.7195 239.992 86.3643C239.519 86.0033 238.936 85.8228 238.243 85.8228C237.527 85.8228 236.929 86.0092 236.45 86.3821C235.97 86.755 235.609 87.2669 235.367 87.918C235.124 88.5631 235.003 89.297 235.003 90.1197C235.003 90.9542 235.124 91.6851 235.367 92.3125C235.615 92.9339 235.979 93.4193 236.459 93.7685C236.944 94.1117 237.539 94.2834 238.243 94.2834ZM258.689 86.968L255.759 87.2876C255.676 86.9917 255.531 86.7135 255.324 86.4531C255.123 86.1927 254.851 85.9826 254.507 85.8228C254.164 85.663 253.744 85.5831 253.247 85.5831C252.578 85.5831 252.016 85.7281 251.56 86.0181C251.11 86.3081 250.888 86.6839 250.894 87.1456C250.888 87.5421 251.033 87.8647 251.329 88.1133C251.631 88.3619 252.128 88.5661 252.82 88.7259L255.146 89.223C256.437 89.5012 257.396 89.9421 258.023 90.5458C258.656 91.1495 258.976 91.9396 258.982 92.9162C258.976 93.7744 258.724 94.532 258.227 95.1889C257.736 95.84 257.052 96.349 256.176 96.7159C255.3 97.0829 254.294 97.2663 253.158 97.2663C251.489 97.2663 250.145 96.9171 249.127 96.2188C248.109 95.5144 247.503 94.5349 247.307 93.2802L250.441 92.9783C250.583 93.5939 250.885 94.0585 251.347 94.3722C251.808 94.6858 252.409 94.8427 253.149 94.8427C253.912 94.8427 254.525 94.6858 254.987 94.3722C255.454 94.0585 255.688 93.6708 255.688 93.2092C255.688 92.8185 255.537 92.496 255.235 92.2415C254.939 91.987 254.478 91.7917 253.85 91.6555L251.524 91.1673C250.216 90.895 249.249 90.4363 248.621 89.7912C247.994 89.1402 247.683 88.3175 247.689 87.3232C247.683 86.4827 247.911 85.7547 248.373 85.1392C248.84 84.5178 249.488 84.0384 250.317 83.701C251.151 83.3577 252.113 83.1861 253.202 83.1861C254.8 83.1861 256.058 83.5264 256.975 84.207C257.899 84.8877 258.47 85.808 258.689 86.968Z" fill="#393939"/> +<circle cx="139" cy="215" r="9" fill="#FFDEDE"/> +<g filter="url(#filter1_d_625_11712)"> +<rect width="679" height="95" transform="translate(46 121)" fill="white"/> <g opacity="0.5"> -<rect x="231.039" y="154.062" width="151.913" height="33.7906" fill="white"/> -<path d="M368.04 171.254L370.758 168.536L371.534 169.313L368.04 172.807L364.545 169.313L365.322 168.536L368.04 171.254Z" fill="#575757"/> -<rect x="231.039" y="154.062" width="151.913" height="33.7906" stroke="#B3B3B3" stroke-width="0.83"/> +<rect x="224" y="162" width="157" height="34" fill="white"/> +<path d="M369.589 179.193L372.307 176.475L373.083 177.251L369.589 180.745L366.095 177.251L366.871 176.475L369.589 179.193Z" fill="#575757"/> +<rect x="224" y="162" width="157" height="34" stroke="#B3B3B3" stroke-width="0.83"/> </g> <g opacity="0.5"> -<rect x="394.049" y="154.062" width="151.913" height="33.7906" fill="white"/> -<path d="M531.05 171.254L533.768 168.536L534.544 169.313L531.05 172.807L527.555 169.313L528.332 168.536L531.05 171.254Z" fill="#575757"/> -<rect x="394.049" y="154.062" width="151.913" height="33.7906" stroke="#B3B3B3" stroke-width="0.83"/> -</g> +<rect x="65" y="162" width="150" height="34" fill="white"/> +<path d="M204.589 179.193L207.307 176.475L208.083 177.251L204.589 180.745L201.094 177.251L201.871 176.475L204.589 179.193Z" fill="#575757"/> +<rect x="65" y="162" width="150" height="34" stroke="#B3B3B3" stroke-width="0.83"/> +</g> +<path d="M78.4697 183.197C79.0032 183.197 79.4973 183.112 79.9297 182.944L80.6147 183.876H81.9119L80.845 182.422C81.7434 181.697 82.2488 180.49 82.2488 178.951V178.94C82.2488 176.34 80.8 174.701 78.4697 174.701C76.145 174.701 74.6851 176.335 74.6851 178.94V178.951C74.6851 181.551 76.1113 183.197 78.4697 183.197ZM78.4697 182.085C76.9087 182.085 75.9709 180.849 75.9709 178.951V178.94C75.9709 177.025 76.9368 175.812 78.4697 175.812C80.0027 175.812 80.9629 177.025 80.9629 178.94V178.951C80.9629 180.024 80.6597 180.889 80.115 181.433L79.4692 180.557H78.1721L79.2166 181.972C78.9863 182.045 78.7336 182.085 78.4697 182.085ZM85.6266 183.118C86.5138 183.118 87.1315 182.736 87.4235 182.079H87.5189V183H88.7318V176.902H87.5189V180.479C87.5189 181.461 86.9967 182.073 86.0197 182.073C85.1269 182.073 84.7562 181.574 84.7562 180.563V176.902H83.5377V180.849C83.5377 182.292 84.2509 183.118 85.6266 183.118ZM92.8284 183.118C94.3894 183.118 95.2317 182.219 95.4339 181.417L95.4451 181.366L94.2715 181.372L94.2491 181.417C94.1031 181.731 93.637 182.118 92.8565 182.118C91.8514 182.118 91.2112 181.439 91.1888 180.271H95.5125V179.844C95.5125 178.014 94.4681 176.784 92.7666 176.784C91.0652 176.784 89.9646 178.059 89.9646 179.962V179.968C89.9646 181.899 91.0428 183.118 92.8284 183.118ZM92.7723 177.783C93.5977 177.783 94.2098 178.311 94.3052 179.401H91.2056C91.3123 178.351 91.9412 177.783 92.7723 177.783ZM96.7397 183H97.9582V179.356C97.9582 178.474 98.5927 177.901 99.5248 177.901C99.7551 177.901 99.9628 177.929 100.182 177.974V176.851C100.058 176.823 99.8449 176.795 99.6484 176.795C98.8342 176.795 98.267 177.177 98.048 177.823H97.9582V176.902H96.7397V183ZM101.796 185.145C103.032 185.145 103.649 184.69 104.166 183.236L106.435 176.902H105.154L103.633 181.776H103.526L101.999 176.902H100.685L102.897 183.006L102.807 183.32C102.628 183.938 102.285 184.179 101.718 184.179C101.577 184.179 101.426 184.174 101.308 184.157V185.117C101.465 185.134 101.645 185.145 101.796 185.145ZM110.512 183H115.655V181.916H111.77V179.395H115.448V178.351H111.77V175.981H115.655V174.897H110.512V183ZM116.641 183H117.966L119.303 180.799H119.393L120.729 183H122.116L120.078 179.912L122.094 176.902H120.746L119.443 179.081H119.348L118.034 176.902H116.624L118.668 179.962L116.641 183ZM125.415 183.118C126.976 183.118 127.819 182.219 128.021 181.417L128.032 181.366L126.858 181.372L126.836 181.417C126.69 181.731 126.224 182.118 125.443 182.118C124.438 182.118 123.798 181.439 123.776 180.271H128.099V179.844C128.099 178.014 127.055 176.784 125.353 176.784C123.652 176.784 122.551 178.059 122.551 179.962V179.968C122.551 181.899 123.63 183.118 125.415 183.118ZM125.359 177.783C126.184 177.783 126.797 178.311 126.892 179.401H123.792C123.899 178.351 124.528 177.783 125.359 177.783ZM131.893 183.118C133.403 183.118 134.273 182.304 134.492 181.119L134.504 181.068H133.336L133.325 181.096C133.128 181.753 132.656 182.102 131.893 182.102C130.888 182.102 130.264 181.282 130.264 179.934V179.923C130.264 178.609 130.876 177.8 131.893 177.8C132.701 177.8 133.195 178.25 133.33 178.85L133.336 178.867L134.504 178.862V178.833C134.335 177.649 133.42 176.784 131.887 176.784C130.107 176.784 129.023 177.991 129.023 179.923V179.934C129.023 181.905 130.113 183.118 131.893 183.118ZM137.696 183.118C138.583 183.118 139.201 182.736 139.493 182.079H139.589V183H140.801V176.902H139.589V180.479C139.589 181.461 139.066 182.073 138.089 182.073C137.196 182.073 136.826 181.574 136.826 180.563V176.902H135.607V180.849C135.607 182.292 136.321 183.118 137.696 183.118ZM144.64 183.039C144.876 183.039 145.1 183.011 145.297 182.978V182.006C145.128 182.023 145.022 182.029 144.836 182.029C144.235 182.029 143.988 181.759 143.988 181.102V177.862H145.297V176.902H143.988V175.363H142.747V176.902H141.793V177.862H142.747V181.394C142.747 182.568 143.298 183.039 144.64 183.039ZM148.989 183.118C150.55 183.118 151.392 182.219 151.594 181.417L151.606 181.366L150.432 181.372L150.41 181.417C150.264 181.731 149.798 182.118 149.017 182.118C148.012 182.118 147.372 181.439 147.349 180.271H151.673V179.844C151.673 178.014 150.629 176.784 148.927 176.784C147.226 176.784 146.125 178.059 146.125 179.962V179.968C146.125 181.899 147.203 183.118 148.989 183.118ZM148.933 177.783C149.758 177.783 150.37 178.311 150.466 179.401H147.366C147.473 178.351 148.102 177.783 148.933 177.783ZM155.124 183.101C155.977 183.101 156.646 182.708 156.999 182.04H157.095V183H158.308V174.51H157.095V177.868H156.999C156.674 177.211 155.961 176.795 155.124 176.795C153.574 176.795 152.597 178.014 152.597 179.945V179.957C152.597 181.871 153.591 183.101 155.124 183.101ZM155.472 182.062C154.45 182.062 153.838 181.265 153.838 179.957V179.945C153.838 178.637 154.45 177.84 155.472 177.84C156.483 177.84 157.112 178.643 157.112 179.945V179.957C157.112 181.259 156.488 182.062 155.472 182.062Z" fill="#4B4848"/> +<rect x="555" y="162" width="160" height="34" fill="white"/> +<path d="M567.938 183.197C569.528 183.197 570.465 182.259 570.465 180.664V174.897H569.208V180.653C569.208 181.574 568.758 182.073 567.927 182.073C567.175 182.073 566.787 181.591 566.737 180.973L566.731 180.922H565.49L565.496 180.99C565.563 182.281 566.439 183.197 567.938 183.197ZM574.163 183.118C575.05 183.118 575.668 182.736 575.96 182.079H576.056V183H577.268V176.902H576.056V180.479C576.056 181.461 575.533 182.073 574.556 182.073C573.663 182.073 573.293 181.574 573.293 180.563V176.902H572.074V180.849C572.074 182.292 572.787 183.118 574.163 183.118ZM578.804 183H580.023V179.423C580.023 178.44 580.579 177.828 581.472 177.828C582.365 177.828 582.786 178.328 582.786 179.339V183H583.999V179.052C583.999 177.598 583.246 176.784 581.882 176.784C580.994 176.784 580.41 177.177 580.113 177.828H580.023V176.902H578.804V183ZM591.394 183.197C593.096 183.197 594.326 182.006 594.326 180.378V180.366C594.326 178.817 593.219 177.671 591.675 177.671C590.569 177.671 589.839 178.25 589.541 178.901H589.435C589.435 178.839 589.435 178.777 589.44 178.716C589.502 177.098 590.069 175.768 591.434 175.768C592.197 175.768 592.725 176.161 592.95 176.778L592.972 176.834H594.219L594.208 176.767C593.938 175.543 592.871 174.701 591.439 174.701C589.435 174.701 588.239 176.318 588.239 179.058V179.069C588.239 182.051 589.766 183.197 591.394 183.197ZM589.682 180.378V180.372C589.682 179.395 590.423 178.688 591.394 178.688C592.377 178.688 593.085 179.406 593.085 180.4V180.411C593.085 181.383 592.332 182.141 591.383 182.141C590.429 182.141 589.682 181.366 589.682 180.378ZM598.627 183H604.085V181.927H600.34V181.815L602.058 180.103C603.529 178.643 603.956 177.935 603.956 177.014V176.997C603.956 175.661 602.844 174.701 601.334 174.701C599.705 174.701 598.56 175.745 598.554 177.228L598.566 177.239H599.745L599.75 177.222C599.75 176.335 600.357 175.74 601.266 175.74C602.154 175.74 602.698 176.323 602.698 177.115V177.132C602.698 177.789 602.39 178.205 601.317 179.322L598.627 182.146V183ZM608.373 183.197C610.237 183.197 611.366 181.562 611.366 178.951V178.94C611.366 176.329 610.237 174.701 608.373 174.701C606.503 174.701 605.38 176.329 605.38 178.94V178.951C605.38 181.562 606.503 183.197 608.373 183.197ZM608.373 182.152C607.283 182.152 606.649 180.934 606.649 178.951V178.94C606.649 176.958 607.283 175.751 608.373 175.751C609.457 175.751 610.097 176.958 610.097 178.94V178.951C610.097 180.934 609.457 182.152 608.373 182.152ZM612.761 183H618.219V181.927H614.474V181.815L616.192 180.103C617.663 178.643 618.09 177.935 618.09 177.014V176.997C618.09 175.661 616.978 174.701 615.468 174.701C613.84 174.701 612.694 175.745 612.688 177.228L612.7 177.239H613.879L613.884 177.222C613.884 176.335 614.491 175.74 615.401 175.74C616.288 175.74 616.832 176.323 616.832 177.115V177.132C616.832 177.789 616.524 178.205 615.451 179.322L612.761 182.146V183ZM619.649 183H625.107V181.927H621.361V181.815L623.08 180.103C624.551 178.643 624.978 177.935 624.978 177.014V176.997C624.978 175.661 623.866 174.701 622.355 174.701C620.727 174.701 619.581 175.745 619.576 177.228L619.587 177.239H620.766L620.772 177.222C620.772 176.335 621.378 175.74 622.288 175.74C623.175 175.74 623.72 176.323 623.72 177.115V177.132C623.72 177.789 623.411 178.205 622.338 179.322L619.649 182.146V183ZM638.034 178.94C638.034 178.794 637.966 178.648 637.854 178.542L634.979 175.667C634.855 175.554 634.726 175.498 634.591 175.498C634.288 175.498 634.064 175.717 634.064 176.015C634.064 176.166 634.125 176.295 634.221 176.396L635.046 177.233L636.411 178.474L635.372 178.407H630.251C629.925 178.407 629.706 178.626 629.706 178.94C629.706 179.255 629.925 179.479 630.251 179.479H635.372L636.416 179.406L635.046 180.653L634.221 181.484C634.125 181.585 634.064 181.714 634.064 181.866C634.064 182.163 634.288 182.382 634.591 182.382C634.726 182.382 634.855 182.326 634.973 182.214L637.854 179.339C637.966 179.232 638.034 179.086 638.034 178.94ZM646.333 183.197C648.675 183.197 650.112 181.546 650.112 178.951V178.94C650.112 176.34 648.664 174.701 646.333 174.701C644.009 174.701 642.549 176.335 642.549 178.94V178.951C642.549 181.551 643.975 183.197 646.333 183.197ZM646.333 182.085C644.772 182.085 643.835 180.849 643.835 178.951V178.94C643.835 177.025 644.8 175.812 646.333 175.812C647.866 175.812 648.827 177.025 648.827 178.94V178.951C648.827 180.849 647.872 182.085 646.333 182.085ZM654.024 183.118C655.534 183.118 656.405 182.304 656.624 181.119L656.635 181.068H655.467L655.456 181.096C655.259 181.753 654.787 182.102 654.024 182.102C653.019 182.102 652.395 181.282 652.395 179.934V179.923C652.395 178.609 653.007 177.8 654.024 177.8C654.832 177.8 655.326 178.25 655.461 178.85L655.467 178.867L656.635 178.862V178.833C656.466 177.649 655.551 176.784 654.018 176.784C652.238 176.784 651.154 177.991 651.154 179.923V179.934C651.154 181.905 652.244 183.118 654.024 183.118ZM660.187 183.039C660.423 183.039 660.647 183.011 660.844 182.978V182.006C660.675 182.023 660.569 182.029 660.383 182.029C659.782 182.029 659.535 181.759 659.535 181.102V177.862H660.844V176.902H659.535V175.363H658.294V176.902H657.34V177.862H658.294V181.394C658.294 182.568 658.845 183.039 660.187 183.039ZM664.966 183H670.424V181.927H666.678V181.815L668.397 180.103C669.868 178.643 670.295 177.935 670.295 177.014V176.997C670.295 175.661 669.183 174.701 667.672 174.701C666.044 174.701 664.898 175.745 664.893 177.228L664.904 177.239H666.083L666.089 177.222C666.089 176.335 666.695 175.74 667.605 175.74C668.492 175.74 669.037 176.323 669.037 177.115V177.132C669.037 177.789 668.728 178.205 667.655 179.322L664.966 182.146V183ZM671.853 183H677.311V181.927H673.566V181.815L675.284 180.103C676.755 178.643 677.182 177.935 677.182 177.014V176.997C677.182 175.661 676.07 174.701 674.56 174.701C672.931 174.701 671.786 175.745 671.78 177.228L671.791 177.239H672.971L672.976 177.222C672.976 176.335 673.583 175.74 674.492 175.74C675.379 175.74 675.924 176.323 675.924 177.115V177.132C675.924 177.789 675.615 178.205 674.543 179.322L671.853 182.146V183ZM681.663 183H687.121V181.927H683.376V181.815L685.094 180.103C686.566 178.643 686.992 177.935 686.992 177.014V176.997C686.992 175.661 685.881 174.701 684.37 174.701C682.742 174.701 681.596 175.745 681.59 177.228L681.602 177.239H682.781L682.787 177.222C682.787 176.335 683.393 175.74 684.303 175.74C685.19 175.74 685.735 176.323 685.735 177.115V177.132C685.735 177.789 685.426 178.205 684.353 179.322L681.663 182.146V183ZM691.409 183.197C693.273 183.197 694.402 181.562 694.402 178.951V178.94C694.402 176.329 693.273 174.701 691.409 174.701C689.539 174.701 688.416 176.329 688.416 178.94V178.951C688.416 181.562 689.539 183.197 691.409 183.197ZM691.409 182.152C690.32 182.152 689.685 180.934 689.685 178.951V178.94C689.685 176.958 690.32 175.751 691.409 175.751C692.493 175.751 693.133 176.958 693.133 178.94V178.951C693.133 180.934 692.493 182.152 691.409 182.152ZM695.798 183H701.256V181.927H697.51V181.815L699.228 180.103C700.7 178.643 701.126 177.935 701.126 177.014V176.997C701.126 175.661 700.015 174.701 698.504 174.701C696.876 174.701 695.73 175.745 695.725 177.228L695.736 177.239H696.915L696.921 177.222C696.921 176.335 697.527 175.74 698.437 175.74C699.324 175.74 699.869 176.323 699.869 177.115V177.132C699.869 177.789 699.56 178.205 698.487 179.322L695.798 182.146V183ZM702.685 183H708.143V181.927H704.398V181.815L706.116 180.103C707.587 178.643 708.014 177.935 708.014 177.014V176.997C708.014 175.661 706.902 174.701 705.391 174.701C703.763 174.701 702.618 175.745 702.612 177.228L702.623 177.239H703.802L703.808 177.222C703.808 176.335 704.414 175.74 705.324 175.74C706.211 175.74 706.756 176.323 706.756 177.115V177.132C706.756 177.789 706.447 178.205 705.375 179.322L702.685 182.146V183Z" fill="#4B4848"/> +<rect x="555" y="162" width="160" height="34" stroke="#D7D7D7" stroke-width="0.83"/> +<path d="M234.886 183H236.104V179.356C236.104 178.474 236.739 177.901 237.671 177.901C237.901 177.901 238.109 177.929 238.328 177.974V176.851C238.204 176.823 237.991 176.795 237.794 176.795C236.98 176.795 236.413 177.177 236.194 177.823H236.104V176.902H234.886V183ZM241.694 183.118C243.48 183.118 244.575 181.922 244.575 179.957V179.945C244.575 177.98 243.475 176.784 241.694 176.784C239.909 176.784 238.808 177.986 238.808 179.945V179.957C238.808 181.922 239.903 183.118 241.694 183.118ZM241.694 182.102C240.644 182.102 240.055 181.31 240.055 179.957V179.945C240.055 178.592 240.644 177.8 241.694 177.8C242.739 177.8 243.334 178.592 243.334 179.945V179.957C243.334 181.304 242.739 182.102 241.694 182.102ZM245.808 183H247.026V179.255C247.026 178.457 247.571 177.828 248.307 177.828C249.025 177.828 249.48 178.266 249.48 178.963V183H250.693V179.142C250.693 178.407 251.204 177.828 251.979 177.828C252.776 177.828 253.158 178.244 253.158 179.086V183H254.371V178.794C254.371 177.525 253.652 176.784 252.423 176.784C251.575 176.784 250.873 177.216 250.564 177.873H250.469C250.199 177.216 249.609 176.784 248.778 176.784C247.981 176.784 247.386 177.171 247.116 177.84H247.026V176.902H245.808V183ZM256.486 175.812C256.901 175.812 257.249 175.47 257.249 175.054C257.249 174.633 256.901 174.291 256.486 174.291C256.064 174.291 255.722 174.633 255.722 175.054C255.722 175.47 256.064 175.812 256.486 175.812ZM255.873 183H257.086V176.902H255.873V183ZM258.639 183H259.858V179.423C259.858 178.44 260.414 177.828 261.306 177.828C262.199 177.828 262.62 178.328 262.62 179.339V183H263.833V179.052C263.833 177.598 263.081 176.784 261.716 176.784C260.829 176.784 260.245 177.177 259.948 177.828H259.858V176.902H258.639V183ZM266.987 183.101C267.795 183.101 268.435 182.753 268.795 182.135H268.89V183H270.097V178.828C270.097 177.548 269.233 176.784 267.7 176.784C266.313 176.784 265.353 177.452 265.207 178.452L265.201 178.491H266.374L266.38 178.469C266.526 178.036 266.97 177.789 267.644 177.789C268.469 177.789 268.89 178.16 268.89 178.828V179.367L267.239 179.462C265.785 179.552 264.965 180.187 264.965 181.276V181.287C264.965 182.394 265.824 183.101 266.987 183.101ZM266.178 181.237V181.226C266.178 180.675 266.56 180.372 267.402 180.322L268.89 180.226V180.748C268.89 181.534 268.222 182.13 267.312 182.13C266.655 182.13 266.178 181.798 266.178 181.237ZM276.26 184.28C276.929 184.28 277.569 184.19 278.052 184.033V183.253C277.715 183.404 277.007 183.5 276.3 183.5C273.902 183.5 272.363 181.989 272.363 179.636V179.625C272.363 177.323 273.919 175.689 276.103 175.689C278.31 175.689 279.804 177.053 279.804 179.081V179.092C279.804 180.383 279.382 181.22 278.72 181.22C278.338 181.22 278.125 180.99 278.125 180.597V177.407H277.17V178.087H277.075C276.856 177.593 276.356 177.295 275.766 177.295C274.621 177.295 273.835 178.238 273.835 179.597V179.608C273.835 181.029 274.615 181.984 275.783 181.984C276.44 181.984 276.929 181.675 277.164 181.102H277.26L277.265 181.136C277.372 181.675 277.872 182.023 278.535 182.023C279.849 182.023 280.68 180.877 280.68 179.064V179.052C280.68 176.61 278.832 174.914 276.165 174.914C273.391 174.914 271.487 176.818 271.487 179.592V179.603C271.487 182.45 273.352 184.28 276.26 184.28ZM275.963 181.108C275.283 181.108 274.868 180.546 274.868 179.636V179.625C274.868 178.704 275.278 178.154 275.974 178.154C276.676 178.154 277.125 178.727 277.125 179.625V179.636C277.125 180.535 276.676 181.108 275.963 181.108ZM284.535 183.118C286.096 183.118 286.938 182.219 287.14 181.417L287.151 181.366L285.978 181.372L285.955 181.417C285.809 181.731 285.343 182.118 284.563 182.118C283.558 182.118 282.917 181.439 282.895 180.271H287.219V179.844C287.219 178.014 286.174 176.784 284.473 176.784C282.771 176.784 281.671 178.059 281.671 179.962V179.968C281.671 181.899 282.749 183.118 284.535 183.118ZM284.479 177.783C285.304 177.783 285.916 178.311 286.011 179.401H282.912C283.019 178.351 283.647 177.783 284.479 177.783ZM287.738 183H289.064L290.4 180.799H290.49L291.826 183H293.213L291.175 179.912L293.191 176.902H291.843L290.54 179.081H290.445L289.131 176.902H287.722L289.766 179.962L287.738 183ZM295.895 183.101C296.703 183.101 297.344 182.753 297.703 182.135H297.798V183H299.006V178.828C299.006 177.548 298.141 176.784 296.608 176.784C295.221 176.784 294.261 177.452 294.115 178.452L294.109 178.491H295.283L295.288 178.469C295.434 178.036 295.878 177.789 296.552 177.789C297.377 177.789 297.798 178.16 297.798 178.828V179.367L296.148 179.462C294.693 179.552 293.873 180.187 293.873 181.276V181.287C293.873 182.394 294.732 183.101 295.895 183.101ZM295.086 181.237V181.226C295.086 180.675 295.468 180.372 296.31 180.322L297.798 180.226V180.748C297.798 181.534 297.13 182.13 296.221 182.13C295.564 182.13 295.086 181.798 295.086 181.237ZM300.502 183H301.721V179.255C301.721 178.457 302.266 177.828 303.001 177.828C303.72 177.828 304.175 178.266 304.175 178.963V183H305.388V179.142C305.388 178.407 305.899 177.828 306.674 177.828C307.471 177.828 307.853 178.244 307.853 179.086V183H309.066V178.794C309.066 177.525 308.347 176.784 307.117 176.784C306.269 176.784 305.567 177.216 305.258 177.873H305.163C304.894 177.216 304.304 176.784 303.473 176.784C302.675 176.784 302.08 177.171 301.811 177.84H301.721V176.902H300.502V183ZM310.546 185.033H311.764V182.034H311.854C312.18 182.691 312.893 183.101 313.729 183.101C315.279 183.101 316.256 181.888 316.256 179.957V179.945C316.256 178.025 315.268 176.795 313.729 176.795C312.876 176.795 312.208 177.194 311.854 177.862H311.764V176.902H310.546V185.033ZM313.387 182.062C312.37 182.062 311.742 181.259 311.742 179.957V179.945C311.742 178.643 312.37 177.84 313.387 177.84C314.403 177.84 315.015 178.631 315.015 179.945V179.957C315.015 181.265 314.403 182.062 313.387 182.062ZM317.556 183H318.775V174.51H317.556V183ZM322.928 183.118C324.489 183.118 325.331 182.219 325.533 181.417L325.544 181.366L324.371 181.372L324.348 181.417C324.202 181.731 323.736 182.118 322.956 182.118C321.951 182.118 321.31 181.439 321.288 180.271H325.612V179.844C325.612 178.014 324.567 176.784 322.866 176.784C321.164 176.784 320.064 178.059 320.064 179.962V179.968C320.064 181.899 321.142 183.118 322.928 183.118ZM322.871 177.783C323.697 177.783 324.309 178.311 324.404 179.401H321.305C321.412 178.351 322.04 177.783 322.871 177.783ZM327.777 183.084C328.243 183.084 328.596 182.725 328.596 182.27C328.596 181.81 328.243 181.45 327.777 181.45C327.311 181.45 326.951 181.81 326.951 182.27C326.951 182.725 327.311 183.084 327.777 183.084ZM332.586 183.118C334.097 183.118 334.967 182.304 335.186 181.119L335.197 181.068H334.029L334.018 181.096C333.822 181.753 333.35 182.102 332.586 182.102C331.581 182.102 330.958 181.282 330.958 179.934V179.923C330.958 178.609 331.57 177.8 332.586 177.8C333.395 177.8 333.889 178.25 334.024 178.85L334.029 178.867L335.197 178.862V178.833C335.029 177.649 334.114 176.784 332.581 176.784C330.801 176.784 329.717 177.991 329.717 179.923V179.934C329.717 181.905 330.806 183.118 332.586 183.118ZM338.94 183.118C340.726 183.118 341.821 181.922 341.821 179.957V179.945C341.821 177.98 340.72 176.784 338.94 176.784C337.155 176.784 336.054 177.986 336.054 179.945V179.957C336.054 181.922 337.149 183.118 338.94 183.118ZM338.94 182.102C337.89 182.102 337.301 181.31 337.301 179.957V179.945C337.301 178.592 337.89 177.8 338.94 177.8C339.985 177.8 340.58 178.592 340.58 179.945V179.957C340.58 181.304 339.985 182.102 338.94 182.102ZM343.054 183H344.272V179.255C344.272 178.457 344.817 177.828 345.552 177.828C346.271 177.828 346.726 178.266 346.726 178.963V183H347.939V179.142C347.939 178.407 348.45 177.828 349.225 177.828C350.022 177.828 350.404 178.244 350.404 179.086V183H351.617V178.794C351.617 177.525 350.898 176.784 349.668 176.784C348.821 176.784 348.119 177.216 347.81 177.873H347.714C347.445 177.216 346.855 176.784 346.024 176.784C345.227 176.784 344.632 177.171 344.362 177.84H344.272V176.902H343.054V183Z" fill="#4B4848"/> <g opacity="0.5"> -<rect x="557.059" y="154.062" width="151.913" height="33.7906" fill="white"/> -<path d="M694.06 171.254L696.778 168.536L697.554 169.313L694.06 172.807L690.565 169.313L691.342 168.536L694.06 171.254Z" fill="#575757"/> -<rect x="557.059" y="154.062" width="151.913" height="33.7906" stroke="#B3B3B3" stroke-width="0.83"/> +<rect x="390" y="162" width="156" height="34" fill="white"/> +<path d="M532.589 179.193L535.307 176.475L536.083 177.251L532.589 180.745L529.094 177.251L529.871 176.475L532.589 179.193Z" fill="#575757"/> +<rect x="390" y="162" width="156" height="34" stroke="#B3B3B3" stroke-width="0.83"/> </g> -<path d="M81.0781 175H86.3164V174.051H82.1328V171.145H86.0996V170.207H82.1328V167.494H86.3164V166.545H81.0781V175Z" fill="#4B4848"/> -<path d="M89.8848 175H90.916L93.2539 168.684H92.1758L90.4473 173.887H90.3535L88.625 168.684H87.5469L89.8848 175Z" fill="#4B4848"/> -<path d="M96.9453 175.111C98.4336 175.111 99.3359 174.268 99.5527 173.412L99.5645 173.365H98.5449L98.5215 173.418C98.3516 173.799 97.8242 174.203 96.9688 174.203C95.8438 174.203 95.123 173.441 95.0938 172.135H99.6406V171.736C99.6406 169.85 98.5977 168.572 96.8809 168.572C95.1641 168.572 94.0508 169.908 94.0508 171.859V171.865C94.0508 173.846 95.1406 175.111 96.9453 175.111ZM96.875 169.48C97.8066 169.48 98.498 170.072 98.6035 171.32H95.1113C95.2227 170.119 95.9375 169.48 96.875 169.48Z" fill="#4B4848"/> -<path d="M101.223 175H102.242V171.262C102.242 170.154 102.881 169.475 103.889 169.475C104.896 169.475 105.365 170.02 105.365 171.156V175H106.385V170.91C106.385 169.41 105.594 168.572 104.176 168.572C103.244 168.572 102.652 168.965 102.336 169.633H102.242V168.684H101.223V175Z" fill="#4B4848"/> -<path d="M110.475 175.047C110.674 175.047 110.867 175.023 111.066 174.988V174.121C110.879 174.139 110.779 174.145 110.598 174.145C109.941 174.145 109.684 173.846 109.684 173.102V169.527H111.066V168.684H109.684V167.049H108.629V168.684H107.633V169.527H108.629V173.359C108.629 174.566 109.174 175.047 110.475 175.047Z" fill="#4B4848"/> -<path d="M118.209 175.047C118.408 175.047 118.602 175.023 118.801 174.988V174.121C118.613 174.139 118.514 174.145 118.332 174.145C117.676 174.145 117.418 173.846 117.418 173.102V169.527H118.801V168.684H117.418V167.049H116.363V168.684H115.367V169.527H116.363V173.359C116.363 174.566 116.908 175.047 118.209 175.047Z" fill="#4B4848"/> -<path d="M120.863 177.215C121.982 177.215 122.504 176.805 123.025 175.387L125.492 168.684H124.42L122.691 173.881H122.598L120.863 168.684H119.773L122.111 175.006L121.994 175.381C121.766 176.107 121.414 176.371 120.834 176.371C120.693 176.371 120.535 176.365 120.412 176.342V177.18C120.553 177.203 120.729 177.215 120.863 177.215Z" fill="#4B4848"/> -<path d="M126.84 177.109H127.859V174.004H127.953C128.299 174.678 129.055 175.111 129.922 175.111C131.527 175.111 132.57 173.828 132.57 171.848V171.836C132.57 169.867 131.521 168.572 129.922 168.572C129.043 168.572 128.34 168.988 127.953 169.691H127.859V168.684H126.84V177.109ZM129.688 174.209C128.539 174.209 127.836 173.307 127.836 171.848V171.836C127.836 170.377 128.539 169.475 129.688 169.475C130.842 169.475 131.527 170.365 131.527 171.836V171.848C131.527 173.318 130.842 174.209 129.688 174.209Z" fill="#4B4848"/> -<path d="M136.742 175.111C138.23 175.111 139.133 174.268 139.35 173.412L139.361 173.365H138.342L138.318 173.418C138.148 173.799 137.621 174.203 136.766 174.203C135.641 174.203 134.92 173.441 134.891 172.135H139.438V171.736C139.438 169.85 138.395 168.572 136.678 168.572C134.961 168.572 133.848 169.908 133.848 171.859V171.865C133.848 173.846 134.938 175.111 136.742 175.111ZM136.672 169.48C137.604 169.48 138.295 170.072 138.4 171.32H134.908C135.02 170.119 135.734 169.48 136.672 169.48Z" fill="#4B4848"/> -<path d="M247.439 175.199C249.537 175.199 250.791 173.934 250.791 172.094V166.545H249.736V172.023C249.736 173.324 248.904 174.227 247.439 174.227C245.975 174.227 245.131 173.324 245.131 172.023V166.545H244.076V172.094C244.076 173.934 245.342 175.199 247.439 175.199Z" fill="#4B4848"/> -<path d="M254.975 175.111C256.41 175.111 257.506 174.332 257.506 173.207V173.195C257.506 172.293 256.932 171.777 255.742 171.49L254.77 171.256C254.025 171.074 253.709 170.805 253.709 170.377V170.365C253.709 169.809 254.26 169.422 255.01 169.422C255.771 169.422 256.264 169.768 256.398 170.266H257.4C257.26 169.234 256.34 168.572 255.016 168.572C253.674 168.572 252.666 169.363 252.666 170.412V170.418C252.666 171.326 253.199 171.842 254.383 172.123L255.361 172.357C256.141 172.545 256.463 172.844 256.463 173.271V173.283C256.463 173.857 255.859 174.262 255.01 174.262C254.201 174.262 253.697 173.916 253.527 173.389H252.484C252.602 174.432 253.568 175.111 254.975 175.111Z" fill="#4B4848"/> -<path d="M261.666 175.111C263.154 175.111 264.057 174.268 264.273 173.412L264.285 173.365H263.266L263.242 173.418C263.072 173.799 262.545 174.203 261.689 174.203C260.564 174.203 259.844 173.441 259.814 172.135H264.361V171.736C264.361 169.85 263.318 168.572 261.602 168.572C259.885 168.572 258.771 169.908 258.771 171.859V171.865C258.771 173.846 259.861 175.111 261.666 175.111ZM261.596 169.48C262.527 169.48 263.219 170.072 263.324 171.32H259.832C259.943 170.119 260.658 169.48 261.596 169.48Z" fill="#4B4848"/> -<path d="M265.943 175H266.963V171.086C266.963 170.16 267.654 169.545 268.627 169.545C268.85 169.545 269.043 169.568 269.254 169.604V168.613C269.154 168.596 268.938 168.572 268.744 168.572C267.889 168.572 267.297 168.959 267.057 169.621H266.963V168.684H265.943V175Z" fill="#4B4848"/> -<path d="M407.098 175H408.153V171.654H410.233L412.043 175H413.28L411.323 171.49C412.383 171.156 413.022 170.242 413.022 169.07V169.059C413.022 167.541 411.956 166.545 410.327 166.545H407.098V175ZM408.153 170.717V167.482H410.186C411.276 167.482 411.932 168.086 411.932 169.094V169.105C411.932 170.137 411.317 170.717 410.233 170.717H408.153Z" fill="#4B4848"/> -<path d="M417.211 175.111C418.7 175.111 419.602 174.268 419.819 173.412L419.831 173.365H418.811L418.788 173.418C418.618 173.799 418.09 174.203 417.235 174.203C416.11 174.203 415.389 173.441 415.36 172.135H419.907V171.736C419.907 169.85 418.864 168.572 417.147 168.572C415.43 168.572 414.317 169.908 414.317 171.859V171.865C414.317 173.846 415.407 175.111 417.211 175.111ZM417.141 169.48C418.073 169.48 418.764 170.072 418.87 171.32H415.377C415.489 170.119 416.204 169.48 417.141 169.48Z" fill="#4B4848"/> -<path d="M423.657 175.111C425.092 175.111 426.188 174.332 426.188 173.207V173.195C426.188 172.293 425.614 171.777 424.424 171.49L423.452 171.256C422.708 171.074 422.391 170.805 422.391 170.377V170.365C422.391 169.809 422.942 169.422 423.692 169.422C424.454 169.422 424.946 169.768 425.081 170.266H426.083C425.942 169.234 425.022 168.572 423.698 168.572C422.356 168.572 421.348 169.363 421.348 170.412V170.418C421.348 171.326 421.881 171.842 423.065 172.123L424.043 172.357C424.823 172.545 425.145 172.844 425.145 173.271V173.283C425.145 173.857 424.542 174.262 423.692 174.262C422.883 174.262 422.379 173.916 422.209 173.389H421.167C421.284 174.432 422.25 175.111 423.657 175.111Z" fill="#4B4848"/> -<path d="M430.366 175.111C432.165 175.111 433.278 173.869 433.278 171.848V171.836C433.278 169.809 432.165 168.572 430.366 168.572C428.567 168.572 427.454 169.809 427.454 171.836V171.848C427.454 173.869 428.567 175.111 430.366 175.111ZM430.366 174.209C429.17 174.209 428.497 173.336 428.497 171.848V171.836C428.497 170.342 429.17 169.475 430.366 169.475C431.561 169.475 432.235 170.342 432.235 171.836V171.848C432.235 173.336 431.561 174.209 430.366 174.209Z" fill="#4B4848"/> -<path d="M436.975 175.111C437.901 175.111 438.54 174.73 438.85 174.057H438.944V175H439.963V168.684H438.944V172.422C438.944 173.529 438.352 174.209 437.239 174.209C436.231 174.209 435.821 173.664 435.821 172.527V168.684H434.801V172.773C434.801 174.268 435.54 175.111 436.975 175.111Z" fill="#4B4848"/> -<path d="M441.868 175H442.887V171.086C442.887 170.16 443.579 169.545 444.551 169.545C444.774 169.545 444.967 169.568 445.178 169.604V168.613C445.079 168.596 444.862 168.572 444.668 168.572C443.813 168.572 443.221 168.959 442.981 169.621H442.887V168.684H441.868V175Z" fill="#4B4848"/> -<path d="M448.846 175.111C450.364 175.111 451.213 174.297 451.471 173.154L451.483 173.09L450.475 173.096L450.463 173.131C450.229 173.834 449.69 174.209 448.84 174.209C447.715 174.209 446.989 173.277 446.989 171.824V171.812C446.989 170.389 447.704 169.475 448.84 169.475C449.749 169.475 450.311 169.979 450.469 170.6L450.475 170.617H451.489L451.483 170.582C451.295 169.457 450.375 168.572 448.84 168.572C447.071 168.572 445.946 169.85 445.946 171.812V171.824C445.946 173.828 447.077 175.111 448.846 175.111Z" fill="#4B4848"/> -<path d="M455.555 175.111C457.043 175.111 457.946 174.268 458.163 173.412L458.174 173.365H457.155L457.131 173.418C456.961 173.799 456.434 174.203 455.579 174.203C454.454 174.203 453.733 173.441 453.704 172.135H458.25V171.736C458.25 169.85 457.208 168.572 455.491 168.572C453.774 168.572 452.661 169.908 452.661 171.859V171.865C452.661 173.846 453.75 175.111 455.555 175.111ZM455.485 169.48C456.417 169.48 457.108 170.072 457.213 171.32H453.721C453.833 170.119 454.547 169.48 455.485 169.48Z" fill="#4B4848"/> -<path d="M463.336 175H464.391V166.545H463.336V175Z" fill="#4B4848"/> -<path d="M466.547 175H469.448C471.961 175 473.438 173.436 473.438 170.775V170.764C473.438 168.109 471.956 166.545 469.448 166.545H466.547V175ZM467.602 174.051V167.494H469.377C471.252 167.494 472.36 168.713 472.36 170.775V170.787C472.36 172.844 471.264 174.051 469.377 174.051H467.602Z" fill="#4B4848"/> -<path d="M570.108 175H573.008C575.522 175 576.999 173.436 576.999 170.775V170.764C576.999 168.109 575.516 166.545 573.008 166.545H570.108V175ZM571.163 174.051V167.494H572.938C574.813 167.494 575.92 168.713 575.92 170.775V170.787C575.92 172.844 574.825 174.051 572.938 174.051H571.163Z" fill="#4B4848"/> -<path d="M580.432 175.111C581.282 175.111 581.944 174.742 582.342 174.068H582.436V175H583.456V170.676C583.456 169.363 582.594 168.572 581.053 168.572C579.706 168.572 578.745 169.24 578.581 170.23L578.575 170.266H579.594L579.6 170.248C579.764 169.756 580.262 169.475 581.018 169.475C581.961 169.475 582.436 169.896 582.436 170.676V171.25L580.625 171.361C579.155 171.449 578.323 172.1 578.323 173.225V173.236C578.323 174.385 579.231 175.111 580.432 175.111ZM579.366 173.213V173.201C579.366 172.574 579.788 172.234 580.749 172.176L582.436 172.07V172.645C582.436 173.547 581.68 174.227 580.643 174.227C579.911 174.227 579.366 173.852 579.366 173.213Z" fill="#4B4848"/> -<path d="M587.563 175.047C587.762 175.047 587.956 175.023 588.155 174.988V174.121C587.967 174.139 587.868 174.145 587.686 174.145C587.03 174.145 586.772 173.846 586.772 173.102V169.527H588.155V168.684H586.772V167.049H585.717V168.684H584.721V169.527H585.717V173.359C585.717 174.566 586.262 175.047 587.563 175.047Z" fill="#4B4848"/> -<path d="M592.163 175.111C593.651 175.111 594.553 174.268 594.77 173.412L594.782 173.365H593.762L593.739 173.418C593.569 173.799 593.042 174.203 592.186 174.203C591.061 174.203 590.34 173.441 590.311 172.135H594.858V171.736C594.858 169.85 593.815 168.572 592.098 168.572C590.381 168.572 589.268 169.908 589.268 171.859V171.865C589.268 173.846 590.358 175.111 592.163 175.111ZM592.092 169.48C593.024 169.48 593.715 170.072 593.821 171.32H590.329C590.44 170.119 591.155 169.48 592.092 169.48Z" fill="#4B4848"/> -<path d="M599.944 175H600.999V171.654H603.079L604.889 175H606.125L604.168 171.49C605.229 171.156 605.868 170.242 605.868 169.07V169.059C605.868 167.541 604.801 166.545 603.172 166.545H599.944V175ZM600.999 170.717V167.482H603.032C604.122 167.482 604.778 168.086 604.778 169.094V169.105C604.778 170.137 604.163 170.717 603.079 170.717H600.999Z" fill="#4B4848"/> -<path d="M609.389 175.111C610.239 175.111 610.901 174.742 611.299 174.068H611.393V175H612.413V170.676C612.413 169.363 611.551 168.572 610.01 168.572C608.663 168.572 607.702 169.24 607.538 170.23L607.532 170.266H608.551L608.557 170.248C608.721 169.756 609.219 169.475 609.975 169.475C610.918 169.475 611.393 169.896 611.393 170.676V171.25L609.583 171.361C608.112 171.449 607.28 172.1 607.28 173.225V173.236C607.28 174.385 608.188 175.111 609.389 175.111ZM608.323 173.213V173.201C608.323 172.574 608.745 172.234 609.706 172.176L611.393 172.07V172.645C611.393 173.547 610.637 174.227 609.6 174.227C608.868 174.227 608.323 173.852 608.323 173.213Z" fill="#4B4848"/> -<path d="M614.276 175H615.295V171.262C615.295 170.154 615.934 169.475 616.942 169.475C617.95 169.475 618.418 170.02 618.418 171.156V175H619.438V170.91C619.438 169.41 618.647 168.572 617.229 168.572C616.297 168.572 615.706 168.965 615.389 169.633H615.295V168.684H614.276V175Z" fill="#4B4848"/> -<path d="M623.885 177.227C625.608 177.227 626.698 176.324 626.698 174.912V168.684H625.678V169.727H625.608C625.221 169.012 624.53 168.572 623.639 168.572C621.987 168.572 620.967 169.855 620.967 171.625V171.637C620.967 173.406 621.981 174.672 623.616 174.672C624.483 174.672 625.198 174.279 625.596 173.582H625.69V174.859C625.69 175.791 625.016 176.324 623.885 176.324C622.977 176.324 622.415 175.984 622.303 175.504L622.297 175.498H621.243L621.231 175.504C621.389 176.541 622.362 177.227 623.885 177.227ZM623.838 173.77C622.667 173.77 622.01 172.891 622.01 171.637V171.625C622.01 170.371 622.667 169.475 623.838 169.475C625.004 169.475 625.713 170.371 625.713 171.625V171.637C625.713 172.891 625.01 173.77 623.838 173.77Z" fill="#4B4848"/> -<path d="M631.174 175.111C632.663 175.111 633.565 174.268 633.782 173.412L633.793 173.365H632.774L632.75 173.418C632.581 173.799 632.053 174.203 631.198 174.203C630.073 174.203 629.352 173.441 629.323 172.135H633.87V171.736C633.87 169.85 632.827 168.572 631.11 168.572C629.393 168.572 628.28 169.908 628.28 171.859V171.865C628.28 173.846 629.37 175.111 631.174 175.111ZM631.104 169.48C632.036 169.48 632.727 170.072 632.833 171.32H629.34C629.452 170.119 630.167 169.48 631.104 169.48Z" fill="#4B4848"/> -<path d="M68.9481 140V129.091H76.1711V130.993H71.2546V133.592H75.6917V135.494H71.2546V140H68.9481Z" fill="#393939"/> -<path d="M77.6799 140V131.818H79.9491V140H77.6799ZM78.8198 130.764C78.4825 130.764 78.1931 130.652 77.9516 130.428C77.7137 130.201 77.5947 129.929 77.5947 129.613C77.5947 129.301 77.7137 129.032 77.9516 128.809C78.1931 128.581 78.4825 128.468 78.8198 128.468C79.1572 128.468 79.4448 128.581 79.6828 128.809C79.9242 129.032 80.045 129.301 80.045 129.613C80.045 129.929 79.9242 130.201 79.6828 130.428C79.4448 130.652 79.1572 130.764 78.8198 130.764Z" fill="#393939"/> -<path d="M84.036 129.091V140H81.7668V129.091H84.036Z" fill="#393939"/> -<path d="M90.2057 131.818V133.523H85.2785V131.818H90.2057ZM86.3971 129.858H88.6663V137.486C88.6663 137.695 88.6982 137.859 88.7621 137.976C88.8261 138.09 88.9148 138.169 89.0285 138.216C89.1457 138.262 89.2806 138.285 89.4333 138.285C89.5398 138.285 89.6464 138.276 89.7529 138.258C89.8594 138.237 89.9411 138.221 89.9979 138.21L90.3548 139.899C90.2412 139.934 90.0814 139.975 89.8754 140.021C89.6694 140.071 89.4191 140.101 89.1243 140.112C88.5775 140.133 88.0981 140.06 87.6861 139.894C87.2778 139.727 86.9599 139.467 86.7327 139.116C86.5054 138.764 86.3935 138.32 86.3971 137.784V129.858Z" fill="#393939"/> -<path d="M95.3246 140.16C94.483 140.16 93.7586 139.989 93.1513 139.649C92.5476 139.304 92.0824 138.818 91.7557 138.189C91.429 137.557 91.2657 136.809 91.2657 135.946C91.2657 135.105 91.429 134.366 91.7557 133.731C92.0824 133.095 92.5423 132.6 93.1354 132.244C93.7319 131.889 94.4315 131.712 95.2341 131.712C95.7738 131.712 96.2763 131.799 96.7415 131.973C97.2103 132.143 97.6187 132.401 97.9667 132.745C98.3182 133.09 98.5917 133.523 98.787 134.045C98.9823 134.563 99.08 135.171 99.08 135.867V136.49H92.1712V135.084H96.9439C96.9439 134.757 96.8729 134.467 96.7309 134.215C96.5888 133.963 96.3917 133.766 96.1396 133.624C95.891 133.478 95.6016 133.406 95.2714 133.406C94.9269 133.406 94.6215 133.486 94.3552 133.645C94.0924 133.802 93.8864 134.013 93.7373 134.279C93.5881 134.542 93.5118 134.835 93.5082 135.158V136.495C93.5082 136.9 93.5828 137.25 93.7319 137.544C93.8846 137.839 94.0995 138.066 94.3765 138.226C94.6535 138.386 94.9819 138.466 95.3619 138.466C95.614 138.466 95.8449 138.43 96.0544 138.359C96.2639 138.288 96.4432 138.182 96.5924 138.04C96.7415 137.898 96.8552 137.724 96.9333 137.518L99.032 137.656C98.9255 138.161 98.7071 138.601 98.3768 138.977C98.0501 139.35 97.6275 139.641 97.1091 139.851C96.5942 140.057 95.9993 140.16 95.3246 140.16Z" fill="#393939"/> -<path d="M100.561 140V131.818H102.761V133.246H102.846C102.995 132.738 103.245 132.354 103.597 132.095C103.949 131.832 104.353 131.701 104.811 131.701C104.925 131.701 105.048 131.708 105.179 131.722C105.31 131.737 105.426 131.756 105.525 131.781V133.794C105.419 133.763 105.271 133.734 105.083 133.709C104.895 133.684 104.723 133.672 104.566 133.672C104.233 133.672 103.934 133.745 103.672 133.89C103.412 134.032 103.206 134.231 103.054 134.487C102.905 134.743 102.83 135.037 102.83 135.371V140H100.561Z" fill="#393939"/> -<path d="M113.506 134.151L111.429 134.279C111.393 134.102 111.317 133.942 111.2 133.8C111.082 133.654 110.928 133.539 110.736 133.454C110.548 133.365 110.322 133.32 110.06 133.32C109.708 133.32 109.412 133.395 109.17 133.544C108.929 133.69 108.808 133.885 108.808 134.13C108.808 134.325 108.886 134.491 109.042 134.625C109.198 134.76 109.467 134.869 109.847 134.95L111.327 135.249C112.123 135.412 112.716 135.675 113.106 136.037C113.497 136.399 113.692 136.875 113.692 137.465C113.692 138.001 113.534 138.471 113.218 138.876C112.906 139.281 112.476 139.597 111.929 139.824C111.386 140.048 110.759 140.16 110.049 140.16C108.966 140.16 108.103 139.934 107.46 139.483C106.821 139.029 106.446 138.411 106.336 137.63L108.568 137.513C108.636 137.843 108.799 138.095 109.058 138.269C109.317 138.439 109.649 138.525 110.054 138.525C110.452 138.525 110.772 138.448 111.013 138.296C111.258 138.139 111.382 137.939 111.386 137.694C111.382 137.488 111.295 137.319 111.125 137.188C110.955 137.053 110.692 136.95 110.337 136.879L108.92 136.596C108.121 136.437 107.526 136.16 107.135 135.765C106.748 135.371 106.555 134.869 106.555 134.258C106.555 133.732 106.697 133.28 106.981 132.9C107.268 132.52 107.671 132.227 108.19 132.021C108.712 131.815 109.323 131.712 110.022 131.712C111.056 131.712 111.869 131.93 112.462 132.367C113.059 132.804 113.407 133.399 113.506 134.151Z" fill="#393939"/> +<path d="M402.889 183.197C404.59 183.197 405.82 182.006 405.82 180.378V180.366C405.82 178.817 404.714 177.671 403.17 177.671C402.063 177.671 401.333 178.25 401.036 178.901H400.929C400.929 178.839 400.929 178.777 400.935 178.716C400.997 177.098 401.564 175.768 402.928 175.768C403.692 175.768 404.22 176.161 404.444 176.778L404.467 176.834H405.713L405.702 176.767C405.433 175.543 404.366 174.701 402.934 174.701C400.929 174.701 399.733 176.318 399.733 179.058V179.069C399.733 182.051 401.26 183.197 402.889 183.197ZM401.176 180.378V180.372C401.176 179.395 401.917 178.688 402.889 178.688C403.872 178.688 404.579 179.406 404.579 180.4V180.411C404.579 181.383 403.827 182.141 402.878 182.141C401.923 182.141 401.176 181.366 401.176 180.378ZM407.199 183H412.657V181.927H408.912V181.815L410.63 180.103C412.101 178.643 412.528 177.935 412.528 177.014V176.997C412.528 175.661 411.416 174.701 409.905 174.701C408.277 174.701 407.131 175.745 407.126 177.228L407.137 177.239H408.316L408.322 177.222C408.322 176.335 408.928 175.74 409.838 175.74C410.725 175.74 411.27 176.323 411.27 177.115V177.132C411.27 177.789 410.961 178.205 409.889 179.322L407.199 182.146V183ZM417.326 183.101C418.865 183.101 419.853 181.871 419.853 179.957V179.945C419.853 178.014 418.876 176.795 417.326 176.795C416.49 176.795 415.776 177.211 415.451 177.868H415.361V174.51H414.142V183H415.361V182.04H415.451C415.804 182.708 416.473 183.101 417.326 183.101ZM416.984 182.062C415.967 182.062 415.338 181.259 415.338 179.957V179.945C415.338 178.643 415.967 177.84 416.984 177.84C418 177.84 418.612 178.637 418.612 179.945V179.957C418.612 181.265 418 182.062 416.984 182.062ZM423.652 183.118C425.163 183.118 426.033 182.304 426.252 181.119L426.263 181.068H425.095L425.084 181.096C424.887 181.753 424.416 182.102 423.652 182.102C422.647 182.102 422.024 181.282 422.024 179.934V179.923C422.024 178.609 422.636 177.8 423.652 177.8C424.461 177.8 424.955 178.25 425.09 178.85L425.095 178.867L426.263 178.862V178.833C426.095 177.649 425.179 176.784 423.646 176.784C421.866 176.784 420.783 177.991 420.783 179.923V179.934C420.783 181.905 421.872 183.118 423.652 183.118ZM430.281 183.197C432.145 183.197 433.274 181.562 433.274 178.951V178.94C433.274 176.329 432.145 174.701 430.281 174.701C428.411 174.701 427.288 176.329 427.288 178.94V178.951C427.288 181.562 428.411 183.197 430.281 183.197ZM430.281 182.152C429.192 182.152 428.557 180.934 428.557 178.951V178.94C428.557 176.958 429.192 175.751 430.281 175.751C431.365 175.751 432.005 176.958 432.005 178.94V178.951C432.005 180.934 431.365 182.152 430.281 182.152ZM435.102 183H436.315V177.862H437.657V176.902H436.304V176.318C436.304 175.7 436.568 175.375 437.241 175.375C437.432 175.375 437.595 175.386 437.707 175.403V174.51C437.5 174.476 437.264 174.454 436.989 174.454C435.72 174.454 435.102 175.049 435.102 176.262V176.902H434.097V177.862H435.102V183ZM440.788 183H442.046V174.897H440.788L438.654 176.413V177.649L440.692 176.194H440.788V183ZM446.103 183H447.361V174.897H446.103L443.969 176.413V177.649L446.007 176.194H446.103V183ZM452.243 183.197C453.95 183.197 455.152 182.051 455.152 180.389V180.378C455.152 178.822 454.063 177.688 452.541 177.688C451.794 177.688 451.16 178.002 450.817 178.547H450.722L450.969 175.964H454.692V174.897H449.98L449.576 179.603H450.66C450.755 179.417 450.884 179.26 451.03 179.131C451.35 178.839 451.772 178.693 452.266 178.693C453.243 178.693 453.95 179.401 453.95 180.4V180.411C453.95 181.428 453.254 182.141 452.255 182.141C451.367 182.141 450.722 181.574 450.615 180.861L450.609 180.816H449.43L449.436 180.889C449.548 182.203 450.649 183.197 452.243 183.197ZM460.231 183H461.444V181.388H462.562V180.322H461.444V174.897H459.653C458.535 176.576 457.345 178.491 456.278 180.322V181.388H460.231V183ZM457.485 180.344V180.265C458.316 178.845 459.305 177.267 460.175 175.958H460.248V180.344H457.485ZM466.681 183.197C468.388 183.197 469.589 182.051 469.589 180.389V180.378C469.589 178.822 468.5 177.688 466.978 177.688C466.231 177.688 465.597 178.002 465.254 178.547H465.159L465.406 175.964H469.129V174.897H464.418L464.013 179.603H465.097C465.193 179.417 465.322 179.26 465.468 179.131C465.788 178.839 466.209 178.693 466.703 178.693C467.68 178.693 468.388 179.401 468.388 180.4V180.411C468.388 181.428 467.691 182.141 466.692 182.141C465.805 182.141 465.159 181.574 465.052 180.861L465.047 180.816H463.867L463.873 180.889C463.985 182.203 465.086 183.197 466.681 183.197ZM473.517 183.118C475.028 183.118 475.898 182.304 476.117 181.119L476.129 181.068H474.961L474.949 181.096C474.753 181.753 474.281 182.102 473.517 182.102C472.512 182.102 471.889 181.282 471.889 179.934V179.923C471.889 178.609 472.501 177.8 473.517 177.8C474.326 177.8 474.82 178.25 474.955 178.85L474.961 178.867L476.129 178.862V178.833C475.96 177.649 475.045 176.784 473.512 176.784C471.732 176.784 470.648 177.991 470.648 179.923V179.934C470.648 181.905 471.737 183.118 473.517 183.118ZM481.006 183H482.218V181.388H483.336V180.322H482.218V174.897H480.427C479.31 176.576 478.119 178.491 477.052 180.322V181.388H481.006V183ZM478.26 180.344V180.265C479.091 178.845 480.079 177.267 480.949 175.958H481.022V180.344H478.26ZM484.647 183H490.105V181.927H486.36V181.815L488.078 180.103C489.549 178.643 489.976 177.935 489.976 177.014V176.997C489.976 175.661 488.864 174.701 487.354 174.701C485.725 174.701 484.58 175.745 484.574 177.228L484.586 177.239H485.765L485.77 177.222C485.77 176.335 486.377 175.74 487.287 175.74C488.174 175.74 488.718 176.323 488.718 177.115V177.132C488.718 177.789 488.41 178.205 487.337 179.322L484.647 182.146V183ZM491.535 183H496.993V181.927H493.247V181.815L494.966 180.103C496.437 178.643 496.864 177.935 496.864 177.014V176.997C496.864 175.661 495.752 174.701 494.241 174.701C492.613 174.701 491.467 175.745 491.462 177.228L491.473 177.239H492.652L492.658 177.222C492.658 176.335 493.264 175.74 494.174 175.74C495.061 175.74 495.606 176.323 495.606 177.115V177.132C495.606 177.789 495.297 178.205 494.224 179.322L491.535 182.146V183ZM499.214 183.084C499.68 183.084 500.034 182.725 500.034 182.27C500.034 181.81 499.68 181.45 499.214 181.45C498.748 181.45 498.388 181.81 498.388 182.27C498.388 182.725 498.748 183.084 499.214 183.084ZM502.62 183.084C503.086 183.084 503.44 182.725 503.44 182.27C503.44 181.81 503.086 181.45 502.62 181.45C502.154 181.45 501.794 181.81 501.794 182.27C501.794 182.725 502.154 183.084 502.62 183.084ZM506.026 183.084C506.492 183.084 506.845 182.725 506.845 182.27C506.845 181.81 506.492 181.45 506.026 181.45C505.56 181.45 505.2 181.81 505.2 182.27C505.2 182.725 505.56 183.084 506.026 183.084Z" fill="#4B4848"/> +<path d="M65.9482 148V137.091H73.1712V138.993H68.2546V141.592H72.6918V143.494H68.2546V148H65.9482ZM74.68 148V139.818H76.9491V148H74.68ZM75.8199 138.763C75.4825 138.763 75.1931 138.652 74.9516 138.428C74.7137 138.201 74.5947 137.929 74.5947 137.613C74.5947 137.3 74.7137 137.032 74.9516 136.809C75.1931 136.581 75.4825 136.468 75.8199 136.468C76.1572 136.468 76.4449 136.581 76.6828 136.809C76.9243 137.032 77.045 137.3 77.045 137.613C77.045 137.929 76.9243 138.201 76.6828 138.428C76.4449 138.652 76.1572 138.763 75.8199 138.763ZM81.036 137.091V148H78.7669V137.091H81.036ZM87.2057 139.818V141.523H82.2785V139.818H87.2057ZM83.3971 137.858H85.6663V145.486C85.6663 145.695 85.6982 145.859 85.7622 145.976C85.8261 146.089 85.9149 146.169 86.0285 146.216C86.1457 146.262 86.2806 146.285 86.4333 146.285C86.5399 146.285 86.6464 146.276 86.7529 146.258C86.8595 146.237 86.9411 146.221 86.998 146.21L87.3548 147.899C87.2412 147.934 87.0814 147.975 86.8754 148.021C86.6695 148.071 86.4191 148.101 86.1244 148.112C85.5775 148.133 85.0981 148.06 84.6862 147.893C84.2778 147.727 83.96 147.467 83.7327 147.116C83.5054 146.764 83.3936 146.32 83.3971 145.784V137.858ZM92.3247 148.16C91.483 148.16 90.7586 147.989 90.1514 147.648C89.5477 147.304 89.0825 146.817 88.7558 146.189C88.4291 145.557 88.2657 144.809 88.2657 143.946C88.2657 143.105 88.4291 142.366 88.7558 141.73C89.0825 141.095 89.5423 140.599 90.1354 140.244C90.732 139.889 91.4316 139.712 92.2341 139.712C92.7739 139.712 93.2764 139.799 93.7416 139.973C94.2103 140.143 94.6187 140.401 94.9667 140.745C95.3183 141.089 95.5917 141.523 95.787 142.045C95.9823 142.563 96.08 143.17 96.08 143.866V144.49H89.1713V143.083H93.944C93.944 142.757 93.873 142.467 93.7309 142.215C93.5889 141.963 93.3918 141.766 93.1396 141.624C92.8911 141.478 92.6017 141.406 92.2714 141.406C91.9269 141.406 91.6215 141.485 91.3552 141.645C91.0924 141.801 90.8865 142.013 90.7373 142.279C90.5882 142.542 90.5118 142.835 90.5083 143.158V144.495C90.5083 144.9 90.5828 145.25 90.732 145.544C90.8847 145.839 91.0995 146.066 91.3765 146.226C91.6535 146.386 91.982 146.466 92.3619 146.466C92.6141 146.466 92.8449 146.43 93.0544 146.359C93.2639 146.288 93.4433 146.182 93.5924 146.04C93.7416 145.898 93.8552 145.724 93.9333 145.518L96.032 145.656C95.9255 146.161 95.7071 146.601 95.3769 146.977C95.0502 147.35 94.6276 147.641 94.1091 147.851C93.5942 148.057 92.9994 148.16 92.3247 148.16ZM97.5608 148V139.818H99.7607V141.246H99.846C99.9951 140.738 100.245 140.354 100.597 140.095C100.949 139.832 101.353 139.701 101.812 139.701C101.925 139.701 102.048 139.708 102.179 139.722C102.31 139.737 102.426 139.756 102.525 139.781V141.794C102.419 141.762 102.271 141.734 102.083 141.709C101.895 141.684 101.723 141.672 101.566 141.672C101.233 141.672 100.934 141.745 100.672 141.89C100.412 142.032 100.206 142.231 100.054 142.487C99.9046 142.743 99.83 143.037 99.83 143.371V148H97.5608ZM110.506 142.151L108.429 142.279C108.393 142.102 108.317 141.942 108.2 141.8C108.082 141.654 107.928 141.539 107.736 141.453C107.548 141.365 107.322 141.32 107.06 141.32C106.708 141.32 106.412 141.395 106.17 141.544C105.929 141.69 105.808 141.885 105.808 142.13C105.808 142.325 105.886 142.49 106.042 142.625C106.199 142.76 106.467 142.869 106.847 142.95L108.327 143.249C109.123 143.412 109.716 143.675 110.107 144.037C110.497 144.399 110.692 144.875 110.692 145.464C110.692 146.001 110.534 146.471 110.218 146.876C109.906 147.281 109.476 147.597 108.929 147.824C108.386 148.048 107.759 148.16 107.049 148.16C105.966 148.16 105.103 147.934 104.46 147.483C103.821 147.029 103.446 146.411 103.336 145.63L105.568 145.512C105.636 145.843 105.799 146.095 106.058 146.269C106.317 146.439 106.65 146.525 107.054 146.525C107.452 146.525 107.772 146.448 108.013 146.295C108.258 146.139 108.382 145.939 108.386 145.694C108.382 145.488 108.295 145.319 108.125 145.188C107.955 145.053 107.692 144.95 107.337 144.879L105.92 144.596C105.121 144.436 104.526 144.159 104.135 143.765C103.748 143.371 103.555 142.869 103.555 142.258C103.555 141.732 103.697 141.279 103.981 140.9C104.268 140.52 104.672 140.227 105.19 140.021C105.712 139.815 106.323 139.712 107.022 139.712C108.056 139.712 108.869 139.93 109.462 140.367C110.059 140.804 110.407 141.398 110.506 142.151Z" fill="#393939"/> </g> </g> <defs> -<filter id="filter0_d_625_11712" x="71" y="23" width="679" height="511" 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 dy="10"/> -<feGaussianBlur stdDeviation="10"/> -<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.11 0"/> -<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_625_11712"/> -<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_625_11712" result="shape"/> -</filter> -<filter id="filter1_d_625_11712" x="71" y="23" width="679" height="511" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"> +<filter id="filter0_d_625_11712" x="68" y="31" width="679" height="511" 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 dy="10"/> @@ -153,7 +96,7 @@ <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_625_11712"/> <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_625_11712" result="shape"/> </filter> -<filter id="filter2_d_625_11712" x="-5" y="73" width="787" height="203" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"> +<filter id="filter1_d_625_11712" x="-8" y="81" width="787" height="203" 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 dy="14"/> diff --git a/app/client/src/assets/svg/upgrade/audit-logs/incident-management.svg b/app/client/src/assets/svg/upgrade/audit-logs/incident-management.svg index 404eb9dd750d..074acf6dc9cd 100644 --- a/app/client/src/assets/svg/upgrade/audit-logs/incident-management.svg +++ b/app/client/src/assets/svg/upgrade/audit-logs/incident-management.svg @@ -1,344 +1,118 @@ <svg width="725" height="537" viewBox="0 0 725 537" fill="none" xmlns="http://www.w3.org/2000/svg"> <g clip-path="url(#clip0_625_11871)"> <g filter="url(#filter0_d_625_11871)"> -<path d="M88 33H727V504H88V33Z" fill="white"/> +<rect x="87" y="45" width="639" height="471" fill="white"/> +<rect x="87.5" y="45.5" width="638" height="470" stroke="#E7E7E7"/> </g> -<g filter="url(#filter1_d_625_11871)"> -<path fill-rule="evenodd" clip-rule="evenodd" d="M726 34H89V503H726V34ZM88 33V504H727V33H88Z" fill="#E7E7E7"/> -</g> -<path d="M148 137C148 141.971 143.971 146 139 146C134.029 146 130 141.971 130 137C130 132.029 134.029 128 139 128C143.971 128 148 132.029 148 137Z" fill="#FFDEDE"/> +<circle cx="143" cy="149" r="9" fill="#FFDEDE"/> <g opacity="0.7"> -<path d="M178 133H329.334V141.294H178V133Z" fill="#D9D9D9"/> -<path d="M351.83 133H568.606V141.294H351.83V133Z" fill="#D9D9D9"/> -<path d="M647 133H591.102V141.294H647V133Z" fill="#D9D9D9"/> +<rect x="182" y="145" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="355.83" y="145" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 651 145)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M178 205H329.334V213.294H178V205Z" fill="#D9D9D9"/> -<path d="M351.83 205H568.606V213.294H351.83V205Z" fill="#D9D9D9"/> -<path d="M647 205H591.102V213.294H647V205Z" fill="#D9D9D9"/> +<rect x="182" y="217" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="355.83" y="217" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 651 217)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M178 242H329.334V250.294H178V242Z" fill="#D9D9D9"/> -<path d="M351.83 242H568.606V250.294H351.83V242Z" fill="#D9D9D9"/> -<path d="M647 242H591.102V250.294H647V242Z" fill="#D9D9D9"/> -</g> -<path d="M147 244C147 248.971 142.971 253 138 253C133.029 253 129 248.971 129 244C129 239.029 133.029 235 138 235C142.971 235 147 239.029 147 244Z" fill="#FFDEDE"/> -<path d="M147 285C147 289.971 142.971 294 138 294C133.029 294 129 289.971 129 285C129 280.029 133.029 276 138 276C142.971 276 147 280.029 147 285Z" fill="#FFDEDE"/> -<path d="M147 322C147 326.971 142.971 331 138 331C133.029 331 129 326.971 129 322C129 317.029 133.029 313 138 313C142.971 313 147 317.029 147 322Z" fill="#FFDEDE"/> -<path d="M147 359C147 363.971 142.971 368 138 368C133.029 368 129 363.971 129 359C129 354.029 133.029 350 138 350C142.971 350 147 354.029 147 359Z" fill="#FFDEDE"/> -<path d="M147 396C147 400.971 142.971 405 138 405C133.029 405 129 400.971 129 396C129 391.029 133.029 387 138 387C142.971 387 147 391.029 147 396Z" fill="#FFDEDE"/> -<path d="M147 433C147 437.971 142.971 442 138 442C133.029 442 129 437.971 129 433C129 428.029 133.029 424 138 424C142.971 424 147 428.029 147 433Z" fill="#FFDEDE"/> -<path d="M147 470C147 474.971 142.971 479 138 479C133.029 479 129 474.971 129 470C129 465.029 133.029 461 138 461C142.971 461 147 465.029 147 470Z" fill="#FFDEDE"/> +<rect x="182" y="254" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="355.83" y="254" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 651 254)" fill="#D9D9D9"/> +</g> +<circle cx="142" cy="256" r="9" fill="#FFDEDE"/> +<circle cx="142" cy="297" r="9" fill="#FFDEDE"/> +<circle cx="142" cy="334" r="9" fill="#FFDEDE"/> +<circle cx="142" cy="371" r="9" fill="#FFDEDE"/> +<circle cx="142" cy="408" r="9" fill="#FFDEDE"/> +<circle cx="142" cy="445" r="9" fill="#FFDEDE"/> +<circle cx="142" cy="482" r="9" fill="#FFDEDE"/> <g opacity="0.7"> -<path d="M178 281H329.334V289.294H178V281Z" fill="#D9D9D9"/> -<path d="M351.83 281H568.606V289.294H351.83V281Z" fill="#D9D9D9"/> -<path d="M647 281H591.102V289.294H647V281Z" fill="#D9D9D9"/> +<rect x="182" y="293" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="355.83" y="293" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 651 293)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M178 318H329.334V326.294H178V318Z" fill="#D9D9D9"/> -<path d="M351.83 318H568.606V326.294H351.83V318Z" fill="#D9D9D9"/> -<path d="M647 318H591.102V326.294H647V318Z" fill="#D9D9D9"/> +<rect x="182" y="330" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="355.83" y="330" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 651 330)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M178 355H329.334V363.294H178V355Z" fill="#D9D9D9"/> -<path d="M351.83 355H568.606V363.294H351.83V355Z" fill="#D9D9D9"/> -<path d="M647 355H591.102V363.294H647V355Z" fill="#D9D9D9"/> +<rect x="182" y="367" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="355.83" y="367" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 651 367)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M178 392H329.334V400.294H178V392Z" fill="#D9D9D9"/> -<path d="M351.83 392H568.606V400.294H351.83V392Z" fill="#D9D9D9"/> -<path d="M647 392H591.102V400.294H647V392Z" fill="#D9D9D9"/> +<rect x="182" y="404" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="355.83" y="404" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 651 404)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M178 429H329.334V437.294H178V429Z" fill="#D9D9D9"/> -<path d="M351.83 429H568.606V437.294H351.83V429Z" fill="#D9D9D9"/> -<path d="M647 429H591.102V437.294H647V429Z" fill="#D9D9D9"/> +<rect x="182" y="441" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="355.83" y="441" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 651 441)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M178 466H329.334V474.294H178V466Z" fill="#D9D9D9"/> -<path d="M351.83 466H568.606V474.294H351.83V466Z" fill="#D9D9D9"/> -<path d="M647 466H591.102V474.294H647V466Z" fill="#D9D9D9"/> +<rect x="182" y="478" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="355.83" y="478" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 651 478)" fill="#D9D9D9"/> </g> -<path d="M134.128 89.0002H130.613L137.013 70.8184H141.08L147.489 89.0002H143.974L139.118 74.5471H138.975L134.128 89.0002ZM134.244 81.8713H143.832V84.5169H134.244V81.8713Z" fill="#393939"/> -<path d="M158.433 83.2651V75.3638H161.647V89.0002H158.531V86.5765H158.389C158.081 87.34 157.575 87.9644 156.871 88.4498C156.173 88.9351 155.311 89.1777 154.288 89.1777C153.394 89.1777 152.604 88.9795 151.917 88.5829C151.237 88.1805 150.704 87.5975 150.319 86.834C149.934 86.0646 149.742 85.1354 149.742 84.0463V75.3638H152.956V83.5492C152.956 84.4133 153.193 85.0998 153.666 85.6088C154.14 86.1178 154.761 86.3723 155.53 86.3723C156.004 86.3723 156.463 86.2569 156.906 86.0261C157.35 85.7953 157.714 85.452 157.998 84.9963C158.288 84.5346 158.433 83.9576 158.433 83.2651Z" fill="#393939"/> -<path d="M170.012 89.2399C168.941 89.2399 167.982 88.9647 167.136 88.4142C166.29 87.8638 165.621 87.0648 165.13 86.0172C164.638 84.9696 164.393 83.6971 164.393 82.1998C164.393 80.6846 164.641 79.4062 165.138 78.3645C165.642 77.3169 166.319 76.5268 167.171 75.9941C168.024 75.4556 168.974 75.1863 170.021 75.1863C170.82 75.1863 171.477 75.3224 171.992 75.5946C172.507 75.861 172.915 76.1835 173.217 76.5623C173.519 76.9352 173.753 77.2873 173.919 77.6188H174.052V70.8184H177.274V89.0002H174.114V86.8517H173.919C173.753 87.1832 173.513 87.5353 173.2 87.9082C172.886 88.2752 172.472 88.5888 171.957 88.8493C171.442 89.1097 170.794 89.2399 170.012 89.2399ZM170.909 86.6032C171.59 86.6032 172.17 86.4197 172.649 86.0527C173.129 85.6799 173.493 85.162 173.741 84.4991C173.99 83.8362 174.114 83.0639 174.114 82.182C174.114 81.3001 173.99 80.5337 173.741 79.8826C173.498 79.2316 173.137 78.7256 172.658 78.3645C172.185 78.0035 171.602 77.823 170.909 77.823C170.193 77.823 169.595 78.0094 169.116 78.3823C168.636 78.7551 168.275 79.2701 168.033 79.927C167.79 80.584 167.669 81.3356 167.669 82.182C167.669 83.0343 167.79 83.7948 168.033 84.4636C168.281 85.1265 168.645 85.6503 169.125 86.035C169.61 86.4138 170.205 86.6032 170.909 86.6032Z" fill="#393939"/> -<path d="M180.699 89.0002V75.3638H183.913V89.0002H180.699ZM182.315 73.4284C181.806 73.4284 181.368 73.2598 181.001 72.9224C180.634 72.5791 180.451 72.1678 180.451 71.6884C180.451 71.2031 180.634 70.7917 181.001 70.4544C181.368 70.1111 181.806 69.9395 182.315 69.9395C182.83 69.9395 183.268 70.1111 183.629 70.4544C183.996 70.7917 184.179 71.2031 184.179 71.6884C184.179 72.1678 183.996 72.5791 183.629 72.9224C183.268 73.2598 182.83 73.4284 182.315 73.4284Z" fill="#393939"/> -<path d="M194.027 75.3638V77.8496H186.188V75.3638H194.027ZM188.123 72.0968H191.337V84.8986C191.337 85.3307 191.402 85.6621 191.532 85.8929C191.668 86.1178 191.846 86.2717 192.065 86.3546C192.284 86.4374 192.527 86.4789 192.793 86.4789C192.994 86.4789 193.178 86.4641 193.343 86.4345C193.515 86.4049 193.645 86.3783 193.734 86.3546L194.276 88.867C194.104 88.9262 193.858 88.9913 193.539 89.0623C193.225 89.1333 192.84 89.1748 192.385 89.1866C191.58 89.2103 190.855 89.089 190.209 88.8226C189.564 88.5504 189.052 88.1302 188.674 87.562C188.301 86.9938 188.117 86.2836 188.123 85.4313V72.0968Z" fill="#393939"/> -<path d="M203.058 89.0002V70.8184H206.352V86.2392H214.359V89.0002H203.058Z" fill="#393939"/> -<path d="M223.024 89.2665C221.693 89.2665 220.538 88.9735 219.562 88.3876C218.585 87.8017 217.828 86.9819 217.289 85.9284C216.756 84.8749 216.49 83.6439 216.49 82.2353C216.49 80.8266 216.756 79.5926 217.289 78.5332C217.828 77.4738 218.585 76.6511 219.562 76.0652C220.538 75.4792 221.693 75.1863 223.024 75.1863C224.356 75.1863 225.51 75.4792 226.487 76.0652C227.463 76.6511 228.218 77.4738 228.75 78.5332C229.289 79.5926 229.558 80.8266 229.558 82.2353C229.558 83.6439 229.289 84.8749 228.75 85.9284C228.218 86.9819 227.463 87.8017 226.487 88.3876C225.51 88.9735 224.356 89.2665 223.024 89.2665ZM223.042 86.6919C223.764 86.6919 224.368 86.4937 224.853 86.0971C225.338 85.6947 225.699 85.1561 225.936 84.4814C226.179 83.8066 226.3 83.055 226.3 82.2264C226.3 81.3919 226.179 80.6373 225.936 79.9625C225.699 79.2819 225.338 78.7404 224.853 78.3379C224.368 77.9354 223.764 77.7342 223.042 77.7342C222.302 77.7342 221.687 77.9354 221.195 78.3379C220.71 78.7404 220.346 79.2819 220.103 79.9625C219.867 80.6373 219.748 81.3919 219.748 82.2264C219.748 83.055 219.867 83.8066 220.103 84.4814C220.346 85.1561 220.71 85.6947 221.195 86.0971C221.687 86.4937 222.302 86.6919 223.042 86.6919Z" fill="#393939"/> -<path d="M238.216 94.3979C237.062 94.3979 236.071 94.2411 235.242 93.9274C234.414 93.6196 233.748 93.2053 233.245 92.6845C232.742 92.1636 232.393 91.5866 232.197 90.9533L235.091 90.252C235.222 90.5183 235.411 90.7817 235.66 91.0421C235.908 91.3084 236.243 91.5274 236.663 91.699C237.089 91.8766 237.625 91.9654 238.27 91.9654C239.181 91.9654 239.936 91.7434 240.534 91.2995C241.131 90.8616 241.43 90.1395 241.43 89.1333V86.5499H241.27C241.105 86.8813 240.862 87.2217 240.542 87.5708C240.229 87.92 239.811 88.213 239.291 88.4498C238.776 88.6865 238.128 88.8049 237.346 88.8049C236.299 88.8049 235.349 88.5592 234.497 88.068C233.65 87.5708 232.976 86.831 232.472 85.8485C231.975 84.8601 231.727 83.6232 231.727 82.1376C231.727 80.6402 231.975 79.3766 232.472 78.3468C232.976 77.311 233.653 76.5268 234.505 75.9941C235.358 75.4556 236.308 75.1863 237.355 75.1863C238.154 75.1863 238.811 75.3224 239.326 75.5946C239.847 75.861 240.261 76.1835 240.569 76.5623C240.877 76.9352 241.111 77.2873 241.27 77.6188H241.448V75.3638H244.617V89.2221C244.617 90.3881 244.339 91.3528 243.783 92.1163C243.226 92.8798 242.466 93.4509 241.501 93.8297C240.536 94.2085 239.442 94.3979 238.216 94.3979ZM238.243 86.2836C238.924 86.2836 239.504 86.1178 239.983 85.7864C240.463 85.455 240.827 84.9785 241.075 84.3571C241.324 83.7356 241.448 82.9899 241.448 82.1199C241.448 81.2617 241.324 80.51 241.075 79.8649C240.832 79.2198 240.471 78.7196 239.992 78.3645C239.519 78.0035 238.936 77.823 238.243 77.823C237.527 77.823 236.929 78.0094 236.45 78.3823C235.97 78.7551 235.609 79.2671 235.367 79.9181C235.124 80.5633 235.003 81.2972 235.003 82.1199C235.003 82.9544 235.124 83.6853 235.367 84.3127C235.615 84.9341 235.979 85.4194 236.459 85.7686C236.944 86.1119 237.539 86.2836 238.243 86.2836Z" fill="#393939"/> -<path d="M258.689 78.9682L255.759 79.2878C255.676 78.9919 255.531 78.7137 255.324 78.4533C255.123 78.1929 254.851 77.9828 254.507 77.823C254.164 77.6632 253.744 77.5833 253.247 77.5833C252.578 77.5833 252.016 77.7283 251.56 78.0183C251.11 78.3083 250.888 78.6841 250.894 79.1458C250.888 79.5423 251.033 79.8649 251.329 80.1135C251.631 80.362 252.128 80.5662 252.82 80.726L255.146 81.2232C256.437 81.5014 257.396 81.9423 258.023 82.546C258.656 83.1497 258.976 83.9398 258.982 84.9164C258.976 85.7746 258.724 86.5321 258.227 87.1891C257.736 87.8401 257.052 88.3491 256.176 88.7161C255.3 89.083 254.294 89.2665 253.158 89.2665C251.489 89.2665 250.145 88.9173 249.127 88.2189C248.109 87.5146 247.503 86.5351 247.307 85.2804L250.441 84.9785C250.583 85.594 250.885 86.0587 251.347 86.3723C251.808 86.686 252.409 86.8429 253.149 86.8429C253.912 86.8429 254.525 86.686 254.987 86.3723C255.454 86.0587 255.688 85.671 255.688 85.2093C255.688 84.8187 255.537 84.4962 255.235 84.2417C254.939 83.9872 254.478 83.7918 253.85 83.6557L251.524 83.1674C250.216 82.8952 249.249 82.4365 248.621 81.7914C247.994 81.1403 247.683 80.3176 247.689 79.3233C247.683 78.4829 247.911 77.7549 248.373 77.1394C248.84 76.5179 249.488 76.0385 250.317 75.7012C251.151 75.3579 252.113 75.1863 253.202 75.1863C254.8 75.1863 256.058 75.5266 256.975 76.2072C257.899 76.8878 258.47 77.8082 258.689 78.9682Z" fill="#393939"/> -<path d="M148 207C148 211.971 143.971 216 139 216C134.029 216 130 211.971 130 207C130 202.029 134.029 198 139 198C143.971 198 148 202.029 148 207Z" fill="#FFDEDE"/> +<path d="M138.128 101H134.613L141.013 82.8182H145.08L151.489 101H147.974L143.118 86.5469H142.975L138.128 101ZM138.244 93.8711H147.832V96.5167H138.244V93.8711ZM162.434 95.2649V87.3636H165.647V101H162.531V98.5763H162.389C162.081 99.3398 161.575 99.9643 160.871 100.45C160.173 100.935 159.311 101.178 158.288 101.178C157.394 101.178 156.604 100.979 155.917 100.583C155.237 100.18 154.704 99.5973 154.319 98.8338C153.934 98.0644 153.742 97.1352 153.742 96.0462V87.3636H156.956V95.549C156.956 96.4131 157.193 97.0997 157.666 97.6087C158.14 98.1177 158.761 98.3722 159.53 98.3722C160.004 98.3722 160.463 98.2567 160.907 98.0259C161.35 97.7951 161.714 97.4518 161.998 96.9961C162.289 96.5344 162.434 95.9574 162.434 95.2649ZM174.012 101.24C172.941 101.24 171.982 100.964 171.136 100.414C170.29 99.8636 169.621 99.0646 169.13 98.017C168.638 96.9695 168.393 95.697 168.393 94.1996C168.393 92.6844 168.641 91.406 169.138 90.3643C169.642 89.3168 170.319 88.5266 171.172 87.994C172.024 87.4554 172.974 87.1861 174.021 87.1861C174.82 87.1861 175.477 87.3222 175.992 87.5945C176.507 87.8608 176.915 88.1834 177.217 88.5621C177.519 88.935 177.753 89.2872 177.919 89.6186H178.052V82.8182H181.275V101H178.114V98.8516H177.919C177.753 99.183 177.513 99.5352 177.2 99.908C176.886 100.275 176.472 100.589 175.957 100.849C175.442 101.109 174.794 101.24 174.012 101.24ZM174.909 98.603C175.59 98.603 176.17 98.4195 176.649 98.0526C177.129 97.6797 177.493 97.1618 177.741 96.4989C177.99 95.8361 178.114 95.0637 178.114 94.1818C178.114 93.3 177.99 92.5335 177.741 91.8825C177.498 91.2314 177.137 90.7254 176.658 90.3643C176.185 90.0033 175.602 89.8228 174.909 89.8228C174.193 89.8228 173.595 90.0092 173.116 90.3821C172.636 90.755 172.275 91.2699 172.033 91.9268C171.79 92.5838 171.669 93.3355 171.669 94.1818C171.669 95.0341 171.79 95.7946 172.033 96.4634C172.281 97.1263 172.645 97.6501 173.125 98.0348C173.61 98.4136 174.205 98.603 174.909 98.603ZM184.699 101V87.3636H187.913V101H184.699ZM186.315 85.4283C185.806 85.4283 185.368 85.2596 185.001 84.9222C184.634 84.579 184.451 84.1676 184.451 83.6882C184.451 83.2029 184.634 82.7915 185.001 82.4542C185.368 82.1109 185.806 81.9393 186.315 81.9393C186.83 81.9393 187.268 82.1109 187.629 82.4542C187.996 82.7915 188.179 83.2029 188.179 83.6882C188.179 84.1676 187.996 84.579 187.629 84.9222C187.268 85.2596 186.83 85.4283 186.315 85.4283ZM198.027 87.3636V89.8494H190.188V87.3636H198.027ZM192.123 84.0966H195.337V96.8984C195.337 97.3305 195.402 97.6619 195.532 97.8928C195.668 98.1177 195.846 98.2715 196.065 98.3544C196.284 98.4373 196.527 98.4787 196.793 98.4787C196.994 98.4787 197.178 98.4639 197.343 98.4343C197.515 98.4047 197.645 98.3781 197.734 98.3544L198.276 100.867C198.104 100.926 197.858 100.991 197.539 101.062C197.225 101.133 196.84 101.175 196.385 101.186C195.58 101.21 194.855 101.089 194.21 100.822C193.564 100.55 193.052 100.13 192.674 99.5618C192.301 98.9936 192.117 98.2834 192.123 97.4311V84.0966ZM207.058 101V82.8182H210.352V98.239H218.359V101H207.058ZM227.024 101.266C225.693 101.266 224.538 100.973 223.562 100.387C222.585 99.8015 221.828 98.9818 221.289 97.9283C220.756 96.8748 220.49 95.6437 220.49 94.2351C220.49 92.8265 220.756 91.5924 221.289 90.533C221.828 89.4736 222.585 88.6509 223.562 88.065C224.538 87.479 225.693 87.1861 227.024 87.1861C228.356 87.1861 229.51 87.479 230.487 88.065C231.463 88.6509 232.218 89.4736 232.75 90.533C233.289 91.5924 233.558 92.8265 233.558 94.2351C233.558 95.6437 233.289 96.8748 232.75 97.9283C232.218 98.9818 231.463 99.8015 230.487 100.387C229.51 100.973 228.356 101.266 227.024 101.266ZM227.042 98.6918C227.764 98.6918 228.368 98.4935 228.853 98.0969C229.338 97.6945 229.699 97.1559 229.936 96.4812C230.179 95.8065 230.3 95.0548 230.3 94.2262C230.3 93.3917 230.179 92.6371 229.936 91.9624C229.699 91.2817 229.338 90.7402 228.853 90.3377C228.368 89.9353 227.764 89.734 227.042 89.734C226.302 89.734 225.687 89.9353 225.195 90.3377C224.71 90.7402 224.346 91.2817 224.103 91.9624C223.867 92.6371 223.748 93.3917 223.748 94.2262C223.748 95.0548 223.867 95.8065 224.103 96.4812C224.346 97.1559 224.71 97.6945 225.195 98.0969C225.687 98.4935 226.302 98.6918 227.042 98.6918ZM242.216 106.398C241.062 106.398 240.071 106.241 239.242 105.927C238.414 105.619 237.748 105.205 237.245 104.684C236.742 104.163 236.393 103.586 236.197 102.953L239.091 102.252C239.222 102.518 239.411 102.781 239.66 103.042C239.908 103.308 240.243 103.527 240.663 103.699C241.089 103.876 241.625 103.965 242.27 103.965C243.181 103.965 243.936 103.743 244.534 103.299C245.131 102.861 245.43 102.139 245.43 101.133V98.5497H245.27C245.105 98.8812 244.862 99.2215 244.542 99.5707C244.229 99.9199 243.811 100.213 243.291 100.45C242.776 100.686 242.128 100.805 241.346 100.805C240.299 100.805 239.349 100.559 238.497 100.068C237.65 99.5707 236.976 98.8308 236.472 97.8484C235.975 96.86 235.727 95.623 235.727 94.1374C235.727 92.64 235.975 91.3764 236.472 90.3466C236.976 89.3108 237.653 88.5266 238.506 87.994C239.358 87.4554 240.308 87.1861 241.355 87.1861C242.154 87.1861 242.811 87.3222 243.326 87.5945C243.847 87.8608 244.261 88.1834 244.569 88.5621C244.877 88.935 245.111 89.2872 245.27 89.6186H245.448V87.3636H248.617V101.222C248.617 102.388 248.339 103.353 247.783 104.116C247.227 104.88 246.466 105.451 245.501 105.83C244.537 106.208 243.442 106.398 242.216 106.398ZM242.243 98.2834C242.924 98.2834 243.504 98.1177 243.983 97.7862C244.463 97.4548 244.827 96.9783 245.075 96.3569C245.324 95.7354 245.448 94.9897 245.448 94.1197C245.448 93.2615 245.324 92.5098 245.075 91.8647C244.832 91.2196 244.471 90.7195 243.992 90.3643C243.519 90.0033 242.936 89.8228 242.243 89.8228C241.527 89.8228 240.929 90.0092 240.45 90.3821C239.97 90.755 239.609 91.2669 239.367 91.918C239.124 92.5631 239.003 93.297 239.003 94.1197C239.003 94.9542 239.124 95.6851 239.367 96.3125C239.615 96.9339 239.979 97.4193 240.459 97.7685C240.944 98.1117 241.539 98.2834 242.243 98.2834ZM262.689 90.968L259.759 91.2876C259.676 90.9917 259.531 90.7135 259.324 90.4531C259.123 90.1927 258.851 89.9826 258.507 89.8228C258.164 89.663 257.744 89.5831 257.247 89.5831C256.578 89.5831 256.016 89.7281 255.56 90.0181C255.11 90.3081 254.888 90.6839 254.894 91.1456C254.888 91.5421 255.033 91.8647 255.329 92.1133C255.631 92.3619 256.128 92.5661 256.82 92.7259L259.146 93.223C260.437 93.5012 261.396 93.9421 262.023 94.5458C262.656 95.1495 262.976 95.9396 262.982 96.9162C262.976 97.7744 262.724 98.532 262.227 99.1889C261.736 99.84 261.052 100.349 260.176 100.716C259.3 101.083 258.294 101.266 257.158 101.266C255.489 101.266 254.145 100.917 253.127 100.219C252.109 99.5144 251.503 98.5349 251.307 97.2802L254.441 96.9783C254.583 97.5939 254.885 98.0585 255.347 98.3722C255.808 98.6858 256.409 98.8427 257.149 98.8427C257.912 98.8427 258.525 98.6858 258.987 98.3722C259.454 98.0585 259.688 97.6708 259.688 97.2092C259.688 96.8185 259.537 96.496 259.235 96.2415C258.939 95.987 258.478 95.7917 257.85 95.6555L255.524 95.1673C254.216 94.895 253.249 94.4363 252.621 93.7912C251.994 93.1402 251.683 92.3175 251.689 91.3232C251.683 90.4827 251.911 89.7547 252.373 89.1392C252.84 88.5178 253.488 88.0384 254.317 87.701C255.151 87.3577 256.113 87.1861 257.202 87.1861C258.8 87.1861 260.058 87.5264 260.975 88.207C261.899 88.8877 262.47 89.808 262.689 90.968Z" fill="#393939"/> +<circle cx="143" cy="219" r="9" fill="#FFDEDE"/> <g opacity="0.7"> -<path d="M178 167H329.334V175.294H178V167Z" fill="#D9D9D9"/> -<path d="M351.83 167H568.606V175.294H351.83V167Z" fill="#D9D9D9"/> -<path d="M647 167H591.102V175.294H647V167Z" fill="#D9D9D9"/> -</g> -<path d="M148 169C148 173.971 143.971 178 139 178C134.029 178 130 173.971 130 169C130 164.029 134.029 160 139 160C143.971 160 148 164.029 148 169Z" fill="#FFDEDE"/> -<g filter="url(#filter2_d_625_11871)"> -<path d="M50 224H783V429H50V224Z" fill="white"/> -</g> -<g filter="url(#filter3_d_625_11871)"> -<path fill-rule="evenodd" clip-rule="evenodd" d="M782 225H51V428H782V225ZM50 224V429H783V224H50Z" fill="#E7E7E7"/> +<rect x="182" y="179" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="355.83" y="179" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 651 179)" fill="#D9D9D9"/> </g> +<circle cx="143" cy="181" r="9" fill="#FFDEDE"/> +<g filter="url(#filter1_d_625_11871)"> +<rect x="51" y="205" width="733" height="243" fill="white"/> +<rect x="51.5" y="205.5" width="732" height="242" stroke="#E7E7E7"/> +</g> +<path d="M103.4 223.858V224.458H104H108.4V225.202H107H106.4V225.802V238.438C106.4 238.531 106.362 238.624 106.289 238.695C106.215 238.767 106.111 238.81 106 238.81H92C91.8885 238.81 91.7849 238.767 91.7111 238.695C91.6379 238.624 91.6 238.531 91.6 238.438V225.802V225.202H91H89.6V224.458H94H94.6V223.858V220.942C94.6 220.849 94.6379 220.756 94.7111 220.685C94.7849 220.613 94.8885 220.57 95 220.57H103C103.111 220.57 103.215 220.613 103.289 220.685C103.362 220.756 103.4 220.849 103.4 220.942V223.858ZM105.6 225.802V225.202H105H93H92.4V225.802V237.466V238.066H93H105H105.6V237.466V225.802ZM96 221.314H95.4V221.914V223.858V224.458H96H102H102.6V223.858V221.914V221.314H102H96Z" stroke="#F86A2B" stroke-width="1.2"/> +<path d="M127.573 234.429C129.87 234.429 131.34 233.253 131.34 231.366V231.359C131.34 229.896 130.492 229.062 128.421 228.618L127.348 228.379C126.069 228.105 125.55 227.627 125.55 226.896V226.889C125.55 225.959 126.404 225.419 127.56 225.419C128.756 225.412 129.528 226 129.658 226.807L129.672 226.896H131.155L131.148 226.8C131.039 225.269 129.672 224.086 127.58 224.086C125.488 224.086 124.012 225.262 124.005 226.964V226.971C124.005 228.427 124.866 229.356 126.869 229.78L127.949 230.013C129.255 230.293 129.788 230.785 129.788 231.544V231.551C129.788 232.467 128.893 233.096 127.635 233.096C126.315 233.096 125.365 232.521 125.283 231.626L125.276 231.551H123.772L123.779 231.64C123.916 233.301 125.345 234.429 127.573 234.429ZM135.182 234.312C136.166 234.312 136.945 233.889 137.383 233.137H137.499V234.189H138.969V229.11C138.969 227.552 137.916 226.622 136.05 226.622C134.361 226.622 133.192 227.436 133.015 228.652L133.008 228.7H134.437L134.443 228.673C134.621 228.146 135.161 227.846 135.981 227.846C136.986 227.846 137.499 228.297 137.499 229.11V229.767L135.489 229.883C133.719 229.992 132.721 230.765 132.721 232.091V232.104C132.721 233.451 133.767 234.312 135.182 234.312ZM134.197 232.043V232.029C134.197 231.359 134.662 230.99 135.688 230.929L137.499 230.812V231.448C137.499 232.405 136.686 233.13 135.578 233.13C134.778 233.13 134.197 232.727 134.197 232.043ZM141.129 234.189H142.612V223.854H141.129V234.189ZM147.938 234.333C149.838 234.333 150.863 233.239 151.109 232.262L151.123 232.2L149.694 232.207L149.667 232.262C149.489 232.645 148.922 233.116 147.972 233.116C146.748 233.116 145.969 232.289 145.941 230.867H151.205V230.348C151.205 228.119 149.934 226.622 147.862 226.622C145.791 226.622 144.451 228.174 144.451 230.491V230.498C144.451 232.85 145.764 234.333 147.938 234.333ZM147.869 227.839C148.874 227.839 149.619 228.481 149.735 229.808H145.962C146.092 228.529 146.857 227.839 147.869 227.839ZM155.669 234.333C157.433 234.333 158.745 233.396 158.745 232.022V232.009C158.745 230.936 158.062 230.327 156.633 229.992L155.457 229.726C154.623 229.527 154.281 229.24 154.281 228.775V228.762C154.281 228.167 154.869 227.764 155.683 227.764C156.517 227.764 157.043 228.153 157.187 228.673V228.687H158.602V228.68C158.472 227.47 157.385 226.622 155.689 226.622C154.008 226.622 152.805 227.552 152.805 228.844V228.851C152.805 229.938 153.454 230.573 154.855 230.895L156.038 231.168C156.899 231.366 157.248 231.681 157.248 232.146V232.159C157.248 232.768 156.612 233.185 155.696 233.185C154.814 233.185 154.274 232.809 154.09 232.248L154.083 232.241H152.6V232.248C152.743 233.492 153.878 234.333 155.669 234.333ZM168.562 234.429C170.763 234.429 172.369 233.171 172.656 231.277V231.236H171.139L171.125 231.264C170.845 232.378 169.867 233.075 168.562 233.075C166.784 233.075 165.677 231.605 165.677 229.268V229.254C165.677 226.909 166.784 225.439 168.555 225.439C169.854 225.439 170.845 226.226 171.132 227.436V227.456H172.649L172.656 227.422C172.396 225.46 170.729 224.086 168.555 224.086C165.813 224.086 164.111 226.068 164.111 229.254V229.268C164.111 232.446 165.82 234.429 168.562 234.429ZM174.673 234.189H176.204V230.396H178.364L180.374 234.189H182.145L179.93 230.156C181.133 229.753 181.844 228.673 181.844 227.347V227.333C181.844 225.501 180.586 224.325 178.562 224.325H174.673V234.189ZM176.204 229.151V225.61H178.364C179.547 225.61 180.271 226.28 180.271 227.374V227.388C180.271 228.509 179.588 229.151 178.412 229.151H176.204ZM184.024 234.189H185.419V226.95H185.528L188.42 234.189H189.555L192.453 226.95H192.556V234.189H193.95V224.325H192.187L189.042 232.193H188.933L185.788 224.325H184.024V234.189ZM202.789 234.312C203.828 234.312 204.642 233.834 205.072 233.021H205.188V234.189H206.665V223.854H205.188V227.941H205.072C204.676 227.142 203.808 226.636 202.789 226.636C200.902 226.636 199.713 228.119 199.713 230.471V230.484C199.713 232.815 200.923 234.312 202.789 234.312ZM203.213 233.048C201.969 233.048 201.224 232.077 201.224 230.484V230.471C201.224 228.878 201.969 227.907 203.213 227.907C204.443 227.907 205.209 228.885 205.209 230.471V230.484C205.209 232.07 204.45 233.048 203.213 233.048ZM211.99 234.333C213.891 234.333 214.916 233.239 215.162 232.262L215.176 232.2L213.747 232.207L213.72 232.262C213.542 232.645 212.975 233.116 212.024 233.116C210.801 233.116 210.021 232.289 209.994 230.867H215.258V230.348C215.258 228.119 213.986 226.622 211.915 226.622C209.844 226.622 208.504 228.174 208.504 230.491V230.498C208.504 232.85 209.816 234.333 211.99 234.333ZM211.922 227.839C212.927 227.839 213.672 228.481 213.788 229.808H210.015C210.145 228.529 210.91 227.839 211.922 227.839ZM217.09 234.189H218.573V223.854H217.09V234.189ZM223.898 234.333C225.799 234.333 226.824 233.239 227.07 232.262L227.084 232.2L225.655 232.207L225.628 232.262C225.45 232.645 224.883 233.116 223.933 233.116C222.709 233.116 221.93 232.289 221.902 230.867H227.166V230.348C227.166 228.119 225.895 226.622 223.823 226.622C221.752 226.622 220.412 228.174 220.412 230.491V230.498C220.412 232.85 221.725 234.333 223.898 234.333ZM223.83 227.839C224.835 227.839 225.58 228.481 225.696 229.808H221.923C222.053 228.529 222.818 227.839 223.83 227.839ZM231.732 234.237C232.02 234.237 232.293 234.203 232.532 234.162V232.979C232.327 233 232.197 233.007 231.972 233.007C231.24 233.007 230.939 232.679 230.939 231.879V227.935H232.532V226.766H230.939V224.893H229.429V226.766H228.267V227.935H229.429V232.234C229.429 233.663 230.099 234.237 231.732 234.237ZM237.297 234.333C239.197 234.333 240.223 233.239 240.469 232.262L240.482 232.2L239.054 232.207L239.026 232.262C238.849 232.645 238.281 233.116 237.331 233.116C236.107 233.116 235.328 232.289 235.301 230.867H240.564V230.348C240.564 228.119 239.293 226.622 237.222 226.622C235.15 226.622 233.811 228.174 233.811 230.491V230.498C233.811 232.85 235.123 234.333 237.297 234.333ZM237.229 227.839C238.233 227.839 238.979 228.481 239.095 229.808H235.321C235.451 228.529 236.217 227.839 237.229 227.839ZM245.035 234.312C246.074 234.312 246.888 233.834 247.318 233.021H247.435V234.189H248.911V223.854H247.435V227.941H247.318C246.922 227.142 246.054 226.636 245.035 226.636C243.148 226.636 241.959 228.119 241.959 230.471V230.484C241.959 232.815 243.169 234.312 245.035 234.312ZM245.459 233.048C244.215 233.048 243.47 232.077 243.47 230.484V230.471C243.47 228.878 244.215 227.907 245.459 227.907C246.689 227.907 247.455 228.885 247.455 230.471V230.484C247.455 232.07 246.696 233.048 245.459 233.048ZM255.72 225.439C256.226 225.439 256.649 225.022 256.649 224.517C256.649 224.004 256.226 223.587 255.72 223.587C255.207 223.587 254.79 224.004 254.79 224.517C254.79 225.022 255.207 225.439 255.72 225.439ZM254.975 234.189H256.451V226.766H254.975V234.189ZM258.611 234.189H260.095V229.835C260.095 228.639 260.771 227.894 261.858 227.894C262.945 227.894 263.458 228.502 263.458 229.732V234.189H264.935V229.384C264.935 227.613 264.019 226.622 262.357 226.622C261.277 226.622 260.566 227.101 260.204 227.894H260.095V226.766H258.611V234.189ZM271.005 234.189H275.059C277.164 234.189 278.429 233.137 278.429 231.407V231.394C278.429 230.108 277.54 229.165 276.207 229.021V228.905C277.178 228.741 277.937 227.818 277.937 226.793V226.779C277.937 225.269 276.822 224.325 274.97 224.325H271.005V234.189ZM274.614 225.576C275.749 225.576 276.412 226.116 276.412 227.046V227.06C276.412 228.017 275.708 228.522 274.354 228.522H272.536V225.576H274.614ZM274.662 229.691C276.104 229.691 276.863 230.238 276.863 231.298V231.312C276.863 232.371 276.132 232.938 274.751 232.938H272.536V229.691H274.662ZM282.264 234.312C283.248 234.312 284.027 233.889 284.465 233.137H284.581V234.189H286.051V229.11C286.051 227.552 284.998 226.622 283.132 226.622C281.443 226.622 280.274 227.436 280.097 228.652L280.09 228.7H281.519L281.525 228.673C281.703 228.146 282.243 227.846 283.063 227.846C284.068 227.846 284.581 228.297 284.581 229.11V229.767L282.571 229.883C280.801 229.992 279.803 230.765 279.803 232.091V232.104C279.803 233.451 280.849 234.312 282.264 234.312ZM281.279 232.043V232.029C281.279 231.359 281.744 230.99 282.77 230.929L284.581 230.812V231.448C284.581 232.405 283.768 233.13 282.66 233.13C281.86 233.13 281.279 232.727 281.279 232.043ZM291.267 234.333C293.105 234.333 294.165 233.342 294.432 231.899L294.445 231.838H293.023L293.01 231.872C292.771 232.672 292.196 233.096 291.267 233.096C290.043 233.096 289.284 232.098 289.284 230.457V230.443C289.284 228.844 290.029 227.859 291.267 227.859C292.251 227.859 292.853 228.406 293.017 229.138L293.023 229.158L294.445 229.151V229.117C294.24 227.675 293.126 226.622 291.26 226.622C289.093 226.622 287.773 228.092 287.773 230.443V230.457C287.773 232.856 289.1 234.333 291.267 234.333ZM296.195 234.189H297.679V231.489L298.314 230.854L300.871 234.189H302.676L299.374 229.896L302.471 226.766H300.734L297.788 229.896H297.679V223.854H296.195V234.189ZM306.791 234.333C308.965 234.333 310.298 232.877 310.298 230.484V230.471C310.298 228.078 308.958 226.622 306.791 226.622C304.617 226.622 303.277 228.085 303.277 230.471V230.484C303.277 232.877 304.61 234.333 306.791 234.333ZM306.791 233.096C305.513 233.096 304.795 232.132 304.795 230.484V230.471C304.795 228.823 305.513 227.859 306.791 227.859C308.062 227.859 308.787 228.823 308.787 230.471V230.484C308.787 232.125 308.062 233.096 306.791 233.096ZM312.595 234.189H314.071V227.935H315.705V226.766H314.058V226.055C314.058 225.303 314.379 224.906 315.199 224.906C315.432 224.906 315.63 224.92 315.767 224.94V223.854C315.514 223.812 315.227 223.785 314.892 223.785C313.347 223.785 312.595 224.51 312.595 225.986V226.766H311.371V227.935H312.595V234.189ZM317.927 234.189H319.403V227.935H321.037V226.766H319.39V226.055C319.39 225.303 319.711 224.906 320.531 224.906C320.764 224.906 320.962 224.92 321.099 224.94V223.854C320.846 223.812 320.559 223.785 320.224 223.785C318.679 223.785 317.927 224.51 317.927 225.986V226.766H316.703V227.935H317.927V234.189ZM323.478 225.439C323.983 225.439 324.407 225.022 324.407 224.517C324.407 224.004 323.983 223.587 323.478 223.587C322.965 223.587 322.548 224.004 322.548 224.517C322.548 225.022 322.965 225.439 323.478 225.439ZM322.732 234.189H324.209V226.766H322.732V234.189ZM329.493 234.333C331.332 234.333 332.392 233.342 332.658 231.899L332.672 231.838H331.25L331.236 231.872C330.997 232.672 330.423 233.096 329.493 233.096C328.27 233.096 327.511 232.098 327.511 230.457V230.443C327.511 228.844 328.256 227.859 329.493 227.859C330.478 227.859 331.079 228.406 331.243 229.138L331.25 229.158L332.672 229.151V229.117C332.467 227.675 331.353 226.622 329.486 226.622C327.319 226.622 326 228.092 326 230.443V230.457C326 232.856 327.326 234.333 329.493 234.333ZM337.471 234.333C339.371 234.333 340.396 233.239 340.643 232.262L340.656 232.2L339.228 232.207L339.2 232.262C339.022 232.645 338.455 233.116 337.505 233.116C336.281 233.116 335.502 232.289 335.475 230.867H340.738V230.348C340.738 228.119 339.467 226.622 337.396 226.622C335.324 226.622 333.984 228.174 333.984 230.491V230.498C333.984 232.85 335.297 234.333 337.471 234.333ZM337.402 227.839C338.407 227.839 339.152 228.481 339.269 229.808H335.495C335.625 228.529 336.391 227.839 337.402 227.839Z" fill="#393939"/> +<path d="M355.107 234.483H356.297V229.917C356.297 228.837 357.104 228.119 358.238 228.119C358.498 228.119 358.724 228.146 358.97 228.188V227.032C358.854 227.012 358.601 226.984 358.375 226.984C357.377 226.984 356.687 227.436 356.406 228.208H356.297V227.114H355.107V234.483ZM363.263 234.613C365.361 234.613 366.66 233.164 366.66 230.806V230.792C366.66 228.427 365.361 226.984 363.263 226.984C361.164 226.984 359.865 228.427 359.865 230.792V230.806C359.865 233.164 361.164 234.613 363.263 234.613ZM363.263 233.561C361.868 233.561 361.082 232.542 361.082 230.806V230.792C361.082 229.049 361.868 228.037 363.263 228.037C364.657 228.037 365.443 229.049 365.443 230.792V230.806C365.443 232.542 364.657 233.561 363.263 233.561ZM368.506 234.483H369.695V229.917C369.695 228.878 370.427 228.037 371.391 228.037C372.32 228.037 372.922 228.604 372.922 229.479V234.483H374.111V229.746C374.111 228.81 374.788 228.037 375.813 228.037C376.853 228.037 377.352 228.577 377.352 229.664V234.483H378.541V229.391C378.541 227.846 377.7 226.984 376.196 226.984C375.178 226.984 374.337 227.497 373.94 228.276H373.831C373.489 227.511 372.792 226.984 371.794 226.984C370.83 226.984 370.133 227.442 369.805 228.235H369.695V227.114H368.506V234.483ZM382.711 234.613C383.702 234.613 384.475 234.183 384.939 233.396H385.049V234.483H386.238V229.438C386.238 227.907 385.233 226.984 383.436 226.984C381.863 226.984 380.742 227.764 380.551 228.919L380.544 228.96H381.733L381.74 228.939C381.932 228.365 382.513 228.037 383.395 228.037C384.495 228.037 385.049 228.529 385.049 229.438V230.108L382.937 230.238C381.221 230.341 380.25 231.1 380.25 232.412V232.426C380.25 233.766 381.31 234.613 382.711 234.613ZM381.467 232.398V232.385C381.467 231.653 381.959 231.257 383.08 231.188L385.049 231.065V231.735C385.049 232.788 384.167 233.581 382.957 233.581C382.103 233.581 381.467 233.144 381.467 232.398ZM389.041 225.692C389.492 225.692 389.861 225.323 389.861 224.872C389.861 224.421 389.492 224.052 389.041 224.052C388.59 224.052 388.221 224.421 388.221 224.872C388.221 225.323 388.59 225.692 389.041 225.692ZM388.439 234.483H389.629V227.114H388.439V234.483ZM391.871 234.483H393.061V230.122C393.061 228.83 393.806 228.037 394.981 228.037C396.157 228.037 396.704 228.673 396.704 229.999V234.483H397.894V229.712C397.894 227.962 396.971 226.984 395.316 226.984C394.229 226.984 393.539 227.442 393.17 228.222H393.061V227.114H391.871V234.483ZM402.07 234.613C403.062 234.613 403.834 234.183 404.299 233.396H404.408V234.483H405.598V229.438C405.598 227.907 404.593 226.984 402.795 226.984C401.223 226.984 400.102 227.764 399.91 228.919L399.903 228.96H401.093L401.1 228.939C401.291 228.365 401.872 228.037 402.754 228.037C403.854 228.037 404.408 228.529 404.408 229.438V230.108L402.296 230.238C400.58 230.341 399.609 231.1 399.609 232.412V232.426C399.609 233.766 400.669 234.613 402.07 234.613ZM400.826 232.398V232.385C400.826 231.653 401.318 231.257 402.439 231.188L404.408 231.065V231.735C404.408 232.788 403.526 233.581 402.316 233.581C401.462 233.581 400.826 233.144 400.826 232.398ZM413.404 236.083C414.266 236.083 415.093 235.96 415.708 235.748V234.887C415.277 235.085 414.354 235.215 413.418 235.215C410.492 235.215 408.605 233.335 408.605 230.423V230.409C408.605 227.572 410.526 225.535 413.199 225.535C415.934 225.535 417.807 227.224 417.807 229.685V229.698C417.807 231.373 417.253 232.46 416.392 232.46C415.899 232.46 415.619 232.18 415.619 231.701V227.688H414.587V228.522H414.478C414.211 227.928 413.596 227.559 412.878 227.559C411.477 227.559 410.499 228.721 410.499 230.375V230.389C410.499 232.118 411.456 233.287 412.878 233.287C413.678 233.287 414.293 232.897 414.587 232.2H414.696L414.703 232.241C414.812 232.904 415.414 233.349 416.2 233.349C417.772 233.349 418.771 231.934 418.771 229.712V229.698C418.771 226.738 416.521 224.674 413.288 224.674C409.938 224.674 407.642 226.991 407.642 230.368V230.382C407.642 233.868 409.877 236.083 413.404 236.083ZM413.035 232.323C412.14 232.323 411.593 231.599 411.593 230.416V230.402C411.593 229.213 412.133 228.502 413.049 228.502C413.979 228.502 414.573 229.24 414.573 230.402V230.416C414.573 231.578 413.972 232.323 413.035 232.323ZM423.631 234.613C425.367 234.613 426.42 233.629 426.673 232.631L426.687 232.576H425.497L425.47 232.638C425.271 233.082 424.656 233.554 423.658 233.554C422.346 233.554 421.505 232.665 421.471 231.141H426.775V230.676C426.775 228.475 425.559 226.984 423.556 226.984C421.553 226.984 420.254 228.543 420.254 230.819V230.826C420.254 233.137 421.525 234.613 423.631 234.613ZM423.549 228.044C424.636 228.044 425.442 228.734 425.565 230.19H421.491C421.621 228.789 422.455 228.044 423.549 228.044ZM427.76 234.483H429.093L430.843 231.701H430.952L432.695 234.483H434.09L431.554 230.751L434.056 227.114H432.723L430.993 229.855H430.884L429.134 227.114H427.732L430.282 230.799L427.76 234.483ZM437.713 234.613C438.704 234.613 439.477 234.183 439.941 233.396H440.051V234.483H441.24V229.438C441.24 227.907 440.235 226.984 438.438 226.984C436.865 226.984 435.744 227.764 435.553 228.919L435.546 228.96H436.735L436.742 228.939C436.934 228.365 437.515 228.037 438.396 228.037C439.497 228.037 440.051 228.529 440.051 229.438V230.108L437.938 230.238C436.223 230.341 435.252 231.1 435.252 232.412V232.426C435.252 233.766 436.312 234.613 437.713 234.613ZM436.469 232.398V232.385C436.469 231.653 436.961 231.257 438.082 231.188L440.051 231.065V231.735C440.051 232.788 439.169 233.581 437.959 233.581C437.104 233.581 436.469 233.144 436.469 232.398ZM443.414 234.483H444.604V229.917C444.604 228.878 445.335 228.037 446.299 228.037C447.229 228.037 447.83 228.604 447.83 229.479V234.483H449.02V229.746C449.02 228.81 449.696 228.037 450.722 228.037C451.761 228.037 452.26 228.577 452.26 229.664V234.483H453.449V229.391C453.449 227.846 452.608 226.984 451.104 226.984C450.086 226.984 449.245 227.497 448.849 228.276H448.739C448.397 227.511 447.7 226.984 446.702 226.984C445.738 226.984 445.041 227.442 444.713 228.235H444.604V227.114H443.414V234.483ZM455.596 236.944H456.785V233.321H456.895C457.298 234.107 458.18 234.613 459.191 234.613C461.064 234.613 462.281 233.116 462.281 230.806V230.792C462.281 228.495 461.058 226.984 459.191 226.984C458.166 226.984 457.346 227.47 456.895 228.29H456.785V227.114H455.596V236.944ZM458.918 233.561C457.578 233.561 456.758 232.508 456.758 230.806V230.792C456.758 229.09 457.578 228.037 458.918 228.037C460.265 228.037 461.064 229.076 461.064 230.792V230.806C461.064 232.521 460.265 233.561 458.918 233.561ZM464.209 234.483H465.398V224.188H464.209V234.483ZM470.689 234.613C472.426 234.613 473.479 233.629 473.731 232.631L473.745 232.576H472.556L472.528 232.638C472.33 233.082 471.715 233.554 470.717 233.554C469.404 233.554 468.563 232.665 468.529 231.141H473.834V230.676C473.834 228.475 472.617 226.984 470.614 226.984C468.611 226.984 467.312 228.543 467.312 230.819V230.826C467.312 233.137 468.584 234.613 470.689 234.613ZM470.607 228.044C471.694 228.044 472.501 228.734 472.624 230.19H468.55C468.68 228.789 469.514 228.044 470.607 228.044ZM476.65 234.552C477.143 234.552 477.539 234.148 477.539 233.663C477.539 233.171 477.143 232.774 476.65 232.774C476.165 232.774 475.762 233.171 475.762 233.663C475.762 234.148 476.165 234.552 476.65 234.552ZM482.577 234.613C484.348 234.613 485.339 233.663 485.64 232.33L485.653 232.255L484.478 232.262L484.464 232.303C484.19 233.123 483.562 233.561 482.57 233.561C481.258 233.561 480.41 232.474 480.41 230.778V230.765C480.41 229.104 481.244 228.037 482.57 228.037C483.63 228.037 484.286 228.625 484.471 229.35L484.478 229.37H485.66L485.653 229.329C485.435 228.017 484.361 226.984 482.57 226.984C480.506 226.984 479.193 228.475 479.193 230.765V230.778C479.193 233.116 480.513 234.613 482.577 234.613ZM490.425 234.613C492.523 234.613 493.822 233.164 493.822 230.806V230.792C493.822 228.427 492.523 226.984 490.425 226.984C488.326 226.984 487.027 228.427 487.027 230.792V230.806C487.027 233.164 488.326 234.613 490.425 234.613ZM490.425 233.561C489.03 233.561 488.244 232.542 488.244 230.806V230.792C488.244 229.049 489.03 228.037 490.425 228.037C491.819 228.037 492.605 229.049 492.605 230.792V230.806C492.605 232.542 491.819 233.561 490.425 233.561ZM495.668 234.483H496.857V229.917C496.857 228.878 497.589 228.037 498.553 228.037C499.482 228.037 500.084 228.604 500.084 229.479V234.483H501.273V229.746C501.273 228.81 501.95 228.037 502.976 228.037C504.015 228.037 504.514 228.577 504.514 229.664V234.483H505.703V229.391C505.703 227.846 504.862 226.984 503.358 226.984C502.34 226.984 501.499 227.497 501.103 228.276H500.993C500.651 227.511 499.954 226.984 498.956 226.984C497.992 226.984 497.295 227.442 496.967 228.235H496.857V227.114H495.668V234.483Z" fill="#575757"/> +<path d="M527.491 234.716C529.692 234.716 531.135 233.567 531.135 231.722V231.715C531.135 230.293 530.321 229.466 528.264 229.008L527.17 228.762C525.83 228.468 525.29 227.935 525.29 227.148V227.142C525.29 226.109 526.24 225.528 527.471 225.521C528.756 225.515 529.576 226.157 529.713 227.025L529.727 227.114H530.957L530.95 227.019C530.848 225.549 529.474 224.387 527.505 224.387C525.468 224.387 524.039 225.542 524.032 227.176V227.183C524.032 228.611 524.887 229.521 526.862 229.958L527.956 230.197C529.31 230.498 529.877 231.059 529.877 231.879V231.886C529.877 232.891 528.899 233.581 527.56 233.581C526.138 233.581 525.112 232.959 525.023 231.975L525.017 231.899H523.786L523.793 231.975C523.937 233.581 525.331 234.716 527.491 234.716ZM536.043 234.613C537.779 234.613 538.832 233.629 539.085 232.631L539.099 232.576H537.909L537.882 232.638C537.684 233.082 537.068 233.554 536.07 233.554C534.758 233.554 533.917 232.665 533.883 231.141H539.188V230.676C539.188 228.475 537.971 226.984 535.968 226.984C533.965 226.984 532.666 228.543 532.666 230.819V230.826C532.666 233.137 533.938 234.613 536.043 234.613ZM535.961 228.044C537.048 228.044 537.854 228.734 537.978 230.19H533.903C534.033 228.789 534.867 228.044 535.961 228.044ZM541.033 236.944H542.223V233.321H542.332C542.735 234.107 543.617 234.613 544.629 234.613C546.502 234.613 547.719 233.116 547.719 230.806V230.792C547.719 228.495 546.495 226.984 544.629 226.984C543.604 226.984 542.783 227.47 542.332 228.29H542.223V227.114H541.033V236.944ZM544.355 233.561C543.016 233.561 542.195 232.508 542.195 230.806V230.792C542.195 229.09 543.016 228.037 544.355 228.037C545.702 228.037 546.502 229.076 546.502 230.792V230.806C546.502 232.521 545.702 233.561 544.355 233.561ZM556.879 234.647C558.971 234.647 560.461 233.472 560.461 231.817V231.804C560.461 230.587 559.606 229.575 558.342 229.281V229.254C559.422 228.919 560.105 228.099 560.105 227.06V227.046C560.105 225.556 558.745 224.455 556.879 224.455C555.013 224.455 553.652 225.556 553.652 227.046V227.06C553.652 228.099 554.336 228.919 555.416 229.254V229.281C554.151 229.575 553.297 230.587 553.297 231.804V231.817C553.297 233.472 554.787 234.647 556.879 234.647ZM556.879 228.796C555.689 228.796 554.876 228.119 554.876 227.162V227.148C554.876 226.191 555.689 225.515 556.879 225.515C558.068 225.515 558.882 226.191 558.882 227.148V227.162C558.882 228.119 558.068 228.796 556.879 228.796ZM556.879 233.574C555.519 233.574 554.548 232.809 554.548 231.742V231.729C554.548 230.648 555.512 229.876 556.879 229.876C558.246 229.876 559.21 230.648 559.21 231.729V231.742C559.21 232.809 558.239 233.574 556.879 233.574ZM569.689 234.716C571.87 234.716 573.183 232.727 573.183 229.555V229.541C573.183 226.369 571.87 224.387 569.689 224.387C567.509 224.387 566.21 226.369 566.21 229.541V229.555C566.21 232.727 567.509 234.716 569.689 234.716ZM569.689 233.643C568.274 233.643 567.447 232.07 567.447 229.555V229.541C567.447 227.025 568.274 225.467 569.689 225.467C571.104 225.467 571.945 227.025 571.945 229.541V229.555C571.945 232.07 571.104 233.643 569.689 233.643ZM578.433 224.387C576.443 224.387 574.98 225.815 574.98 227.784V227.798C574.98 229.691 576.361 231.1 578.214 231.1C579.547 231.1 580.477 230.382 580.839 229.575H580.969C580.969 229.65 580.969 229.732 580.962 229.808C580.887 231.865 580.155 233.615 578.364 233.615C577.366 233.615 576.676 233.103 576.375 232.275L576.348 232.2H575.11L575.131 232.289C575.466 233.745 576.696 234.716 578.351 234.716C580.743 234.716 582.145 232.747 582.145 229.384V229.37C582.145 225.658 580.237 224.387 578.433 224.387ZM578.426 230.026C577.147 230.026 576.218 229.083 576.218 227.771V227.757C576.218 226.479 577.209 225.474 578.446 225.474C579.697 225.474 580.675 226.499 580.675 227.798V227.805C580.675 229.09 579.704 230.026 578.426 230.026ZM585.098 227.791C585.59 227.791 585.986 227.388 585.986 226.902C585.986 226.41 585.59 226.014 585.098 226.014C584.612 226.014 584.209 226.41 584.209 226.902C584.209 227.388 584.612 227.791 585.098 227.791ZM585.098 233.082C585.59 233.082 585.986 232.679 585.986 232.193C585.986 231.701 585.59 231.305 585.098 231.305C584.612 231.305 584.209 231.701 584.209 232.193C584.209 232.679 584.612 233.082 585.098 233.082ZM588.345 234.483H594.729V233.376H590.054V233.267L592.296 230.949C594.08 229.11 594.565 228.29 594.565 227.162V227.148C594.565 225.556 593.246 224.387 591.523 224.387C589.637 224.387 588.283 225.645 588.276 227.395L588.29 227.401L589.466 227.408L589.473 227.395C589.473 226.232 590.259 225.46 591.441 225.46C592.604 225.46 593.308 226.239 593.308 227.278V227.292C593.308 228.153 592.938 228.666 591.681 230.026L588.345 233.636V234.483ZM600.15 234.647C602.126 234.647 603.575 233.431 603.575 231.783V231.77C603.575 230.368 602.598 229.473 601.162 229.35V229.322C602.393 229.062 603.254 228.229 603.254 227.012V226.998C603.254 225.501 602.017 224.455 600.137 224.455C598.291 224.455 597.02 225.528 596.862 227.135L596.855 227.203H598.038L598.045 227.135C598.147 226.137 598.975 225.521 600.137 225.521C601.34 225.521 602.017 226.116 602.017 227.148V227.162C602.017 228.146 601.196 228.871 600.021 228.871H598.838V229.91H600.075C601.456 229.91 602.324 230.587 602.324 231.797V231.811C602.324 232.856 601.442 233.581 600.15 233.581C598.838 233.581 597.942 232.911 597.847 231.94L597.84 231.872H596.657L596.664 231.954C596.794 233.513 598.113 234.647 600.15 234.647ZM606.549 227.791C607.041 227.791 607.438 227.388 607.438 226.902C607.438 226.41 607.041 226.014 606.549 226.014C606.063 226.014 605.66 226.41 605.66 226.902C605.66 227.388 606.063 227.791 606.549 227.791ZM606.549 233.082C607.041 233.082 607.438 232.679 607.438 232.193C607.438 231.701 607.041 231.305 606.549 231.305C606.063 231.305 605.66 231.701 605.66 232.193C605.66 232.679 606.063 233.082 606.549 233.082ZM613.029 234.716C615.21 234.716 616.522 232.727 616.522 229.555V229.541C616.522 226.369 615.21 224.387 613.029 224.387C610.849 224.387 609.55 226.369 609.55 229.541V229.555C609.55 232.727 610.849 234.716 613.029 234.716ZM613.029 233.643C611.614 233.643 610.787 232.07 610.787 229.555V229.541C610.787 227.025 611.614 225.467 613.029 225.467C614.444 225.467 615.285 227.025 615.285 229.541V229.555C615.285 232.07 614.444 233.643 613.029 233.643ZM621.848 234.716C624.028 234.716 625.341 232.727 625.341 229.555V229.541C625.341 226.369 624.028 224.387 621.848 224.387C619.667 224.387 618.368 226.369 618.368 229.541V229.555C618.368 232.727 619.667 234.716 621.848 234.716ZM621.848 233.643C620.433 233.643 619.605 232.07 619.605 229.555V229.541C619.605 227.025 620.433 225.467 621.848 225.467C623.263 225.467 624.104 227.025 624.104 229.541V229.555C624.104 232.07 623.263 233.643 621.848 233.643ZM635.547 234.716C638.069 234.716 639.737 233.103 639.737 230.669V229.466H635.738V230.546H638.507V230.785C638.507 232.453 637.317 233.581 635.554 233.581C633.571 233.581 632.334 232.036 632.334 229.555V229.541C632.334 227.094 633.592 225.521 635.547 225.521C637.017 225.521 638.008 226.219 638.411 227.49L638.432 227.559H639.676L639.662 227.49C639.272 225.617 637.734 224.387 635.547 224.387C632.847 224.387 631.076 226.431 631.076 229.541V229.555C631.076 232.706 632.819 234.716 635.547 234.716ZM641.918 234.483H643.066V226.95H643.142L646.259 234.483H647.298L650.415 226.95H650.49V234.483H651.639V224.619H650.21L646.833 232.85H646.724L643.347 224.619H641.918V234.483ZM656.718 234.483H657.948V225.727H661.127V224.619H653.539V225.727H656.718V234.483ZM666.5 231.065H669.562V234.196H670.67V231.065H673.732V229.958H670.67V226.827H669.562V229.958H666.5V231.065ZM682.804 234.716C684.807 234.716 686.235 233.328 686.235 231.339V231.325C686.235 229.418 684.902 228.03 683.05 228.03C682.154 228.03 681.382 228.393 680.944 229.056H680.835L681.17 225.72H685.688V224.619H680.199L679.68 230.286H680.746C680.869 230.054 681.026 229.862 681.197 229.698C681.621 229.295 682.182 229.097 682.838 229.097C684.116 229.097 685.032 230.033 685.032 231.346V231.359C685.032 232.692 684.13 233.629 682.817 233.629C681.662 233.629 680.808 232.877 680.691 231.934L680.685 231.879H679.502L679.509 231.954C679.652 233.533 680.965 234.716 682.804 234.716ZM689.195 227.791C689.688 227.791 690.084 227.388 690.084 226.902C690.084 226.41 689.688 226.014 689.195 226.014C688.71 226.014 688.307 226.41 688.307 226.902C688.307 227.388 688.71 227.791 689.195 227.791ZM689.195 233.082C689.688 233.082 690.084 232.679 690.084 232.193C690.084 231.701 689.688 231.305 689.195 231.305C688.71 231.305 688.307 231.701 688.307 232.193C688.307 232.679 688.71 233.082 689.195 233.082ZM695.662 234.647C697.638 234.647 699.087 233.431 699.087 231.783V231.77C699.087 230.368 698.109 229.473 696.674 229.35V229.322C697.904 229.062 698.766 228.229 698.766 227.012V226.998C698.766 225.501 697.528 224.455 695.648 224.455C693.803 224.455 692.531 225.528 692.374 227.135L692.367 227.203H693.55L693.557 227.135C693.659 226.137 694.486 225.521 695.648 225.521C696.852 225.521 697.528 226.116 697.528 227.148V227.162C697.528 228.146 696.708 228.871 695.532 228.871H694.35V229.91H695.587C696.968 229.91 697.836 230.587 697.836 231.797V231.811C697.836 232.856 696.954 233.581 695.662 233.581C694.35 233.581 693.454 232.911 693.358 231.94L693.352 231.872H692.169L692.176 231.954C692.306 233.513 693.625 234.647 695.662 234.647ZM704.385 234.716C706.565 234.716 707.878 232.727 707.878 229.555V229.541C707.878 226.369 706.565 224.387 704.385 224.387C702.204 224.387 700.905 226.369 700.905 229.541V229.555C700.905 232.727 702.204 234.716 704.385 234.716ZM704.385 233.643C702.97 233.643 702.143 232.07 702.143 229.555V229.541C702.143 227.025 702.97 225.467 704.385 225.467C705.8 225.467 706.641 227.025 706.641 229.541V229.555C706.641 232.07 705.8 233.643 704.385 233.643Z" fill="#575757"/> +<rect x="67.5" y="257.988" width="23" height="23" fill="white"/> <g clip-path="url(#clip1_625_11871)"> -<path fill-rule="evenodd" clip-rule="evenodd" d="M73 243.4H68V245.4H70V258.4C70 258.666 70.1054 258.92 70.2929 259.107C70.4804 259.295 70.7348 259.4 71 259.4H85C85.2652 259.4 85.5196 259.295 85.7071 259.107C85.8946 258.92 86 258.666 86 258.4V245.4H88V243.4H83V240.4C83 240.135 82.8946 239.881 82.7071 239.693C82.5196 239.506 82.2652 239.4 82 239.4H74C73.7348 239.4 73.4804 239.506 73.2929 239.693C73.1054 239.881 73 240.135 73 240.4V243.4ZM72 245.4H84V257.4H72V245.4ZM75 243.4V241.4H81V243.4H75Z" fill="#F86A2B"/> -</g> -<path d="M104.237 255H108.291C110.396 255 111.661 253.947 111.661 252.218V252.204C111.661 250.919 110.772 249.976 109.439 249.832V249.716C110.41 249.552 111.169 248.629 111.169 247.604V247.59C111.169 246.079 110.055 245.136 108.202 245.136H104.237V255ZM107.847 246.387C108.981 246.387 109.645 246.927 109.645 247.856V247.87C109.645 248.827 108.94 249.333 107.587 249.333H105.769V246.387H107.847ZM107.895 250.502C109.337 250.502 110.096 251.049 110.096 252.108V252.122C110.096 253.182 109.364 253.749 107.983 253.749H105.769V250.502H107.895Z" fill="#393939"/> -<path d="M115.934 255.144C117.014 255.144 117.766 254.679 118.121 253.879H118.237V255H119.714V247.576H118.237V251.931C118.237 253.127 117.602 253.872 116.412 253.872C115.325 253.872 114.874 253.264 114.874 252.033V247.576H113.391V252.382C113.391 254.139 114.259 255.144 115.934 255.144Z" fill="#393939"/> -<path d="M124.554 255.144C126.317 255.144 127.63 254.207 127.63 252.833V252.819C127.63 251.746 126.946 251.138 125.518 250.803L124.342 250.536C123.508 250.338 123.166 250.051 123.166 249.586V249.572C123.166 248.978 123.754 248.574 124.567 248.574C125.401 248.574 125.928 248.964 126.071 249.483V249.497H127.486V249.49C127.356 248.28 126.27 247.433 124.574 247.433C122.893 247.433 121.689 248.362 121.689 249.654V249.661C121.689 250.748 122.339 251.384 123.74 251.705L124.923 251.979C125.784 252.177 126.133 252.491 126.133 252.956V252.97C126.133 253.578 125.497 253.995 124.581 253.995C123.699 253.995 123.159 253.619 122.975 253.059L122.968 253.052H121.484V253.059C121.628 254.303 122.763 255.144 124.554 255.144Z" fill="#393939"/> -<path d="M130.173 246.25C130.679 246.25 131.103 245.833 131.103 245.327C131.103 244.814 130.679 244.397 130.173 244.397C129.66 244.397 129.243 244.814 129.243 245.327C129.243 245.833 129.66 246.25 130.173 246.25ZM129.428 255H130.904V247.576H129.428V255Z" fill="#393939"/> -<path d="M133.064 255H134.548V250.646C134.548 249.449 135.225 248.704 136.312 248.704C137.398 248.704 137.911 249.312 137.911 250.543V255H139.388V250.194C139.388 248.424 138.472 247.433 136.811 247.433C135.73 247.433 135.02 247.911 134.657 248.704H134.548V247.576H133.064V255Z" fill="#393939"/> -<path d="M144.576 255.144C146.477 255.144 147.502 254.05 147.748 253.072L147.762 253.011L146.333 253.018L146.306 253.072C146.128 253.455 145.561 253.927 144.61 253.927C143.387 253.927 142.607 253.1 142.58 251.678H147.844V251.158C147.844 248.93 146.572 247.433 144.501 247.433C142.43 247.433 141.09 248.984 141.09 251.302V251.309C141.09 253.66 142.402 255.144 144.576 255.144ZM144.508 248.649C145.513 248.649 146.258 249.292 146.374 250.618H142.601C142.73 249.34 143.496 248.649 144.508 248.649Z" fill="#393939"/> -<path d="M152.308 255.144C154.071 255.144 155.384 254.207 155.384 252.833V252.819C155.384 251.746 154.7 251.138 153.271 250.803L152.096 250.536C151.262 250.338 150.92 250.051 150.92 249.586V249.572C150.92 248.978 151.508 248.574 152.321 248.574C153.155 248.574 153.682 248.964 153.825 249.483V249.497H155.24V249.49C155.11 248.28 154.023 247.433 152.328 247.433C150.646 247.433 149.443 248.362 149.443 249.654V249.661C149.443 250.748 150.093 251.384 151.494 251.705L152.677 251.979C153.538 252.177 153.887 252.491 153.887 252.956V252.97C153.887 253.578 153.251 253.995 152.335 253.995C151.453 253.995 150.913 253.619 150.729 253.059L150.722 253.052H149.238V253.059C149.382 254.303 150.517 255.144 152.308 255.144Z" fill="#393939"/> -<path d="M159.718 255.144C161.481 255.144 162.794 254.207 162.794 252.833V252.819C162.794 251.746 162.11 251.138 160.682 250.803L159.506 250.536C158.672 250.338 158.33 250.051 158.33 249.586V249.572C158.33 248.978 158.918 248.574 159.731 248.574C160.565 248.574 161.092 248.964 161.235 249.483V249.497H162.65V249.49C162.521 248.28 161.434 247.433 159.738 247.433C158.057 247.433 156.854 248.362 156.854 249.654V249.661C156.854 250.748 157.503 251.384 158.904 251.705L160.087 251.979C160.948 252.177 161.297 252.491 161.297 252.956V252.97C161.297 253.578 160.661 253.995 159.745 253.995C158.863 253.995 158.323 253.619 158.139 253.059L158.132 253.052H156.648V253.059C156.792 254.303 157.927 255.144 159.718 255.144Z" fill="#393939"/> -<path d="M170.43 255.123C171.414 255.123 172.193 254.699 172.631 253.947H172.747V255H174.217V249.921C174.217 248.362 173.164 247.433 171.298 247.433C169.609 247.433 168.44 248.246 168.263 249.463L168.256 249.511H169.685L169.691 249.483C169.869 248.957 170.409 248.656 171.229 248.656C172.234 248.656 172.747 249.107 172.747 249.921V250.577L170.737 250.693C168.967 250.803 167.969 251.575 167.969 252.901V252.915C167.969 254.262 169.015 255.123 170.43 255.123ZM169.445 252.854V252.84C169.445 252.17 169.91 251.801 170.936 251.739L172.747 251.623V252.259C172.747 253.216 171.934 253.94 170.826 253.94C170.026 253.94 169.445 253.537 169.445 252.854Z" fill="#393939"/> -<path d="M176.309 255H177.792V250.646C177.792 249.449 178.469 248.704 179.556 248.704C180.643 248.704 181.155 249.312 181.155 250.543V255H182.632V250.194C182.632 248.424 181.716 247.433 180.055 247.433C178.975 247.433 178.264 247.911 177.901 248.704H177.792V247.576H176.309V255Z" fill="#393939"/> -<path d="M186.74 255.123C187.725 255.123 188.504 254.699 188.941 253.947H189.058V255H190.527V249.921C190.527 248.362 189.475 247.433 187.608 247.433C185.92 247.433 184.751 248.246 184.573 249.463L184.566 249.511H185.995L186.002 249.483C186.18 248.957 186.72 248.656 187.54 248.656C188.545 248.656 189.058 249.107 189.058 249.921V250.577L187.048 250.693C185.277 250.803 184.279 251.575 184.279 252.901V252.915C184.279 254.262 185.325 255.123 186.74 255.123ZM185.756 252.854V252.84C185.756 252.17 186.221 251.801 187.246 251.739L189.058 251.623V252.259C189.058 253.216 188.244 253.94 187.137 253.94C186.337 253.94 185.756 253.537 185.756 252.854Z" fill="#393939"/> -<path d="M192.688 255H194.171V244.664H192.688V255Z" fill="#393939"/> -<path d="M197.104 257.611C198.607 257.611 199.359 257.058 199.988 255.287L202.75 247.576H201.191L199.339 253.51H199.209L197.35 247.576H195.75L198.443 255.007L198.334 255.39C198.115 256.142 197.698 256.436 197.008 256.436C196.837 256.436 196.652 256.429 196.509 256.408V257.577C196.7 257.598 196.919 257.611 197.104 257.611Z" fill="#393939"/> -<path d="M207.057 255.048C207.344 255.048 207.617 255.014 207.856 254.973V253.79C207.651 253.811 207.521 253.817 207.296 253.817C206.564 253.817 206.264 253.489 206.264 252.689V248.745H207.856V247.576H206.264V245.703H204.753V247.576H203.591V248.745H204.753V253.045C204.753 254.474 205.423 255.048 207.057 255.048Z" fill="#393939"/> -<path d="M210.358 246.25C210.864 246.25 211.288 245.833 211.288 245.327C211.288 244.814 210.864 244.397 210.358 244.397C209.846 244.397 209.429 244.814 209.429 245.327C209.429 245.833 209.846 246.25 210.358 246.25ZM209.613 255H211.09V247.576H209.613V255Z" fill="#393939"/> -<path d="M216.374 255.144C218.213 255.144 219.272 254.152 219.539 252.71L219.553 252.648H218.131L218.117 252.683C217.878 253.482 217.304 253.906 216.374 253.906C215.15 253.906 214.392 252.908 214.392 251.268V251.254C214.392 249.654 215.137 248.67 216.374 248.67C217.358 248.67 217.96 249.217 218.124 249.948L218.131 249.969L219.553 249.962V249.928C219.348 248.485 218.233 247.433 216.367 247.433C214.2 247.433 212.881 248.902 212.881 251.254V251.268C212.881 253.667 214.207 255.144 216.374 255.144Z" fill="#393939"/> -<path d="M223.935 255.144C225.698 255.144 227.011 254.207 227.011 252.833V252.819C227.011 251.746 226.327 251.138 224.898 250.803L223.723 250.536C222.889 250.338 222.547 250.051 222.547 249.586V249.572C222.547 248.978 223.135 248.574 223.948 248.574C224.782 248.574 225.309 248.964 225.452 249.483V249.497H226.867V249.49C226.737 248.28 225.65 247.433 223.955 247.433C222.273 247.433 221.07 248.362 221.07 249.654V249.661C221.07 250.748 221.72 251.384 223.121 251.705L224.304 251.979C225.165 252.177 225.514 252.491 225.514 252.956V252.97C225.514 253.578 224.878 253.995 223.962 253.995C223.08 253.995 222.54 253.619 222.355 253.059L222.349 253.052H220.865V253.059C221.009 254.303 222.144 255.144 223.935 255.144Z" fill="#393939"/> -<path d="M235.316 255.123C236.355 255.123 237.169 254.645 237.6 253.831H237.716V255H239.192V244.664H237.716V248.752H237.6C237.203 247.952 236.335 247.446 235.316 247.446C233.43 247.446 232.24 248.93 232.24 251.281V251.295C232.24 253.626 233.45 255.123 235.316 255.123ZM235.74 253.858C234.496 253.858 233.751 252.888 233.751 251.295V251.281C233.751 249.688 234.496 248.718 235.74 248.718C236.971 248.718 237.736 249.695 237.736 251.281V251.295C237.736 252.881 236.978 253.858 235.74 253.858Z" fill="#393939"/> -<path d="M244.518 255.144C246.418 255.144 247.443 254.05 247.689 253.072L247.703 253.011L246.274 253.018L246.247 253.072C246.069 253.455 245.502 253.927 244.552 253.927C243.328 253.927 242.549 253.1 242.521 251.678H247.785V251.158C247.785 248.93 246.514 247.433 244.442 247.433C242.371 247.433 241.031 248.984 241.031 251.302V251.309C241.031 253.66 242.344 255.144 244.518 255.144ZM244.449 248.649C245.454 248.649 246.199 249.292 246.315 250.618H242.542C242.672 249.34 243.438 248.649 244.449 248.649Z" fill="#393939"/> -<path d="M249.617 255H251.101V244.664H249.617V255Z" fill="#393939"/> -<path d="M256.426 255.144C258.326 255.144 259.352 254.05 259.598 253.072L259.611 253.011L258.183 253.018L258.155 253.072C257.978 253.455 257.41 253.927 256.46 253.927C255.236 253.927 254.457 253.1 254.43 251.678H259.693V251.158C259.693 248.93 258.422 247.433 256.351 247.433C254.279 247.433 252.939 248.984 252.939 251.302V251.309C252.939 253.66 254.252 255.144 256.426 255.144ZM256.357 248.649C257.362 248.649 258.107 249.292 258.224 250.618H254.45C254.58 249.34 255.346 248.649 256.357 248.649Z" fill="#393939"/> -<path d="M264.26 255.048C264.547 255.048 264.82 255.014 265.06 254.973V253.79C264.854 253.811 264.725 253.817 264.499 253.817C263.768 253.817 263.467 253.489 263.467 252.689V248.745H265.06V247.576H263.467V245.703H261.956V247.576H260.794V248.745H261.956V253.045C261.956 254.474 262.626 255.048 264.26 255.048Z" fill="#393939"/> -<path d="M269.824 255.144C271.725 255.144 272.75 254.05 272.996 253.072L273.01 253.011L271.581 253.018L271.554 253.072C271.376 253.455 270.809 253.927 269.858 253.927C268.635 253.927 267.855 253.1 267.828 251.678H273.092V251.158C273.092 248.93 271.82 247.433 269.749 247.433C267.678 247.433 266.338 248.984 266.338 251.302V251.309C266.338 253.66 267.65 255.144 269.824 255.144ZM269.756 248.649C270.761 248.649 271.506 249.292 271.622 250.618H267.849C267.979 249.34 268.744 248.649 269.756 248.649Z" fill="#393939"/> -<path d="M277.562 255.123C278.602 255.123 279.415 254.645 279.846 253.831H279.962V255H281.438V244.664H279.962V248.752H279.846C279.449 247.952 278.581 247.446 277.562 247.446C275.676 247.446 274.486 248.93 274.486 251.281V251.295C274.486 253.626 275.696 255.123 277.562 255.123ZM277.986 253.858C276.742 253.858 275.997 252.888 275.997 251.295V251.281C275.997 249.688 276.742 248.718 277.986 248.718C279.217 248.718 279.982 249.695 279.982 251.281V251.295C279.982 252.881 279.224 253.858 277.986 253.858Z" fill="#393939"/> -<path d="M288.247 246.25C288.753 246.25 289.177 245.833 289.177 245.327C289.177 244.814 288.753 244.397 288.247 244.397C287.734 244.397 287.317 244.814 287.317 245.327C287.317 245.833 287.734 246.25 288.247 246.25ZM287.502 255H288.979V247.576H287.502V255Z" fill="#393939"/> -<path d="M291.139 255H292.622V250.646C292.622 249.449 293.299 248.704 294.386 248.704C295.473 248.704 295.985 249.312 295.985 250.543V255H297.462V250.194C297.462 248.424 296.546 247.433 294.885 247.433C293.805 247.433 293.094 247.911 292.731 248.704H292.622V247.576H291.139V255Z" fill="#393939"/> -<path d="M307.518 255.239C309.999 255.239 311.51 253.77 311.51 251.603V245.136H309.979V251.486C309.979 252.915 309.09 253.886 307.518 253.886C305.945 253.886 305.05 252.915 305.05 251.486V245.136H303.519V251.603C303.519 253.77 305.043 255.239 307.518 255.239Z" fill="#393939"/> -<path d="M313.807 255H315.29V250.646C315.29 249.449 315.967 248.704 317.054 248.704C318.141 248.704 318.653 249.312 318.653 250.543V255H320.13V250.194C320.13 248.424 319.214 247.433 317.553 247.433C316.473 247.433 315.762 247.911 315.399 248.704H315.29V247.576H313.807V255Z" fill="#393939"/> -<path d="M325.004 255.048C325.291 255.048 325.564 255.014 325.804 254.973V253.79C325.599 253.811 325.469 253.817 325.243 253.817C324.512 253.817 324.211 253.489 324.211 252.689V248.745H325.804V247.576H324.211V245.703H322.7V247.576H321.538V248.745H322.7V253.045C322.7 254.474 323.37 255.048 325.004 255.048Z" fill="#393939"/> -<path d="M328.306 246.25C328.812 246.25 329.235 245.833 329.235 245.327C329.235 244.814 328.812 244.397 328.306 244.397C327.793 244.397 327.376 244.814 327.376 245.327C327.376 245.833 327.793 246.25 328.306 246.25ZM327.561 255H329.037V247.576H327.561V255Z" fill="#393939"/> -<path d="M334 255.048C334.287 255.048 334.561 255.014 334.8 254.973V253.79C334.595 253.811 334.465 253.817 334.239 253.817C333.508 253.817 333.207 253.489 333.207 252.689V248.745H334.8V247.576H333.207V245.703H331.696V247.576H330.534V248.745H331.696V253.045C331.696 254.474 332.366 255.048 334 255.048Z" fill="#393939"/> -<path d="M336.598 255H338.081V244.664H336.598V255Z" fill="#393939"/> -<path d="M343.406 255.144C345.307 255.144 346.332 254.05 346.578 253.072L346.592 253.011L345.163 253.018L345.136 253.072C344.958 253.455 344.391 253.927 343.44 253.927C342.217 253.927 341.438 253.1 341.41 251.678H346.674V251.158C346.674 248.93 345.402 247.433 343.331 247.433C341.26 247.433 339.92 248.984 339.92 251.302V251.309C339.92 253.66 341.232 255.144 343.406 255.144ZM343.338 248.649C344.343 248.649 345.088 249.292 345.204 250.618H341.431C341.561 249.34 342.326 248.649 343.338 248.649Z" fill="#393939"/> -<path d="M351.145 255.123C352.184 255.123 352.997 254.645 353.428 253.831H353.544V255H355.021V244.664H353.544V248.752H353.428C353.031 247.952 352.163 247.446 351.145 247.446C349.258 247.446 348.068 248.93 348.068 251.281V251.295C348.068 253.626 349.278 255.123 351.145 255.123ZM351.568 253.858C350.324 253.858 349.579 252.888 349.579 251.295V251.281C349.579 249.688 350.324 248.718 351.568 248.718C352.799 248.718 353.564 249.695 353.564 251.281V251.295C353.564 252.881 352.806 253.858 351.568 253.858Z" fill="#393939"/> -<path d="M363.258 255H364.707L366.819 247.624H366.915L369.034 255H370.477L373.143 245.136H371.55L369.745 252.806H369.649L367.578 245.136H366.156L364.099 252.806H364.003L362.191 245.136H360.599L363.258 255Z" fill="#393939"/> -<path d="M377.23 255.144C379.404 255.144 380.737 253.688 380.737 251.295V251.281C380.737 248.889 379.397 247.433 377.23 247.433C375.057 247.433 373.717 248.896 373.717 251.281V251.295C373.717 253.688 375.05 255.144 377.23 255.144ZM377.23 253.906C375.952 253.906 375.234 252.942 375.234 251.295V251.281C375.234 249.634 375.952 248.67 377.23 248.67C378.502 248.67 379.227 249.634 379.227 251.281V251.295C379.227 252.936 378.502 253.906 377.23 253.906Z" fill="#393939"/> -<path d="M382.508 255H383.991V250.563C383.991 249.49 384.764 248.793 385.898 248.793C386.179 248.793 386.432 248.827 386.698 248.882V247.515C386.548 247.48 386.288 247.446 386.049 247.446C385.058 247.446 384.367 247.911 384.101 248.697H383.991V247.576H382.508V255Z" fill="#393939"/> -<path d="M388.182 255H389.665V252.3L390.301 251.664L392.857 255H394.662L391.36 250.707L394.457 247.576H392.721L389.774 250.707H389.665V244.664H388.182V255Z" fill="#393939"/> -<path d="M398.429 255.144C400.192 255.144 401.505 254.207 401.505 252.833V252.819C401.505 251.746 400.821 251.138 399.393 250.803L398.217 250.536C397.383 250.338 397.041 250.051 397.041 249.586V249.572C397.041 248.978 397.629 248.574 398.442 248.574C399.276 248.574 399.803 248.964 399.946 249.483V249.497H401.361V249.49C401.231 248.28 400.145 247.433 398.449 247.433C396.768 247.433 395.564 248.362 395.564 249.654V249.661C395.564 250.748 396.214 251.384 397.615 251.705L398.798 251.979C399.659 252.177 400.008 252.491 400.008 252.956V252.97C400.008 253.578 399.372 253.995 398.456 253.995C397.574 253.995 397.034 253.619 396.85 253.059L396.843 253.052H395.359V253.059C395.503 254.303 396.638 255.144 398.429 255.144Z" fill="#393939"/> -<path d="M403.275 257.475H404.759V253.824H404.868C405.265 254.624 406.133 255.123 407.151 255.123C409.038 255.123 410.228 253.646 410.228 251.295V251.281C410.228 248.943 409.024 247.446 407.151 247.446C406.112 247.446 405.299 247.932 404.868 248.745H404.759V247.576H403.275V257.475ZM406.734 253.858C405.497 253.858 404.731 252.881 404.731 251.295V251.281C404.731 249.695 405.497 248.718 406.734 248.718C407.972 248.718 408.717 249.682 408.717 251.281V251.295C408.717 252.888 407.972 253.858 406.734 253.858Z" fill="#393939"/> -<path d="M414.049 255.123C415.033 255.123 415.812 254.699 416.25 253.947H416.366V255H417.836V249.921C417.836 248.362 416.783 247.433 414.917 247.433C413.229 247.433 412.06 248.246 411.882 249.463L411.875 249.511H413.304L413.311 249.483C413.488 248.957 414.028 248.656 414.849 248.656C415.854 248.656 416.366 249.107 416.366 249.921V250.577L414.356 250.693C412.586 250.803 411.588 251.575 411.588 252.901V252.915C411.588 254.262 412.634 255.123 414.049 255.123ZM413.064 252.854V252.84C413.064 252.17 413.529 251.801 414.555 251.739L416.366 251.623V252.259C416.366 253.216 415.553 253.94 414.445 253.94C413.646 253.94 413.064 253.537 413.064 252.854Z" fill="#393939"/> -<path d="M423.052 255.144C424.891 255.144 425.95 254.152 426.217 252.71L426.23 252.648H424.809L424.795 252.683C424.556 253.482 423.981 253.906 423.052 253.906C421.828 253.906 421.069 252.908 421.069 251.268V251.254C421.069 249.654 421.814 248.67 423.052 248.67C424.036 248.67 424.638 249.217 424.802 249.948L424.809 249.969L426.23 249.962V249.928C426.025 248.485 424.911 247.433 423.045 247.433C420.878 247.433 419.559 248.902 419.559 251.254V251.268C419.559 253.667 420.885 255.144 423.052 255.144Z" fill="#393939"/> -<path d="M431.029 255.144C432.93 255.144 433.955 254.05 434.201 253.072L434.215 253.011L432.786 253.018L432.759 253.072C432.581 253.455 432.014 253.927 431.063 253.927C429.84 253.927 429.061 253.1 429.033 251.678H434.297V251.158C434.297 248.93 433.025 247.433 430.954 247.433C428.883 247.433 427.543 248.984 427.543 251.302V251.309C427.543 253.66 428.855 255.144 431.029 255.144ZM430.961 248.649C431.966 248.649 432.711 249.292 432.827 250.618H429.054C429.184 249.34 429.949 248.649 430.961 248.649Z" fill="#393939"/> -<path d="M455.107 255H456.297V250.434C456.297 249.354 457.104 248.636 458.238 248.636C458.498 248.636 458.724 248.663 458.97 248.704V247.549C458.854 247.528 458.601 247.501 458.375 247.501C457.377 247.501 456.687 247.952 456.406 248.725H456.297V247.631H455.107V255Z" fill="#575757"/> -<path d="M463.263 255.13C465.361 255.13 466.66 253.681 466.66 251.322V251.309C466.66 248.943 465.361 247.501 463.263 247.501C461.164 247.501 459.865 248.943 459.865 251.309V251.322C459.865 253.681 461.164 255.13 463.263 255.13ZM463.263 254.077C461.868 254.077 461.082 253.059 461.082 251.322V251.309C461.082 249.565 461.868 248.554 463.263 248.554C464.657 248.554 465.443 249.565 465.443 251.309V251.322C465.443 253.059 464.657 254.077 463.263 254.077Z" fill="#575757"/> -<path d="M468.506 255H469.695V250.434C469.695 249.395 470.427 248.554 471.391 248.554C472.32 248.554 472.922 249.121 472.922 249.996V255H474.111V250.263C474.111 249.326 474.788 248.554 475.813 248.554C476.853 248.554 477.352 249.094 477.352 250.181V255H478.541V249.907C478.541 248.362 477.7 247.501 476.196 247.501C475.178 247.501 474.337 248.014 473.94 248.793H473.831C473.489 248.027 472.792 247.501 471.794 247.501C470.83 247.501 470.133 247.959 469.805 248.752H469.695V247.631H468.506V255Z" fill="#575757"/> -<path d="M482.711 255.13C483.702 255.13 484.475 254.699 484.939 253.913H485.049V255H486.238V249.955C486.238 248.424 485.233 247.501 483.436 247.501C481.863 247.501 480.742 248.28 480.551 249.436L480.544 249.477H481.733L481.74 249.456C481.932 248.882 482.513 248.554 483.395 248.554C484.495 248.554 485.049 249.046 485.049 249.955V250.625L482.937 250.755C481.221 250.857 480.25 251.616 480.25 252.929V252.942C480.25 254.282 481.31 255.13 482.711 255.13ZM481.467 252.915V252.901C481.467 252.17 481.959 251.773 483.08 251.705L485.049 251.582V252.252C485.049 253.305 484.167 254.098 482.957 254.098C482.103 254.098 481.467 253.66 481.467 252.915Z" fill="#575757"/> -<path d="M489.041 246.209C489.492 246.209 489.861 245.84 489.861 245.389C489.861 244.938 489.492 244.568 489.041 244.568C488.59 244.568 488.221 244.938 488.221 245.389C488.221 245.84 488.59 246.209 489.041 246.209ZM488.439 255H489.629V247.631H488.439V255Z" fill="#575757"/> -<path d="M491.871 255H493.061V250.639C493.061 249.347 493.806 248.554 494.981 248.554C496.157 248.554 496.704 249.189 496.704 250.516V255H497.894V250.229C497.894 248.479 496.971 247.501 495.316 247.501C494.229 247.501 493.539 247.959 493.17 248.738H493.061V247.631H491.871V255Z" fill="#575757"/> -<path d="M502.07 255.13C503.062 255.13 503.834 254.699 504.299 253.913H504.408V255H505.598V249.955C505.598 248.424 504.593 247.501 502.795 247.501C501.223 247.501 500.102 248.28 499.91 249.436L499.903 249.477H501.093L501.1 249.456C501.291 248.882 501.872 248.554 502.754 248.554C503.854 248.554 504.408 249.046 504.408 249.955V250.625L502.296 250.755C500.58 250.857 499.609 251.616 499.609 252.929V252.942C499.609 254.282 500.669 255.13 502.07 255.13ZM500.826 252.915V252.901C500.826 252.17 501.318 251.773 502.439 251.705L504.408 251.582V252.252C504.408 253.305 503.526 254.098 502.316 254.098C501.462 254.098 500.826 253.66 500.826 252.915Z" fill="#575757"/> -<path d="M513.404 256.6C514.266 256.6 515.093 256.477 515.708 256.265V255.403C515.277 255.602 514.354 255.731 513.418 255.731C510.492 255.731 508.605 253.852 508.605 250.939V250.926C508.605 248.089 510.526 246.052 513.199 246.052C515.934 246.052 517.807 247.74 517.807 250.201V250.215C517.807 251.89 517.253 252.977 516.392 252.977C515.899 252.977 515.619 252.696 515.619 252.218V248.205H514.587V249.039H514.478C514.211 248.444 513.596 248.075 512.878 248.075C511.477 248.075 510.499 249.237 510.499 250.892V250.905C510.499 252.635 511.456 253.804 512.878 253.804C513.678 253.804 514.293 253.414 514.587 252.717H514.696L514.703 252.758C514.812 253.421 515.414 253.865 516.2 253.865C517.772 253.865 518.771 252.45 518.771 250.229V250.215C518.771 247.255 516.521 245.19 513.288 245.19C509.938 245.19 507.642 247.508 507.642 250.885V250.898C507.642 254.385 509.877 256.6 513.404 256.6ZM513.035 252.84C512.14 252.84 511.593 252.115 511.593 250.933V250.919C511.593 249.729 512.133 249.019 513.049 249.019C513.979 249.019 514.573 249.757 514.573 250.919V250.933C514.573 252.095 513.972 252.84 513.035 252.84Z" fill="#575757"/> -<path d="M523.631 255.13C525.367 255.13 526.42 254.146 526.673 253.147L526.687 253.093H525.497L525.47 253.154C525.271 253.599 524.656 254.07 523.658 254.07C522.346 254.07 521.505 253.182 521.471 251.657H526.775V251.192C526.775 248.991 525.559 247.501 523.556 247.501C521.553 247.501 520.254 249.06 520.254 251.336V251.343C520.254 253.653 521.525 255.13 523.631 255.13ZM523.549 248.561C524.636 248.561 525.442 249.251 525.565 250.707H521.491C521.621 249.306 522.455 248.561 523.549 248.561Z" fill="#575757"/> -<path d="M527.76 255H529.093L530.843 252.218H530.952L532.695 255H534.09L531.554 251.268L534.056 247.631H532.723L530.993 250.372H530.884L529.134 247.631H527.732L530.282 251.315L527.76 255Z" fill="#575757"/> -<path d="M537.713 255.13C538.704 255.13 539.477 254.699 539.941 253.913H540.051V255H541.24V249.955C541.24 248.424 540.235 247.501 538.438 247.501C536.865 247.501 535.744 248.28 535.553 249.436L535.546 249.477H536.735L536.742 249.456C536.934 248.882 537.515 248.554 538.396 248.554C539.497 248.554 540.051 249.046 540.051 249.955V250.625L537.938 250.755C536.223 250.857 535.252 251.616 535.252 252.929V252.942C535.252 254.282 536.312 255.13 537.713 255.13ZM536.469 252.915V252.901C536.469 252.17 536.961 251.773 538.082 251.705L540.051 251.582V252.252C540.051 253.305 539.169 254.098 537.959 254.098C537.104 254.098 536.469 253.66 536.469 252.915Z" fill="#575757"/> -<path d="M543.414 255H544.604V250.434C544.604 249.395 545.335 248.554 546.299 248.554C547.229 248.554 547.83 249.121 547.83 249.996V255H549.02V250.263C549.02 249.326 549.696 248.554 550.722 248.554C551.761 248.554 552.26 249.094 552.26 250.181V255H553.449V249.907C553.449 248.362 552.608 247.501 551.104 247.501C550.086 247.501 549.245 248.014 548.849 248.793H548.739C548.397 248.027 547.7 247.501 546.702 247.501C545.738 247.501 545.041 247.959 544.713 248.752H544.604V247.631H543.414V255Z" fill="#575757"/> -<path d="M555.596 257.461H556.785V253.838H556.895C557.298 254.624 558.18 255.13 559.191 255.13C561.064 255.13 562.281 253.633 562.281 251.322V251.309C562.281 249.012 561.058 247.501 559.191 247.501C558.166 247.501 557.346 247.986 556.895 248.807H556.785V247.631H555.596V257.461ZM558.918 254.077C557.578 254.077 556.758 253.024 556.758 251.322V251.309C556.758 249.606 557.578 248.554 558.918 248.554C560.265 248.554 561.064 249.593 561.064 251.309V251.322C561.064 253.038 560.265 254.077 558.918 254.077Z" fill="#575757"/> -<path d="M564.209 255H565.398V244.705H564.209V255Z" fill="#575757"/> -<path d="M570.689 255.13C572.426 255.13 573.479 254.146 573.731 253.147L573.745 253.093H572.556L572.528 253.154C572.33 253.599 571.715 254.07 570.717 254.07C569.404 254.07 568.563 253.182 568.529 251.657H573.834V251.192C573.834 248.991 572.617 247.501 570.614 247.501C568.611 247.501 567.312 249.06 567.312 251.336V251.343C567.312 253.653 568.584 255.13 570.689 255.13ZM570.607 248.561C571.694 248.561 572.501 249.251 572.624 250.707H568.55C568.68 249.306 569.514 248.561 570.607 248.561Z" fill="#575757"/> -<path d="M576.65 255.068C577.143 255.068 577.539 254.665 577.539 254.18C577.539 253.688 577.143 253.291 576.65 253.291C576.165 253.291 575.762 253.688 575.762 254.18C575.762 254.665 576.165 255.068 576.65 255.068Z" fill="#575757"/> -<path d="M582.577 255.13C584.348 255.13 585.339 254.18 585.64 252.847L585.653 252.771L584.478 252.778L584.464 252.819C584.19 253.64 583.562 254.077 582.57 254.077C581.258 254.077 580.41 252.99 580.41 251.295V251.281C580.41 249.62 581.244 248.554 582.57 248.554C583.63 248.554 584.286 249.142 584.471 249.866L584.478 249.887H585.66L585.653 249.846C585.435 248.533 584.361 247.501 582.57 247.501C580.506 247.501 579.193 248.991 579.193 251.281V251.295C579.193 253.633 580.513 255.13 582.577 255.13Z" fill="#575757"/> -<path d="M590.425 255.13C592.523 255.13 593.822 253.681 593.822 251.322V251.309C593.822 248.943 592.523 247.501 590.425 247.501C588.326 247.501 587.027 248.943 587.027 251.309V251.322C587.027 253.681 588.326 255.13 590.425 255.13ZM590.425 254.077C589.03 254.077 588.244 253.059 588.244 251.322V251.309C588.244 249.565 589.03 248.554 590.425 248.554C591.819 248.554 592.605 249.565 592.605 251.309V251.322C592.605 253.059 591.819 254.077 590.425 254.077Z" fill="#575757"/> -<path d="M595.668 255H596.857V250.434C596.857 249.395 597.589 248.554 598.553 248.554C599.482 248.554 600.084 249.121 600.084 249.996V255H601.273V250.263C601.273 249.326 601.95 248.554 602.976 248.554C604.015 248.554 604.514 249.094 604.514 250.181V255H605.703V249.907C605.703 248.362 604.862 247.501 603.358 247.501C602.34 247.501 601.499 248.014 601.103 248.793H600.993C600.651 248.027 599.954 247.501 598.956 247.501C597.992 247.501 597.295 247.959 596.967 248.752H596.857V247.631H595.668V255Z" fill="#575757"/> -<path d="M629.37 255.633C631.195 255.633 632.275 254.525 632.275 252.659V245.536H631.045V252.646C631.045 253.849 630.457 254.498 629.363 254.498C628.386 254.498 627.9 253.876 627.825 253.131L627.818 253.062H626.588L626.595 253.158C626.697 254.573 627.661 255.633 629.37 255.633Z" fill="#575757"/> -<path d="M637.108 255.53C638.188 255.53 638.934 255.086 639.296 254.3H639.405V255.4H640.595V248.031H639.405V252.393C639.405 253.685 638.715 254.478 637.416 254.478C636.24 254.478 635.762 253.842 635.762 252.516V248.031H634.572V252.803C634.572 254.546 635.434 255.53 637.108 255.53Z" fill="#575757"/> -<path d="M642.885 255.4H644.074V245.105H642.885V255.4Z" fill="#575757"/> -<path d="M653.528 255.633C655.531 255.633 656.96 254.245 656.96 252.256V252.242C656.96 250.335 655.627 248.947 653.774 248.947C652.879 248.947 652.106 249.31 651.669 249.973H651.56L651.895 246.637H656.413V245.536H650.924L650.404 251.203H651.471C651.594 250.971 651.751 250.779 651.922 250.615C652.346 250.212 652.906 250.014 653.562 250.014C654.841 250.014 655.757 250.95 655.757 252.263V252.276C655.757 253.609 654.854 254.546 653.542 254.546C652.387 254.546 651.532 253.794 651.416 252.851L651.409 252.796H650.227L650.233 252.871C650.377 254.45 651.689 255.633 653.528 255.633Z" fill="#575757"/> -<path d="M665.293 255.4H666.523V245.536H665.3L662.675 247.423V248.722L665.184 246.903H665.293V255.4Z" fill="#575757"/> -<path d="M669.374 255.4H675.759V254.293H671.083V254.184L673.325 251.866C675.109 250.027 675.595 249.207 675.595 248.079V248.065C675.595 246.473 674.275 245.304 672.553 245.304C670.666 245.304 669.312 246.562 669.306 248.312L669.319 248.318L670.495 248.325L670.502 248.312C670.502 247.149 671.288 246.377 672.471 246.377C673.633 246.377 674.337 247.156 674.337 248.195V248.209C674.337 249.07 673.968 249.583 672.71 250.943L669.374 254.553V255.4Z" fill="#575757"/> -<path d="M678.801 248.708C679.293 248.708 679.689 248.305 679.689 247.819C679.689 247.327 679.293 246.931 678.801 246.931C678.315 246.931 677.912 247.327 677.912 247.819C677.912 248.305 678.315 248.708 678.801 248.708ZM678.801 253.999C679.293 253.999 679.689 253.596 679.689 253.11C679.689 252.618 679.293 252.222 678.801 252.222C678.315 252.222 677.912 252.618 677.912 253.11C677.912 253.596 678.315 253.999 678.801 253.999Z" fill="#575757"/> -<path d="M685.452 255.633C687.455 255.633 688.884 254.245 688.884 252.256V252.242C688.884 250.335 687.551 248.947 685.698 248.947C684.803 248.947 684.03 249.31 683.593 249.973H683.483L683.818 246.637H688.337V245.536H682.848L682.328 251.203H683.395C683.518 250.971 683.675 250.779 683.846 250.615C684.27 250.212 684.83 250.014 685.486 250.014C686.765 250.014 687.681 250.95 687.681 252.263V252.276C687.681 253.609 686.778 254.546 685.466 254.546C684.311 254.546 683.456 253.794 683.34 252.851L683.333 252.796H682.15L682.157 252.871C682.301 254.45 683.613 255.633 685.452 255.633Z" fill="#575757"/> -<path d="M694.223 255.564C696.198 255.564 697.647 254.348 697.647 252.7V252.687C697.647 251.285 696.67 250.39 695.234 250.267V250.239C696.465 249.979 697.326 249.146 697.326 247.929V247.915C697.326 246.418 696.089 245.372 694.209 245.372C692.363 245.372 691.092 246.445 690.935 248.052L690.928 248.12H692.11L692.117 248.052C692.22 247.054 693.047 246.438 694.209 246.438C695.412 246.438 696.089 247.033 696.089 248.065V248.079C696.089 249.063 695.269 249.788 694.093 249.788H692.91V250.827H694.147C695.528 250.827 696.396 251.504 696.396 252.714V252.728C696.396 253.773 695.515 254.498 694.223 254.498C692.91 254.498 692.015 253.828 691.919 252.857L691.912 252.789H690.729L690.736 252.871C690.866 254.43 692.186 255.564 694.223 255.564Z" fill="#575757"/> -<path d="M700.621 248.708C701.113 248.708 701.51 248.305 701.51 247.819C701.51 247.327 701.113 246.931 700.621 246.931C700.136 246.931 699.732 247.327 699.732 247.819C699.732 248.305 700.136 248.708 700.621 248.708ZM700.621 253.999C701.113 253.999 701.51 253.596 701.51 253.11C701.51 252.618 701.113 252.222 700.621 252.222C700.136 252.222 699.732 252.618 699.732 253.11C699.732 253.596 700.136 253.999 700.621 253.999Z" fill="#575757"/> -<path d="M707.102 255.633C709.282 255.633 710.595 253.644 710.595 250.472V250.458C710.595 247.286 709.282 245.304 707.102 245.304C704.921 245.304 703.622 247.286 703.622 250.458V250.472C703.622 253.644 704.921 255.633 707.102 255.633ZM707.102 254.56C705.687 254.56 704.859 252.987 704.859 250.472V250.458C704.859 247.942 705.687 246.384 707.102 246.384C708.517 246.384 709.357 247.942 709.357 250.458V250.472C709.357 252.987 708.517 254.56 707.102 254.56Z" fill="#575757"/> -<path d="M715.92 255.633C718.101 255.633 719.413 253.644 719.413 250.472V250.458C719.413 247.286 718.101 245.304 715.92 245.304C713.739 245.304 712.44 247.286 712.44 250.458V250.472C712.44 253.644 713.739 255.633 715.92 255.633ZM715.92 254.56C714.505 254.56 713.678 252.987 713.678 250.472V250.458C713.678 247.942 714.505 246.384 715.92 246.384C717.335 246.384 718.176 247.942 718.176 250.458V250.472C718.176 252.987 717.335 254.56 715.92 254.56Z" fill="#575757"/> -<path d="M729.619 255.633C732.142 255.633 733.81 254.02 733.81 251.586V250.383H729.811V251.463H732.579V251.702C732.579 253.37 731.39 254.498 729.626 254.498C727.644 254.498 726.406 252.953 726.406 250.472V250.458C726.406 248.011 727.664 246.438 729.619 246.438C731.089 246.438 732.08 247.136 732.483 248.407L732.504 248.476H733.748L733.734 248.407C733.345 246.534 731.807 245.304 729.619 245.304C726.919 245.304 725.148 247.348 725.148 250.458V250.472C725.148 253.623 726.892 255.633 729.619 255.633Z" fill="#575757"/> -<path d="M735.99 255.4H737.139V247.867H737.214L740.331 255.4H741.37L744.487 247.867H744.562V255.4H745.711V245.536H744.282L740.905 253.767H740.796L737.419 245.536H735.99V255.4Z" fill="#575757"/> -<path d="M750.79 255.4H752.021V246.644H755.199V245.536H747.611V246.644H750.79V255.4Z" fill="#575757"/> -<path d="M760.572 251.982H763.635V255.113H764.742V251.982H767.805V250.875H764.742V247.744H763.635V250.875H760.572V251.982Z" fill="#575757"/> -<path d="M776.876 255.633C778.879 255.633 780.308 254.245 780.308 252.256V252.242C780.308 250.335 778.975 248.947 777.122 248.947C776.227 248.947 775.454 249.31 775.017 249.973H774.907L775.242 246.637H779.761V245.536H774.271L773.752 251.203H774.818C774.941 250.971 775.099 250.779 775.27 250.615C775.693 250.212 776.254 250.014 776.91 250.014C778.188 250.014 779.104 250.95 779.104 252.263V252.276C779.104 253.609 778.202 254.546 776.89 254.546C775.734 254.546 774.88 253.794 774.764 252.851L774.757 252.796H773.574L773.581 252.871C773.725 254.45 775.037 255.633 776.876 255.633Z" fill="#575757"/> -<path d="M783.268 248.708C783.76 248.708 784.156 248.305 784.156 247.819C784.156 247.327 783.76 246.931 783.268 246.931C782.782 246.931 782.379 247.327 782.379 247.819C782.379 248.305 782.782 248.708 783.268 248.708ZM783.268 253.999C783.76 253.999 784.156 253.596 784.156 253.11C784.156 252.618 783.76 252.222 783.268 252.222C782.782 252.222 782.379 252.618 782.379 253.11C782.379 253.596 782.782 253.999 783.268 253.999Z" fill="#575757"/> -<path d="M789.734 255.564C791.71 255.564 793.159 254.348 793.159 252.7V252.687C793.159 251.285 792.182 250.39 790.746 250.267V250.239C791.977 249.979 792.838 249.146 792.838 247.929V247.915C792.838 246.418 791.601 245.372 789.721 245.372C787.875 245.372 786.604 246.445 786.446 248.052L786.439 248.12H787.622L787.629 248.052C787.731 247.054 788.559 246.438 789.721 246.438C790.924 246.438 791.601 247.033 791.601 248.065V248.079C791.601 249.063 790.78 249.788 789.604 249.788H788.422V250.827H789.659C791.04 250.827 791.908 251.504 791.908 252.714V252.728C791.908 253.773 791.026 254.498 789.734 254.498C788.422 254.498 787.526 253.828 787.431 252.857L787.424 252.789H786.241L786.248 252.871C786.378 254.43 787.697 255.564 789.734 255.564Z" fill="#575757"/> -<path d="M798.457 255.633C800.638 255.633 801.95 253.644 801.95 250.472V250.458C801.95 247.286 800.638 245.304 798.457 245.304C796.276 245.304 794.978 247.286 794.978 250.458V250.472C794.978 253.644 796.276 255.633 798.457 255.633ZM798.457 254.56C797.042 254.56 796.215 252.987 796.215 250.472V250.458C796.215 247.942 797.042 246.384 798.457 246.384C799.872 246.384 800.713 247.942 800.713 250.458V250.472C800.713 252.987 799.872 254.56 798.457 254.56Z" fill="#575757"/> +<path d="M83.0207 272.566L85.876 275.421L84.9327 276.364L82.078 273.509C81.0159 274.36 79.6947 274.823 78.3334 274.821C75.0214 274.821 72.3334 272.133 72.3334 268.821C72.3334 265.509 75.0214 262.821 78.3334 262.821C81.6454 262.821 84.3334 265.509 84.3334 268.821C84.3353 270.183 83.8722 271.504 83.0207 272.566ZM81.6834 272.071C82.5294 271.201 83.002 270.035 83 268.821C83 266.243 80.9114 264.155 78.3334 264.155C75.7547 264.155 73.6667 266.243 73.6667 268.821C73.6667 271.399 75.7547 273.488 78.3334 273.488C79.547 273.49 80.7133 273.017 81.5834 272.171L81.6834 272.071Z" fill="#858282"/> +</g> +<rect x="67.5" y="257.988" width="23" height="23" stroke="#F1F1F1"/> +<rect x="91.5" y="257.988" width="255" height="23" fill="white"/> +<path d="M97.044 269.014V264.688H98.332V269.014H97.044ZM100.082 269.014V264.688H101.37V269.014H100.082ZM107.651 266.312C107.371 266.312 107.137 266.219 106.951 266.032C106.764 265.846 106.671 265.622 106.671 265.36C106.671 265.09 106.764 264.866 106.951 264.688C107.137 264.502 107.371 264.408 107.651 264.408C107.921 264.408 108.15 264.502 108.337 264.688C108.533 264.866 108.631 265.09 108.631 265.36C108.631 265.622 108.533 265.846 108.337 266.032C108.15 266.219 107.921 266.312 107.651 266.312ZM104.935 274.488V273.48H107.147V268.902C107.147 268.669 107.03 268.552 106.797 268.552H105.173V267.544H107.077C107.907 267.544 108.323 267.96 108.323 268.79V273.48H110.535V274.488H104.935ZM116.031 274.656C115.443 274.656 114.916 274.516 114.449 274.236C113.992 273.956 113.632 273.546 113.371 273.004C113.11 272.454 112.979 271.786 112.979 271.002C112.979 270.228 113.11 269.57 113.371 269.028C113.632 268.487 113.992 268.076 114.449 267.796C114.916 267.516 115.443 267.376 116.031 267.376C116.582 267.376 117.034 267.484 117.389 267.698C117.753 267.913 118.024 268.193 118.201 268.538V264.408H119.377V274.488H118.411L118.285 273.41H118.201C118.014 273.793 117.739 274.096 117.375 274.32C117.011 274.544 116.563 274.656 116.031 274.656ZM116.185 273.536C116.773 273.536 117.258 273.331 117.641 272.92C118.024 272.5 118.215 271.866 118.215 271.016C118.215 270.167 118.024 269.537 117.641 269.126C117.258 268.706 116.773 268.496 116.185 268.496C115.597 268.496 115.112 268.706 114.729 269.126C114.356 269.537 114.169 270.167 114.169 271.016C114.169 271.866 114.356 272.5 114.729 272.92C115.112 273.331 115.597 273.536 116.185 273.536ZM122.648 269.014V264.688H123.936V269.014H122.648ZM125.686 269.014V264.688H126.974V269.014H125.686ZM133.338 274.516C133.049 274.516 132.801 274.418 132.596 274.222C132.391 274.026 132.288 273.784 132.288 273.494C132.288 273.214 132.391 272.976 132.596 272.78C132.801 272.584 133.049 272.486 133.338 272.486C133.627 272.486 133.875 272.584 134.08 272.78C134.285 272.976 134.388 273.214 134.388 273.494C134.388 273.784 134.285 274.026 134.08 274.222C133.875 274.418 133.627 274.516 133.338 274.516ZM133.338 268.986C133.049 268.986 132.801 268.888 132.596 268.692C132.391 268.496 132.288 268.254 132.288 267.964C132.288 267.684 132.391 267.446 132.596 267.25C132.801 267.054 133.049 266.956 133.338 266.956C133.627 266.956 133.875 267.054 134.08 267.25C134.285 267.446 134.388 267.684 134.388 267.964C134.388 268.254 134.285 268.496 134.08 268.692C133.875 268.888 133.627 268.986 133.338 268.986ZM148.251 269.014V264.688H149.539V269.014H148.251ZM151.289 269.014V264.688H152.577V269.014H151.289ZM336.011 269.014V264.688H337.299V269.014H336.011ZM339.049 269.014V264.688H340.337V269.014H339.049Z" fill="#575757"/> +<path d="M159.138 274.656C158.279 274.656 157.579 274.451 157.038 274.04C156.506 273.62 156.109 273.06 155.848 272.36C155.596 271.651 155.47 270.853 155.47 269.966C155.47 268.893 155.619 267.95 155.918 267.138C156.216 266.317 156.646 265.678 157.206 265.22C157.775 264.754 158.456 264.52 159.25 264.52C159.875 264.52 160.407 264.642 160.846 264.884C161.294 265.118 161.644 265.44 161.896 265.85C162.157 266.252 162.311 266.704 162.358 267.208H161.252C161.158 266.714 160.934 266.322 160.58 266.032C160.225 265.734 159.782 265.584 159.25 265.584C158.783 265.584 158.354 265.734 157.962 266.032C157.579 266.322 157.262 266.774 157.01 267.39C156.767 267.997 156.627 268.772 156.59 269.714H156.66C156.874 269.313 157.206 268.963 157.654 268.664C158.102 268.366 158.643 268.216 159.278 268.216C159.866 268.216 160.393 268.352 160.86 268.622C161.326 268.893 161.695 269.266 161.966 269.742C162.246 270.218 162.386 270.76 162.386 271.366C162.386 271.964 162.25 272.514 161.98 273.018C161.718 273.513 161.34 273.91 160.846 274.208C160.36 274.507 159.791 274.656 159.138 274.656ZM159.054 273.592C159.698 273.592 160.216 273.387 160.608 272.976C161 272.566 161.196 272.052 161.196 271.436C161.196 270.811 161 270.298 160.608 269.896C160.216 269.486 159.698 269.28 159.054 269.28C158.624 269.28 158.246 269.374 157.92 269.56C157.602 269.747 157.35 270.004 157.164 270.33C156.986 270.657 156.898 271.026 156.898 271.436C156.898 271.847 156.986 272.216 157.164 272.542C157.35 272.869 157.602 273.126 157.92 273.312C158.246 273.499 158.624 273.592 159.054 273.592ZM167.602 274.656C166.958 274.656 166.38 274.54 165.866 274.306C165.362 274.064 164.956 273.714 164.648 273.256C164.34 272.799 164.172 272.239 164.144 271.576H165.348C165.367 272.136 165.572 272.612 165.964 273.004C166.356 273.387 166.902 273.578 167.602 273.578C168.284 273.578 168.811 273.406 169.184 273.06C169.558 272.706 169.744 272.225 169.744 271.618C169.744 271.198 169.637 270.853 169.422 270.582C169.208 270.302 168.918 270.097 168.554 269.966C168.2 269.826 167.803 269.756 167.364 269.756H166.51V268.692H167.252C167.887 268.692 168.391 268.557 168.764 268.286C169.147 268.016 169.338 267.619 169.338 267.096C169.338 266.658 169.184 266.298 168.876 266.018C168.578 265.738 168.148 265.598 167.588 265.598C167.047 265.598 166.608 265.752 166.272 266.06C165.936 266.359 165.745 266.751 165.698 267.236H164.522C164.541 266.704 164.681 266.238 164.942 265.836C165.204 265.426 165.558 265.104 166.006 264.87C166.464 264.637 166.991 264.52 167.588 264.52C168.232 264.52 168.769 264.632 169.198 264.856C169.637 265.08 169.968 265.384 170.192 265.766C170.416 266.14 170.528 266.555 170.528 267.012C170.528 267.498 170.379 267.927 170.08 268.3C169.782 268.664 169.427 268.921 169.016 269.07V269.154C169.567 269.322 170.024 269.607 170.388 270.008C170.752 270.41 170.934 270.946 170.934 271.618C170.934 272.188 170.799 272.701 170.528 273.158C170.267 273.616 169.884 273.98 169.38 274.25C168.886 274.521 168.293 274.656 167.602 274.656ZM177.215 274.488V272.22H172.525V271.31L176.991 264.688H178.391V271.156H179.791V272.22H178.391V274.488H177.215ZM173.841 271.156H177.271V266.06L173.841 271.156ZM182.753 274.488L186.575 265.752H181.227V264.688H187.793V265.626L183.999 274.488H182.753ZM193.192 274.656C192.567 274.656 192.007 274.512 191.512 274.222C191.027 273.933 190.639 273.518 190.35 272.976C190.061 272.426 189.916 271.772 189.916 271.016C189.916 270.26 190.061 269.612 190.35 269.07C190.639 268.52 191.031 268.1 191.526 267.81C192.03 267.521 192.585 267.376 193.192 267.376C194.051 267.376 194.737 267.591 195.25 268.02C195.763 268.45 196.09 269.024 196.23 269.742H195.026C194.914 269.36 194.699 269.056 194.382 268.832C194.065 268.599 193.663 268.482 193.178 268.482C192.823 268.482 192.487 268.576 192.17 268.762C191.853 268.949 191.596 269.229 191.4 269.602C191.204 269.976 191.106 270.447 191.106 271.016C191.106 271.586 191.204 272.062 191.4 272.444C191.596 272.818 191.853 273.098 192.17 273.284C192.487 273.471 192.823 273.564 193.178 273.564C193.691 273.564 194.097 273.448 194.396 273.214C194.704 272.981 194.914 272.673 195.026 272.29H196.23C196.053 273.028 195.703 273.606 195.18 274.026C194.667 274.446 194.004 274.656 193.192 274.656ZM201.614 274.656C200.942 274.656 200.364 274.53 199.878 274.278C199.393 274.026 199.01 273.686 198.73 273.256C198.45 272.827 198.282 272.337 198.226 271.786H199.43C199.514 272.318 199.752 272.752 200.144 273.088C200.536 273.415 201.031 273.578 201.628 273.578C202.328 273.578 202.879 273.354 203.28 272.906C203.682 272.449 203.882 271.875 203.882 271.184C203.882 270.456 203.677 269.887 203.266 269.476C202.856 269.056 202.324 268.846 201.67 268.846C201.148 268.846 200.7 268.968 200.326 269.21C199.962 269.444 199.668 269.742 199.444 270.106H198.324L199.164 264.688H204.4V265.766H200.088L199.57 268.678H199.64C199.855 268.445 200.144 268.24 200.508 268.062C200.882 267.885 201.311 267.796 201.796 267.796C202.44 267.796 203 267.936 203.476 268.216C203.962 268.487 204.34 268.879 204.61 269.392C204.881 269.896 205.016 270.489 205.016 271.17C205.016 271.805 204.881 272.388 204.61 272.92C204.349 273.443 203.962 273.863 203.448 274.18C202.944 274.498 202.333 274.656 201.614 274.656ZM210.345 274.656C209.486 274.656 208.786 274.451 208.245 274.04C207.713 273.62 207.316 273.06 207.055 272.36C206.803 271.651 206.677 270.853 206.677 269.966C206.677 268.893 206.826 267.95 207.125 267.138C207.424 266.317 207.853 265.678 208.413 265.22C208.982 264.754 209.664 264.52 210.457 264.52C211.082 264.52 211.614 264.642 212.053 264.884C212.501 265.118 212.851 265.44 213.103 265.85C213.364 266.252 213.518 266.704 213.565 267.208H212.459C212.366 266.714 212.142 266.322 211.787 266.032C211.432 265.734 210.989 265.584 210.457 265.584C209.99 265.584 209.561 265.734 209.169 266.032C208.786 266.322 208.469 266.774 208.217 267.39C207.974 267.997 207.834 268.772 207.797 269.714H207.867C208.082 269.313 208.413 268.963 208.861 268.664C209.309 268.366 209.85 268.216 210.485 268.216C211.073 268.216 211.6 268.352 212.067 268.622C212.534 268.893 212.902 269.266 213.173 269.742C213.453 270.218 213.593 270.76 213.593 271.366C213.593 271.964 213.458 272.514 213.187 273.018C212.926 273.513 212.548 273.91 212.053 274.208C211.568 274.507 210.998 274.656 210.345 274.656ZM210.261 273.592C210.905 273.592 211.423 273.387 211.815 272.976C212.207 272.566 212.403 272.052 212.403 271.436C212.403 270.811 212.207 270.298 211.815 269.896C211.423 269.486 210.905 269.28 210.261 269.28C209.832 269.28 209.454 269.374 209.127 269.56C208.81 269.747 208.558 270.004 208.371 270.33C208.194 270.657 208.105 271.026 208.105 271.436C208.105 271.847 208.194 272.216 208.371 272.542C208.558 272.869 208.81 273.126 209.127 273.312C209.454 273.499 209.832 273.592 210.261 273.592ZM218.515 274.656C217.918 274.656 217.386 274.54 216.919 274.306C216.462 274.064 216.093 273.742 215.813 273.34C215.543 272.93 215.384 272.472 215.337 271.968H216.471C216.555 272.463 216.775 272.86 217.129 273.158C217.493 273.448 217.955 273.592 218.515 273.592C219.253 273.592 219.855 273.261 220.321 272.598C220.788 271.926 221.054 270.881 221.119 269.462H221.035C220.783 269.901 220.461 270.26 220.069 270.54C219.677 270.82 219.127 270.96 218.417 270.96C217.829 270.96 217.302 270.825 216.835 270.554C216.369 270.284 215.995 269.91 215.715 269.434C215.445 268.958 215.309 268.417 215.309 267.81C215.309 267.213 215.44 266.667 215.701 266.172C215.972 265.668 216.35 265.267 216.835 264.968C217.33 264.67 217.904 264.52 218.557 264.52C219.789 264.52 220.709 264.94 221.315 265.78C221.922 266.62 222.225 267.764 222.225 269.21C222.225 270.284 222.081 271.231 221.791 272.052C221.502 272.864 221.082 273.504 220.531 273.97C219.981 274.428 219.309 274.656 218.515 274.656ZM218.641 269.896C219.295 269.896 219.817 269.691 220.209 269.28C220.601 268.87 220.797 268.356 220.797 267.74C220.797 267.124 220.601 266.611 220.209 266.2C219.817 265.79 219.295 265.584 218.641 265.584C217.988 265.584 217.465 265.79 217.073 266.2C216.691 266.611 216.499 267.124 216.499 267.74C216.499 268.366 216.691 268.884 217.073 269.294C217.465 269.696 217.988 269.896 218.641 269.896ZM224.054 274.488V273.564C225.062 272.762 225.939 272.024 226.686 271.352C227.442 270.68 228.025 270.032 228.436 269.406C228.847 268.781 229.052 268.142 229.052 267.488C229.052 266.9 228.884 266.438 228.548 266.102C228.221 265.757 227.778 265.584 227.218 265.584C226.789 265.584 226.425 265.678 226.126 265.864C225.827 266.051 225.603 266.298 225.454 266.606C225.305 266.914 225.23 267.246 225.23 267.6H224.068C224.077 266.956 224.217 266.406 224.488 265.948C224.768 265.482 225.141 265.127 225.608 264.884C226.084 264.642 226.621 264.52 227.218 264.52C228.179 264.52 228.926 264.786 229.458 265.318C229.99 265.85 230.256 266.564 230.256 267.46C230.256 268.048 230.13 268.613 229.878 269.154C229.626 269.686 229.29 270.2 228.87 270.694C228.45 271.189 227.979 271.665 227.456 272.122C226.933 272.58 226.406 273.018 225.874 273.438H230.522V274.488H224.054ZM235.823 274.656C235.169 274.656 234.591 274.507 234.087 274.208C233.592 273.9 233.2 273.476 232.911 272.934C232.621 272.384 232.477 271.744 232.477 271.016C232.477 270.288 232.617 269.654 232.897 269.112C233.186 268.562 233.583 268.137 234.087 267.838C234.591 267.53 235.179 267.376 235.851 267.376C236.523 267.376 237.097 267.53 237.573 267.838C238.049 268.137 238.413 268.534 238.665 269.028C238.917 269.523 239.043 270.055 239.043 270.624C239.043 270.727 239.038 270.83 239.029 270.932C239.029 271.035 239.029 271.152 239.029 271.282H233.639C233.667 271.796 233.783 272.225 233.989 272.57C234.203 272.906 234.469 273.158 234.787 273.326C235.113 273.494 235.459 273.578 235.823 273.578C236.336 273.578 236.737 273.471 237.027 273.256C237.316 273.042 237.535 272.743 237.685 272.36H238.847C238.688 273.004 238.357 273.55 237.853 273.998C237.349 274.437 236.672 274.656 235.823 274.656ZM235.823 268.426C235.281 268.426 234.805 268.59 234.395 268.916C233.993 269.243 233.746 269.7 233.653 270.288H237.881C237.843 269.71 237.633 269.257 237.251 268.93C236.877 268.594 236.401 268.426 235.823 268.426ZM244.357 274.656C243.704 274.656 243.125 274.507 242.621 274.208C242.126 273.9 241.734 273.476 241.445 272.934C241.156 272.384 241.011 271.744 241.011 271.016C241.011 270.288 241.151 269.654 241.431 269.112C241.72 268.562 242.117 268.137 242.621 267.838C243.125 267.53 243.713 267.376 244.385 267.376C245.057 267.376 245.631 267.53 246.107 267.838C246.583 268.137 246.947 268.534 247.199 269.028C247.451 269.523 247.577 270.055 247.577 270.624C247.577 270.727 247.572 270.83 247.563 270.932C247.563 271.035 247.563 271.152 247.563 271.282H242.173C242.201 271.796 242.318 272.225 242.523 272.57C242.738 272.906 243.004 273.158 243.321 273.326C243.648 273.494 243.993 273.578 244.357 273.578C244.87 273.578 245.272 273.471 245.561 273.256C245.85 273.042 246.07 272.743 246.219 272.36H247.381C247.222 273.004 246.891 273.55 246.387 273.998C245.883 274.437 245.206 274.656 244.357 274.656ZM244.357 268.426C243.816 268.426 243.34 268.59 242.929 268.916C242.528 269.243 242.28 269.7 242.187 270.288H246.415C246.378 269.71 246.168 269.257 245.785 268.93C245.412 268.594 244.936 268.426 244.357 268.426ZM251.03 274.488L254.852 265.752H249.504V264.688H256.07V265.626L252.276 274.488H251.03ZM259.564 274.488L263.386 265.752H258.038V264.688H264.604V265.626L260.81 274.488H259.564ZM266.727 274.488V273.564C267.735 272.762 268.612 272.024 269.359 271.352C270.115 270.68 270.698 270.032 271.109 269.406C271.519 268.781 271.725 268.142 271.725 267.488C271.725 266.9 271.557 266.438 271.221 266.102C270.894 265.757 270.451 265.584 269.891 265.584C269.461 265.584 269.097 265.678 268.799 265.864C268.5 266.051 268.276 266.298 268.127 266.606C267.977 266.914 267.903 267.246 267.903 267.6H266.741C266.75 266.956 266.89 266.406 267.161 265.948C267.441 265.482 267.814 265.127 268.281 264.884C268.757 264.642 269.293 264.52 269.891 264.52C270.852 264.52 271.599 264.786 272.131 265.318C272.663 265.85 272.929 266.564 272.929 267.46C272.929 268.048 272.803 268.613 272.551 269.154C272.299 269.686 271.963 270.2 271.543 270.694C271.123 271.189 270.651 271.665 270.129 272.122C269.606 272.58 269.079 273.018 268.547 273.438H273.195V274.488H266.727ZM278.425 274.656C277.753 274.656 277.174 274.53 276.689 274.278C276.204 274.026 275.821 273.686 275.541 273.256C275.261 272.827 275.093 272.337 275.037 271.786H276.241C276.325 272.318 276.563 272.752 276.955 273.088C277.347 273.415 277.842 273.578 278.439 273.578C279.139 273.578 279.69 273.354 280.091 272.906C280.492 272.449 280.693 271.875 280.693 271.184C280.693 270.456 280.488 269.887 280.077 269.476C279.666 269.056 279.134 268.846 278.481 268.846C277.958 268.846 277.51 268.968 277.137 269.21C276.773 269.444 276.479 269.742 276.255 270.106H275.135L275.975 264.688H281.211V265.766H276.899L276.381 268.678H276.451C276.666 268.445 276.955 268.24 277.319 268.062C277.692 267.885 278.122 267.796 278.607 267.796C279.251 267.796 279.811 267.936 280.287 268.216C280.772 268.487 281.15 268.879 281.421 269.392C281.692 269.896 281.827 270.489 281.827 271.17C281.827 271.805 281.692 272.388 281.421 272.92C281.16 273.443 280.772 273.863 280.259 274.18C279.755 274.498 279.144 274.656 278.425 274.656ZM286.372 274.656C285.821 274.656 285.364 274.558 285 274.362C284.636 274.166 284.365 273.91 284.188 273.592C284.01 273.266 283.922 272.911 283.922 272.528C283.922 271.819 284.178 271.282 284.692 270.918C285.214 270.545 285.91 270.358 286.778 270.358H288.682V270.218C288.682 269.005 288.126 268.398 287.016 268.398C286.568 268.398 286.19 268.496 285.882 268.692C285.583 268.888 285.392 269.196 285.308 269.616H284.104C284.15 269.15 284.304 268.748 284.566 268.412C284.836 268.076 285.182 267.82 285.602 267.642C286.022 267.465 286.493 267.376 287.016 267.376C288.005 267.376 288.724 267.638 289.172 268.16C289.629 268.674 289.858 269.36 289.858 270.218V274.488H288.85L288.752 273.41H288.654C288.448 273.746 288.173 274.04 287.828 274.292C287.492 274.535 287.006 274.656 286.372 274.656ZM286.582 273.62C287.03 273.62 287.408 273.513 287.716 273.298C288.033 273.084 288.271 272.799 288.43 272.444C288.598 272.09 288.682 271.702 288.682 271.282H286.876C286.241 271.282 285.793 271.39 285.532 271.604C285.28 271.819 285.154 272.104 285.154 272.458C285.154 272.822 285.275 273.107 285.518 273.312C285.76 273.518 286.115 273.62 286.582 273.62ZM295.494 274.656C294.841 274.656 294.267 274.535 293.772 274.292C293.287 274.04 292.904 273.7 292.624 273.27C292.344 272.841 292.204 272.351 292.204 271.8C292.204 271.184 292.368 270.662 292.694 270.232C293.021 269.803 293.399 269.504 293.828 269.336V269.266C293.418 269.07 293.086 268.79 292.834 268.426C292.592 268.053 292.47 267.619 292.47 267.124C292.47 266.648 292.592 266.214 292.834 265.822C293.086 265.421 293.441 265.104 293.898 264.87C294.356 264.637 294.888 264.52 295.494 264.52C296.092 264.52 296.614 264.637 297.062 264.87C297.52 265.104 297.874 265.421 298.126 265.822C298.388 266.214 298.518 266.648 298.518 267.124C298.518 267.619 298.392 268.053 298.14 268.426C297.898 268.79 297.571 269.07 297.16 269.266V269.336C297.59 269.504 297.968 269.803 298.294 270.232C298.621 270.662 298.784 271.184 298.784 271.8C298.784 272.351 298.644 272.841 298.364 273.27C298.084 273.7 297.697 274.04 297.202 274.292C296.717 274.535 296.148 274.656 295.494 274.656ZM295.494 268.832C296.073 268.832 296.526 268.683 296.852 268.384C297.188 268.076 297.356 267.68 297.356 267.194C297.356 266.718 297.188 266.331 296.852 266.032C296.526 265.724 296.073 265.57 295.494 265.57C294.916 265.57 294.458 265.724 294.122 266.032C293.796 266.331 293.632 266.718 293.632 267.194C293.632 267.68 293.796 268.076 294.122 268.384C294.458 268.683 294.916 268.832 295.494 268.832ZM295.494 273.592C296.12 273.592 296.624 273.434 297.006 273.116C297.398 272.79 297.594 272.318 297.594 271.702C297.594 271.096 297.398 270.634 297.006 270.316C296.624 269.99 296.12 269.826 295.494 269.826C294.869 269.826 294.36 269.99 293.968 270.316C293.586 270.634 293.394 271.096 293.394 271.702C293.394 272.318 293.586 272.79 293.968 273.116C294.36 273.434 294.869 273.592 295.494 273.592ZM300.809 274.488V273.424H303.343V266.074L300.949 266.536V265.64L303.735 264.688H304.519V273.424H307.193V274.488H300.809ZM312.563 274.656C311.91 274.656 311.336 274.535 310.841 274.292C310.356 274.04 309.973 273.7 309.693 273.27C309.413 272.841 309.273 272.351 309.273 271.8C309.273 271.184 309.437 270.662 309.763 270.232C310.09 269.803 310.468 269.504 310.897 269.336V269.266C310.487 269.07 310.155 268.79 309.903 268.426C309.661 268.053 309.539 267.619 309.539 267.124C309.539 266.648 309.661 266.214 309.903 265.822C310.155 265.421 310.51 265.104 310.967 264.87C311.425 264.637 311.957 264.52 312.563 264.52C313.161 264.52 313.683 264.637 314.131 264.87C314.589 265.104 314.943 265.421 315.195 265.822C315.457 266.214 315.587 266.648 315.587 267.124C315.587 267.619 315.461 268.053 315.209 268.426C314.967 268.79 314.64 269.07 314.229 269.266V269.336C314.659 269.504 315.037 269.803 315.363 270.232C315.69 270.662 315.853 271.184 315.853 271.8C315.853 272.351 315.713 272.841 315.433 273.27C315.153 273.7 314.766 274.04 314.271 274.292C313.786 274.535 313.217 274.656 312.563 274.656ZM312.563 268.832C313.142 268.832 313.595 268.683 313.921 268.384C314.257 268.076 314.425 267.68 314.425 267.194C314.425 266.718 314.257 266.331 313.921 266.032C313.595 265.724 313.142 265.57 312.563 265.57C311.985 265.57 311.527 265.724 311.191 266.032C310.865 266.331 310.701 266.718 310.701 267.194C310.701 267.68 310.865 268.076 311.191 268.384C311.527 268.683 311.985 268.832 312.563 268.832ZM312.563 273.592C313.189 273.592 313.693 273.434 314.075 273.116C314.467 272.79 314.663 272.318 314.663 271.702C314.663 271.096 314.467 270.634 314.075 270.316C313.693 269.99 313.189 269.826 312.563 269.826C311.938 269.826 311.429 269.99 311.037 270.316C310.655 270.634 310.463 271.096 310.463 271.702C310.463 272.318 310.655 272.79 311.037 273.116C311.429 273.434 311.938 273.592 312.563 273.592ZM321.098 274.656C320.444 274.656 319.87 274.535 319.376 274.292C318.89 274.04 318.508 273.7 318.228 273.27C317.948 272.841 317.808 272.351 317.808 271.8C317.808 271.184 317.971 270.662 318.298 270.232C318.624 269.803 319.002 269.504 319.432 269.336V269.266C319.021 269.07 318.69 268.79 318.438 268.426C318.195 268.053 318.074 267.619 318.074 267.124C318.074 266.648 318.195 266.214 318.438 265.822C318.69 265.421 319.044 265.104 319.502 264.87C319.959 264.637 320.491 264.52 321.098 264.52C321.695 264.52 322.218 264.637 322.666 264.87C323.123 265.104 323.478 265.421 323.73 265.822C323.991 266.214 324.122 266.648 324.122 267.124C324.122 267.619 323.996 268.053 323.744 268.426C323.501 268.79 323.174 269.07 322.764 269.266V269.336C323.193 269.504 323.571 269.803 323.898 270.232C324.224 270.662 324.388 271.184 324.388 271.8C324.388 272.351 324.248 272.841 323.968 273.27C323.688 273.7 323.3 274.04 322.806 274.292C322.32 274.535 321.751 274.656 321.098 274.656ZM321.098 268.832C321.676 268.832 322.129 268.683 322.456 268.384C322.792 268.076 322.96 267.68 322.96 267.194C322.96 266.718 322.792 266.331 322.456 266.032C322.129 265.724 321.676 265.57 321.098 265.57C320.519 265.57 320.062 265.724 319.726 266.032C319.399 266.331 319.236 266.718 319.236 267.194C319.236 267.68 319.399 268.076 319.726 268.384C320.062 268.683 320.519 268.832 321.098 268.832ZM321.098 273.592C321.723 273.592 322.227 273.434 322.61 273.116C323.002 272.79 323.198 272.318 323.198 271.702C323.198 271.096 323.002 270.634 322.61 270.316C322.227 269.99 321.723 269.826 321.098 269.826C320.472 269.826 319.964 269.99 319.572 270.316C319.189 270.634 318.998 271.096 318.998 271.702C318.998 272.318 319.189 272.79 319.572 273.116C319.964 273.434 320.472 273.592 321.098 273.592ZM326.412 274.488V273.424H328.946V266.074L326.552 266.536V265.64L329.338 264.688H330.122V273.424H332.796V274.488H326.412Z" fill="#F86A2B"/> +<rect x="91.5" y="257.988" width="255" height="23" stroke="#F1F1F1"/> +<rect x="67.5" y="257.988" width="279" height="23" stroke="#393939"/> +<rect x="357.5" y="257.988" width="23" height="23" fill="white"/> <g clip-path="url(#clip2_625_11871)"> -<rect width="650" height="138" transform="translate(66 275)" fill="#F8F8F8"/> -<path d="M77.876 295.756H78.252V294.792H77.9785C77.0146 294.792 76.625 294.348 76.625 293.254V291.053C76.625 290.068 76.1328 289.556 75.1279 289.453V289.289C76.1328 289.187 76.625 288.674 76.625 287.689V285.502C76.625 284.408 77.0146 283.964 77.9785 283.964H78.252V283H77.876C76.2627 283 75.5039 283.759 75.5039 285.352V287.266C75.5039 288.359 75.1279 288.722 74 288.722V290.021C75.1279 290.021 75.5039 290.383 75.5039 291.477V293.404C75.5039 294.997 76.2627 295.756 77.876 295.756Z" fill="#191919"/> -<path d="M90.7891 309.32H91.7734L91.917 305.431H90.6455L90.7891 309.32ZM93.3184 309.32H94.3027L94.4463 305.431H93.1748L93.3184 309.32Z" fill="#191919"/> -<path d="M100.004 315.425C101.74 315.425 102.793 314.44 103.046 313.442L103.06 313.388H101.87L101.843 313.449C101.645 313.894 101.029 314.365 100.031 314.365C98.7188 314.365 97.8779 313.477 97.8438 311.952H103.148V311.487C103.148 309.286 101.932 307.796 99.9287 307.796C97.9258 307.796 96.627 309.354 96.627 311.631V311.638C96.627 313.948 97.8984 315.425 100.004 315.425ZM99.9219 308.855C101.009 308.855 101.815 309.546 101.938 311.002H97.8643C97.9941 309.601 98.8281 308.855 99.9219 308.855Z" fill="#191919"/> -<path d="M106.942 315.295H108.146L110.873 307.926H109.615L107.599 313.996H107.489L105.473 307.926H104.215L106.942 315.295Z" fill="#191919"/> -<path d="M115.18 315.425C116.916 315.425 117.969 314.44 118.222 313.442L118.235 313.388H117.046L117.019 313.449C116.82 313.894 116.205 314.365 115.207 314.365C113.895 314.365 113.054 313.477 113.02 311.952H118.324V311.487C118.324 309.286 117.107 307.796 115.104 307.796C113.102 307.796 111.803 309.354 111.803 311.631V311.638C111.803 313.948 113.074 315.425 115.18 315.425ZM115.098 308.855C116.185 308.855 116.991 309.546 117.114 311.002H113.04C113.17 309.601 114.004 308.855 115.098 308.855Z" fill="#191919"/> -<path d="M120.17 315.295H121.359V310.934C121.359 309.642 122.104 308.849 123.28 308.849C124.456 308.849 125.003 309.484 125.003 310.811V315.295H126.192V310.523C126.192 308.773 125.27 307.796 123.615 307.796C122.528 307.796 121.838 308.254 121.469 309.033H121.359V307.926H120.17V315.295Z" fill="#191919"/> -<path d="M130.964 315.35C131.196 315.35 131.422 315.322 131.654 315.281V314.27C131.436 314.29 131.319 314.297 131.107 314.297C130.342 314.297 130.041 313.948 130.041 313.08V308.91H131.654V307.926H130.041V306.019H128.811V307.926H127.648V308.91H128.811V313.381C128.811 314.789 129.446 315.35 130.964 315.35Z" fill="#191919"/> -<path d="M133.91 309.32H134.895L135.038 305.431H133.767L133.91 309.32ZM136.439 309.32H137.424L137.567 305.431H136.296L136.439 309.32Z" fill="#191919"/> -<path d="M141.088 310.072C141.58 310.072 141.977 309.669 141.977 309.184C141.977 308.691 141.58 308.295 141.088 308.295C140.603 308.295 140.199 308.691 140.199 309.184C140.199 309.669 140.603 310.072 141.088 310.072ZM141.088 315.363C141.58 315.363 141.977 314.96 141.977 314.475C141.977 313.982 141.58 313.586 141.088 313.586C140.603 313.586 140.199 313.982 140.199 314.475C140.199 314.96 140.603 315.363 141.088 315.363Z" fill="#191919"/> -<path d="M148.689 309.32H149.674L149.817 305.431H148.546L148.689 309.32ZM151.219 309.32H152.203L152.347 305.431H151.075L151.219 309.32Z" fill="#191919"/> -<path d="M156.92 315.425C157.911 315.425 158.684 314.994 159.148 314.208H159.258V315.295H160.447V310.25C160.447 308.719 159.442 307.796 157.645 307.796C156.072 307.796 154.951 308.575 154.76 309.73L154.753 309.771H155.942L155.949 309.751C156.141 309.177 156.722 308.849 157.604 308.849C158.704 308.849 159.258 309.341 159.258 310.25V310.92L157.146 311.05C155.43 311.152 154.459 311.911 154.459 313.224V313.237C154.459 314.577 155.519 315.425 156.92 315.425ZM155.676 313.21V313.196C155.676 312.465 156.168 312.068 157.289 312L159.258 311.877V312.547C159.258 313.6 158.376 314.393 157.166 314.393C156.312 314.393 155.676 313.955 155.676 313.21Z" fill="#191919"/> -<path d="M162.621 317.756H163.811V314.133H163.92C164.323 314.919 165.205 315.425 166.217 315.425C168.09 315.425 169.307 313.928 169.307 311.617V311.604C169.307 309.307 168.083 307.796 166.217 307.796C165.191 307.796 164.371 308.281 163.92 309.102H163.811V307.926H162.621V317.756ZM165.943 314.372C164.604 314.372 163.783 313.319 163.783 311.617V311.604C163.783 309.901 164.604 308.849 165.943 308.849C167.29 308.849 168.09 309.888 168.09 311.604V311.617C168.09 313.333 167.29 314.372 165.943 314.372Z" fill="#191919"/> -<path d="M171.166 317.756H172.355V314.133H172.465C172.868 314.919 173.75 315.425 174.762 315.425C176.635 315.425 177.852 313.928 177.852 311.617V311.604C177.852 309.307 176.628 307.796 174.762 307.796C173.736 307.796 172.916 308.281 172.465 309.102H172.355V307.926H171.166V317.756ZM174.488 314.372C173.148 314.372 172.328 313.319 172.328 311.617V311.604C172.328 309.901 173.148 308.849 174.488 308.849C175.835 308.849 176.635 309.888 176.635 311.604V311.617C176.635 313.333 175.835 314.372 174.488 314.372Z" fill="#191919"/> -<path d="M179.779 315.295H180.969V305H179.779V315.295Z" fill="#191919"/> -<path d="M183.881 306.504C184.332 306.504 184.701 306.135 184.701 305.684C184.701 305.232 184.332 304.863 183.881 304.863C183.43 304.863 183.061 305.232 183.061 305.684C183.061 306.135 183.43 306.504 183.881 306.504ZM183.279 315.295H184.469V307.926H183.279V315.295Z" fill="#191919"/> -<path d="M189.726 315.425C191.496 315.425 192.487 314.475 192.788 313.142L192.802 313.066L191.626 313.073L191.612 313.114C191.339 313.935 190.71 314.372 189.719 314.372C188.406 314.372 187.559 313.285 187.559 311.59V311.576C187.559 309.915 188.393 308.849 189.719 308.849C190.778 308.849 191.435 309.437 191.619 310.161L191.626 310.182H192.809L192.802 310.141C192.583 308.828 191.51 307.796 189.719 307.796C187.654 307.796 186.342 309.286 186.342 311.576V311.59C186.342 313.928 187.661 315.425 189.726 315.425Z" fill="#191919"/> -<path d="M196.568 315.425C197.56 315.425 198.332 314.994 198.797 314.208H198.906V315.295H200.096V310.25C200.096 308.719 199.091 307.796 197.293 307.796C195.721 307.796 194.6 308.575 194.408 309.73L194.401 309.771H195.591L195.598 309.751C195.789 309.177 196.37 308.849 197.252 308.849C198.353 308.849 198.906 309.341 198.906 310.25V310.92L196.794 311.05C195.078 311.152 194.107 311.911 194.107 313.224V313.237C194.107 314.577 195.167 315.425 196.568 315.425ZM195.324 313.21V313.196C195.324 312.465 195.816 312.068 196.938 312L198.906 311.877V312.547C198.906 313.6 198.024 314.393 196.814 314.393C195.96 314.393 195.324 313.955 195.324 313.21Z" fill="#191919"/> -<path d="M204.888 315.35C205.12 315.35 205.346 315.322 205.578 315.281V314.27C205.359 314.29 205.243 314.297 205.031 314.297C204.266 314.297 203.965 313.948 203.965 313.08V308.91H205.578V307.926H203.965V306.019H202.734V307.926H201.572V308.91H202.734V313.381C202.734 314.789 203.37 315.35 204.888 315.35Z" fill="#191919"/> -<path d="M207.984 306.504C208.436 306.504 208.805 306.135 208.805 305.684C208.805 305.232 208.436 304.863 207.984 304.863C207.533 304.863 207.164 305.232 207.164 305.684C207.164 306.135 207.533 306.504 207.984 306.504ZM207.383 315.295H208.572V307.926H207.383V315.295Z" fill="#191919"/> -<path d="M213.843 315.425C215.941 315.425 217.24 313.976 217.24 311.617V311.604C217.24 309.238 215.941 307.796 213.843 307.796C211.744 307.796 210.445 309.238 210.445 311.604V311.617C210.445 313.976 211.744 315.425 213.843 315.425ZM213.843 314.372C212.448 314.372 211.662 313.354 211.662 311.617V311.604C211.662 309.86 212.448 308.849 213.843 308.849C215.237 308.849 216.023 309.86 216.023 311.604V311.617C216.023 313.354 215.237 314.372 213.843 314.372Z" fill="#191919"/> -<path d="M219.086 315.295H220.275V310.934C220.275 309.642 221.021 308.849 222.196 308.849C223.372 308.849 223.919 309.484 223.919 310.811V315.295H225.108V310.523C225.108 308.773 224.186 307.796 222.531 307.796C221.444 307.796 220.754 308.254 220.385 309.033H220.275V307.926H219.086V315.295Z" fill="#191919"/> -<path d="M228.232 315.363C228.725 315.363 229.121 314.96 229.121 314.475C229.121 313.982 228.725 313.586 228.232 313.586C227.747 313.586 227.344 313.982 227.344 314.475C227.344 314.96 227.747 315.363 228.232 315.363Z" fill="#191919"/> -<path d="M233.886 315.425C234.966 315.425 235.711 314.98 236.073 314.194H236.183V315.295H237.372V307.926H236.183V312.287C236.183 313.579 235.492 314.372 234.193 314.372C233.018 314.372 232.539 313.736 232.539 312.41V307.926H231.35V312.697C231.35 314.44 232.211 315.425 233.886 315.425Z" fill="#191919"/> -<path d="M239.594 317.756H240.783V314.133H240.893C241.296 314.919 242.178 315.425 243.189 315.425C245.062 315.425 246.279 313.928 246.279 311.617V311.604C246.279 309.307 245.056 307.796 243.189 307.796C242.164 307.796 241.344 308.281 240.893 309.102H240.783V307.926H239.594V317.756ZM242.916 314.372C241.576 314.372 240.756 313.319 240.756 311.617V311.604C240.756 309.901 241.576 308.849 242.916 308.849C244.263 308.849 245.062 309.888 245.062 311.604V311.617C245.062 313.333 244.263 314.372 242.916 314.372Z" fill="#191919"/> -<path d="M250.859 315.425C251.885 315.425 252.705 314.939 253.156 314.119H253.266V315.295H254.455V305H253.266V309.088H253.156C252.753 308.302 251.871 307.796 250.859 307.796C248.986 307.796 247.77 309.293 247.77 311.604V311.617C247.77 313.914 248.993 315.425 250.859 315.425ZM251.133 314.372C249.786 314.372 248.986 313.333 248.986 311.617V311.604C248.986 309.888 249.786 308.849 251.133 308.849C252.473 308.849 253.293 309.901 253.293 311.604V311.617C253.293 313.319 252.473 314.372 251.133 314.372Z" fill="#191919"/> -<path d="M258.762 315.425C259.753 315.425 260.525 314.994 260.99 314.208H261.1V315.295H262.289V310.25C262.289 308.719 261.284 307.796 259.486 307.796C257.914 307.796 256.793 308.575 256.602 309.73L256.595 309.771H257.784L257.791 309.751C257.982 309.177 258.563 308.849 259.445 308.849C260.546 308.849 261.1 309.341 261.1 310.25V310.92L258.987 311.05C257.271 311.152 256.301 311.911 256.301 313.224V313.237C256.301 314.577 257.36 315.425 258.762 315.425ZM257.518 313.21V313.196C257.518 312.465 258.01 312.068 259.131 312L261.1 311.877V312.547C261.1 313.6 260.218 314.393 259.008 314.393C258.153 314.393 257.518 313.955 257.518 313.21Z" fill="#191919"/> -<path d="M267.081 315.35C267.313 315.35 267.539 315.322 267.771 315.281V314.27C267.553 314.29 267.437 314.297 267.225 314.297C266.459 314.297 266.158 313.948 266.158 313.08V308.91H267.771V307.926H266.158V306.019H264.928V307.926H263.766V308.91H264.928V313.381C264.928 314.789 265.563 315.35 267.081 315.35Z" fill="#191919"/> -<path d="M272.447 315.425C274.184 315.425 275.236 314.44 275.489 313.442L275.503 313.388H274.313L274.286 313.449C274.088 313.894 273.473 314.365 272.475 314.365C271.162 314.365 270.321 313.477 270.287 311.952H275.592V311.487C275.592 309.286 274.375 307.796 272.372 307.796C270.369 307.796 269.07 309.354 269.07 311.631V311.638C269.07 313.948 270.342 315.425 272.447 315.425ZM272.365 308.855C273.452 308.855 274.259 309.546 274.382 311.002H270.308C270.438 309.601 271.271 308.855 272.365 308.855Z" fill="#191919"/> -<path d="M280.158 315.425C281.184 315.425 282.004 314.939 282.455 314.119H282.564V315.295H283.754V305H282.564V309.088H282.455C282.052 308.302 281.17 307.796 280.158 307.796C278.285 307.796 277.068 309.293 277.068 311.604V311.617C277.068 313.914 278.292 315.425 280.158 315.425ZM280.432 314.372C279.085 314.372 278.285 313.333 278.285 311.617V311.604C278.285 309.888 279.085 308.849 280.432 308.849C281.771 308.849 282.592 309.901 282.592 311.604V311.617C282.592 313.319 281.771 314.372 280.432 314.372Z" fill="#191919"/> -<path d="M286.516 309.32H287.5L287.644 305.431H286.372L286.516 309.32ZM289.045 309.32H290.029L290.173 305.431H288.901L289.045 309.32Z" fill="#191919"/> -<path d="M291.123 317.804H292.005L293.078 313.914H291.718L291.123 317.804Z" fill="#191919"/> -<path d="M90.7891 331.32H91.7734L91.917 327.431H90.6455L90.7891 331.32ZM93.3184 331.32H94.3027L94.4463 327.431H93.1748L93.3184 331.32Z" fill="#191919"/> -<path d="M99.6143 337.35C99.8467 337.35 100.072 337.322 100.305 337.281V336.27C100.086 336.29 99.9697 336.297 99.7578 336.297C98.9922 336.297 98.6914 335.948 98.6914 335.08V330.91H100.305V329.926H98.6914V328.019H97.4609V329.926H96.2988V330.91H97.4609V335.381C97.4609 336.789 98.0967 337.35 99.6143 337.35Z" fill="#191919"/> -<path d="M102.711 328.504C103.162 328.504 103.531 328.135 103.531 327.684C103.531 327.232 103.162 326.863 102.711 326.863C102.26 326.863 101.891 327.232 101.891 327.684C101.891 328.135 102.26 328.504 102.711 328.504ZM102.109 337.295H103.299V329.926H102.109V337.295Z" fill="#191919"/> -<path d="M105.541 337.295H106.73V332.729C106.73 331.689 107.462 330.849 108.426 330.849C109.355 330.849 109.957 331.416 109.957 332.291V337.295H111.146V332.558C111.146 331.621 111.823 330.849 112.849 330.849C113.888 330.849 114.387 331.389 114.387 332.476V337.295H115.576V332.202C115.576 330.657 114.735 329.796 113.231 329.796C112.213 329.796 111.372 330.309 110.976 331.088H110.866C110.524 330.322 109.827 329.796 108.829 329.796C107.865 329.796 107.168 330.254 106.84 331.047H106.73V329.926H105.541V337.295Z" fill="#191919"/> -<path d="M120.73 337.425C122.467 337.425 123.52 336.44 123.772 335.442L123.786 335.388H122.597L122.569 335.449C122.371 335.894 121.756 336.365 120.758 336.365C119.445 336.365 118.604 335.477 118.57 333.952H123.875V333.487C123.875 331.286 122.658 329.796 120.655 329.796C118.652 329.796 117.354 331.354 117.354 333.631V333.638C117.354 335.948 118.625 337.425 120.73 337.425ZM120.648 330.855C121.735 330.855 122.542 331.546 122.665 333.002H118.591C118.721 331.601 119.555 330.855 120.648 330.855Z" fill="#191919"/> -<path d="M128.25 337.425C129.925 337.425 131.203 336.516 131.203 335.203V335.189C131.203 334.137 130.533 333.535 129.146 333.2L128.011 332.927C127.143 332.715 126.773 332.4 126.773 331.901V331.888C126.773 331.238 127.416 330.787 128.291 330.787C129.18 330.787 129.754 331.19 129.911 331.771H131.08C130.916 330.568 129.843 329.796 128.298 329.796C126.732 329.796 125.557 330.719 125.557 331.942V331.949C125.557 333.009 126.179 333.61 127.56 333.938L128.701 334.212C129.61 334.431 129.986 334.779 129.986 335.278V335.292C129.986 335.962 129.282 336.434 128.291 336.434C127.348 336.434 126.76 336.03 126.562 335.415H125.345C125.481 336.632 126.609 337.425 128.25 337.425Z" fill="#191919"/> -<path d="M135.599 337.35C135.831 337.35 136.057 337.322 136.289 337.281V336.27C136.07 336.29 135.954 336.297 135.742 336.297C134.977 336.297 134.676 335.948 134.676 335.08V330.91H136.289V329.926H134.676V328.019H133.445V329.926H132.283V330.91H133.445V335.381C133.445 336.789 134.081 337.35 135.599 337.35Z" fill="#191919"/> -<path d="M140.09 337.425C141.081 337.425 141.854 336.994 142.318 336.208H142.428V337.295H143.617V332.25C143.617 330.719 142.612 329.796 140.814 329.796C139.242 329.796 138.121 330.575 137.93 331.73L137.923 331.771H139.112L139.119 331.751C139.311 331.177 139.892 330.849 140.773 330.849C141.874 330.849 142.428 331.341 142.428 332.25V332.92L140.315 333.05C138.6 333.152 137.629 333.911 137.629 335.224V335.237C137.629 336.577 138.688 337.425 140.09 337.425ZM138.846 335.21V335.196C138.846 334.465 139.338 334.068 140.459 334L142.428 333.877V334.547C142.428 335.6 141.546 336.393 140.336 336.393C139.481 336.393 138.846 335.955 138.846 335.21Z" fill="#191919"/> -<path d="M145.791 337.295H146.98V332.729C146.98 331.689 147.712 330.849 148.676 330.849C149.605 330.849 150.207 331.416 150.207 332.291V337.295H151.396V332.558C151.396 331.621 152.073 330.849 153.099 330.849C154.138 330.849 154.637 331.389 154.637 332.476V337.295H155.826V332.202C155.826 330.657 154.985 329.796 153.481 329.796C152.463 329.796 151.622 330.309 151.226 331.088H151.116C150.774 330.322 150.077 329.796 149.079 329.796C148.115 329.796 147.418 330.254 147.09 331.047H146.98V329.926H145.791V337.295Z" fill="#191919"/> -<path d="M157.973 339.756H159.162V336.133H159.271C159.675 336.919 160.557 337.425 161.568 337.425C163.441 337.425 164.658 335.928 164.658 333.617V333.604C164.658 331.307 163.435 329.796 161.568 329.796C160.543 329.796 159.723 330.281 159.271 331.102H159.162V329.926H157.973V339.756ZM161.295 336.372C159.955 336.372 159.135 335.319 159.135 333.617V333.604C159.135 331.901 159.955 330.849 161.295 330.849C162.642 330.849 163.441 331.888 163.441 333.604V333.617C163.441 335.333 162.642 336.372 161.295 336.372Z" fill="#191919"/> -<path d="M166.996 331.32H167.98L168.124 327.431H166.853L166.996 331.32ZM169.525 331.32H170.51L170.653 327.431H169.382L169.525 331.32Z" fill="#191919"/> -<path d="M174.174 332.072C174.666 332.072 175.062 331.669 175.062 331.184C175.062 330.691 174.666 330.295 174.174 330.295C173.688 330.295 173.285 330.691 173.285 331.184C173.285 331.669 173.688 332.072 174.174 332.072ZM174.174 337.363C174.666 337.363 175.062 336.96 175.062 336.475C175.062 335.982 174.666 335.586 174.174 335.586C173.688 335.586 173.285 335.982 173.285 336.475C173.285 336.96 173.688 337.363 174.174 337.363Z" fill="#191919"/> -<path d="M181.775 331.32H182.76L182.903 327.431H181.632L181.775 331.32ZM184.305 331.32H185.289L185.433 327.431H184.161L184.305 331.32Z" fill="#191919"/> -<path d="M187.976 337.295H194.36V336.188H189.685V336.078L191.927 333.761C193.711 331.922 194.196 331.102 194.196 329.974V329.96C194.196 328.367 192.877 327.198 191.154 327.198C189.268 327.198 187.914 328.456 187.907 330.206L187.921 330.213L189.097 330.22L189.104 330.206C189.104 329.044 189.89 328.271 191.072 328.271C192.234 328.271 192.938 329.051 192.938 330.09V330.104C192.938 330.965 192.569 331.478 191.312 332.838L187.976 336.447V337.295Z" fill="#191919"/> -<path d="M199.727 337.527C201.907 337.527 203.22 335.538 203.22 332.366V332.353C203.22 329.181 201.907 327.198 199.727 327.198C197.546 327.198 196.247 329.181 196.247 332.353V332.366C196.247 335.538 197.546 337.527 199.727 337.527ZM199.727 336.454C198.312 336.454 197.484 334.882 197.484 332.366V332.353C197.484 329.837 198.312 328.278 199.727 328.278C201.142 328.278 201.982 329.837 201.982 332.353V332.366C201.982 334.882 201.142 336.454 199.727 336.454Z" fill="#191919"/> -<path d="M205.243 337.295H211.628V336.188H206.952V336.078L209.194 333.761C210.979 331.922 211.464 331.102 211.464 329.974V329.96C211.464 328.367 210.145 327.198 208.422 327.198C206.535 327.198 205.182 328.456 205.175 330.206L205.188 330.213L206.364 330.22L206.371 330.206C206.371 329.044 207.157 328.271 208.34 328.271C209.502 328.271 210.206 329.051 210.206 330.09V330.104C210.206 330.965 209.837 331.478 208.579 332.838L205.243 336.447V337.295Z" fill="#191919"/> -<path d="M213.692 337.295H220.077V336.188H215.401V336.078L217.644 333.761C219.428 331.922 219.913 331.102 219.913 329.974V329.96C219.913 328.367 218.594 327.198 216.871 327.198C214.984 327.198 213.631 328.456 213.624 330.206L213.638 330.213L214.813 330.22L214.82 330.206C214.82 329.044 215.606 328.271 216.789 328.271C217.951 328.271 218.655 329.051 218.655 330.09V330.104C218.655 330.965 218.286 331.478 217.028 332.838L213.692 336.447V337.295Z" fill="#191919"/> -<path d="M222.046 333.877H226.64V332.77H222.046V333.877Z" fill="#191919"/> -<path d="M232.047 337.527C234.228 337.527 235.54 335.538 235.54 332.366V332.353C235.54 329.181 234.228 327.198 232.047 327.198C229.866 327.198 228.567 329.181 228.567 332.353V332.366C228.567 335.538 229.866 337.527 232.047 337.527ZM232.047 336.454C230.632 336.454 229.805 334.882 229.805 332.366V332.353C229.805 329.837 230.632 328.278 232.047 328.278C233.462 328.278 234.303 329.837 234.303 332.353V332.366C234.303 334.882 233.462 336.454 232.047 336.454Z" fill="#191919"/> -<path d="M241.05 337.527C243.039 337.527 244.502 336.099 244.502 334.13V334.116C244.502 332.223 243.121 330.814 241.269 330.814C239.936 330.814 239.006 331.532 238.644 332.339H238.514C238.514 332.264 238.514 332.182 238.521 332.106C238.596 330.049 239.327 328.299 241.118 328.299C242.116 328.299 242.807 328.812 243.107 329.639L243.135 329.714H244.372L244.352 329.625C244.017 328.169 242.786 327.198 241.132 327.198C238.739 327.198 237.338 329.167 237.338 332.53V332.544C237.338 336.256 239.245 337.527 241.05 337.527ZM238.808 334.116V334.109C238.808 332.824 239.778 331.888 241.057 331.888C242.335 331.888 243.265 332.831 243.265 334.144V334.157C243.265 335.436 242.273 336.44 241.036 336.44C239.785 336.44 238.808 335.415 238.808 334.116Z" fill="#191919"/> -<path d="M246.382 333.877H250.976V332.77H246.382V333.877Z" fill="#191919"/> -<path d="M253.081 337.295H259.466V336.188H254.79V336.078L257.032 333.761C258.816 331.922 259.302 331.102 259.302 329.974V329.96C259.302 328.367 257.982 327.198 256.26 327.198C254.373 327.198 253.02 328.456 253.013 330.206L253.026 330.213L254.202 330.22L254.209 330.206C254.209 329.044 254.995 328.271 256.178 328.271C257.34 328.271 258.044 329.051 258.044 330.09V330.104C258.044 330.965 257.675 331.478 256.417 332.838L253.081 336.447V337.295Z" fill="#191919"/> -<path d="M264.757 327.198C262.768 327.198 261.305 328.627 261.305 330.596V330.609C261.305 332.503 262.686 333.911 264.538 333.911C265.871 333.911 266.801 333.193 267.163 332.387H267.293C267.293 332.462 267.293 332.544 267.286 332.619C267.211 334.677 266.479 336.427 264.688 336.427C263.69 336.427 263 335.914 262.699 335.087L262.672 335.012H261.435L261.455 335.101C261.79 336.557 263.021 337.527 264.675 337.527C267.067 337.527 268.469 335.559 268.469 332.195V332.182C268.469 328.47 266.562 327.198 264.757 327.198ZM264.75 332.838C263.472 332.838 262.542 331.895 262.542 330.582V330.568C262.542 329.29 263.533 328.285 264.771 328.285C266.021 328.285 266.999 329.311 266.999 330.609V330.616C266.999 331.901 266.028 332.838 264.75 332.838Z" fill="#191919"/> -<path d="M272.755 337.295H273.985V328.538H277.164V327.431H269.576V328.538H272.755V337.295Z" fill="#191919"/> -<path d="M281.799 337.527C283.979 337.527 285.292 335.538 285.292 332.366V332.353C285.292 329.181 283.979 327.198 281.799 327.198C279.618 327.198 278.319 329.181 278.319 332.353V332.366C278.319 335.538 279.618 337.527 281.799 337.527ZM281.799 336.454C280.384 336.454 279.557 334.882 279.557 332.366V332.353C279.557 329.837 280.384 328.278 281.799 328.278C283.214 328.278 284.055 329.837 284.055 332.353V332.366C284.055 334.882 283.214 336.454 281.799 336.454Z" fill="#191919"/> -<path d="M290.686 337.459C292.777 337.459 294.268 336.283 294.268 334.629V334.615C294.268 333.398 293.413 332.387 292.148 332.093V332.065C293.229 331.73 293.912 330.91 293.912 329.871V329.857C293.912 328.367 292.552 327.267 290.686 327.267C288.819 327.267 287.459 328.367 287.459 329.857V329.871C287.459 330.91 288.143 331.73 289.223 332.065V332.093C287.958 332.387 287.104 333.398 287.104 334.615V334.629C287.104 336.283 288.594 337.459 290.686 337.459ZM290.686 331.607C289.496 331.607 288.683 330.931 288.683 329.974V329.96C288.683 329.003 289.496 328.326 290.686 328.326C291.875 328.326 292.688 329.003 292.688 329.96V329.974C292.688 330.931 291.875 331.607 290.686 331.607ZM290.686 336.386C289.325 336.386 288.354 335.62 288.354 334.554V334.54C288.354 333.46 289.318 332.688 290.686 332.688C292.053 332.688 293.017 333.46 293.017 334.54V334.554C293.017 335.62 292.046 336.386 290.686 336.386Z" fill="#191919"/> -<path d="M297.234 330.603C297.727 330.603 298.123 330.199 298.123 329.714C298.123 329.222 297.727 328.825 297.234 328.825C296.749 328.825 296.346 329.222 296.346 329.714C296.346 330.199 296.749 330.603 297.234 330.603ZM297.234 335.894C297.727 335.894 298.123 335.49 298.123 335.005C298.123 334.513 297.727 334.116 297.234 334.116C296.749 334.116 296.346 334.513 296.346 335.005C296.346 335.49 296.749 335.894 297.234 335.894Z" fill="#191919"/> -<path d="M303.701 337.459C305.677 337.459 307.126 336.242 307.126 334.595V334.581C307.126 333.18 306.148 332.284 304.713 332.161V332.134C305.943 331.874 306.805 331.04 306.805 329.823V329.81C306.805 328.312 305.567 327.267 303.688 327.267C301.842 327.267 300.57 328.34 300.413 329.946L300.406 330.015H301.589L301.596 329.946C301.698 328.948 302.525 328.333 303.688 328.333C304.891 328.333 305.567 328.928 305.567 329.96V329.974C305.567 330.958 304.747 331.683 303.571 331.683H302.389V332.722H303.626C305.007 332.722 305.875 333.398 305.875 334.608V334.622C305.875 335.668 304.993 336.393 303.701 336.393C302.389 336.393 301.493 335.723 301.397 334.752L301.391 334.684H300.208L300.215 334.766C300.345 336.324 301.664 337.459 303.701 337.459Z" fill="#191919"/> -<path d="M312.608 337.527C314.598 337.527 316.061 336.099 316.061 334.13V334.116C316.061 332.223 314.68 330.814 312.827 330.814C311.494 330.814 310.564 331.532 310.202 332.339H310.072C310.072 332.264 310.072 332.182 310.079 332.106C310.154 330.049 310.886 328.299 312.677 328.299C313.675 328.299 314.365 328.812 314.666 329.639L314.693 329.714H315.931L315.91 329.625C315.575 328.169 314.345 327.198 312.69 327.198C310.298 327.198 308.896 329.167 308.896 332.53V332.544C308.896 336.256 310.804 337.527 312.608 337.527ZM310.366 334.116V334.109C310.366 332.824 311.337 331.888 312.615 331.888C313.894 331.888 314.823 332.831 314.823 334.144V334.157C314.823 335.436 313.832 336.44 312.595 336.44C311.344 336.44 310.366 335.415 310.366 334.116Z" fill="#191919"/> -<path d="M319.014 330.603C319.506 330.603 319.902 330.199 319.902 329.714C319.902 329.222 319.506 328.825 319.014 328.825C318.528 328.825 318.125 329.222 318.125 329.714C318.125 330.199 318.528 330.603 319.014 330.603ZM319.014 335.894C319.506 335.894 319.902 335.49 319.902 335.005C319.902 334.513 319.506 334.116 319.014 334.116C318.528 334.116 318.125 334.513 318.125 335.005C318.125 335.49 318.528 335.894 319.014 335.894Z" fill="#191919"/> -<path d="M325.48 337.459C327.456 337.459 328.905 336.242 328.905 334.595V334.581C328.905 333.18 327.928 332.284 326.492 332.161V332.134C327.723 331.874 328.584 331.04 328.584 329.823V329.81C328.584 328.312 327.347 327.267 325.467 327.267C323.621 327.267 322.35 328.34 322.192 329.946L322.186 330.015H323.368L323.375 329.946C323.478 328.948 324.305 328.333 325.467 328.333C326.67 328.333 327.347 328.928 327.347 329.96V329.974C327.347 330.958 326.526 331.683 325.351 331.683H324.168V332.722H325.405C326.786 332.722 327.654 333.398 327.654 334.608V334.622C327.654 335.668 326.772 336.393 325.48 336.393C324.168 336.393 323.272 335.723 323.177 334.752L323.17 334.684H321.987L321.994 334.766C322.124 336.324 323.443 337.459 325.48 337.459Z" fill="#191919"/> -<path d="M334.258 337.459C336.233 337.459 337.683 336.242 337.683 334.595V334.581C337.683 333.18 336.705 332.284 335.27 332.161V332.134C336.5 331.874 337.361 331.04 337.361 329.823V329.81C337.361 328.312 336.124 327.267 334.244 327.267C332.398 327.267 331.127 328.34 330.97 329.946L330.963 330.015H332.146L332.152 329.946C332.255 328.948 333.082 328.333 334.244 328.333C335.447 328.333 336.124 328.928 336.124 329.96V329.974C336.124 330.958 335.304 331.683 334.128 331.683H332.945V332.722H334.183C335.563 332.722 336.432 333.398 336.432 334.608V334.622C336.432 335.668 335.55 336.393 334.258 336.393C332.945 336.393 332.05 335.723 331.954 334.752L331.947 334.684H330.765L330.771 334.766C330.901 336.324 332.221 337.459 334.258 337.459Z" fill="#191919"/> -<path d="M340.178 337.363C340.67 337.363 341.066 336.96 341.066 336.475C341.066 335.982 340.67 335.586 340.178 335.586C339.692 335.586 339.289 335.982 339.289 336.475C339.289 336.96 339.692 337.363 340.178 337.363Z" fill="#191919"/> -<path d="M346.146 337.527C348.148 337.527 349.577 336.14 349.577 334.15V334.137C349.577 332.229 348.244 330.842 346.392 330.842C345.496 330.842 344.724 331.204 344.286 331.867H344.177L344.512 328.531H349.03V327.431H343.541L343.021 333.098H344.088C344.211 332.865 344.368 332.674 344.539 332.51C344.963 332.106 345.523 331.908 346.18 331.908C347.458 331.908 348.374 332.845 348.374 334.157V334.171C348.374 335.504 347.472 336.44 346.159 336.44C345.004 336.44 344.149 335.688 344.033 334.745L344.026 334.69H342.844L342.851 334.766C342.994 336.345 344.307 337.527 346.146 337.527Z" fill="#191919"/> -<path d="M354.861 337.527C357.042 337.527 358.354 335.538 358.354 332.366V332.353C358.354 329.181 357.042 327.198 354.861 327.198C352.681 327.198 351.382 329.181 351.382 332.353V332.366C351.382 335.538 352.681 337.527 354.861 337.527ZM354.861 336.454C353.446 336.454 352.619 334.882 352.619 332.366V332.353C352.619 329.837 353.446 328.278 354.861 328.278C356.276 328.278 357.117 329.837 357.117 332.353V332.366C357.117 334.882 356.276 336.454 354.861 336.454Z" fill="#191919"/> -<path d="M360.515 337.295H361.807L366.195 328.572V327.431H359.667V328.531H364.944V328.627L360.515 337.295Z" fill="#191919"/> -<path d="M367.768 333.877H370.83V337.008H371.938V333.877H375V332.77H371.938V329.639H370.83V332.77H367.768V333.877Z" fill="#191919"/> -<path d="M380.195 337.527C382.376 337.527 383.688 335.538 383.688 332.366V332.353C383.688 329.181 382.376 327.198 380.195 327.198C378.015 327.198 376.716 329.181 376.716 332.353V332.366C376.716 335.538 378.015 337.527 380.195 337.527ZM380.195 336.454C378.78 336.454 377.953 334.882 377.953 332.366V332.353C377.953 329.837 378.78 328.278 380.195 328.278C381.61 328.278 382.451 329.837 382.451 332.353V332.366C382.451 334.882 381.61 336.454 380.195 336.454Z" fill="#191919"/> -<path d="M389.014 337.527C391.194 337.527 392.507 335.538 392.507 332.366V332.353C392.507 329.181 391.194 327.198 389.014 327.198C386.833 327.198 385.534 329.181 385.534 332.353V332.366C385.534 335.538 386.833 337.527 389.014 337.527ZM389.014 336.454C387.599 336.454 386.771 334.882 386.771 332.366V332.353C386.771 329.837 387.599 328.278 389.014 328.278C390.429 328.278 391.27 329.837 391.27 332.353V332.366C391.27 334.882 390.429 336.454 389.014 336.454Z" fill="#191919"/> -<path d="M395.508 330.603C396 330.603 396.396 330.199 396.396 329.714C396.396 329.222 396 328.825 395.508 328.825C395.022 328.825 394.619 329.222 394.619 329.714C394.619 330.199 395.022 330.603 395.508 330.603ZM395.508 335.894C396 335.894 396.396 335.49 396.396 335.005C396.396 334.513 396 334.116 395.508 334.116C395.022 334.116 394.619 334.513 394.619 335.005C394.619 335.49 395.022 335.894 395.508 335.894Z" fill="#191919"/> -<path d="M401.988 337.527C404.169 337.527 405.481 335.538 405.481 332.366V332.353C405.481 329.181 404.169 327.198 401.988 327.198C399.808 327.198 398.509 329.181 398.509 332.353V332.366C398.509 335.538 399.808 337.527 401.988 337.527ZM401.988 336.454C400.573 336.454 399.746 334.882 399.746 332.366V332.353C399.746 329.837 400.573 328.278 401.988 328.278C403.403 328.278 404.244 329.837 404.244 332.353V332.366C404.244 334.882 403.403 336.454 401.988 336.454Z" fill="#191919"/> -<path d="M410.807 337.527C412.987 337.527 414.3 335.538 414.3 332.366V332.353C414.3 329.181 412.987 327.198 410.807 327.198C408.626 327.198 407.327 329.181 407.327 332.353V332.366C407.327 335.538 408.626 337.527 410.807 337.527ZM410.807 336.454C409.392 336.454 408.564 334.882 408.564 332.366V332.353C408.564 329.837 409.392 328.278 410.807 328.278C412.222 328.278 413.062 329.837 413.062 332.353V332.366C413.062 334.882 412.222 336.454 410.807 336.454Z" fill="#191919"/> -<path d="M416.604 331.32H417.588L417.731 327.431H416.46L416.604 331.32ZM419.133 331.32H420.117L420.261 327.431H418.989L419.133 331.32Z" fill="#191919"/> -<path d="M421.211 339.804H422.093L423.166 335.914H421.806L421.211 339.804Z" fill="#191919"/> -<path d="M90.7891 353.32H91.7734L91.917 349.431H90.6455L90.7891 353.32ZM93.3184 353.32H94.3027L94.4463 349.431H93.1748L93.3184 353.32Z" fill="#191919"/> -<path d="M96.9961 359.295H98.1855V354.729C98.1855 353.648 98.9922 352.931 100.127 352.931C100.387 352.931 100.612 352.958 100.858 352.999V351.844C100.742 351.823 100.489 351.796 100.264 351.796C99.2656 351.796 98.5752 352.247 98.2949 353.02H98.1855V351.926H96.9961V359.295Z" fill="#191919"/> -<path d="M105.131 359.425C106.867 359.425 107.92 358.44 108.173 357.442L108.187 357.388H106.997L106.97 357.449C106.771 357.894 106.156 358.365 105.158 358.365C103.846 358.365 103.005 357.477 102.971 355.952H108.275V355.487C108.275 353.286 107.059 351.796 105.056 351.796C103.053 351.796 101.754 353.354 101.754 355.631V355.638C101.754 357.948 103.025 359.425 105.131 359.425ZM105.049 352.855C106.136 352.855 106.942 353.546 107.065 355.002H102.991C103.121 353.601 103.955 352.855 105.049 352.855Z" fill="#191919"/> -<path d="M112.65 359.425C114.325 359.425 115.604 358.516 115.604 357.203V357.189C115.604 356.137 114.934 355.535 113.546 355.2L112.411 354.927C111.543 354.715 111.174 354.4 111.174 353.901V353.888C111.174 353.238 111.816 352.787 112.691 352.787C113.58 352.787 114.154 353.19 114.312 353.771H115.48C115.316 352.568 114.243 351.796 112.698 351.796C111.133 351.796 109.957 352.719 109.957 353.942V353.949C109.957 355.009 110.579 355.61 111.96 355.938L113.102 356.212C114.011 356.431 114.387 356.779 114.387 357.278V357.292C114.387 357.962 113.683 358.434 112.691 358.434C111.748 358.434 111.16 358.03 110.962 357.415H109.745C109.882 358.632 111.01 359.425 112.65 359.425Z" fill="#191919"/> -<path d="M120.478 359.425C122.576 359.425 123.875 357.976 123.875 355.617V355.604C123.875 353.238 122.576 351.796 120.478 351.796C118.379 351.796 117.08 353.238 117.08 355.604V355.617C117.08 357.976 118.379 359.425 120.478 359.425ZM120.478 358.372C119.083 358.372 118.297 357.354 118.297 355.617V355.604C118.297 353.86 119.083 352.849 120.478 352.849C121.872 352.849 122.658 353.86 122.658 355.604V355.617C122.658 357.354 121.872 358.372 120.478 358.372Z" fill="#191919"/> -<path d="M128.188 359.425C129.269 359.425 130.014 358.98 130.376 358.194H130.485V359.295H131.675V351.926H130.485V356.287C130.485 357.579 129.795 358.372 128.496 358.372C127.32 358.372 126.842 357.736 126.842 356.41V351.926H125.652V356.697C125.652 358.44 126.514 359.425 128.188 359.425Z" fill="#191919"/> -<path d="M133.896 359.295H135.086V354.729C135.086 353.648 135.893 352.931 137.027 352.931C137.287 352.931 137.513 352.958 137.759 352.999V351.844C137.643 351.823 137.39 351.796 137.164 351.796C136.166 351.796 135.476 352.247 135.195 353.02H135.086V351.926H133.896V359.295Z" fill="#191919"/> -<path d="M142.038 359.425C143.809 359.425 144.8 358.475 145.101 357.142L145.114 357.066L143.938 357.073L143.925 357.114C143.651 357.935 143.022 358.372 142.031 358.372C140.719 358.372 139.871 357.285 139.871 355.59V355.576C139.871 353.915 140.705 352.849 142.031 352.849C143.091 352.849 143.747 353.437 143.932 354.161L143.938 354.182H145.121L145.114 354.141C144.896 352.828 143.822 351.796 142.031 351.796C139.967 351.796 138.654 353.286 138.654 355.576V355.59C138.654 357.928 139.974 359.425 142.038 359.425Z" fill="#191919"/> -<path d="M149.865 359.425C151.602 359.425 152.654 358.44 152.907 357.442L152.921 357.388H151.731L151.704 357.449C151.506 357.894 150.891 358.365 149.893 358.365C148.58 358.365 147.739 357.477 147.705 355.952H153.01V355.487C153.01 353.286 151.793 351.796 149.79 351.796C147.787 351.796 146.488 353.354 146.488 355.631V355.638C146.488 357.948 147.76 359.425 149.865 359.425ZM149.783 352.855C150.87 352.855 151.677 353.546 151.8 355.002H147.726C147.855 353.601 148.689 352.855 149.783 352.855Z" fill="#191919"/> -<path d="M155.334 353.32H156.318L156.462 349.431H155.19L155.334 353.32ZM157.863 353.32H158.848L158.991 349.431H157.72L157.863 353.32Z" fill="#191919"/> -<path d="M162.512 354.072C163.004 354.072 163.4 353.669 163.4 353.184C163.4 352.691 163.004 352.295 162.512 352.295C162.026 352.295 161.623 352.691 161.623 353.184C161.623 353.669 162.026 354.072 162.512 354.072ZM162.512 359.363C163.004 359.363 163.4 358.96 163.4 358.475C163.4 357.982 163.004 357.586 162.512 357.586C162.026 357.586 161.623 357.982 161.623 358.475C161.623 358.96 162.026 359.363 162.512 359.363Z" fill="#191919"/> -<path d="M172.95 361.756H173.326V360.792H173.053C172.089 360.792 171.699 360.348 171.699 359.254V357.053C171.699 356.068 171.207 355.556 170.202 355.453V355.289C171.207 355.187 171.699 354.674 171.699 353.689V351.502C171.699 350.408 172.089 349.964 173.053 349.964H173.326V349H172.95C171.337 349 170.578 349.759 170.578 351.352V353.266C170.578 354.359 170.202 354.722 169.074 354.722V356.021C170.202 356.021 170.578 356.383 170.578 357.477V359.404C170.578 360.997 171.337 361.756 172.95 361.756Z" fill="#191919"/> -<path d="M106.539 375.32H107.523L107.667 371.431H106.396L106.539 375.32ZM109.068 375.32H110.053L110.196 371.431H108.925L109.068 375.32Z" fill="#191919"/> -<path d="M113.375 372.504C113.826 372.504 114.195 372.135 114.195 371.684C114.195 371.232 113.826 370.863 113.375 370.863C112.924 370.863 112.555 371.232 112.555 371.684C112.555 372.135 112.924 372.504 113.375 372.504ZM112.773 381.295H113.963V373.926H112.773V381.295Z" fill="#191919"/> -<path d="M118.926 381.425C119.951 381.425 120.771 380.939 121.223 380.119H121.332V381.295H122.521V371H121.332V375.088H121.223C120.819 374.302 119.938 373.796 118.926 373.796C117.053 373.796 115.836 375.293 115.836 377.604V377.617C115.836 379.914 117.06 381.425 118.926 381.425ZM119.199 380.372C117.853 380.372 117.053 379.333 117.053 377.617V377.604C117.053 375.888 117.853 374.849 119.199 374.849C120.539 374.849 121.359 375.901 121.359 377.604V377.617C121.359 379.319 120.539 380.372 119.199 380.372Z" fill="#191919"/> -<path d="M125.283 375.32H126.268L126.411 371.431H125.14L125.283 375.32ZM127.812 375.32H128.797L128.94 371.431H127.669L127.812 375.32Z" fill="#191919"/> -<path d="M132.461 376.072C132.953 376.072 133.35 375.669 133.35 375.184C133.35 374.691 132.953 374.295 132.461 374.295C131.976 374.295 131.572 374.691 131.572 375.184C131.572 375.669 131.976 376.072 132.461 376.072ZM132.461 381.363C132.953 381.363 133.35 380.96 133.35 380.475C133.35 379.982 132.953 379.586 132.461 379.586C131.976 379.586 131.572 379.982 131.572 380.475C131.572 380.96 131.976 381.363 132.461 381.363Z" fill="#191919"/> -<path d="M140.062 375.32H141.047L141.19 371.431H139.919L140.062 375.32ZM142.592 375.32H143.576L143.72 371.431H142.448L142.592 375.32Z" fill="#191919"/> -<path d="M149.544 381.527C151.533 381.527 152.996 380.099 152.996 378.13V378.116C152.996 376.223 151.615 374.814 149.763 374.814C148.43 374.814 147.5 375.532 147.138 376.339H147.008C147.008 376.264 147.008 376.182 147.015 376.106C147.09 374.049 147.821 372.299 149.612 372.299C150.61 372.299 151.301 372.812 151.602 373.639L151.629 373.714H152.866L152.846 373.625C152.511 372.169 151.28 371.198 149.626 371.198C147.233 371.198 145.832 373.167 145.832 376.53V376.544C145.832 380.256 147.739 381.527 149.544 381.527ZM147.302 378.116V378.109C147.302 376.824 148.272 375.888 149.551 375.888C150.829 375.888 151.759 376.831 151.759 378.144V378.157C151.759 379.436 150.768 380.44 149.53 380.44C148.279 380.44 147.302 379.415 147.302 378.116Z" fill="#191919"/> -<path d="M154.972 381.295H161.356V380.188H156.681V380.078L158.923 377.761C160.707 375.922 161.192 375.102 161.192 373.974V373.96C161.192 372.367 159.873 371.198 158.15 371.198C156.264 371.198 154.91 372.456 154.903 374.206L154.917 374.213L156.093 374.22L156.1 374.206C156.1 373.044 156.886 372.271 158.068 372.271C159.23 372.271 159.935 373.051 159.935 374.09V374.104C159.935 374.965 159.565 375.478 158.308 376.838L154.972 380.447V381.295Z" fill="#191919"/> -<path d="M167.092 381.425C168.958 381.425 170.182 379.914 170.182 377.617V377.604C170.182 375.293 168.965 373.796 167.092 373.796C166.08 373.796 165.198 374.302 164.795 375.088H164.686V371H163.496V381.295H164.686V380.119H164.795C165.246 380.939 166.066 381.425 167.092 381.425ZM166.818 380.372C165.479 380.372 164.658 379.319 164.658 377.617V377.604C164.658 375.901 165.479 374.849 166.818 374.849C168.165 374.849 168.965 375.888 168.965 377.604V377.617C168.965 379.333 168.165 380.372 166.818 380.372Z" fill="#191919"/> -<path d="M175.042 381.425C176.812 381.425 177.804 380.475 178.104 379.142L178.118 379.066L176.942 379.073L176.929 379.114C176.655 379.935 176.026 380.372 175.035 380.372C173.723 380.372 172.875 379.285 172.875 377.59V377.576C172.875 375.915 173.709 374.849 175.035 374.849C176.095 374.849 176.751 375.437 176.936 376.161L176.942 376.182H178.125L178.118 376.141C177.899 374.828 176.826 373.796 175.035 373.796C172.971 373.796 171.658 375.286 171.658 377.576V377.59C171.658 379.928 172.978 381.425 175.042 381.425Z" fill="#191919"/> -<path d="M183.156 381.527C185.337 381.527 186.649 379.538 186.649 376.366V376.353C186.649 373.181 185.337 371.198 183.156 371.198C180.976 371.198 179.677 373.181 179.677 376.353V376.366C179.677 379.538 180.976 381.527 183.156 381.527ZM183.156 380.454C181.741 380.454 180.914 378.882 180.914 376.366V376.353C180.914 373.837 181.741 372.278 183.156 372.278C184.571 372.278 185.412 373.837 185.412 376.353V376.366C185.412 378.882 184.571 380.454 183.156 380.454Z" fill="#191919"/> -<path d="M189.172 381.295H190.361V374.91H192.036V373.926H190.361V373.14C190.361 372.333 190.703 371.916 191.551 371.916C191.763 371.916 191.961 371.923 192.104 371.95V371C191.858 370.952 191.599 370.932 191.312 370.932C189.91 370.932 189.172 371.636 189.172 373.105V373.926H187.948V374.91H189.172V381.295Z" fill="#191919"/> -<path d="M196.158 381.295H197.389V371.431H196.165L193.54 373.317V374.616L196.049 372.798H196.158V381.295Z" fill="#191919"/> -<path d="M202.652 381.295H203.883V371.431H202.659L200.034 373.317V374.616L202.543 372.798H202.652V381.295Z" fill="#191919"/> -<path d="M209.974 381.527C211.977 381.527 213.405 380.14 213.405 378.15V378.137C213.405 376.229 212.072 374.842 210.22 374.842C209.324 374.842 208.552 375.204 208.114 375.867H208.005L208.34 372.531H212.858V371.431H207.369L206.85 377.098H207.916C208.039 376.865 208.196 376.674 208.367 376.51C208.791 376.106 209.352 375.908 210.008 375.908C211.286 375.908 212.202 376.845 212.202 378.157V378.171C212.202 379.504 211.3 380.44 209.987 380.44C208.832 380.44 207.978 379.688 207.861 378.745L207.854 378.69H206.672L206.679 378.766C206.822 380.345 208.135 381.527 209.974 381.527Z" fill="#191919"/> -<path d="M219.893 381.295H221.096V379.251H222.497V378.15H221.096V371.431H219.312C217.931 373.488 216.42 375.895 215.087 378.13V379.251H219.893V381.295ZM216.345 378.157V378.075C217.418 376.264 218.71 374.227 219.817 372.572H219.899V378.157H216.345Z" fill="#191919"/> -<path d="M227.638 381.527C229.641 381.527 231.069 380.14 231.069 378.15V378.137C231.069 376.229 229.736 374.842 227.884 374.842C226.988 374.842 226.216 375.204 225.778 375.867H225.669L226.004 372.531H230.522V371.431H225.033L224.514 377.098H225.58C225.703 376.865 225.86 376.674 226.031 376.51C226.455 376.106 227.016 375.908 227.672 375.908C228.95 375.908 229.866 376.845 229.866 378.157V378.171C229.866 379.504 228.964 380.44 227.651 380.44C226.496 380.44 225.642 379.688 225.525 378.745L225.519 378.69H224.336L224.343 378.766C224.486 380.345 225.799 381.527 227.638 381.527Z" fill="#191919"/> -<path d="M236.073 381.425C237.844 381.425 238.835 380.475 239.136 379.142L239.149 379.066L237.974 379.073L237.96 379.114C237.687 379.935 237.058 380.372 236.066 380.372C234.754 380.372 233.906 379.285 233.906 377.59V377.576C233.906 375.915 234.74 374.849 236.066 374.849C237.126 374.849 237.782 375.437 237.967 376.161L237.974 376.182H239.156L239.149 376.141C238.931 374.828 237.857 373.796 236.066 373.796C234.002 373.796 232.689 375.286 232.689 377.576V377.59C232.689 379.928 234.009 381.425 236.073 381.425Z" fill="#191919"/> -<path d="M245.391 381.295H246.594V379.251H247.995V378.15H246.594V371.431H244.81C243.429 373.488 241.918 375.895 240.585 378.13V379.251H245.391V381.295ZM241.843 378.157V378.075C242.916 376.264 244.208 374.227 245.315 372.572H245.397V378.157H241.843Z" fill="#191919"/> -<path d="M252.917 381.425C254.688 381.425 255.679 380.475 255.979 379.142L255.993 379.066L254.817 379.073L254.804 379.114C254.53 379.935 253.901 380.372 252.91 380.372C251.598 380.372 250.75 379.285 250.75 377.59V377.576C250.75 375.915 251.584 374.849 252.91 374.849C253.97 374.849 254.626 375.437 254.811 376.161L254.817 376.182H256L255.993 376.141C255.774 374.828 254.701 373.796 252.91 373.796C250.846 373.796 249.533 375.286 249.533 377.576V377.59C249.533 379.928 250.853 381.425 252.917 381.425Z" fill="#191919"/> -<path d="M261.031 381.527C263.212 381.527 264.524 379.538 264.524 376.366V376.353C264.524 373.181 263.212 371.198 261.031 371.198C258.851 371.198 257.552 373.181 257.552 376.353V376.366C257.552 379.538 258.851 381.527 261.031 381.527ZM261.031 380.454C259.616 380.454 258.789 378.882 258.789 376.366V376.353C258.789 373.837 259.616 372.278 261.031 372.278C262.446 372.278 263.287 373.837 263.287 376.353V376.366C263.287 378.882 262.446 380.454 261.031 380.454Z" fill="#191919"/> -<path d="M269.85 381.527C272.03 381.527 273.343 379.538 273.343 376.366V376.353C273.343 373.181 272.03 371.198 269.85 371.198C267.669 371.198 266.37 373.181 266.37 376.353V376.366C266.37 379.538 267.669 381.527 269.85 381.527ZM269.85 380.454C268.435 380.454 267.607 378.882 267.607 376.366V376.353C267.607 373.837 268.435 372.278 269.85 372.278C271.265 372.278 272.105 373.837 272.105 376.353V376.366C272.105 378.882 271.265 380.454 269.85 380.454Z" fill="#191919"/> -<path d="M279.037 381.425C280.903 381.425 282.127 379.914 282.127 377.617V377.604C282.127 375.293 280.91 373.796 279.037 373.796C278.025 373.796 277.144 374.302 276.74 375.088H276.631V371H275.441V381.295H276.631V380.119H276.74C277.191 380.939 278.012 381.425 279.037 381.425ZM278.764 380.372C277.424 380.372 276.604 379.319 276.604 377.617V377.604C276.604 375.901 277.424 374.849 278.764 374.849C280.11 374.849 280.91 375.888 280.91 377.604V377.617C280.91 379.333 280.11 380.372 278.764 380.372Z" fill="#191919"/> -<path d="M286.037 381.295H287.268V371.431H286.044L283.419 373.317V374.616L285.928 372.798H286.037V381.295Z" fill="#191919"/> -<path d="M293.345 371.198C291.355 371.198 289.893 372.627 289.893 374.596V374.609C289.893 376.503 291.273 377.911 293.126 377.911C294.459 377.911 295.389 377.193 295.751 376.387H295.881C295.881 376.462 295.881 376.544 295.874 376.619C295.799 378.677 295.067 380.427 293.276 380.427C292.278 380.427 291.588 379.914 291.287 379.087L291.26 379.012H290.022L290.043 379.101C290.378 380.557 291.608 381.527 293.263 381.527C295.655 381.527 297.057 379.559 297.057 376.195V376.182C297.057 372.47 295.149 371.198 293.345 371.198ZM293.338 376.838C292.06 376.838 291.13 375.895 291.13 374.582V374.568C291.13 373.29 292.121 372.285 293.358 372.285C294.609 372.285 295.587 373.311 295.587 374.609V374.616C295.587 375.901 294.616 376.838 293.338 376.838Z" fill="#191919"/> -<path d="M301.76 381.425C302.785 381.425 303.605 380.939 304.057 380.119H304.166V381.295H305.355V371H304.166V375.088H304.057C303.653 374.302 302.771 373.796 301.76 373.796C299.887 373.796 298.67 375.293 298.67 377.604V377.617C298.67 379.914 299.894 381.425 301.76 381.425ZM302.033 380.372C300.687 380.372 299.887 379.333 299.887 377.617V377.604C299.887 375.888 300.687 374.849 302.033 374.849C303.373 374.849 304.193 375.901 304.193 377.604V377.617C304.193 379.319 303.373 380.372 302.033 380.372Z" fill="#191919"/> -<path d="M310.872 381.527C312.875 381.527 314.304 380.14 314.304 378.15V378.137C314.304 376.229 312.971 374.842 311.118 374.842C310.223 374.842 309.45 375.204 309.013 375.867H308.903L309.238 372.531H313.757V371.431H308.268L307.748 377.098H308.814C308.938 376.865 309.095 376.674 309.266 376.51C309.689 376.106 310.25 375.908 310.906 375.908C312.185 375.908 313.101 376.845 313.101 378.157V378.171C313.101 379.504 312.198 380.44 310.886 380.44C309.73 380.44 308.876 379.688 308.76 378.745L308.753 378.69H307.57L307.577 378.766C307.721 380.345 309.033 381.527 310.872 381.527Z" fill="#191919"/> -<path d="M319.308 381.425C321.078 381.425 322.069 380.475 322.37 379.142L322.384 379.066L321.208 379.073L321.194 379.114C320.921 379.935 320.292 380.372 319.301 380.372C317.988 380.372 317.141 379.285 317.141 377.59V377.576C317.141 375.915 317.975 374.849 319.301 374.849C320.36 374.849 321.017 375.437 321.201 376.161L321.208 376.182H322.391L322.384 376.141C322.165 374.828 321.092 373.796 319.301 373.796C317.236 373.796 315.924 375.286 315.924 377.576V377.59C315.924 379.928 317.243 381.425 319.308 381.425Z" fill="#191919"/> -<path d="M327.36 381.527C329.363 381.527 330.792 380.14 330.792 378.15V378.137C330.792 376.229 329.459 374.842 327.606 374.842C326.711 374.842 325.938 375.204 325.501 375.867H325.392L325.727 372.531H330.245V371.431H324.756L324.236 377.098H325.303C325.426 376.865 325.583 376.674 325.754 376.51C326.178 376.106 326.738 375.908 327.395 375.908C328.673 375.908 329.589 376.845 329.589 378.157V378.171C329.589 379.504 328.687 380.44 327.374 380.44C326.219 380.44 325.364 379.688 325.248 378.745L325.241 378.69H324.059L324.065 378.766C324.209 380.345 325.521 381.527 327.36 381.527Z" fill="#191919"/> -<path d="M336.001 371.198C334.012 371.198 332.549 372.627 332.549 374.596V374.609C332.549 376.503 333.93 377.911 335.782 377.911C337.115 377.911 338.045 377.193 338.407 376.387H338.537C338.537 376.462 338.537 376.544 338.53 376.619C338.455 378.677 337.724 380.427 335.933 380.427C334.935 380.427 334.244 379.914 333.943 379.087L333.916 379.012H332.679L332.699 379.101C333.034 380.557 334.265 381.527 335.919 381.527C338.312 381.527 339.713 379.559 339.713 376.195V376.182C339.713 372.47 337.806 371.198 336.001 371.198ZM335.994 376.838C334.716 376.838 333.786 375.895 333.786 374.582V374.568C333.786 373.29 334.777 372.285 336.015 372.285C337.266 372.285 338.243 373.311 338.243 374.609V374.616C338.243 375.901 337.272 376.838 335.994 376.838Z" fill="#191919"/> -<path d="M341.969 375.32H342.953L343.097 371.431H341.825L341.969 375.32ZM344.498 375.32H345.482L345.626 371.431H344.354L344.498 375.32Z" fill="#191919"/> -<path d="M346.576 383.804H347.458L348.531 379.914H347.171L346.576 383.804Z" fill="#191919"/> -<path d="M106.539 397.32H107.523L107.667 393.431H106.396L106.539 397.32ZM109.068 397.32H110.053L110.196 393.431H108.925L109.068 397.32Z" fill="#191919"/> -<path d="M115.364 403.35C115.597 403.35 115.822 403.322 116.055 403.281V402.27C115.836 402.29 115.72 402.297 115.508 402.297C114.742 402.297 114.441 401.948 114.441 401.08V396.91H116.055V395.926H114.441V394.019H113.211V395.926H112.049V396.91H113.211V401.381C113.211 402.789 113.847 403.35 115.364 403.35Z" fill="#191919"/> -<path d="M118.461 405.879C119.767 405.879 120.375 405.4 120.983 403.746L123.861 395.926H122.61L120.594 401.989H120.484L118.461 395.926H117.189L119.917 403.302L119.78 403.739C119.514 404.587 119.104 404.895 118.427 404.895C118.263 404.895 118.078 404.888 117.935 404.86V405.838C118.099 405.865 118.304 405.879 118.461 405.879Z" fill="#191919"/> -<path d="M125.434 405.756H126.623V402.133H126.732C127.136 402.919 128.018 403.425 129.029 403.425C130.902 403.425 132.119 401.928 132.119 399.617V399.604C132.119 397.307 130.896 395.796 129.029 395.796C128.004 395.796 127.184 396.281 126.732 397.102H126.623V395.926H125.434V405.756ZM128.756 402.372C127.416 402.372 126.596 401.319 126.596 399.617V399.604C126.596 397.901 127.416 396.849 128.756 396.849C130.103 396.849 130.902 397.888 130.902 399.604V399.617C130.902 401.333 130.103 402.372 128.756 402.372Z" fill="#191919"/> -<path d="M136.986 403.425C138.723 403.425 139.775 402.44 140.028 401.442L140.042 401.388H138.853L138.825 401.449C138.627 401.894 138.012 402.365 137.014 402.365C135.701 402.365 134.86 401.477 134.826 399.952H140.131V399.487C140.131 397.286 138.914 395.796 136.911 395.796C134.908 395.796 133.609 397.354 133.609 399.631V399.638C133.609 401.948 134.881 403.425 136.986 403.425ZM136.904 396.855C137.991 396.855 138.798 397.546 138.921 399.002H134.847C134.977 397.601 135.811 396.855 136.904 396.855Z" fill="#191919"/> -<path d="M142.455 397.32H143.439L143.583 393.431H142.312L142.455 397.32ZM144.984 397.32H145.969L146.112 393.431H144.841L144.984 397.32Z" fill="#191919"/> -<path d="M149.633 398.072C150.125 398.072 150.521 397.669 150.521 397.184C150.521 396.691 150.125 396.295 149.633 396.295C149.147 396.295 148.744 396.691 148.744 397.184C148.744 397.669 149.147 398.072 149.633 398.072ZM149.633 403.363C150.125 403.363 150.521 402.96 150.521 402.475C150.521 401.982 150.125 401.586 149.633 401.586C149.147 401.586 148.744 401.982 148.744 402.475C148.744 402.96 149.147 403.363 149.633 403.363Z" fill="#191919"/> -<path d="M157.234 397.32H158.219L158.362 393.431H157.091L157.234 397.32ZM159.764 397.32H160.748L160.892 393.431H159.62L159.764 397.32Z" fill="#191919"/> -<path d="M161.712 403.295H163.004L163.995 400.472H167.919L168.91 403.295H170.202L166.565 393.431H165.349L161.712 403.295ZM165.902 395.023H166.012L167.557 399.426H164.357L165.902 395.023Z" fill="#191919"/> -<path d="M171.781 405.756H172.971V402.133H173.08C173.483 402.919 174.365 403.425 175.377 403.425C177.25 403.425 178.467 401.928 178.467 399.617V399.604C178.467 397.307 177.243 395.796 175.377 395.796C174.352 395.796 173.531 396.281 173.08 397.102H172.971V395.926H171.781V405.756ZM175.104 402.372C173.764 402.372 172.943 401.319 172.943 399.617V399.604C172.943 397.901 173.764 396.849 175.104 396.849C176.45 396.849 177.25 397.888 177.25 399.604V399.617C177.25 401.333 176.45 402.372 175.104 402.372Z" fill="#191919"/> -<path d="M180.326 405.756H181.516V402.133H181.625C182.028 402.919 182.91 403.425 183.922 403.425C185.795 403.425 187.012 401.928 187.012 399.617V399.604C187.012 397.307 185.788 395.796 183.922 395.796C182.896 395.796 182.076 396.281 181.625 397.102H181.516V395.926H180.326V405.756ZM183.648 402.372C182.309 402.372 181.488 401.319 181.488 399.617V399.604C181.488 397.901 182.309 396.849 183.648 396.849C184.995 396.849 185.795 397.888 185.795 399.604V399.617C185.795 401.333 184.995 402.372 183.648 402.372Z" fill="#191919"/> -<path d="M188.939 403.295H190.129V393H188.939V403.295Z" fill="#191919"/> -<path d="M193.041 394.504C193.492 394.504 193.861 394.135 193.861 393.684C193.861 393.232 193.492 392.863 193.041 392.863C192.59 392.863 192.221 393.232 192.221 393.684C192.221 394.135 192.59 394.504 193.041 394.504ZM192.439 403.295H193.629V395.926H192.439V403.295Z" fill="#191919"/> -<path d="M198.886 403.425C200.656 403.425 201.647 402.475 201.948 401.142L201.962 401.066L200.786 401.073L200.772 401.114C200.499 401.935 199.87 402.372 198.879 402.372C197.566 402.372 196.719 401.285 196.719 399.59V399.576C196.719 397.915 197.553 396.849 198.879 396.849C199.938 396.849 200.595 397.437 200.779 398.161L200.786 398.182H201.969L201.962 398.141C201.743 396.828 200.67 395.796 198.879 395.796C196.814 395.796 195.502 397.286 195.502 399.576V399.59C195.502 401.928 196.821 403.425 198.886 403.425Z" fill="#191919"/> -<path d="M205.729 403.425C206.72 403.425 207.492 402.994 207.957 402.208H208.066V403.295H209.256V398.25C209.256 396.719 208.251 395.796 206.453 395.796C204.881 395.796 203.76 396.575 203.568 397.73L203.562 397.771H204.751L204.758 397.751C204.949 397.177 205.53 396.849 206.412 396.849C207.513 396.849 208.066 397.341 208.066 398.25V398.92L205.954 399.05C204.238 399.152 203.268 399.911 203.268 401.224V401.237C203.268 402.577 204.327 403.425 205.729 403.425ZM204.484 401.21V401.196C204.484 400.465 204.977 400.068 206.098 400L208.066 399.877V400.547C208.066 401.6 207.185 402.393 205.975 402.393C205.12 402.393 204.484 401.955 204.484 401.21Z" fill="#191919"/> -<path d="M214.048 403.35C214.28 403.35 214.506 403.322 214.738 403.281V402.27C214.52 402.29 214.403 402.297 214.191 402.297C213.426 402.297 213.125 401.948 213.125 401.08V396.91H214.738V395.926H213.125V394.019H211.895V395.926H210.732V396.91H211.895V401.381C211.895 402.789 212.53 403.35 214.048 403.35Z" fill="#191919"/> -<path d="M217.145 394.504C217.596 394.504 217.965 394.135 217.965 393.684C217.965 393.232 217.596 392.863 217.145 392.863C216.693 392.863 216.324 393.232 216.324 393.684C216.324 394.135 216.693 394.504 217.145 394.504ZM216.543 403.295H217.732V395.926H216.543V403.295Z" fill="#191919"/> -<path d="M223.003 403.425C225.102 403.425 226.4 401.976 226.4 399.617V399.604C226.4 397.238 225.102 395.796 223.003 395.796C220.904 395.796 219.605 397.238 219.605 399.604V399.617C219.605 401.976 220.904 403.425 223.003 403.425ZM223.003 402.372C221.608 402.372 220.822 401.354 220.822 399.617V399.604C220.822 397.86 221.608 396.849 223.003 396.849C224.397 396.849 225.184 397.86 225.184 399.604V399.617C225.184 401.354 224.397 402.372 223.003 402.372Z" fill="#191919"/> -<path d="M228.246 403.295H229.436V398.934C229.436 397.642 230.181 396.849 231.356 396.849C232.532 396.849 233.079 397.484 233.079 398.811V403.295H234.269V398.523C234.269 396.773 233.346 395.796 231.691 395.796C230.604 395.796 229.914 396.254 229.545 397.033H229.436V395.926H228.246V403.295Z" fill="#191919"/> -<path d="M236.9 397.32H237.885L238.028 393.431H236.757L236.9 397.32ZM239.43 397.32H240.414L240.558 393.431H239.286L239.43 397.32Z" fill="#191919"/> -<path d="M241.508 405.804H242.39L243.463 401.914H242.103L241.508 405.804Z" fill="#191919"/> -<path d="M106.539 419.32H107.523L107.667 415.431H106.396L106.539 419.32ZM109.068 419.32H110.053L110.196 415.431H108.925L109.068 419.32Z" fill="#191919"/> -<path d="M112.746 425.295H113.936V420.934C113.936 419.642 114.681 418.849 115.856 418.849C117.032 418.849 117.579 419.484 117.579 420.811V425.295H118.769V420.523C118.769 418.773 117.846 417.796 116.191 417.796C115.104 417.796 114.414 418.254 114.045 419.033H113.936V417.926H112.746V425.295Z" fill="#191919"/> -<path d="M122.945 425.425C123.937 425.425 124.709 424.994 125.174 424.208H125.283V425.295H126.473V420.25C126.473 418.719 125.468 417.796 123.67 417.796C122.098 417.796 120.977 418.575 120.785 419.73L120.778 419.771H121.968L121.975 419.751C122.166 419.177 122.747 418.849 123.629 418.849C124.729 418.849 125.283 419.341 125.283 420.25V420.92L123.171 421.05C121.455 421.152 120.484 421.911 120.484 423.224V423.237C120.484 424.577 121.544 425.425 122.945 425.425ZM121.701 423.21V423.196C121.701 422.465 122.193 422.068 123.314 422L125.283 421.877V422.547C125.283 423.6 124.401 424.393 123.191 424.393C122.337 424.393 121.701 423.955 121.701 423.21Z" fill="#191919"/> -<path d="M128.646 425.295H129.836V420.729C129.836 419.689 130.567 418.849 131.531 418.849C132.461 418.849 133.062 419.416 133.062 420.291V425.295H134.252V420.558C134.252 419.621 134.929 418.849 135.954 418.849C136.993 418.849 137.492 419.389 137.492 420.476V425.295H138.682V420.202C138.682 418.657 137.841 417.796 136.337 417.796C135.318 417.796 134.478 418.309 134.081 419.088H133.972C133.63 418.322 132.933 417.796 131.935 417.796C130.971 417.796 130.273 418.254 129.945 419.047H129.836V417.926H128.646V425.295Z" fill="#191919"/> -<path d="M143.836 425.425C145.572 425.425 146.625 424.44 146.878 423.442L146.892 423.388H145.702L145.675 423.449C145.477 423.894 144.861 424.365 143.863 424.365C142.551 424.365 141.71 423.477 141.676 421.952H146.98V421.487C146.98 419.286 145.764 417.796 143.761 417.796C141.758 417.796 140.459 419.354 140.459 421.631V421.638C140.459 423.948 141.73 425.425 143.836 425.425ZM143.754 418.855C144.841 418.855 145.647 419.546 145.771 421.002H141.696C141.826 419.601 142.66 418.855 143.754 418.855Z" fill="#191919"/> -<path d="M149.305 419.32H150.289L150.433 415.431H149.161L149.305 419.32ZM151.834 419.32H152.818L152.962 415.431H151.69L151.834 419.32Z" fill="#191919"/> -<path d="M156.482 420.072C156.975 420.072 157.371 419.669 157.371 419.184C157.371 418.691 156.975 418.295 156.482 418.295C155.997 418.295 155.594 418.691 155.594 419.184C155.594 419.669 155.997 420.072 156.482 420.072ZM156.482 425.363C156.975 425.363 157.371 424.96 157.371 424.475C157.371 423.982 156.975 423.586 156.482 423.586C155.997 423.586 155.594 423.982 155.594 424.475C155.594 424.96 155.997 425.363 156.482 425.363Z" fill="#191919"/> -<path d="M164.084 419.32H165.068L165.212 415.431H163.94L164.084 419.32ZM166.613 419.32H167.598L167.741 415.431H166.47L166.613 419.32Z" fill="#191919"/> -<path d="M168.562 425.295H169.854L170.845 422.472H174.769L175.76 425.295H177.052L173.415 415.431H172.198L168.562 425.295ZM172.752 417.023H172.861L174.406 421.426H171.207L172.752 417.023Z" fill="#191919"/> -<path d="M178.323 421.877H182.917V420.77H178.323V421.877Z" fill="#191919"/> -<path d="M185.18 425.295H186.41V421.022H190.778V419.929H186.41V416.538H191.168V415.431H185.18V425.295Z" fill="#191919"/> -<path d="M196.069 425.425C198.168 425.425 199.467 423.976 199.467 421.617V421.604C199.467 419.238 198.168 417.796 196.069 417.796C193.971 417.796 192.672 419.238 192.672 421.604V421.617C192.672 423.976 193.971 425.425 196.069 425.425ZM196.069 424.372C194.675 424.372 193.889 423.354 193.889 421.617V421.604C193.889 419.86 194.675 418.849 196.069 418.849C197.464 418.849 198.25 419.86 198.25 421.604V421.617C198.25 423.354 197.464 424.372 196.069 424.372Z" fill="#191919"/> -<path d="M201.312 425.295H202.502V420.729C202.502 419.648 203.309 418.931 204.443 418.931C204.703 418.931 204.929 418.958 205.175 418.999V417.844C205.059 417.823 204.806 417.796 204.58 417.796C203.582 417.796 202.892 418.247 202.611 419.02H202.502V417.926H201.312V425.295Z" fill="#191919"/> -<path d="M209.454 425.425C211.225 425.425 212.216 424.475 212.517 423.142L212.53 423.066L211.354 423.073L211.341 423.114C211.067 423.935 210.438 424.372 209.447 424.372C208.135 424.372 207.287 423.285 207.287 421.59V421.576C207.287 419.915 208.121 418.849 209.447 418.849C210.507 418.849 211.163 419.437 211.348 420.161L211.354 420.182H212.537L212.53 420.141C212.312 418.828 211.238 417.796 209.447 417.796C207.383 417.796 206.07 419.286 206.07 421.576V421.59C206.07 423.928 207.39 425.425 209.454 425.425Z" fill="#191919"/> -<path d="M217.281 425.425C219.018 425.425 220.07 424.44 220.323 423.442L220.337 423.388H219.147L219.12 423.449C218.922 423.894 218.307 424.365 217.309 424.365C215.996 424.365 215.155 423.477 215.121 421.952H220.426V421.487C220.426 419.286 219.209 417.796 217.206 417.796C215.203 417.796 213.904 419.354 213.904 421.631V421.638C213.904 423.948 215.176 425.425 217.281 425.425ZM217.199 418.855C218.286 418.855 219.093 419.546 219.216 421.002H215.142C215.271 419.601 216.105 418.855 217.199 418.855Z" fill="#191919"/> -<path d="M222.75 419.32H223.734L223.878 415.431H222.606L222.75 419.32ZM225.279 419.32H226.264L226.407 415.431H225.136L225.279 419.32Z" fill="#191919"/> -<path d="M227.357 427.804H228.239L229.312 423.914H227.952L227.357 427.804Z" fill="#191919"/> -</g> +<path d="M373.021 272.566L375.876 275.421L374.933 276.364L372.078 273.509C371.016 274.36 369.695 274.823 368.333 274.821C365.021 274.821 362.333 272.133 362.333 268.821C362.333 265.509 365.021 262.821 368.333 262.821C371.645 262.821 374.333 265.509 374.333 268.821C374.335 270.183 373.872 271.504 373.021 272.566ZM371.683 272.071C372.529 271.201 373.002 270.035 373 268.821C373 266.243 370.911 264.155 368.333 264.155C365.755 264.155 363.667 266.243 363.667 268.821C363.667 271.399 365.755 273.488 368.333 273.488C369.547 273.49 370.713 273.017 371.583 272.171L371.683 272.071Z" fill="#858282"/> +</g> +<rect x="357.5" y="257.988" width="23" height="23" stroke="#F1F1F1"/> +<rect x="380.5" y="257.988" width="246" height="23" fill="white"/> +<path d="M386.044 269.014V264.688H387.332V269.014H386.044ZM389.082 269.014V264.688H390.37V269.014H389.082ZM396.805 274.656C396.151 274.656 395.573 274.507 395.069 274.208C394.574 273.9 394.182 273.476 393.893 272.934C393.603 272.384 393.459 271.744 393.459 271.016C393.459 270.288 393.599 269.654 393.879 269.112C394.168 268.562 394.565 268.137 395.069 267.838C395.573 267.53 396.161 267.376 396.833 267.376C397.505 267.376 398.079 267.53 398.555 267.838C399.031 268.137 399.395 268.534 399.647 269.028C399.899 269.523 400.025 270.055 400.025 270.624C400.025 270.727 400.02 270.83 400.011 270.932C400.011 271.035 400.011 271.152 400.011 271.282H394.621C394.649 271.796 394.765 272.225 394.971 272.57C395.185 272.906 395.451 273.158 395.769 273.326C396.095 273.494 396.441 273.578 396.805 273.578C397.318 273.578 397.719 273.471 398.009 273.256C398.298 273.042 398.517 272.743 398.667 272.36H399.829C399.67 273.004 399.339 273.55 398.835 273.998C398.331 274.437 397.654 274.656 396.805 274.656ZM396.805 268.426C396.263 268.426 395.787 268.59 395.377 268.916C394.975 269.243 394.728 269.7 394.635 270.288H398.863C398.825 269.71 398.615 269.257 398.233 268.93C397.859 268.594 397.383 268.426 396.805 268.426ZM401.587 274.488V267.544H402.553L402.679 268.356H402.749C402.87 268.076 403.052 267.843 403.295 267.656C403.547 267.47 403.85 267.376 404.205 267.376C404.56 267.376 404.858 267.465 405.101 267.642C405.353 267.81 405.535 268.048 405.647 268.356H405.703C405.824 268.076 406.02 267.843 406.291 267.656C406.562 267.47 406.888 267.376 407.271 267.376C407.803 267.376 408.2 267.558 408.461 267.922C408.732 268.277 408.867 268.753 408.867 269.35V274.488H407.719V269.532C407.719 269.196 407.649 268.93 407.509 268.734C407.378 268.538 407.164 268.44 406.865 268.44C406.557 268.44 406.305 268.557 406.109 268.79C405.913 269.024 405.815 269.355 405.815 269.784V274.488H404.653V269.532C404.653 269.196 404.588 268.93 404.457 268.734C404.326 268.538 404.112 268.44 403.813 268.44C403.505 268.44 403.248 268.557 403.043 268.79C402.847 269.024 402.749 269.355 402.749 269.784V274.488H401.587ZM413.216 274.656C412.665 274.656 412.208 274.558 411.844 274.362C411.48 274.166 411.209 273.91 411.032 273.592C410.854 273.266 410.766 272.911 410.766 272.528C410.766 271.819 411.022 271.282 411.536 270.918C412.058 270.545 412.754 270.358 413.622 270.358H415.526V270.218C415.526 269.005 414.97 268.398 413.86 268.398C413.412 268.398 413.034 268.496 412.726 268.692C412.427 268.888 412.236 269.196 412.152 269.616H410.948C410.994 269.15 411.148 268.748 411.41 268.412C411.68 268.076 412.026 267.82 412.446 267.642C412.866 267.465 413.337 267.376 413.86 267.376C414.849 267.376 415.568 267.638 416.016 268.16C416.473 268.674 416.702 269.36 416.702 270.218V274.488H415.694L415.596 273.41H415.498C415.292 273.746 415.017 274.04 414.672 274.292C414.336 274.535 413.85 274.656 413.216 274.656ZM413.426 273.62C413.874 273.62 414.252 273.513 414.56 273.298C414.877 273.084 415.115 272.799 415.274 272.444C415.442 272.09 415.526 271.702 415.526 271.282H413.72C413.085 271.282 412.637 271.39 412.376 271.604C412.124 271.819 411.998 272.104 411.998 272.458C411.998 272.822 412.119 273.107 412.362 273.312C412.604 273.518 412.959 273.62 413.426 273.62ZM422.254 266.312C421.974 266.312 421.741 266.219 421.554 266.032C421.367 265.846 421.274 265.622 421.274 265.36C421.274 265.09 421.367 264.866 421.554 264.688C421.741 264.502 421.974 264.408 422.254 264.408C422.525 264.408 422.753 264.502 422.94 264.688C423.136 264.866 423.234 265.09 423.234 265.36C423.234 265.622 423.136 265.846 422.94 266.032C422.753 266.219 422.525 266.312 422.254 266.312ZM419.538 274.488V273.48H421.75V268.902C421.75 268.669 421.633 268.552 421.4 268.552H419.776V267.544H421.68C422.511 267.544 422.926 267.96 422.926 268.79V273.48H425.138V274.488H419.538ZM427.723 274.488V273.48H430.089V265.766C430.089 265.533 429.972 265.416 429.739 265.416H427.975V264.408H430.019C430.42 264.408 430.728 264.516 430.943 264.73C431.157 264.945 431.265 265.253 431.265 265.654V273.48H433.631V274.488H427.723ZM437.251 269.014V264.688H438.539V269.014H437.251ZM440.289 269.014V264.688H441.577V269.014H440.289ZM447.942 274.516C447.652 274.516 447.405 274.418 447.2 274.222C446.994 274.026 446.892 273.784 446.892 273.494C446.892 273.214 446.994 272.976 447.2 272.78C447.405 272.584 447.652 272.486 447.942 272.486C448.231 272.486 448.478 272.584 448.684 272.78C448.889 272.976 448.992 273.214 448.992 273.494C448.992 273.784 448.889 274.026 448.684 274.222C448.478 274.418 448.231 274.516 447.942 274.516ZM447.942 268.986C447.652 268.986 447.405 268.888 447.2 268.692C446.994 268.496 446.892 268.254 446.892 267.964C446.892 267.684 446.994 267.446 447.2 267.25C447.405 267.054 447.652 266.956 447.942 266.956C448.231 266.956 448.478 267.054 448.684 267.25C448.889 267.446 448.992 267.684 448.992 267.964C448.992 268.254 448.889 268.496 448.684 268.692C448.478 268.888 448.231 268.986 447.942 268.986ZM462.855 269.014V264.688H464.143V269.014H462.855ZM465.893 269.014V264.688H467.181V269.014H465.893ZM616.476 269.014V264.688H617.764V269.014H616.476ZM619.514 269.014V264.688H620.802V269.014H619.514Z" fill="#575757"/> +<path d="M473.825 266.312C473.555 266.312 473.321 266.219 473.125 266.032C472.939 265.846 472.845 265.622 472.845 265.36C472.845 265.09 472.939 264.866 473.125 264.688C473.321 264.502 473.555 264.408 473.825 264.408C474.105 264.408 474.339 264.502 474.525 264.688C474.712 264.866 474.805 265.09 474.805 265.36C474.805 265.622 474.712 265.846 474.525 266.032C474.339 266.219 474.105 266.312 473.825 266.312ZM470.199 277.568V276.56H472.971C473.205 276.56 473.321 276.439 473.321 276.196V268.902C473.321 268.669 473.205 268.552 472.971 268.552H471.291V267.544H473.251C474.082 267.544 474.497 267.96 474.497 268.79V276.322C474.497 277.153 474.082 277.568 473.251 277.568H470.199ZM482.08 274.656C481.427 274.656 480.848 274.507 480.344 274.208C479.84 273.91 479.443 273.49 479.154 272.948C478.865 272.398 478.72 271.754 478.72 271.016C478.72 270.279 478.865 269.64 479.154 269.098C479.443 268.548 479.84 268.123 480.344 267.824C480.848 267.526 481.427 267.376 482.08 267.376C482.733 267.376 483.312 267.526 483.816 267.824C484.32 268.123 484.717 268.548 485.006 269.098C485.295 269.64 485.44 270.279 485.44 271.016C485.44 271.754 485.295 272.398 485.006 272.948C484.717 273.49 484.32 273.91 483.816 274.208C483.312 274.507 482.733 274.656 482.08 274.656ZM482.08 273.536C482.481 273.536 482.845 273.448 483.172 273.27C483.499 273.093 483.755 272.818 483.942 272.444C484.138 272.071 484.236 271.595 484.236 271.016C484.236 270.438 484.138 269.962 483.942 269.588C483.755 269.215 483.499 268.94 483.172 268.762C482.845 268.585 482.481 268.496 482.08 268.496C481.688 268.496 481.329 268.585 481.002 268.762C480.675 268.94 480.414 269.215 480.218 269.588C480.022 269.962 479.924 270.438 479.924 271.016C479.924 271.884 480.134 272.524 480.554 272.934C480.974 273.336 481.483 273.536 482.08 273.536ZM487.576 274.488V264.408H488.752V268.594C488.939 268.24 489.247 267.95 489.676 267.726C490.106 267.493 490.577 267.376 491.09 267.376C491.94 267.376 492.584 267.633 493.022 268.146C493.47 268.66 493.694 269.378 493.694 270.302V274.488H492.518V270.456C492.518 269.831 492.364 269.346 492.056 269C491.758 268.655 491.338 268.482 490.796 268.482C490.423 268.482 490.082 268.566 489.774 268.734C489.466 268.902 489.219 269.15 489.032 269.476C488.846 269.803 488.752 270.204 488.752 270.68V274.488H487.576ZM496.181 274.488V267.544H497.161L497.287 268.594H497.357C497.544 268.258 497.838 267.974 498.239 267.74C498.64 267.498 499.102 267.376 499.625 267.376C500.474 267.376 501.109 267.628 501.529 268.132C501.958 268.636 502.173 269.364 502.173 270.316V274.488H500.997V270.456C500.997 269.84 500.862 269.36 500.591 269.014C500.32 268.66 499.9 268.482 499.331 268.482C498.78 268.482 498.314 268.674 497.931 269.056C497.548 269.43 497.357 269.971 497.357 270.68V274.488H496.181ZM508.705 275.804C507.688 275.804 506.839 275.562 506.157 275.076C505.485 274.6 504.981 273.942 504.645 273.102C504.309 272.262 504.141 271.31 504.141 270.246C504.141 269.276 504.249 268.44 504.463 267.74C504.687 267.04 504.991 266.466 505.373 266.018C505.756 265.561 506.185 265.225 506.661 265.01C507.137 264.796 507.632 264.688 508.145 264.688C509.107 264.688 509.867 264.931 510.427 265.416C510.987 265.902 511.267 266.597 511.267 267.502V272.99H510.427L510.315 272.192H510.259C510.119 272.454 509.919 272.673 509.657 272.85C509.405 273.028 509.083 273.116 508.691 273.116C507.991 273.116 507.413 272.864 506.955 272.36C506.498 271.856 506.269 271.147 506.269 270.232C506.269 269.318 506.493 268.613 506.941 268.118C507.399 267.624 507.982 267.376 508.691 267.376C509.083 267.376 509.405 267.446 509.657 267.586C509.919 267.726 510.119 267.913 510.259 268.146V267.502C510.259 266.924 510.063 266.471 509.671 266.144C509.289 265.808 508.78 265.64 508.145 265.64C507.651 265.64 507.179 265.79 506.731 266.088C506.283 266.387 505.915 266.872 505.625 267.544C505.345 268.216 505.205 269.117 505.205 270.246C505.205 271.068 505.331 271.828 505.583 272.528C505.835 273.228 506.223 273.793 506.745 274.222C507.268 274.642 507.921 274.852 508.705 274.852H510.665V275.804H508.705ZM508.775 272.234C509.205 272.234 509.559 272.076 509.839 271.758C510.119 271.432 510.259 270.928 510.259 270.246C510.259 269.565 510.119 269.066 509.839 268.748C509.559 268.422 509.205 268.258 508.775 268.258C508.346 268.258 507.991 268.422 507.711 268.748C507.431 269.066 507.291 269.565 507.291 270.246C507.291 270.928 507.431 271.432 507.711 271.758C507.991 272.076 508.346 272.234 508.775 272.234ZM515.63 274.656C515.079 274.656 514.622 274.558 514.258 274.362C513.894 274.166 513.623 273.91 513.446 273.592C513.269 273.266 513.18 272.911 513.18 272.528C513.18 271.819 513.437 271.282 513.95 270.918C514.473 270.545 515.168 270.358 516.036 270.358H517.94V270.218C517.94 269.005 517.385 268.398 516.274 268.398C515.826 268.398 515.448 268.496 515.14 268.692C514.841 268.888 514.65 269.196 514.566 269.616H513.362C513.409 269.15 513.563 268.748 513.824 268.412C514.095 268.076 514.44 267.82 514.86 267.642C515.28 267.465 515.751 267.376 516.274 267.376C517.263 267.376 517.982 267.638 518.43 268.16C518.887 268.674 519.116 269.36 519.116 270.218V274.488H518.108L518.01 273.41H517.912C517.707 273.746 517.431 274.04 517.086 274.292C516.75 274.535 516.265 274.656 515.63 274.656ZM515.84 273.62C516.288 273.62 516.666 273.513 516.974 273.298C517.291 273.084 517.529 272.799 517.688 272.444C517.856 272.09 517.94 271.702 517.94 271.282H516.134C515.499 271.282 515.051 271.39 514.79 271.604C514.538 271.819 514.412 272.104 514.412 272.458C514.412 272.822 514.533 273.107 514.776 273.312C515.019 273.518 515.373 273.62 515.84 273.62ZM521.645 277.568V267.544H522.597L522.737 268.692H522.821C522.998 268.319 523.283 268.006 523.675 267.754C524.067 267.502 524.529 267.376 525.061 267.376C525.621 267.376 526.125 267.516 526.573 267.796C527.03 268.076 527.389 268.492 527.651 269.042C527.912 269.584 528.043 270.246 528.043 271.03C528.043 271.805 527.907 272.463 527.637 273.004C527.375 273.546 527.011 273.956 526.545 274.236C526.087 274.516 525.56 274.656 524.963 274.656C524.431 274.656 523.978 274.544 523.605 274.32C523.241 274.087 522.979 273.816 522.821 273.508V277.568H521.645ZM524.823 273.536C525.411 273.536 525.896 273.331 526.279 272.92C526.661 272.5 526.853 271.866 526.853 271.016C526.853 270.167 526.661 269.537 526.279 269.126C525.896 268.706 525.411 268.496 524.823 268.496C524.235 268.496 523.749 268.706 523.367 269.126C522.984 269.537 522.793 270.167 522.793 271.016C522.793 271.866 522.984 272.5 523.367 272.92C523.749 273.331 524.235 273.536 524.823 273.536ZM530.179 277.568V267.544H531.131L531.271 268.692H531.355C531.532 268.319 531.817 268.006 532.209 267.754C532.601 267.502 533.063 267.376 533.595 267.376C534.155 267.376 534.659 267.516 535.107 267.796C535.564 268.076 535.924 268.492 536.185 269.042C536.446 269.584 536.577 270.246 536.577 271.03C536.577 271.805 536.442 272.463 536.171 273.004C535.91 273.546 535.546 273.956 535.079 274.236C534.622 274.516 534.094 274.656 533.497 274.656C532.965 274.656 532.512 274.544 532.139 274.32C531.775 274.087 531.514 273.816 531.355 273.508V277.568H530.179ZM533.357 273.536C533.945 273.536 534.43 273.331 534.813 272.92C535.196 272.5 535.387 271.866 535.387 271.016C535.387 270.167 535.196 269.537 534.813 269.126C534.43 268.706 533.945 268.496 533.357 268.496C532.769 268.496 532.284 268.706 531.901 269.126C531.518 269.537 531.327 270.167 531.327 271.016C531.327 271.866 531.518 272.5 531.901 272.92C532.284 273.331 532.769 273.536 533.357 273.536ZM541.892 274.656C541.005 274.656 540.286 274.451 539.736 274.04C539.194 273.62 538.891 273.046 538.826 272.318H540.044C540.1 272.701 540.286 273.014 540.604 273.256C540.93 273.499 541.369 273.62 541.92 273.62C542.442 273.62 542.83 273.508 543.082 273.284C543.343 273.06 543.474 272.804 543.474 272.514C543.474 272.122 543.32 271.856 543.012 271.716C542.704 271.567 542.242 271.455 541.626 271.38C540.888 271.296 540.277 271.096 539.792 270.778C539.306 270.461 539.064 269.985 539.064 269.35C539.064 268.781 539.302 268.31 539.778 267.936C540.254 267.563 540.902 267.376 541.724 267.376C542.536 267.376 543.175 267.563 543.642 267.936C544.108 268.3 544.374 268.823 544.44 269.504H543.278C543.25 269.168 543.086 268.902 542.788 268.706C542.498 268.501 542.134 268.398 541.696 268.398C541.238 268.398 540.884 268.487 540.632 268.664C540.38 268.832 540.254 269.056 540.254 269.336C540.254 269.616 540.394 269.85 540.674 270.036C540.963 270.214 541.416 270.33 542.032 270.386C542.517 270.442 542.96 270.536 543.362 270.666C543.763 270.797 544.08 271.002 544.314 271.282C544.556 271.562 544.678 271.954 544.678 272.458C544.687 272.878 544.57 273.256 544.328 273.592C544.094 273.919 543.768 274.18 543.348 274.376C542.928 274.563 542.442 274.656 541.892 274.656ZM546.674 274.488V267.544H547.64L547.766 268.356H547.836C547.957 268.076 548.139 267.843 548.382 267.656C548.634 267.47 548.937 267.376 549.292 267.376C549.647 267.376 549.945 267.465 550.188 267.642C550.44 267.81 550.622 268.048 550.734 268.356H550.79C550.911 268.076 551.107 267.843 551.378 267.656C551.649 267.47 551.975 267.376 552.358 267.376C552.89 267.376 553.287 267.558 553.548 267.922C553.819 268.277 553.954 268.753 553.954 269.35V274.488H552.806V269.532C552.806 269.196 552.736 268.93 552.596 268.734C552.465 268.538 552.251 268.44 551.952 268.44C551.644 268.44 551.392 268.557 551.196 268.79C551 269.024 550.902 269.355 550.902 269.784V274.488H549.74V269.532C549.74 269.196 549.675 268.93 549.544 268.734C549.413 268.538 549.199 268.44 548.9 268.44C548.592 268.44 548.335 268.557 548.13 268.79C547.934 269.024 547.836 269.355 547.836 269.784V274.488H546.674ZM558.807 266.312C558.527 266.312 558.293 266.219 558.107 266.032C557.92 265.846 557.827 265.622 557.827 265.36C557.827 265.09 557.92 264.866 558.107 264.688C558.293 264.502 558.527 264.408 558.807 264.408C559.077 264.408 559.306 264.502 559.493 264.688C559.689 264.866 559.787 265.09 559.787 265.36C559.787 265.622 559.689 265.846 559.493 266.032C559.306 266.219 559.077 266.312 558.807 266.312ZM556.091 274.488V273.48H558.303V268.902C558.303 268.669 558.186 268.552 557.953 268.552H556.329V267.544H558.233C559.063 267.544 559.479 267.96 559.479 268.79V273.48H561.691V274.488H556.091ZM568.153 274.488C567.518 274.488 567.019 274.334 566.655 274.026C566.291 273.718 566.109 273.163 566.109 272.36V268.552H564.345V267.544H565.395C565.871 267.544 566.146 267.311 566.221 266.844L566.417 265.766H567.285V267.544H570.057V268.552H567.285V272.36C567.285 272.752 567.374 273.028 567.551 273.186C567.738 273.345 568.055 273.424 568.503 273.424H570.057V274.488H568.153ZM572.922 274.488V264.408H574.098V268.594C574.284 268.24 574.592 267.95 575.022 267.726C575.451 267.493 575.922 267.376 576.436 267.376C577.285 267.376 577.929 267.633 578.368 268.146C578.816 268.66 579.04 269.378 579.04 270.302V274.488H577.864V270.456C577.864 269.831 577.71 269.346 577.402 269C577.103 268.655 576.683 268.482 576.142 268.482C575.768 268.482 575.428 268.566 575.12 268.734C574.812 268.902 574.564 269.15 574.378 269.476C574.191 269.803 574.098 270.204 574.098 270.68V274.488H572.922ZM584.494 274.516C584.205 274.516 583.958 274.418 583.752 274.222C583.547 274.026 583.444 273.784 583.444 273.494C583.444 273.214 583.547 272.976 583.752 272.78C583.958 272.584 584.205 272.486 584.494 272.486C584.784 272.486 585.031 272.584 585.236 272.78C585.442 272.976 585.544 273.214 585.544 273.494C585.544 273.784 585.442 274.026 585.236 274.222C585.031 274.418 584.784 274.516 584.494 274.516ZM593.141 274.656C592.515 274.656 591.955 274.512 591.461 274.222C590.975 273.933 590.588 273.518 590.299 272.976C590.009 272.426 589.865 271.772 589.865 271.016C589.865 270.26 590.009 269.612 590.299 269.07C590.588 268.52 590.98 268.1 591.475 267.81C591.979 267.521 592.534 267.376 593.141 267.376C593.999 267.376 594.685 267.591 595.199 268.02C595.712 268.45 596.039 269.024 596.179 269.742H594.975C594.863 269.36 594.648 269.056 594.331 268.832C594.013 268.599 593.612 268.482 593.127 268.482C592.772 268.482 592.436 268.576 592.119 268.762C591.801 268.949 591.545 269.229 591.349 269.602C591.153 269.976 591.055 270.447 591.055 271.016C591.055 271.586 591.153 272.062 591.349 272.444C591.545 272.818 591.801 273.098 592.119 273.284C592.436 273.471 592.772 273.564 593.127 273.564C593.64 273.564 594.046 273.448 594.345 273.214C594.653 272.981 594.863 272.673 594.975 272.29H596.179C596.001 273.028 595.651 273.606 595.129 274.026C594.615 274.446 593.953 274.656 593.141 274.656ZM601.563 274.656C600.91 274.656 600.331 274.507 599.827 274.208C599.323 273.91 598.927 273.49 598.637 272.948C598.348 272.398 598.203 271.754 598.203 271.016C598.203 270.279 598.348 269.64 598.637 269.098C598.927 268.548 599.323 268.123 599.827 267.824C600.331 267.526 600.91 267.376 601.563 267.376C602.217 267.376 602.795 267.526 603.299 267.824C603.803 268.123 604.2 268.548 604.489 269.098C604.779 269.64 604.923 270.279 604.923 271.016C604.923 271.754 604.779 272.398 604.489 272.948C604.2 273.49 603.803 273.91 603.299 274.208C602.795 274.507 602.217 274.656 601.563 274.656ZM601.563 273.536C601.965 273.536 602.329 273.448 602.655 273.27C602.982 273.093 603.239 272.818 603.425 272.444C603.621 272.071 603.719 271.595 603.719 271.016C603.719 270.438 603.621 269.962 603.425 269.588C603.239 269.215 602.982 268.94 602.655 268.762C602.329 268.585 601.965 268.496 601.563 268.496C601.171 268.496 600.812 268.585 600.485 268.762C600.159 268.94 599.897 269.215 599.701 269.588C599.505 269.962 599.407 270.438 599.407 271.016C599.407 271.884 599.617 272.524 600.037 272.934C600.457 273.336 600.966 273.536 601.563 273.536ZM606.416 274.488V267.544H607.382L607.508 268.356H607.578C607.699 268.076 607.881 267.843 608.124 267.656C608.376 267.47 608.679 267.376 609.034 267.376C609.388 267.376 609.687 267.465 609.93 267.642C610.182 267.81 610.364 268.048 610.476 268.356H610.532C610.653 268.076 610.849 267.843 611.12 267.656C611.39 267.47 611.717 267.376 612.1 267.376C612.632 267.376 613.028 267.558 613.29 267.922C613.56 268.277 613.696 268.753 613.696 269.35V274.488H612.548V269.532C612.548 269.196 612.478 268.93 612.338 268.734C612.207 268.538 611.992 268.44 611.694 268.44C611.386 268.44 611.134 268.557 610.938 268.79C610.742 269.024 610.644 269.355 610.644 269.784V274.488H609.482V269.532C609.482 269.196 609.416 268.93 609.286 268.734C609.155 268.538 608.94 268.44 608.642 268.44C608.334 268.44 608.077 268.557 607.872 268.79C607.676 269.024 607.578 269.355 607.578 269.784V274.488H606.416Z" fill="#F86A2B"/> +<rect x="380.5" y="257.988" width="246" height="23" stroke="#F1F1F1"/> +<rect x="637.5" y="257.988" width="23" height="23" fill="white"/> +<g clip-path="url(#clip3_625_11871)"> +<path d="M653.021 272.566L655.876 275.421L654.933 276.364L652.078 273.509C651.016 274.36 649.695 274.823 648.333 274.821C645.021 274.821 642.333 272.133 642.333 268.821C642.333 265.509 645.021 262.821 648.333 262.821C651.645 262.821 654.333 265.509 654.333 268.821C654.335 270.183 653.872 271.504 653.021 272.566ZM651.683 272.071C652.529 271.201 653.002 270.035 653 268.821C653 266.243 650.911 264.155 648.333 264.155C645.755 264.155 643.667 266.243 643.667 268.821C643.667 271.399 645.755 273.488 648.333 273.488C649.547 273.49 650.713 273.017 651.583 272.171L651.683 272.071Z" fill="#858282"/> +</g> +<rect x="637.5" y="257.988" width="23" height="23" stroke="#F1F1F1"/> +<rect x="660.5" y="257.988" width="272" height="23" fill="white"/> +<path d="M666.044 269.014V264.688H667.332V269.014H666.044ZM669.082 269.014V264.688H670.37V269.014H669.082ZM673.711 274.488V273.48H675.489V268.902C675.489 268.669 675.377 268.552 675.153 268.552H673.893V267.544H675.587C675.895 267.544 676.142 267.628 676.329 267.796C676.515 267.964 676.609 268.212 676.609 268.538V268.832H676.665C676.777 268.366 676.987 268.006 677.295 267.754C677.612 267.502 678.051 267.376 678.611 267.376H679.885V268.622H678.443C677.873 268.622 677.435 268.814 677.127 269.196C676.819 269.57 676.665 270.05 676.665 270.638V273.48H678.849V274.488H673.711ZM685.339 274.656C684.686 274.656 684.107 274.507 683.603 274.208C683.108 273.9 682.716 273.476 682.427 272.934C682.138 272.384 681.993 271.744 681.993 271.016C681.993 270.288 682.133 269.654 682.413 269.112C682.702 268.562 683.099 268.137 683.603 267.838C684.107 267.53 684.695 267.376 685.367 267.376C686.039 267.376 686.613 267.53 687.089 267.838C687.565 268.137 687.929 268.534 688.181 269.028C688.433 269.523 688.559 270.055 688.559 270.624C688.559 270.727 688.554 270.83 688.545 270.932C688.545 271.035 688.545 271.152 688.545 271.282H683.155C683.183 271.796 683.3 272.225 683.505 272.57C683.72 272.906 683.986 273.158 684.303 273.326C684.63 273.494 684.975 273.578 685.339 273.578C685.852 273.578 686.254 273.471 686.543 273.256C686.832 273.042 687.052 272.743 687.201 272.36H688.363C688.204 273.004 687.873 273.55 687.369 273.998C686.865 274.437 686.188 274.656 685.339 274.656ZM685.339 268.426C684.798 268.426 684.322 268.59 683.911 268.916C683.51 269.243 683.262 269.7 683.169 270.288H687.397C687.36 269.71 687.15 269.257 686.767 268.93C686.394 268.594 685.918 268.426 685.339 268.426ZM693.874 274.656C692.987 274.656 692.268 274.451 691.718 274.04C691.176 273.62 690.873 273.046 690.808 272.318H692.026C692.082 272.701 692.268 273.014 692.586 273.256C692.912 273.499 693.351 273.62 693.902 273.62C694.424 273.62 694.812 273.508 695.064 273.284C695.325 273.06 695.456 272.804 695.456 272.514C695.456 272.122 695.302 271.856 694.994 271.716C694.686 271.567 694.224 271.455 693.608 271.38C692.87 271.296 692.259 271.096 691.774 270.778C691.288 270.461 691.046 269.985 691.046 269.35C691.046 268.781 691.284 268.31 691.76 267.936C692.236 267.563 692.884 267.376 693.706 267.376C694.518 267.376 695.157 267.563 695.624 267.936C696.09 268.3 696.356 268.823 696.422 269.504H695.26C695.232 269.168 695.068 268.902 694.77 268.706C694.48 268.501 694.116 268.398 693.678 268.398C693.22 268.398 692.866 268.487 692.614 268.664C692.362 268.832 692.236 269.056 692.236 269.336C692.236 269.616 692.376 269.85 692.656 270.036C692.945 270.214 693.398 270.33 694.014 270.386C694.499 270.442 694.942 270.536 695.344 270.666C695.745 270.797 696.062 271.002 696.296 271.282C696.538 271.562 696.66 271.954 696.66 272.458C696.669 272.878 696.552 273.256 696.31 273.592C696.076 273.919 695.75 274.18 695.33 274.376C694.91 274.563 694.424 274.656 693.874 274.656ZM702.338 274.656C701.685 274.656 701.106 274.507 700.602 274.208C700.098 273.91 699.701 273.49 699.412 272.948C699.123 272.398 698.978 271.754 698.978 271.016C698.978 270.279 699.123 269.64 699.412 269.098C699.701 268.548 700.098 268.123 700.602 267.824C701.106 267.526 701.685 267.376 702.338 267.376C702.991 267.376 703.57 267.526 704.074 267.824C704.578 268.123 704.975 268.548 705.264 269.098C705.553 269.64 705.698 270.279 705.698 271.016C705.698 271.754 705.553 272.398 705.264 272.948C704.975 273.49 704.578 273.91 704.074 274.208C703.57 274.507 702.991 274.656 702.338 274.656ZM702.338 273.536C702.739 273.536 703.103 273.448 703.43 273.27C703.757 273.093 704.013 272.818 704.2 272.444C704.396 272.071 704.494 271.595 704.494 271.016C704.494 270.438 704.396 269.962 704.2 269.588C704.013 269.215 703.757 268.94 703.43 268.762C703.103 268.585 702.739 268.496 702.338 268.496C701.946 268.496 701.587 268.585 701.26 268.762C700.933 268.94 700.672 269.215 700.476 269.588C700.28 269.962 700.182 270.438 700.182 271.016C700.182 271.884 700.392 272.524 700.812 272.934C701.232 273.336 701.741 273.536 702.338 273.536ZM710.383 274.656C709.543 274.656 708.908 274.404 708.479 273.9C708.049 273.396 707.835 272.668 707.835 271.716V267.544H709.011V271.576C709.011 272.192 709.146 272.678 709.417 273.032C709.697 273.378 710.117 273.55 710.677 273.55C711.237 273.55 711.708 273.364 712.091 272.99C712.473 272.608 712.665 272.062 712.665 271.352V267.544H713.841V274.488H712.861L712.735 273.438H712.665C712.478 273.774 712.184 274.064 711.783 274.306C711.381 274.54 710.915 274.656 710.383 274.656ZM716.383 274.488V273.48H718.161V268.902C718.161 268.669 718.049 268.552 717.825 268.552H716.565V267.544H718.259C718.567 267.544 718.815 267.628 719.001 267.796C719.188 267.964 719.281 268.212 719.281 268.538V268.832H719.337C719.449 268.366 719.659 268.006 719.967 267.754C720.285 267.502 720.723 267.376 721.283 267.376H722.557V268.622H721.115C720.546 268.622 720.107 268.814 719.799 269.196C719.491 269.57 719.337 270.05 719.337 270.638V273.48H721.521V274.488H716.383ZM728.054 274.656C727.428 274.656 726.868 274.512 726.374 274.222C725.888 273.933 725.501 273.518 725.212 272.976C724.922 272.426 724.778 271.772 724.778 271.016C724.778 270.26 724.922 269.612 725.212 269.07C725.501 268.52 725.893 268.1 726.388 267.81C726.892 267.521 727.447 267.376 728.054 267.376C728.912 267.376 729.598 267.591 730.112 268.02C730.625 268.45 730.952 269.024 731.092 269.742H729.888C729.776 269.36 729.561 269.056 729.244 268.832C728.926 268.599 728.525 268.482 728.04 268.482C727.685 268.482 727.349 268.576 727.032 268.762C726.714 268.949 726.458 269.229 726.262 269.602C726.066 269.976 725.968 270.447 725.968 271.016C725.968 271.586 726.066 272.062 726.262 272.444C726.458 272.818 726.714 273.098 727.032 273.284C727.349 273.471 727.685 273.564 728.04 273.564C728.553 273.564 728.959 273.448 729.258 273.214C729.566 272.981 729.776 272.673 729.888 272.29H731.092C730.914 273.028 730.564 273.606 730.042 274.026C729.528 274.446 728.866 274.656 728.054 274.656ZM736.546 274.656C735.893 274.656 735.314 274.507 734.81 274.208C734.316 273.9 733.924 273.476 733.634 272.934C733.345 272.384 733.2 271.744 733.2 271.016C733.2 270.288 733.34 269.654 733.62 269.112C733.91 268.562 734.306 268.137 734.81 267.838C735.314 267.53 735.902 267.376 736.574 267.376C737.246 267.376 737.82 267.53 738.296 267.838C738.772 268.137 739.136 268.534 739.388 269.028C739.64 269.523 739.766 270.055 739.766 270.624C739.766 270.727 739.762 270.83 739.752 270.932C739.752 271.035 739.752 271.152 739.752 271.282H734.362C734.39 271.796 734.507 272.225 734.712 272.57C734.927 272.906 735.193 273.158 735.51 273.326C735.837 273.494 736.182 273.578 736.546 273.578C737.06 273.578 737.461 273.471 737.75 273.256C738.04 273.042 738.259 272.743 738.408 272.36H739.57C739.412 273.004 739.08 273.55 738.576 273.998C738.072 274.437 737.396 274.656 736.546 274.656ZM736.546 268.426C736.005 268.426 735.529 268.59 735.118 268.916C734.717 269.243 734.47 269.7 734.376 270.288H738.604C738.567 269.71 738.357 269.257 737.974 268.93C737.601 268.594 737.125 268.426 736.546 268.426ZM742.855 269.014V264.688H744.143V269.014H742.855ZM745.893 269.014V264.688H747.181V269.014H745.893ZM753.545 274.516C753.256 274.516 753.009 274.418 752.803 274.222C752.598 274.026 752.495 273.784 752.495 273.494C752.495 273.214 752.598 272.976 752.803 272.78C753.009 272.584 753.256 272.486 753.545 272.486C753.835 272.486 754.082 272.584 754.287 272.78C754.493 272.976 754.595 273.214 754.595 273.494C754.595 273.784 754.493 274.026 754.287 274.222C754.082 274.418 753.835 274.516 753.545 274.516ZM753.545 268.986C753.256 268.986 753.009 268.888 752.803 268.692C752.598 268.496 752.495 268.254 752.495 267.964C752.495 267.684 752.598 267.446 752.803 267.25C753.009 267.054 753.256 266.956 753.545 266.956C753.835 266.956 754.082 267.054 754.287 267.25C754.493 267.446 754.595 267.684 754.595 267.964C754.595 268.254 754.493 268.496 754.287 268.692C754.082 268.888 753.835 268.986 753.545 268.986ZM768.458 269.014V264.688H769.746V269.014H768.458ZM771.496 269.014V264.688H772.784V269.014H771.496ZM922.08 269.014V264.688H923.368V269.014H922.08ZM925.118 269.014V264.688H926.406V269.014H925.118Z" fill="#575757"/> +<path d="M779.429 266.312C779.158 266.312 778.925 266.219 778.729 266.032C778.542 265.846 778.449 265.622 778.449 265.36C778.449 265.09 778.542 264.866 778.729 264.688C778.925 264.502 779.158 264.408 779.429 264.408C779.709 264.408 779.942 264.502 780.129 264.688C780.316 264.866 780.409 265.09 780.409 265.36C780.409 265.622 780.316 265.846 780.129 266.032C779.942 266.219 779.709 266.312 779.429 266.312ZM775.803 277.568V276.56H778.575C778.808 276.56 778.925 276.439 778.925 276.196V268.902C778.925 268.669 778.808 268.552 778.575 268.552H776.895V267.544H778.855C779.686 267.544 780.101 267.96 780.101 268.79V276.322C780.101 277.153 779.686 277.568 778.855 277.568H775.803ZM787.683 274.656C787.03 274.656 786.451 274.507 785.947 274.208C785.443 273.91 785.047 273.49 784.757 272.948C784.468 272.398 784.323 271.754 784.323 271.016C784.323 270.279 784.468 269.64 784.757 269.098C785.047 268.548 785.443 268.123 785.947 267.824C786.451 267.526 787.03 267.376 787.683 267.376C788.337 267.376 788.915 267.526 789.419 267.824C789.923 268.123 790.32 268.548 790.609 269.098C790.899 269.64 791.043 270.279 791.043 271.016C791.043 271.754 790.899 272.398 790.609 272.948C790.32 273.49 789.923 273.91 789.419 274.208C788.915 274.507 788.337 274.656 787.683 274.656ZM787.683 273.536C788.085 273.536 788.449 273.448 788.775 273.27C789.102 273.093 789.359 272.818 789.545 272.444C789.741 272.071 789.839 271.595 789.839 271.016C789.839 270.438 789.741 269.962 789.545 269.588C789.359 269.215 789.102 268.94 788.775 268.762C788.449 268.585 788.085 268.496 787.683 268.496C787.291 268.496 786.932 268.585 786.605 268.762C786.279 268.94 786.017 269.215 785.821 269.588C785.625 269.962 785.527 270.438 785.527 271.016C785.527 271.884 785.737 272.524 786.157 272.934C786.577 273.336 787.086 273.536 787.683 273.536ZM793.18 274.488V264.408H794.356V268.594C794.543 268.24 794.851 267.95 795.28 267.726C795.709 267.493 796.181 267.376 796.694 267.376C797.543 267.376 798.187 267.633 798.626 268.146C799.074 268.66 799.298 269.378 799.298 270.302V274.488H798.122V270.456C798.122 269.831 797.968 269.346 797.66 269C797.361 268.655 796.941 268.482 796.4 268.482C796.027 268.482 795.686 268.566 795.378 268.734C795.07 268.902 794.823 269.15 794.636 269.476C794.449 269.803 794.356 270.204 794.356 270.68V274.488H793.18ZM801.785 274.488V267.544H802.765L802.891 268.594H802.961C803.147 268.258 803.441 267.974 803.843 267.74C804.244 267.498 804.706 267.376 805.229 267.376C806.078 267.376 806.713 267.628 807.133 268.132C807.562 268.636 807.777 269.364 807.777 270.316V274.488H806.601V270.456C806.601 269.84 806.465 269.36 806.195 269.014C805.924 268.66 805.504 268.482 804.935 268.482C804.384 268.482 803.917 268.674 803.535 269.056C803.152 269.43 802.961 269.971 802.961 270.68V274.488H801.785ZM814.309 275.804C813.292 275.804 812.442 275.562 811.761 275.076C811.089 274.6 810.585 273.942 810.249 273.102C809.913 272.262 809.745 271.31 809.745 270.246C809.745 269.276 809.852 268.44 810.067 267.74C810.291 267.04 810.594 266.466 810.977 266.018C811.36 265.561 811.789 265.225 812.265 265.01C812.741 264.796 813.236 264.688 813.749 264.688C814.71 264.688 815.471 264.931 816.031 265.416C816.591 265.902 816.871 266.597 816.871 267.502V272.99H816.031L815.919 272.192H815.863C815.723 272.454 815.522 272.673 815.261 272.85C815.009 273.028 814.687 273.116 814.295 273.116C813.595 273.116 813.016 272.864 812.559 272.36C812.102 271.856 811.873 271.147 811.873 270.232C811.873 269.318 812.097 268.613 812.545 268.118C813.002 267.624 813.586 267.376 814.295 267.376C814.687 267.376 815.009 267.446 815.261 267.586C815.522 267.726 815.723 267.913 815.863 268.146V267.502C815.863 266.924 815.667 266.471 815.275 266.144C814.892 265.808 814.384 265.64 813.749 265.64C813.254 265.64 812.783 265.79 812.335 266.088C811.887 266.387 811.518 266.872 811.229 267.544C810.949 268.216 810.809 269.117 810.809 270.246C810.809 271.068 810.935 271.828 811.187 272.528C811.439 273.228 811.826 273.793 812.349 274.222C812.872 274.642 813.525 274.852 814.309 274.852H816.269V275.804H814.309ZM814.379 272.234C814.808 272.234 815.163 272.076 815.443 271.758C815.723 271.432 815.863 270.928 815.863 270.246C815.863 269.565 815.723 269.066 815.443 268.748C815.163 268.422 814.808 268.258 814.379 268.258C813.95 268.258 813.595 268.422 813.315 268.748C813.035 269.066 812.895 269.565 812.895 270.246C812.895 270.928 813.035 271.432 813.315 271.758C813.595 272.076 813.95 272.234 814.379 272.234ZM821.234 274.656C820.683 274.656 820.226 274.558 819.862 274.362C819.498 274.166 819.227 273.91 819.05 273.592C818.872 273.266 818.784 272.911 818.784 272.528C818.784 271.819 819.04 271.282 819.554 270.918C820.076 270.545 820.772 270.358 821.64 270.358H823.544V270.218C823.544 269.005 822.988 268.398 821.878 268.398C821.43 268.398 821.052 268.496 820.744 268.692C820.445 268.888 820.254 269.196 820.17 269.616H818.966C819.012 269.15 819.166 268.748 819.428 268.412C819.698 268.076 820.044 267.82 820.464 267.642C820.884 267.465 821.355 267.376 821.878 267.376C822.867 267.376 823.586 267.638 824.034 268.16C824.491 268.674 824.72 269.36 824.72 270.218V274.488H823.712L823.614 273.41H823.516C823.31 273.746 823.035 274.04 822.69 274.292C822.354 274.535 821.868 274.656 821.234 274.656ZM821.444 273.62C821.892 273.62 822.27 273.513 822.578 273.298C822.895 273.084 823.133 272.799 823.292 272.444C823.46 272.09 823.544 271.702 823.544 271.282H821.738C821.103 271.282 820.655 271.39 820.394 271.604C820.142 271.819 820.016 272.104 820.016 272.458C820.016 272.822 820.137 273.107 820.38 273.312C820.622 273.518 820.977 273.62 821.444 273.62ZM827.248 277.568V267.544H828.2L828.34 268.692H828.424C828.601 268.319 828.886 268.006 829.278 267.754C829.67 267.502 830.132 267.376 830.664 267.376C831.224 267.376 831.728 267.516 832.176 267.796C832.633 268.076 832.993 268.492 833.254 269.042C833.515 269.584 833.646 270.246 833.646 271.03C833.646 271.805 833.511 272.463 833.24 273.004C832.979 273.546 832.615 273.956 832.148 274.236C831.691 274.516 831.163 274.656 830.566 274.656C830.034 274.656 829.581 274.544 829.208 274.32C828.844 274.087 828.583 273.816 828.424 273.508V277.568H827.248ZM830.426 273.536C831.014 273.536 831.499 273.331 831.882 272.92C832.265 272.5 832.456 271.866 832.456 271.016C832.456 270.167 832.265 269.537 831.882 269.126C831.499 268.706 831.014 268.496 830.426 268.496C829.838 268.496 829.353 268.706 828.97 269.126C828.587 269.537 828.396 270.167 828.396 271.016C828.396 271.866 828.587 272.5 828.97 272.92C829.353 273.331 829.838 273.536 830.426 273.536ZM835.783 277.568V267.544H836.735L836.875 268.692H836.959C837.136 268.319 837.421 268.006 837.813 267.754C838.205 267.502 838.667 267.376 839.199 267.376C839.759 267.376 840.263 267.516 840.711 267.796C841.168 268.076 841.527 268.492 841.789 269.042C842.05 269.584 842.181 270.246 842.181 271.03C842.181 271.805 842.045 272.463 841.775 273.004C841.513 273.546 841.149 273.956 840.683 274.236C840.225 274.516 839.698 274.656 839.101 274.656C838.569 274.656 838.116 274.544 837.743 274.32C837.379 274.087 837.117 273.816 836.959 273.508V277.568H835.783ZM838.961 273.536C839.549 273.536 840.034 273.331 840.417 272.92C840.799 272.5 840.991 271.866 840.991 271.016C840.991 270.167 840.799 269.537 840.417 269.126C840.034 268.706 839.549 268.496 838.961 268.496C838.373 268.496 837.887 268.706 837.505 269.126C837.122 269.537 836.931 270.167 836.931 271.016C836.931 271.866 837.122 272.5 837.505 272.92C837.887 273.331 838.373 273.536 838.961 273.536ZM847.495 274.656C846.608 274.656 845.89 274.451 845.339 274.04C844.798 273.62 844.494 273.046 844.429 272.318H845.647C845.703 272.701 845.89 273.014 846.207 273.256C846.534 273.499 846.972 273.62 847.523 273.62C848.046 273.62 848.433 273.508 848.685 273.284C848.946 273.06 849.077 272.804 849.077 272.514C849.077 272.122 848.923 271.856 848.615 271.716C848.307 271.567 847.845 271.455 847.229 271.38C846.492 271.296 845.88 271.096 845.395 270.778C844.91 270.461 844.667 269.985 844.667 269.35C844.667 268.781 844.905 268.31 845.381 267.936C845.857 267.563 846.506 267.376 847.327 267.376C848.139 267.376 848.778 267.563 849.245 267.936C849.712 268.3 849.978 268.823 850.043 269.504H848.881C848.853 269.168 848.69 268.902 848.391 268.706C848.102 268.501 847.738 268.398 847.299 268.398C846.842 268.398 846.487 268.487 846.235 268.664C845.983 268.832 845.857 269.056 845.857 269.336C845.857 269.616 845.997 269.85 846.277 270.036C846.566 270.214 847.019 270.33 847.635 270.386C848.12 270.442 848.564 270.536 848.965 270.666C849.366 270.797 849.684 271.002 849.917 271.282C850.16 271.562 850.281 271.954 850.281 272.458C850.29 272.878 850.174 273.256 849.931 273.592C849.698 273.919 849.371 274.18 848.951 274.376C848.531 274.563 848.046 274.656 847.495 274.656ZM852.278 274.488V267.544H853.244L853.37 268.356H853.44C853.561 268.076 853.743 267.843 853.986 267.656C854.238 267.47 854.541 267.376 854.896 267.376C855.25 267.376 855.549 267.465 855.792 267.642C856.044 267.81 856.226 268.048 856.338 268.356H856.394C856.515 268.076 856.711 267.843 856.982 267.656C857.252 267.47 857.579 267.376 857.962 267.376C858.494 267.376 858.89 267.558 859.152 267.922C859.422 268.277 859.558 268.753 859.558 269.35V274.488H858.41V269.532C858.41 269.196 858.34 268.93 858.2 268.734C858.069 268.538 857.854 268.44 857.556 268.44C857.248 268.44 856.996 268.557 856.8 268.79C856.604 269.024 856.506 269.355 856.506 269.784V274.488H855.344V269.532C855.344 269.196 855.278 268.93 855.148 268.734C855.017 268.538 854.802 268.44 854.504 268.44C854.196 268.44 853.939 268.557 853.734 268.79C853.538 269.024 853.44 269.355 853.44 269.784V274.488H852.278ZM864.41 266.312C864.13 266.312 863.897 266.219 863.71 266.032C863.524 265.846 863.43 265.622 863.43 265.36C863.43 265.09 863.524 264.866 863.71 264.688C863.897 264.502 864.13 264.408 864.41 264.408C864.681 264.408 864.91 264.502 865.096 264.688C865.292 264.866 865.39 265.09 865.39 265.36C865.39 265.622 865.292 265.846 865.096 266.032C864.91 266.219 864.681 266.312 864.41 266.312ZM861.694 274.488V273.48H863.906V268.902C863.906 268.669 863.79 268.552 863.556 268.552H861.932V267.544H863.836C864.667 267.544 865.082 267.96 865.082 268.79V273.48H867.294V274.488H861.694ZM873.757 274.488C873.122 274.488 872.623 274.334 872.259 274.026C871.895 273.718 871.713 273.163 871.713 272.36V268.552H869.949V267.544H870.999C871.475 267.544 871.75 267.311 871.825 266.844L872.021 265.766H872.889V267.544H875.661V268.552H872.889V272.36C872.889 272.752 872.977 273.028 873.155 273.186C873.341 273.345 873.659 273.424 874.107 273.424H875.661V274.488H873.757ZM878.525 274.488V264.408H879.701V268.594C879.888 268.24 880.196 267.95 880.625 267.726C881.055 267.493 881.526 267.376 882.039 267.376C882.889 267.376 883.533 267.633 883.971 268.146C884.419 268.66 884.643 269.378 884.643 270.302V274.488H883.467V270.456C883.467 269.831 883.313 269.346 883.005 269C882.707 268.655 882.287 268.482 881.745 268.482C881.372 268.482 881.031 268.566 880.723 268.734C880.415 268.902 880.168 269.15 879.981 269.476C879.795 269.803 879.701 270.204 879.701 270.68V274.488H878.525ZM890.098 274.516C889.808 274.516 889.561 274.418 889.356 274.222C889.15 274.026 889.048 273.784 889.048 273.494C889.048 273.214 889.15 272.976 889.356 272.78C889.561 272.584 889.808 272.486 890.098 272.486C890.387 272.486 890.634 272.584 890.84 272.78C891.045 272.976 891.148 273.214 891.148 273.494C891.148 273.784 891.045 274.026 890.84 274.222C890.634 274.418 890.387 274.516 890.098 274.516ZM898.744 274.656C898.119 274.656 897.559 274.512 897.064 274.222C896.579 273.933 896.192 273.518 895.902 272.976C895.613 272.426 895.468 271.772 895.468 271.016C895.468 270.26 895.613 269.612 895.902 269.07C896.192 268.52 896.584 268.1 897.078 267.81C897.582 267.521 898.138 267.376 898.744 267.376C899.603 267.376 900.289 267.591 900.802 268.02C901.316 268.45 901.642 269.024 901.782 269.742H900.578C900.466 269.36 900.252 269.056 899.934 268.832C899.617 268.599 899.216 268.482 898.73 268.482C898.376 268.482 898.04 268.576 897.722 268.762C897.405 268.949 897.148 269.229 896.952 269.602C896.756 269.976 896.658 270.447 896.658 271.016C896.658 271.586 896.756 272.062 896.952 272.444C897.148 272.818 897.405 273.098 897.722 273.284C898.04 273.471 898.376 273.564 898.73 273.564C899.244 273.564 899.65 273.448 899.948 273.214C900.256 272.981 900.466 272.673 900.578 272.29H901.782C901.605 273.028 901.255 273.606 900.732 274.026C900.219 274.446 899.556 274.656 898.744 274.656ZM907.167 274.656C906.514 274.656 905.935 274.507 905.431 274.208C904.927 273.91 904.53 273.49 904.241 272.948C903.952 272.398 903.807 271.754 903.807 271.016C903.807 270.279 903.952 269.64 904.241 269.098C904.53 268.548 904.927 268.123 905.431 267.824C905.935 267.526 906.514 267.376 907.167 267.376C907.82 267.376 908.399 267.526 908.903 267.824C909.407 268.123 909.804 268.548 910.093 269.098C910.382 269.64 910.527 270.279 910.527 271.016C910.527 271.754 910.382 272.398 910.093 272.948C909.804 273.49 909.407 273.91 908.903 274.208C908.399 274.507 907.82 274.656 907.167 274.656ZM907.167 273.536C907.568 273.536 907.932 273.448 908.259 273.27C908.586 273.093 908.842 272.818 909.029 272.444C909.225 272.071 909.323 271.595 909.323 271.016C909.323 270.438 909.225 269.962 909.029 269.588C908.842 269.215 908.586 268.94 908.259 268.762C907.932 268.585 907.568 268.496 907.167 268.496C906.775 268.496 906.416 268.585 906.089 268.762C905.762 268.94 905.501 269.215 905.305 269.588C905.109 269.962 905.011 270.438 905.011 271.016C905.011 271.884 905.221 272.524 905.641 272.934C906.061 273.336 906.57 273.536 907.167 273.536ZM912.019 274.488V267.544H912.985L913.111 268.356H913.181C913.303 268.076 913.485 267.843 913.727 267.656C913.979 267.47 914.283 267.376 914.637 267.376C914.992 267.376 915.291 267.465 915.533 267.642C915.785 267.81 915.967 268.048 916.079 268.356H916.135C916.257 268.076 916.453 267.843 916.723 267.656C916.994 267.47 917.321 267.376 917.703 267.376C918.235 267.376 918.632 267.558 918.893 267.922C919.164 268.277 919.299 268.753 919.299 269.35V274.488H918.151V269.532C918.151 269.196 918.081 268.93 917.941 268.734C917.811 268.538 917.596 268.44 917.297 268.44C916.989 268.44 916.737 268.557 916.541 268.79C916.345 269.024 916.247 269.355 916.247 269.784V274.488H915.085V269.532C915.085 269.196 915.02 268.93 914.889 268.734C914.759 268.538 914.544 268.44 914.245 268.44C913.937 268.44 913.681 268.557 913.475 268.79C913.279 269.024 913.181 269.355 913.181 269.784V274.488H912.019Z" fill="#F86A2B"/> +<rect x="660.5" y="257.988" width="272" height="23" stroke="#F1F1F1"/> +<g clip-path="url(#clip4_625_11871)"> +<rect width="661" height="138" transform="translate(67 292)" fill="#F8F8F8"/> +<path d="M85 313L80 308L90 308L85 313Z" fill="#939393"/> +<path d="M109.423 318.461H109.799V317.497H109.525C108.562 317.497 108.172 317.053 108.172 315.959V313.758C108.172 312.773 107.68 312.261 106.675 312.158V311.994C107.68 311.892 108.172 311.379 108.172 310.395V308.207C108.172 307.113 108.562 306.669 109.525 306.669H109.799V305.705H109.423C107.81 305.705 107.051 306.464 107.051 308.057V309.971C107.051 311.064 106.675 311.427 105.547 311.427V312.726C106.675 312.726 107.051 313.088 107.051 314.182V316.109C107.051 317.702 107.81 318.461 109.423 318.461ZM122.336 332.025H123.32L123.464 328.136H122.192L122.336 332.025ZM124.865 332.025H125.85L125.993 328.136H124.722L124.865 332.025ZM131.551 338.13C133.287 338.13 134.34 337.146 134.593 336.147L134.606 336.093H133.417L133.39 336.154C133.191 336.599 132.576 337.07 131.578 337.07C130.266 337.07 129.425 336.182 129.391 334.657H134.695V334.192C134.695 331.991 133.479 330.501 131.476 330.501C129.473 330.501 128.174 332.06 128.174 334.336V334.343C128.174 336.653 129.445 338.13 131.551 338.13ZM131.469 331.561C132.556 331.561 133.362 332.251 133.485 333.707H129.411C129.541 332.306 130.375 331.561 131.469 331.561ZM138.489 338H139.692L142.42 330.631H141.162L139.146 336.701H139.036L137.02 330.631H135.762L138.489 338ZM146.727 338.13C148.463 338.13 149.516 337.146 149.769 336.147L149.782 336.093H148.593L148.565 336.154C148.367 336.599 147.752 337.07 146.754 337.07C145.441 337.07 144.601 336.182 144.566 334.657H149.871V334.192C149.871 331.991 148.654 330.501 146.651 330.501C144.648 330.501 143.35 332.06 143.35 334.336V334.343C143.35 336.653 144.621 338.13 146.727 338.13ZM146.645 331.561C147.731 331.561 148.538 332.251 148.661 333.707H144.587C144.717 332.306 145.551 331.561 146.645 331.561ZM151.717 338H152.906V333.639C152.906 332.347 153.651 331.554 154.827 331.554C156.003 331.554 156.55 332.189 156.55 333.516V338H157.739V333.229C157.739 331.479 156.816 330.501 155.162 330.501C154.075 330.501 153.385 330.959 153.016 331.738H152.906V330.631H151.717V338ZM162.511 338.055C162.743 338.055 162.969 338.027 163.201 337.986V336.975C162.982 336.995 162.866 337.002 162.654 337.002C161.889 337.002 161.588 336.653 161.588 335.785V331.615H163.201V330.631H161.588V328.724H160.357V330.631H159.195V331.615H160.357V336.086C160.357 337.494 160.993 338.055 162.511 338.055ZM165.457 332.025H166.441L166.585 328.136H165.313L165.457 332.025ZM167.986 332.025H168.971L169.114 328.136H167.843L167.986 332.025ZM172.635 332.777C173.127 332.777 173.523 332.374 173.523 331.889C173.523 331.396 173.127 331 172.635 331C172.149 331 171.746 331.396 171.746 331.889C171.746 332.374 172.149 332.777 172.635 332.777ZM172.635 338.068C173.127 338.068 173.523 337.665 173.523 337.18C173.523 336.688 173.127 336.291 172.635 336.291C172.149 336.291 171.746 336.688 171.746 337.18C171.746 337.665 172.149 338.068 172.635 338.068ZM122.336 354.025H123.32L123.464 350.136H122.192L122.336 354.025ZM124.865 354.025H125.85L125.993 350.136H124.722L124.865 354.025ZM131.161 360.055C131.394 360.055 131.619 360.027 131.852 359.986V358.975C131.633 358.995 131.517 359.002 131.305 359.002C130.539 359.002 130.238 358.653 130.238 357.785V353.615H131.852V352.631H130.238V350.724H129.008V352.631H127.846V353.615H129.008V358.086C129.008 359.494 129.644 360.055 131.161 360.055ZM134.258 351.209C134.709 351.209 135.078 350.84 135.078 350.389C135.078 349.938 134.709 349.568 134.258 349.568C133.807 349.568 133.438 349.938 133.438 350.389C133.438 350.84 133.807 351.209 134.258 351.209ZM133.656 360H134.846V352.631H133.656V360ZM137.088 360H138.277V355.434C138.277 354.395 139.009 353.554 139.973 353.554C140.902 353.554 141.504 354.121 141.504 354.996V360H142.693V355.263C142.693 354.326 143.37 353.554 144.396 353.554C145.435 353.554 145.934 354.094 145.934 355.181V360H147.123V354.907C147.123 353.362 146.282 352.501 144.778 352.501C143.76 352.501 142.919 353.014 142.522 353.793H142.413C142.071 353.027 141.374 352.501 140.376 352.501C139.412 352.501 138.715 352.959 138.387 353.752H138.277V352.631H137.088V360ZM152.277 360.13C154.014 360.13 155.066 359.146 155.319 358.147L155.333 358.093H154.144L154.116 358.154C153.918 358.599 153.303 359.07 152.305 359.07C150.992 359.07 150.151 358.182 150.117 356.657H155.422V356.192C155.422 353.991 154.205 352.501 152.202 352.501C150.199 352.501 148.9 354.06 148.9 356.336V356.343C148.9 358.653 150.172 360.13 152.277 360.13ZM152.195 353.561C153.282 353.561 154.089 354.251 154.212 355.707H150.138C150.268 354.306 151.102 353.561 152.195 353.561ZM159.797 360.13C161.472 360.13 162.75 359.221 162.75 357.908V357.895C162.75 356.842 162.08 356.24 160.692 355.905L159.558 355.632C158.689 355.42 158.32 355.105 158.32 354.606V354.593C158.32 353.943 158.963 353.492 159.838 353.492C160.727 353.492 161.301 353.896 161.458 354.477H162.627C162.463 353.273 161.39 352.501 159.845 352.501C158.279 352.501 157.104 353.424 157.104 354.647V354.654C157.104 355.714 157.726 356.315 159.106 356.644L160.248 356.917C161.157 357.136 161.533 357.484 161.533 357.983V357.997C161.533 358.667 160.829 359.139 159.838 359.139C158.895 359.139 158.307 358.735 158.108 358.12H156.892C157.028 359.337 158.156 360.13 159.797 360.13ZM167.146 360.055C167.378 360.055 167.604 360.027 167.836 359.986V358.975C167.617 358.995 167.501 359.002 167.289 359.002C166.523 359.002 166.223 358.653 166.223 357.785V353.615H167.836V352.631H166.223V350.724H164.992V352.631H163.83V353.615H164.992V358.086C164.992 359.494 165.628 360.055 167.146 360.055ZM171.637 360.13C172.628 360.13 173.4 359.699 173.865 358.913H173.975V360H175.164V354.955C175.164 353.424 174.159 352.501 172.361 352.501C170.789 352.501 169.668 353.28 169.477 354.436L169.47 354.477H170.659L170.666 354.456C170.857 353.882 171.438 353.554 172.32 353.554C173.421 353.554 173.975 354.046 173.975 354.955V355.625L171.862 355.755C170.146 355.857 169.176 356.616 169.176 357.929V357.942C169.176 359.282 170.235 360.13 171.637 360.13ZM170.393 357.915V357.901C170.393 357.17 170.885 356.773 172.006 356.705L173.975 356.582V357.252C173.975 358.305 173.093 359.098 171.883 359.098C171.028 359.098 170.393 358.66 170.393 357.915ZM177.338 360H178.527V355.434C178.527 354.395 179.259 353.554 180.223 353.554C181.152 353.554 181.754 354.121 181.754 354.996V360H182.943V355.263C182.943 354.326 183.62 353.554 184.646 353.554C185.685 353.554 186.184 354.094 186.184 355.181V360H187.373V354.907C187.373 353.362 186.532 352.501 185.028 352.501C184.01 352.501 183.169 353.014 182.772 353.793H182.663C182.321 353.027 181.624 352.501 180.626 352.501C179.662 352.501 178.965 352.959 178.637 353.752H178.527V352.631H177.338V360ZM189.52 362.461H190.709V358.838H190.818C191.222 359.624 192.104 360.13 193.115 360.13C194.988 360.13 196.205 358.633 196.205 356.322V356.309C196.205 354.012 194.981 352.501 193.115 352.501C192.09 352.501 191.27 352.986 190.818 353.807H190.709V352.631H189.52V362.461ZM192.842 359.077C191.502 359.077 190.682 358.024 190.682 356.322V356.309C190.682 354.606 191.502 353.554 192.842 353.554C194.188 353.554 194.988 354.593 194.988 356.309V356.322C194.988 358.038 194.188 359.077 192.842 359.077ZM198.543 354.025H199.527L199.671 350.136H198.399L198.543 354.025ZM201.072 354.025H202.057L202.2 350.136H200.929L201.072 354.025ZM205.721 354.777C206.213 354.777 206.609 354.374 206.609 353.889C206.609 353.396 206.213 353 205.721 353C205.235 353 204.832 353.396 204.832 353.889C204.832 354.374 205.235 354.777 205.721 354.777ZM205.721 360.068C206.213 360.068 206.609 359.665 206.609 359.18C206.609 358.688 206.213 358.291 205.721 358.291C205.235 358.291 204.832 358.688 204.832 359.18C204.832 359.665 205.235 360.068 205.721 360.068ZM122.336 376.025H123.32L123.464 372.136H122.192L122.336 376.025ZM124.865 376.025H125.85L125.993 372.136H124.722L124.865 376.025ZM128.543 382H129.732V377.434C129.732 376.354 130.539 375.636 131.674 375.636C131.934 375.636 132.159 375.663 132.405 375.704V374.549C132.289 374.528 132.036 374.501 131.811 374.501C130.812 374.501 130.122 374.952 129.842 375.725H129.732V374.631H128.543V382ZM136.678 382.13C138.414 382.13 139.467 381.146 139.72 380.147L139.733 380.093H138.544L138.517 380.154C138.318 380.599 137.703 381.07 136.705 381.07C135.393 381.07 134.552 380.182 134.518 378.657H139.822V378.192C139.822 375.991 138.605 374.501 136.603 374.501C134.6 374.501 133.301 376.06 133.301 378.336V378.343C133.301 380.653 134.572 382.13 136.678 382.13ZM136.596 375.561C137.683 375.561 138.489 376.251 138.612 377.707H134.538C134.668 376.306 135.502 375.561 136.596 375.561ZM144.197 382.13C145.872 382.13 147.15 381.221 147.15 379.908V379.895C147.15 378.842 146.48 378.24 145.093 377.905L143.958 377.632C143.09 377.42 142.721 377.105 142.721 376.606V376.593C142.721 375.943 143.363 375.492 144.238 375.492C145.127 375.492 145.701 375.896 145.858 376.477H147.027C146.863 375.273 145.79 374.501 144.245 374.501C142.68 374.501 141.504 375.424 141.504 376.647V376.654C141.504 377.714 142.126 378.315 143.507 378.644L144.648 378.917C145.558 379.136 145.934 379.484 145.934 379.983V379.997C145.934 380.667 145.229 381.139 144.238 381.139C143.295 381.139 142.707 380.735 142.509 380.12H141.292C141.429 381.337 142.557 382.13 144.197 382.13ZM152.024 382.13C154.123 382.13 155.422 380.681 155.422 378.322V378.309C155.422 375.943 154.123 374.501 152.024 374.501C149.926 374.501 148.627 375.943 148.627 378.309V378.322C148.627 380.681 149.926 382.13 152.024 382.13ZM152.024 381.077C150.63 381.077 149.844 380.059 149.844 378.322V378.309C149.844 376.565 150.63 375.554 152.024 375.554C153.419 375.554 154.205 376.565 154.205 378.309V378.322C154.205 380.059 153.419 381.077 152.024 381.077ZM159.735 382.13C160.815 382.13 161.561 381.686 161.923 380.899H162.032V382H163.222V374.631H162.032V378.992C162.032 380.284 161.342 381.077 160.043 381.077C158.867 381.077 158.389 380.441 158.389 379.115V374.631H157.199V379.402C157.199 381.146 158.061 382.13 159.735 382.13ZM165.443 382H166.633V377.434C166.633 376.354 167.439 375.636 168.574 375.636C168.834 375.636 169.06 375.663 169.306 375.704V374.549C169.189 374.528 168.937 374.501 168.711 374.501C167.713 374.501 167.022 374.952 166.742 375.725H166.633V374.631H165.443V382ZM173.585 382.13C175.355 382.13 176.347 381.18 176.647 379.847L176.661 379.771L175.485 379.778L175.472 379.819C175.198 380.64 174.569 381.077 173.578 381.077C172.266 381.077 171.418 379.99 171.418 378.295V378.281C171.418 376.62 172.252 375.554 173.578 375.554C174.638 375.554 175.294 376.142 175.479 376.866L175.485 376.887H176.668L176.661 376.846C176.442 375.533 175.369 374.501 173.578 374.501C171.514 374.501 170.201 375.991 170.201 378.281V378.295C170.201 380.633 171.521 382.13 173.585 382.13ZM181.412 382.13C183.148 382.13 184.201 381.146 184.454 380.147L184.468 380.093H183.278L183.251 380.154C183.053 380.599 182.438 381.07 181.439 381.07C180.127 381.07 179.286 380.182 179.252 378.657H184.557V378.192C184.557 375.991 183.34 374.501 181.337 374.501C179.334 374.501 178.035 376.06 178.035 378.336V378.343C178.035 380.653 179.307 382.13 181.412 382.13ZM181.33 375.561C182.417 375.561 183.224 376.251 183.347 377.707H179.272C179.402 376.306 180.236 375.561 181.33 375.561ZM186.881 376.025H187.865L188.009 372.136H186.737L186.881 376.025ZM189.41 376.025H190.395L190.538 372.136H189.267L189.41 376.025ZM194.059 376.777C194.551 376.777 194.947 376.374 194.947 375.889C194.947 375.396 194.551 375 194.059 375C193.573 375 193.17 375.396 193.17 375.889C193.17 376.374 193.573 376.777 194.059 376.777ZM194.059 382.068C194.551 382.068 194.947 381.665 194.947 381.18C194.947 380.688 194.551 380.291 194.059 380.291C193.573 380.291 193.17 380.688 193.17 381.18C193.17 381.665 193.573 382.068 194.059 382.068ZM204.497 384.461H204.873V383.497H204.6C203.636 383.497 203.246 383.053 203.246 381.959V379.758C203.246 378.773 202.754 378.261 201.749 378.158V377.994C202.754 377.892 203.246 377.379 203.246 376.395V374.207C203.246 373.113 203.636 372.669 204.6 372.669H204.873V371.705H204.497C202.884 371.705 202.125 372.464 202.125 374.057V375.971C202.125 377.064 201.749 377.427 200.621 377.427V378.726C201.749 378.726 202.125 379.088 202.125 380.182V382.109C202.125 383.702 202.884 384.461 204.497 384.461ZM138.086 398.025H139.07L139.214 394.136H137.942L138.086 398.025ZM140.615 398.025H141.6L141.743 394.136H140.472L140.615 398.025ZM144.922 395.209C145.373 395.209 145.742 394.84 145.742 394.389C145.742 393.938 145.373 393.568 144.922 393.568C144.471 393.568 144.102 393.938 144.102 394.389C144.102 394.84 144.471 395.209 144.922 395.209ZM144.32 404H145.51V396.631H144.32V404ZM150.473 404.13C151.498 404.13 152.318 403.645 152.77 402.824H152.879V404H154.068V393.705H152.879V397.793H152.77C152.366 397.007 151.484 396.501 150.473 396.501C148.6 396.501 147.383 397.998 147.383 400.309V400.322C147.383 402.619 148.606 404.13 150.473 404.13ZM150.746 403.077C149.399 403.077 148.6 402.038 148.6 400.322V400.309C148.6 398.593 149.399 397.554 150.746 397.554C152.086 397.554 152.906 398.606 152.906 400.309V400.322C152.906 402.024 152.086 403.077 150.746 403.077ZM156.83 398.025H157.814L157.958 394.136H156.687L156.83 398.025ZM159.359 398.025H160.344L160.487 394.136H159.216L159.359 398.025ZM164.008 398.777C164.5 398.777 164.896 398.374 164.896 397.889C164.896 397.396 164.5 397 164.008 397C163.522 397 163.119 397.396 163.119 397.889C163.119 398.374 163.522 398.777 164.008 398.777ZM164.008 404.068C164.5 404.068 164.896 403.665 164.896 403.18C164.896 402.688 164.5 402.291 164.008 402.291C163.522 402.291 163.119 402.688 163.119 403.18C163.119 403.665 163.522 404.068 164.008 404.068ZM138.086 420.025H139.07L139.214 416.136H137.942L138.086 420.025ZM140.615 420.025H141.6L141.743 416.136H140.472L140.615 420.025ZM146.911 426.055C147.144 426.055 147.369 426.027 147.602 425.986V424.975C147.383 424.995 147.267 425.002 147.055 425.002C146.289 425.002 145.988 424.653 145.988 423.785V419.615H147.602V418.631H145.988V416.724H144.758V418.631H143.596V419.615H144.758V424.086C144.758 425.494 145.394 426.055 146.911 426.055ZM150.008 428.584C151.313 428.584 151.922 428.105 152.53 426.451L155.408 418.631H154.157L152.141 424.694H152.031L150.008 418.631H148.736L151.464 426.007L151.327 426.444C151.061 427.292 150.65 427.6 149.974 427.6C149.81 427.6 149.625 427.593 149.481 427.565V428.543C149.646 428.57 149.851 428.584 150.008 428.584ZM156.98 428.461H158.17V424.838H158.279C158.683 425.624 159.564 426.13 160.576 426.13C162.449 426.13 163.666 424.633 163.666 422.322V422.309C163.666 420.012 162.442 418.501 160.576 418.501C159.551 418.501 158.73 418.986 158.279 419.807H158.17V418.631H156.98V428.461ZM160.303 425.077C158.963 425.077 158.143 424.024 158.143 422.322V422.309C158.143 420.606 158.963 419.554 160.303 419.554C161.649 419.554 162.449 420.593 162.449 422.309V422.322C162.449 424.038 161.649 425.077 160.303 425.077ZM168.533 426.13C170.27 426.13 171.322 425.146 171.575 424.147L171.589 424.093H170.399L170.372 424.154C170.174 424.599 169.559 425.07 168.561 425.07C167.248 425.07 166.407 424.182 166.373 422.657H171.678V422.192C171.678 419.991 170.461 418.501 168.458 418.501C166.455 418.501 165.156 420.06 165.156 422.336V422.343C165.156 424.653 166.428 426.13 168.533 426.13ZM168.451 419.561C169.538 419.561 170.345 420.251 170.468 421.707H166.394C166.523 420.306 167.357 419.561 168.451 419.561ZM174.002 420.025H174.986L175.13 416.136H173.858L174.002 420.025ZM176.531 420.025H177.516L177.659 416.136H176.388L176.531 420.025ZM181.18 420.777C181.672 420.777 182.068 420.374 182.068 419.889C182.068 419.396 181.672 419 181.18 419C180.694 419 180.291 419.396 180.291 419.889C180.291 420.374 180.694 420.777 181.18 420.777ZM181.18 426.068C181.672 426.068 182.068 425.665 182.068 425.18C182.068 424.688 181.672 424.291 181.18 424.291C180.694 424.291 180.291 424.688 180.291 425.18C180.291 425.665 180.694 426.068 181.18 426.068ZM138.086 442.025H139.07L139.214 438.136H137.942L138.086 442.025ZM140.615 442.025H141.6L141.743 438.136H140.472L140.615 442.025ZM144.293 448H145.482V443.639C145.482 442.347 146.228 441.554 147.403 441.554C148.579 441.554 149.126 442.189 149.126 443.516V448H150.315V443.229C150.315 441.479 149.393 440.501 147.738 440.501C146.651 440.501 145.961 440.959 145.592 441.738H145.482V440.631H144.293V448ZM154.492 448.13C155.483 448.13 156.256 447.699 156.721 446.913H156.83V448H158.02V442.955C158.02 441.424 157.015 440.501 155.217 440.501C153.645 440.501 152.523 441.28 152.332 442.436L152.325 442.477H153.515L153.521 442.456C153.713 441.882 154.294 441.554 155.176 441.554C156.276 441.554 156.83 442.046 156.83 442.955V443.625L154.718 443.755C153.002 443.857 152.031 444.616 152.031 445.929V445.942C152.031 447.282 153.091 448.13 154.492 448.13ZM153.248 445.915V445.901C153.248 445.17 153.74 444.773 154.861 444.705L156.83 444.582V445.252C156.83 446.305 155.948 447.098 154.738 447.098C153.884 447.098 153.248 446.66 153.248 445.915ZM160.193 448H161.383V443.434C161.383 442.395 162.114 441.554 163.078 441.554C164.008 441.554 164.609 442.121 164.609 442.996V448H165.799V443.263C165.799 442.326 166.476 441.554 167.501 441.554C168.54 441.554 169.039 442.094 169.039 443.181V448H170.229V442.907C170.229 441.362 169.388 440.501 167.884 440.501C166.865 440.501 166.024 441.014 165.628 441.793H165.519C165.177 441.027 164.479 440.501 163.481 440.501C162.518 440.501 161.82 440.959 161.492 441.752H161.383V440.631H160.193V448ZM175.383 448.13C177.119 448.13 178.172 447.146 178.425 446.147L178.438 446.093H177.249L177.222 446.154C177.023 446.599 176.408 447.07 175.41 447.07C174.098 447.07 173.257 446.182 173.223 444.657H178.527V444.192C178.527 441.991 177.311 440.501 175.308 440.501C173.305 440.501 172.006 442.06 172.006 444.336V444.343C172.006 446.653 173.277 448.13 175.383 448.13ZM175.301 441.561C176.388 441.561 177.194 442.251 177.317 443.707H173.243C173.373 442.306 174.207 441.561 175.301 441.561ZM180.852 442.025H181.836L181.979 438.136H180.708L180.852 442.025ZM183.381 442.025H184.365L184.509 438.136H183.237L183.381 442.025ZM188.029 442.777C188.521 442.777 188.918 442.374 188.918 441.889C188.918 441.396 188.521 441 188.029 441C187.544 441 187.141 441.396 187.141 441.889C187.141 442.374 187.544 442.777 188.029 442.777ZM188.029 448.068C188.521 448.068 188.918 447.665 188.918 447.18C188.918 446.688 188.521 446.291 188.029 446.291C187.544 446.291 187.141 446.688 187.141 447.18C187.141 447.665 187.544 448.068 188.029 448.068ZM195.631 442.025H196.615L196.759 438.136H195.487L195.631 442.025ZM198.16 442.025H199.145L199.288 438.136H198.017L198.16 442.025ZM200.108 448H201.4L202.392 445.177H206.315L207.307 448H208.599L204.962 438.136H203.745L200.108 448ZM204.299 439.729H204.408L205.953 444.131H202.754L204.299 439.729ZM209.87 444.582H214.464V443.475H209.87V444.582ZM216.727 448H217.957V443.728H222.325V442.634H217.957V439.243H222.715V438.136H216.727V448ZM227.616 448.13C229.715 448.13 231.014 446.681 231.014 444.322V444.309C231.014 441.943 229.715 440.501 227.616 440.501C225.518 440.501 224.219 441.943 224.219 444.309V444.322C224.219 446.681 225.518 448.13 227.616 448.13ZM227.616 447.077C226.222 447.077 225.436 446.059 225.436 444.322V444.309C225.436 442.565 226.222 441.554 227.616 441.554C229.011 441.554 229.797 442.565 229.797 444.309V444.322C229.797 446.059 229.011 447.077 227.616 447.077ZM232.859 448H234.049V443.434C234.049 442.354 234.855 441.636 235.99 441.636C236.25 441.636 236.476 441.663 236.722 441.704V440.549C236.605 440.528 236.353 440.501 236.127 440.501C235.129 440.501 234.438 440.952 234.158 441.725H234.049V440.631H232.859V448ZM241.001 448.13C242.771 448.13 243.763 447.18 244.063 445.847L244.077 445.771L242.901 445.778L242.888 445.819C242.614 446.64 241.985 447.077 240.994 447.077C239.682 447.077 238.834 445.99 238.834 444.295V444.281C238.834 442.62 239.668 441.554 240.994 441.554C242.054 441.554 242.71 442.142 242.895 442.866L242.901 442.887H244.084L244.077 442.846C243.858 441.533 242.785 440.501 240.994 440.501C238.93 440.501 237.617 441.991 237.617 444.281V444.295C237.617 446.633 238.937 448.13 241.001 448.13ZM248.828 448.13C250.564 448.13 251.617 447.146 251.87 446.147L251.884 446.093H250.694L250.667 446.154C250.469 446.599 249.854 447.07 248.855 447.07C247.543 447.07 246.702 446.182 246.668 444.657H251.973V444.192C251.973 441.991 250.756 440.501 248.753 440.501C246.75 440.501 245.451 442.06 245.451 444.336V444.343C245.451 446.653 246.723 448.13 248.828 448.13ZM248.746 441.561C249.833 441.561 250.64 442.251 250.763 443.707H246.688C246.818 442.306 247.652 441.561 248.746 441.561ZM254.297 442.025H255.281L255.425 438.136H254.153L254.297 442.025ZM256.826 442.025H257.811L257.954 438.136H256.683L256.826 442.025ZM258.904 450.509H259.786L260.859 446.619H259.499L258.904 450.509Z" fill="#191919"/> +<path d="M180.236 332.025H181.221L181.364 328.136H180.093L180.236 332.025ZM182.766 332.025H183.75L183.894 328.136H182.622L182.766 332.025ZM188.467 338.13C189.458 338.13 190.23 337.699 190.695 336.913H190.805V338H191.994V332.955C191.994 331.424 190.989 330.501 189.191 330.501C187.619 330.501 186.498 331.28 186.307 332.436L186.3 332.477H187.489L187.496 332.456C187.688 331.882 188.269 331.554 189.15 331.554C190.251 331.554 190.805 332.046 190.805 332.955V333.625L188.692 333.755C186.977 333.857 186.006 334.616 186.006 335.929V335.942C186.006 337.282 187.065 338.13 188.467 338.13ZM187.223 335.915V335.901C187.223 335.17 187.715 334.773 188.836 334.705L190.805 334.582V335.252C190.805 336.305 189.923 337.098 188.713 337.098C187.858 337.098 187.223 336.66 187.223 335.915ZM194.168 340.461H195.357V336.838H195.467C195.87 337.624 196.752 338.13 197.764 338.13C199.637 338.13 200.854 336.633 200.854 334.322V334.309C200.854 332.012 199.63 330.501 197.764 330.501C196.738 330.501 195.918 330.986 195.467 331.807H195.357V330.631H194.168V340.461ZM197.49 337.077C196.15 337.077 195.33 336.024 195.33 334.322V334.309C195.33 332.606 196.15 331.554 197.49 331.554C198.837 331.554 199.637 332.593 199.637 334.309V334.322C199.637 336.038 198.837 337.077 197.49 337.077ZM202.713 340.461H203.902V336.838H204.012C204.415 337.624 205.297 338.13 206.309 338.13C208.182 338.13 209.398 336.633 209.398 334.322V334.309C209.398 332.012 208.175 330.501 206.309 330.501C205.283 330.501 204.463 330.986 204.012 331.807H203.902V330.631H202.713V340.461ZM206.035 337.077C204.695 337.077 203.875 336.024 203.875 334.322V334.309C203.875 332.606 204.695 331.554 206.035 331.554C207.382 331.554 208.182 332.593 208.182 334.309V334.322C208.182 336.038 207.382 337.077 206.035 337.077ZM211.326 338H212.516V327.705H211.326V338ZM215.428 329.209C215.879 329.209 216.248 328.84 216.248 328.389C216.248 327.938 215.879 327.568 215.428 327.568C214.977 327.568 214.607 327.938 214.607 328.389C214.607 328.84 214.977 329.209 215.428 329.209ZM214.826 338H216.016V330.631H214.826V338ZM221.272 338.13C223.043 338.13 224.034 337.18 224.335 335.847L224.349 335.771L223.173 335.778L223.159 335.819C222.886 336.64 222.257 337.077 221.266 337.077C219.953 337.077 219.105 335.99 219.105 334.295V334.281C219.105 332.62 219.939 331.554 221.266 331.554C222.325 331.554 222.981 332.142 223.166 332.866L223.173 332.887H224.355L224.349 332.846C224.13 331.533 223.057 330.501 221.266 330.501C219.201 330.501 217.889 331.991 217.889 334.281V334.295C217.889 336.633 219.208 338.13 221.272 338.13ZM228.115 338.13C229.106 338.13 229.879 337.699 230.344 336.913H230.453V338H231.643V332.955C231.643 331.424 230.638 330.501 228.84 330.501C227.268 330.501 226.146 331.28 225.955 332.436L225.948 332.477H227.138L227.145 332.456C227.336 331.882 227.917 331.554 228.799 331.554C229.899 331.554 230.453 332.046 230.453 332.955V333.625L228.341 333.755C226.625 333.857 225.654 334.616 225.654 335.929V335.942C225.654 337.282 226.714 338.13 228.115 338.13ZM226.871 335.915V335.901C226.871 335.17 227.363 334.773 228.484 334.705L230.453 334.582V335.252C230.453 336.305 229.571 337.098 228.361 337.098C227.507 337.098 226.871 336.66 226.871 335.915ZM236.435 338.055C236.667 338.055 236.893 338.027 237.125 337.986V336.975C236.906 336.995 236.79 337.002 236.578 337.002C235.812 337.002 235.512 336.653 235.512 335.785V331.615H237.125V330.631H235.512V328.724H234.281V330.631H233.119V331.615H234.281V336.086C234.281 337.494 234.917 338.055 236.435 338.055ZM239.531 329.209C239.982 329.209 240.352 328.84 240.352 328.389C240.352 327.938 239.982 327.568 239.531 327.568C239.08 327.568 238.711 327.938 238.711 328.389C238.711 328.84 239.08 329.209 239.531 329.209ZM238.93 338H240.119V330.631H238.93V338ZM245.39 338.13C247.488 338.13 248.787 336.681 248.787 334.322V334.309C248.787 331.943 247.488 330.501 245.39 330.501C243.291 330.501 241.992 331.943 241.992 334.309V334.322C241.992 336.681 243.291 338.13 245.39 338.13ZM245.39 337.077C243.995 337.077 243.209 336.059 243.209 334.322V334.309C243.209 332.565 243.995 331.554 245.39 331.554C246.784 331.554 247.57 332.565 247.57 334.309V334.322C247.57 336.059 246.784 337.077 245.39 337.077ZM250.633 338H251.822V333.639C251.822 332.347 252.567 331.554 253.743 331.554C254.919 331.554 255.466 332.189 255.466 333.516V338H256.655V333.229C256.655 331.479 255.732 330.501 254.078 330.501C252.991 330.501 252.301 330.959 251.932 331.738H251.822V330.631H250.633V338ZM259.779 338.068C260.271 338.068 260.668 337.665 260.668 337.18C260.668 336.688 260.271 336.291 259.779 336.291C259.294 336.291 258.891 336.688 258.891 337.18C258.891 337.665 259.294 338.068 259.779 338.068ZM265.412 338.13C266.438 338.13 267.258 337.645 267.709 336.824H267.818V338H269.008V327.705H267.818V331.793H267.709C267.306 331.007 266.424 330.501 265.412 330.501C263.539 330.501 262.322 331.998 262.322 334.309V334.322C262.322 336.619 263.546 338.13 265.412 338.13ZM265.686 337.077C264.339 337.077 263.539 336.038 263.539 334.322V334.309C263.539 332.593 264.339 331.554 265.686 331.554C267.025 331.554 267.846 332.606 267.846 334.309V334.322C267.846 336.024 267.025 337.077 265.686 337.077ZM274.299 338.13C276.035 338.13 277.088 337.146 277.341 336.147L277.354 336.093H276.165L276.138 336.154C275.939 336.599 275.324 337.07 274.326 337.07C273.014 337.07 272.173 336.182 272.139 334.657H277.443V334.192C277.443 331.991 276.227 330.501 274.224 330.501C272.221 330.501 270.922 332.06 270.922 334.336V334.343C270.922 336.653 272.193 338.13 274.299 338.13ZM274.217 331.561C275.304 331.561 276.11 332.251 276.233 333.707H272.159C272.289 332.306 273.123 331.561 274.217 331.561ZM279.357 338H280.547V327.705H279.357V338ZM285.838 338.13C287.574 338.13 288.627 337.146 288.88 336.147L288.894 336.093H287.704L287.677 336.154C287.479 336.599 286.863 337.07 285.865 337.07C284.553 337.07 283.712 336.182 283.678 334.657H288.982V334.192C288.982 331.991 287.766 330.501 285.763 330.501C283.76 330.501 282.461 332.06 282.461 334.336V334.343C282.461 336.653 283.732 338.13 285.838 338.13ZM285.756 331.561C286.843 331.561 287.649 332.251 287.772 333.707H283.698C283.828 332.306 284.662 331.561 285.756 331.561ZM293.446 338.055C293.679 338.055 293.904 338.027 294.137 337.986V336.975C293.918 336.995 293.802 337.002 293.59 337.002C292.824 337.002 292.523 336.653 292.523 335.785V331.615H294.137V330.631H292.523V328.724H291.293V330.631H290.131V331.615H291.293V336.086C291.293 337.494 291.929 338.055 293.446 338.055ZM298.812 338.13C300.549 338.13 301.602 337.146 301.854 336.147L301.868 336.093H300.679L300.651 336.154C300.453 336.599 299.838 337.07 298.84 337.07C297.527 337.07 296.687 336.182 296.652 334.657H301.957V334.192C301.957 331.991 300.74 330.501 298.737 330.501C296.734 330.501 295.436 332.06 295.436 334.336V334.343C295.436 336.653 296.707 338.13 298.812 338.13ZM298.73 331.561C299.817 331.561 300.624 332.251 300.747 333.707H296.673C296.803 332.306 297.637 331.561 298.73 331.561ZM306.523 338.13C307.549 338.13 308.369 337.645 308.82 336.824H308.93V338H310.119V327.705H308.93V331.793H308.82C308.417 331.007 307.535 330.501 306.523 330.501C304.65 330.501 303.434 331.998 303.434 334.309V334.322C303.434 336.619 304.657 338.13 306.523 338.13ZM306.797 337.077C305.45 337.077 304.65 336.038 304.65 334.322V334.309C304.65 332.593 305.45 331.554 306.797 331.554C308.137 331.554 308.957 332.606 308.957 334.309V334.322C308.957 336.024 308.137 337.077 306.797 337.077ZM312.881 332.025H313.865L314.009 328.136H312.737L312.881 332.025ZM315.41 332.025H316.395L316.538 328.136H315.267L315.41 332.025ZM317.488 340.509H318.37L319.443 336.619H318.083L317.488 340.509ZM213.322 354.025H214.307L214.45 350.136H213.179L213.322 354.025ZM215.852 354.025H216.836L216.979 350.136H215.708L215.852 354.025ZM222.619 360.232C224.8 360.232 226.112 358.243 226.112 355.071V355.058C226.112 351.886 224.8 349.903 222.619 349.903C220.438 349.903 219.14 351.886 219.14 355.058V355.071C219.14 358.243 220.438 360.232 222.619 360.232ZM222.619 359.159C221.204 359.159 220.377 357.587 220.377 355.071V355.058C220.377 352.542 221.204 350.983 222.619 350.983C224.034 350.983 224.875 352.542 224.875 355.058V355.071C224.875 357.587 224.034 359.159 222.619 359.159ZM231.506 360.164C233.598 360.164 235.088 358.988 235.088 357.334V357.32C235.088 356.104 234.233 355.092 232.969 354.798V354.771C234.049 354.436 234.732 353.615 234.732 352.576V352.562C234.732 351.072 233.372 349.972 231.506 349.972C229.64 349.972 228.279 351.072 228.279 352.562V352.576C228.279 353.615 228.963 354.436 230.043 354.771V354.798C228.778 355.092 227.924 356.104 227.924 357.32V357.334C227.924 358.988 229.414 360.164 231.506 360.164ZM231.506 354.312C230.316 354.312 229.503 353.636 229.503 352.679V352.665C229.503 351.708 230.316 351.031 231.506 351.031C232.695 351.031 233.509 351.708 233.509 352.665V352.679C233.509 353.636 232.695 354.312 231.506 354.312ZM231.506 359.091C230.146 359.091 229.175 358.325 229.175 357.259V357.245C229.175 356.165 230.139 355.393 231.506 355.393C232.873 355.393 233.837 356.165 233.837 357.245V357.259C233.837 358.325 232.866 359.091 231.506 359.091ZM240.235 349.705H239.094L235.977 362.461H237.118L240.235 349.705ZM244.645 360.232C246.825 360.232 248.138 358.243 248.138 355.071V355.058C248.138 351.886 246.825 349.903 244.645 349.903C242.464 349.903 241.165 351.886 241.165 355.058V355.071C241.165 358.243 242.464 360.232 244.645 360.232ZM244.645 359.159C243.229 359.159 242.402 357.587 242.402 355.071V355.058C242.402 352.542 243.229 350.983 244.645 350.983C246.06 350.983 246.9 352.542 246.9 355.058V355.071C246.9 357.587 246.06 359.159 244.645 359.159ZM253.388 349.903C251.398 349.903 249.936 351.332 249.936 353.301V353.314C249.936 355.208 251.316 356.616 253.169 356.616C254.502 356.616 255.432 355.898 255.794 355.092H255.924C255.924 355.167 255.924 355.249 255.917 355.324C255.842 357.382 255.11 359.132 253.319 359.132C252.321 359.132 251.631 358.619 251.33 357.792L251.303 357.717H250.065L250.086 357.806C250.421 359.262 251.651 360.232 253.306 360.232C255.698 360.232 257.1 358.264 257.1 354.9V354.887C257.1 351.175 255.192 349.903 253.388 349.903ZM253.381 355.543C252.103 355.543 251.173 354.6 251.173 353.287V353.273C251.173 351.995 252.164 350.99 253.401 350.99C254.652 350.99 255.63 352.016 255.63 353.314V353.321C255.63 354.606 254.659 355.543 253.381 355.543ZM262.233 349.705H261.092L257.975 362.461H259.116L262.233 349.705ZM263.341 360H269.726V358.893H265.05V358.783L267.292 356.466C269.076 354.627 269.562 353.807 269.562 352.679V352.665C269.562 351.072 268.242 349.903 266.52 349.903C264.633 349.903 263.279 351.161 263.272 352.911L263.286 352.918L264.462 352.925L264.469 352.911C264.469 351.749 265.255 350.977 266.438 350.977C267.6 350.977 268.304 351.756 268.304 352.795V352.809C268.304 353.67 267.935 354.183 266.677 355.543L263.341 359.152V360ZM275.092 360.232C277.272 360.232 278.585 358.243 278.585 355.071V355.058C278.585 351.886 277.272 349.903 275.092 349.903C272.911 349.903 271.612 351.886 271.612 355.058V355.071C271.612 358.243 272.911 360.232 275.092 360.232ZM275.092 359.159C273.677 359.159 272.85 357.587 272.85 355.071V355.058C272.85 352.542 273.677 350.983 275.092 350.983C276.507 350.983 277.348 352.542 277.348 355.058V355.071C277.348 357.587 276.507 359.159 275.092 359.159ZM280.608 360H286.993V358.893H282.317V358.783L284.56 356.466C286.344 354.627 286.829 353.807 286.829 352.679V352.665C286.829 351.072 285.51 349.903 283.787 349.903C281.9 349.903 280.547 351.161 280.54 352.911L280.554 352.918L281.729 352.925L281.736 352.911C281.736 351.749 282.522 350.977 283.705 350.977C284.867 350.977 285.571 351.756 285.571 352.795V352.809C285.571 353.67 285.202 354.183 283.944 355.543L280.608 359.152V360ZM289.058 360H295.442V358.893H290.767V358.783L293.009 356.466C294.793 354.627 295.278 353.807 295.278 352.679V352.665C295.278 351.072 293.959 349.903 292.236 349.903C290.35 349.903 288.996 351.161 288.989 352.911L289.003 352.918L290.179 352.925L290.186 352.911C290.186 351.749 290.972 350.977 292.154 350.977C293.316 350.977 294.021 351.756 294.021 352.795V352.809C294.021 353.67 293.651 354.183 292.394 355.543L289.058 359.152V360ZM297.992 354.025H298.977L299.12 350.136H297.849L297.992 354.025ZM300.521 354.025H301.506L301.649 350.136H300.378L300.521 354.025ZM302.6 362.509H303.481L304.555 358.619H303.194L302.6 362.509ZM313.4 360H314.631V350.136H313.407L310.782 352.022V353.321L313.291 351.503H313.4V360ZM320.968 360.232C322.957 360.232 324.42 358.804 324.42 356.835V356.821C324.42 354.928 323.039 353.52 321.187 353.52C319.854 353.52 318.924 354.237 318.562 355.044H318.432C318.432 354.969 318.432 354.887 318.438 354.812C318.514 352.754 319.245 351.004 321.036 351.004C322.034 351.004 322.725 351.517 323.025 352.344L323.053 352.419H324.29L324.27 352.33C323.935 350.874 322.704 349.903 321.05 349.903C318.657 349.903 317.256 351.872 317.256 355.235V355.249C317.256 358.961 319.163 360.232 320.968 360.232ZM318.726 356.821V356.814C318.726 355.529 319.696 354.593 320.975 354.593C322.253 354.593 323.183 355.536 323.183 356.849V356.862C323.183 358.141 322.191 359.146 320.954 359.146C319.703 359.146 318.726 358.12 318.726 356.821ZM327.373 353.308C327.865 353.308 328.262 352.904 328.262 352.419C328.262 351.927 327.865 351.53 327.373 351.53C326.888 351.53 326.484 351.927 326.484 352.419C326.484 352.904 326.888 353.308 327.373 353.308ZM327.373 358.599C327.865 358.599 328.262 358.195 328.262 357.71C328.262 357.218 327.865 356.821 327.373 356.821C326.888 356.821 326.484 357.218 326.484 357.71C326.484 358.195 326.888 358.599 327.373 358.599ZM333.854 360.232C336.034 360.232 337.347 358.243 337.347 355.071V355.058C337.347 351.886 336.034 349.903 333.854 349.903C331.673 349.903 330.374 351.886 330.374 355.058V355.071C330.374 358.243 331.673 360.232 333.854 360.232ZM333.854 359.159C332.438 359.159 331.611 357.587 331.611 355.071V355.058C331.611 352.542 332.438 350.983 333.854 350.983C335.269 350.983 336.109 352.542 336.109 355.058V355.071C336.109 357.587 335.269 359.159 333.854 359.159ZM342.727 360.164C344.702 360.164 346.151 358.947 346.151 357.3V357.286C346.151 355.885 345.174 354.989 343.738 354.866V354.839C344.969 354.579 345.83 353.745 345.83 352.528V352.515C345.83 351.018 344.593 349.972 342.713 349.972C340.867 349.972 339.596 351.045 339.438 352.651L339.432 352.72H340.614L340.621 352.651C340.724 351.653 341.551 351.038 342.713 351.038C343.916 351.038 344.593 351.633 344.593 352.665V352.679C344.593 353.663 343.772 354.388 342.597 354.388H341.414V355.427H342.651C344.032 355.427 344.9 356.104 344.9 357.313V357.327C344.9 358.373 344.019 359.098 342.727 359.098C341.414 359.098 340.519 358.428 340.423 357.457L340.416 357.389H339.233L339.24 357.471C339.37 359.029 340.689 360.164 342.727 360.164ZM349.125 353.308C349.617 353.308 350.014 352.904 350.014 352.419C350.014 351.927 349.617 351.53 349.125 351.53C348.64 351.53 348.236 351.927 348.236 352.419C348.236 352.904 348.64 353.308 349.125 353.308ZM349.125 358.599C349.617 358.599 350.014 358.195 350.014 357.71C350.014 357.218 349.617 356.821 349.125 356.821C348.64 356.821 348.236 357.218 348.236 357.71C348.236 358.195 348.64 358.599 349.125 358.599ZM355.592 360.164C357.567 360.164 359.017 358.947 359.017 357.3V357.286C359.017 355.885 358.039 354.989 356.604 354.866V354.839C357.834 354.579 358.695 353.745 358.695 352.528V352.515C358.695 351.018 357.458 349.972 355.578 349.972C353.732 349.972 352.461 351.045 352.304 352.651L352.297 352.72H353.479L353.486 352.651C353.589 351.653 354.416 351.038 355.578 351.038C356.781 351.038 357.458 351.633 357.458 352.665V352.679C357.458 353.663 356.638 354.388 355.462 354.388H354.279V355.427H355.517C356.897 355.427 357.766 356.104 357.766 357.313V357.327C357.766 358.373 356.884 359.098 355.592 359.098C354.279 359.098 353.384 358.428 353.288 357.457L353.281 357.389H352.099L352.105 357.471C352.235 359.029 353.555 360.164 355.592 360.164ZM364.369 360.164C366.345 360.164 367.794 358.947 367.794 357.3V357.286C367.794 355.885 366.816 354.989 365.381 354.866V354.839C366.611 354.579 367.473 353.745 367.473 352.528V352.515C367.473 351.018 366.235 349.972 364.355 349.972C362.51 349.972 361.238 351.045 361.081 352.651L361.074 352.72H362.257L362.264 352.651C362.366 351.653 363.193 351.038 364.355 351.038C365.559 351.038 366.235 351.633 366.235 352.665V352.679C366.235 353.663 365.415 354.388 364.239 354.388H363.057V355.427H364.294C365.675 355.427 366.543 356.104 366.543 357.313V357.327C366.543 358.373 365.661 359.098 364.369 359.098C363.057 359.098 362.161 358.428 362.065 357.457L362.059 357.389H360.876L360.883 357.471C361.013 359.029 362.332 360.164 364.369 360.164ZM369.38 354.025H370.262L371.335 350.136H369.975L369.38 354.025ZM371.649 354.025H372.531L373.604 350.136H372.244L371.649 354.025ZM171.609 398.025H172.594L172.737 394.136H171.466L171.609 398.025ZM174.139 398.025H175.123L175.267 394.136H173.995L174.139 398.025ZM181.091 404.232C183.08 404.232 184.543 402.804 184.543 400.835V400.821C184.543 398.928 183.162 397.52 181.31 397.52C179.977 397.52 179.047 398.237 178.685 399.044H178.555C178.555 398.969 178.555 398.887 178.562 398.812C178.637 396.754 179.368 395.004 181.159 395.004C182.157 395.004 182.848 395.517 183.148 396.344L183.176 396.419H184.413L184.393 396.33C184.058 394.874 182.827 393.903 181.173 393.903C178.78 393.903 177.379 395.872 177.379 399.235V399.249C177.379 402.961 179.286 404.232 181.091 404.232ZM178.849 400.821V400.814C178.849 399.529 179.819 398.593 181.098 398.593C182.376 398.593 183.306 399.536 183.306 400.849V400.862C183.306 402.141 182.314 403.146 181.077 403.146C179.826 403.146 178.849 402.12 178.849 400.821ZM189.875 404.164C191.851 404.164 193.3 402.947 193.3 401.3V401.286C193.3 399.885 192.322 398.989 190.887 398.866V398.839C192.117 398.579 192.979 397.745 192.979 396.528V396.515C192.979 395.018 191.741 393.972 189.861 393.972C188.016 393.972 186.744 395.045 186.587 396.651L186.58 396.72H187.763L187.77 396.651C187.872 395.653 188.699 395.038 189.861 395.038C191.064 395.038 191.741 395.633 191.741 396.665V396.679C191.741 397.663 190.921 398.388 189.745 398.388H188.562V399.427H189.8C191.181 399.427 192.049 400.104 192.049 401.313V401.327C192.049 402.373 191.167 403.098 189.875 403.098C188.562 403.098 187.667 402.428 187.571 401.457L187.564 401.389H186.382L186.389 401.471C186.519 403.029 187.838 404.164 189.875 404.164ZM199.801 404H201.004V401.956H202.405V400.855H201.004V394.136H199.22C197.839 396.193 196.328 398.6 194.995 400.835V401.956H199.801V404ZM196.253 400.862V400.78C197.326 398.969 198.618 396.932 199.726 395.277H199.808V400.862H196.253ZM204.716 404H206.008L210.396 395.277V394.136H203.868V395.236H209.146V395.332L204.716 404ZM214.614 404.13C216.385 404.13 217.376 403.18 217.677 401.847L217.69 401.771L216.515 401.778L216.501 401.819C216.228 402.64 215.599 403.077 214.607 403.077C213.295 403.077 212.447 401.99 212.447 400.295V400.281C212.447 398.62 213.281 397.554 214.607 397.554C215.667 397.554 216.323 398.142 216.508 398.866L216.515 398.887H217.697L217.69 398.846C217.472 397.533 216.398 396.501 214.607 396.501C212.543 396.501 211.23 397.991 211.23 400.281V400.295C211.23 402.633 212.55 404.13 214.614 404.13ZM222.667 404.232C224.67 404.232 226.099 402.845 226.099 400.855V400.842C226.099 398.935 224.766 397.547 222.913 397.547C222.018 397.547 221.245 397.909 220.808 398.572H220.698L221.033 395.236H225.552V394.136H220.062L219.543 399.803H220.609C220.732 399.57 220.89 399.379 221.061 399.215C221.484 398.812 222.045 398.613 222.701 398.613C223.979 398.613 224.896 399.55 224.896 400.862V400.876C224.896 402.209 223.993 403.146 222.681 403.146C221.525 403.146 220.671 402.394 220.555 401.45L220.548 401.396H219.365L219.372 401.471C219.516 403.05 220.828 404.232 222.667 404.232ZM231.567 404.232C233.557 404.232 235.02 402.804 235.02 400.835V400.821C235.02 398.928 233.639 397.52 231.786 397.52C230.453 397.52 229.523 398.237 229.161 399.044H229.031C229.031 398.969 229.031 398.887 229.038 398.812C229.113 396.754 229.845 395.004 231.636 395.004C232.634 395.004 233.324 395.517 233.625 396.344L233.652 396.419H234.89L234.869 396.33C234.534 394.874 233.304 393.903 231.649 393.903C229.257 393.903 227.855 395.872 227.855 399.235V399.249C227.855 402.961 229.763 404.232 231.567 404.232ZM229.325 400.821V400.814C229.325 399.529 230.296 398.593 231.574 398.593C232.853 398.593 233.782 399.536 233.782 400.849V400.862C233.782 402.141 232.791 403.146 231.554 403.146C230.303 403.146 229.325 402.12 229.325 400.821ZM240.222 393.903C238.232 393.903 236.77 395.332 236.77 397.301V397.314C236.77 399.208 238.15 400.616 240.003 400.616C241.336 400.616 242.266 399.898 242.628 399.092H242.758C242.758 399.167 242.758 399.249 242.751 399.324C242.676 401.382 241.944 403.132 240.153 403.132C239.155 403.132 238.465 402.619 238.164 401.792L238.137 401.717H236.899L236.92 401.806C237.255 403.262 238.485 404.232 240.14 404.232C242.532 404.232 243.934 402.264 243.934 398.9V398.887C243.934 395.175 242.026 393.903 240.222 393.903ZM240.215 399.543C238.937 399.543 238.007 398.6 238.007 397.287V397.273C238.007 395.995 238.998 394.99 240.235 394.99C241.486 394.99 242.464 396.016 242.464 397.314V397.321C242.464 398.606 241.493 399.543 240.215 399.543ZM245.909 404H252.294V402.893H247.618V402.783L249.86 400.466C251.645 398.627 252.13 397.807 252.13 396.679V396.665C252.13 395.072 250.811 393.903 249.088 393.903C247.201 393.903 245.848 395.161 245.841 396.911L245.854 396.918L247.03 396.925L247.037 396.911C247.037 395.749 247.823 394.977 249.006 394.977C250.168 394.977 250.872 395.756 250.872 396.795V396.809C250.872 397.67 250.503 398.183 249.245 399.543L245.909 403.152V404ZM257.305 404.13C259.041 404.13 260.094 403.146 260.347 402.147L260.36 402.093H259.171L259.144 402.154C258.945 402.599 258.33 403.07 257.332 403.07C256.02 403.07 255.179 402.182 255.145 400.657H260.449V400.192C260.449 397.991 259.232 396.501 257.229 396.501C255.227 396.501 253.928 398.06 253.928 400.336V400.343C253.928 402.653 255.199 404.13 257.305 404.13ZM257.223 397.561C258.31 397.561 259.116 398.251 259.239 399.707H255.165C255.295 398.306 256.129 397.561 257.223 397.561ZM265.303 404.13C267.039 404.13 268.092 403.146 268.345 402.147L268.358 402.093H267.169L267.142 402.154C266.943 402.599 266.328 403.07 265.33 403.07C264.018 403.07 263.177 402.182 263.143 400.657H268.447V400.192C268.447 397.991 267.23 396.501 265.228 396.501C263.225 396.501 261.926 398.06 261.926 400.336V400.343C261.926 402.653 263.197 404.13 265.303 404.13ZM265.221 397.561C266.308 397.561 267.114 398.251 267.237 399.707H263.163C263.293 398.306 264.127 397.561 265.221 397.561ZM270.423 404H271.715L276.104 395.277V394.136H269.575V395.236H274.853V395.332L270.423 404ZM278.667 404H279.959L284.348 395.277V394.136H277.819V395.236H283.097V395.332L278.667 404ZM286.228 404H292.612V402.893H287.937V402.783L290.179 400.466C291.963 398.627 292.448 397.807 292.448 396.679V396.665C292.448 395.072 291.129 393.903 289.406 393.903C287.52 393.903 286.166 395.161 286.159 396.911L286.173 396.918L287.349 396.925L287.355 396.911C287.355 395.749 288.142 394.977 289.324 394.977C290.486 394.977 291.19 395.756 291.19 396.795V396.809C291.19 397.67 290.821 398.183 289.563 399.543L286.228 403.152V404ZM297.917 404.232C299.92 404.232 301.349 402.845 301.349 400.855V400.842C301.349 398.935 300.016 397.547 298.163 397.547C297.268 397.547 296.495 397.909 296.058 398.572H295.948L296.283 395.236H300.802V394.136H295.312L294.793 399.803H295.859C295.982 399.57 296.14 399.379 296.311 399.215C296.734 398.812 297.295 398.613 297.951 398.613C299.229 398.613 300.146 399.55 300.146 400.862V400.876C300.146 402.209 299.243 403.146 297.931 403.146C296.775 403.146 295.921 402.394 295.805 401.45L295.798 401.396H294.615L294.622 401.471C294.766 403.05 296.078 404.232 297.917 404.232ZM305.361 404.13C306.353 404.13 307.125 403.699 307.59 402.913H307.699V404H308.889V398.955C308.889 397.424 307.884 396.501 306.086 396.501C304.514 396.501 303.393 397.28 303.201 398.436L303.194 398.477H304.384L304.391 398.456C304.582 397.882 305.163 397.554 306.045 397.554C307.146 397.554 307.699 398.046 307.699 398.955V399.625L305.587 399.755C303.871 399.857 302.9 400.616 302.9 401.929V401.942C302.9 403.282 303.96 404.13 305.361 404.13ZM304.117 401.915V401.901C304.117 401.17 304.609 400.773 305.73 400.705L307.699 400.582V401.252C307.699 402.305 306.817 403.098 305.607 403.098C304.753 403.098 304.117 402.66 304.117 401.915ZM314.426 404.164C316.518 404.164 318.008 402.988 318.008 401.334V401.32C318.008 400.104 317.153 399.092 315.889 398.798V398.771C316.969 398.436 317.652 397.615 317.652 396.576V396.562C317.652 395.072 316.292 393.972 314.426 393.972C312.56 393.972 311.199 395.072 311.199 396.562V396.576C311.199 397.615 311.883 398.436 312.963 398.771V398.798C311.698 399.092 310.844 400.104 310.844 401.32V401.334C310.844 402.988 312.334 404.164 314.426 404.164ZM314.426 398.312C313.236 398.312 312.423 397.636 312.423 396.679V396.665C312.423 395.708 313.236 395.031 314.426 395.031C315.615 395.031 316.429 395.708 316.429 396.665V396.679C316.429 397.636 315.615 398.312 314.426 398.312ZM314.426 403.091C313.065 403.091 312.095 402.325 312.095 401.259V401.245C312.095 400.165 313.059 399.393 314.426 399.393C315.793 399.393 316.757 400.165 316.757 401.245V401.259C316.757 402.325 315.786 403.091 314.426 403.091ZM322.41 404H323.641V394.136H322.417L319.792 396.022V397.321L322.301 395.503H322.41V404ZM329.861 404.164C331.953 404.164 333.443 402.988 333.443 401.334V401.32C333.443 400.104 332.589 399.092 331.324 398.798V398.771C332.404 398.436 333.088 397.615 333.088 396.576V396.562C333.088 395.072 331.728 393.972 329.861 393.972C327.995 393.972 326.635 395.072 326.635 396.562V396.576C326.635 397.615 327.318 398.436 328.398 398.771V398.798C327.134 399.092 326.279 400.104 326.279 401.32V401.334C326.279 402.988 327.77 404.164 329.861 404.164ZM329.861 398.312C328.672 398.312 327.858 397.636 327.858 396.679V396.665C327.858 395.708 328.672 395.031 329.861 395.031C331.051 395.031 331.864 395.708 331.864 396.665V396.679C331.864 397.636 331.051 398.312 329.861 398.312ZM329.861 403.091C328.501 403.091 327.53 402.325 327.53 401.259V401.245C327.53 400.165 328.494 399.393 329.861 399.393C331.229 399.393 332.192 400.165 332.192 401.245V401.259C332.192 402.325 331.222 403.091 329.861 403.091ZM338.803 404.164C340.895 404.164 342.385 402.988 342.385 401.334V401.32C342.385 400.104 341.53 399.092 340.266 398.798V398.771C341.346 398.436 342.029 397.615 342.029 396.576V396.562C342.029 395.072 340.669 393.972 338.803 393.972C336.937 393.972 335.576 395.072 335.576 396.562V396.576C335.576 397.615 336.26 398.436 337.34 398.771V398.798C336.075 399.092 335.221 400.104 335.221 401.32V401.334C335.221 402.988 336.711 404.164 338.803 404.164ZM338.803 398.312C337.613 398.312 336.8 397.636 336.8 396.679V396.665C336.8 395.708 337.613 395.031 338.803 395.031C339.992 395.031 340.806 395.708 340.806 396.665V396.679C340.806 397.636 339.992 398.312 338.803 398.312ZM338.803 403.091C337.442 403.091 336.472 402.325 336.472 401.259V401.245C336.472 400.165 337.436 399.393 338.803 399.393C340.17 399.393 341.134 400.165 341.134 401.245V401.259C341.134 402.325 340.163 403.091 338.803 403.091ZM346.787 404H348.018V394.136H346.794L344.169 396.022V397.321L346.678 395.503H346.787V404ZM351.08 398.025H352.064L352.208 394.136H350.937L351.08 398.025ZM353.609 398.025H354.594L354.737 394.136H353.466L353.609 398.025ZM355.688 406.509H356.569L357.643 402.619H356.282L355.688 406.509ZM188.781 420.025H189.766L189.909 416.136H188.638L188.781 420.025ZM191.311 420.025H192.295L192.438 416.136H191.167L191.311 420.025ZM193.259 426H194.551L195.542 423.177H199.466L200.457 426H201.749L198.112 416.136H196.896L193.259 426ZM197.449 417.729H197.559L199.104 422.131H195.904L197.449 417.729ZM203.328 428.461H204.518V424.838H204.627C205.03 425.624 205.912 426.13 206.924 426.13C208.797 426.13 210.014 424.633 210.014 422.322V422.309C210.014 420.012 208.79 418.501 206.924 418.501C205.898 418.501 205.078 418.986 204.627 419.807H204.518V418.631H203.328V428.461ZM206.65 425.077C205.311 425.077 204.49 424.024 204.49 422.322V422.309C204.49 420.606 205.311 419.554 206.65 419.554C207.997 419.554 208.797 420.593 208.797 422.309V422.322C208.797 424.038 207.997 425.077 206.65 425.077ZM211.873 428.461H213.062V424.838H213.172C213.575 425.624 214.457 426.13 215.469 426.13C217.342 426.13 218.559 424.633 218.559 422.322V422.309C218.559 420.012 217.335 418.501 215.469 418.501C214.443 418.501 213.623 418.986 213.172 419.807H213.062V418.631H211.873V428.461ZM215.195 425.077C213.855 425.077 213.035 424.024 213.035 422.322V422.309C213.035 420.606 213.855 419.554 215.195 419.554C216.542 419.554 217.342 420.593 217.342 422.309V422.322C217.342 424.038 216.542 425.077 215.195 425.077ZM220.486 426H221.676V415.705H220.486V426ZM224.588 417.209C225.039 417.209 225.408 416.84 225.408 416.389C225.408 415.938 225.039 415.568 224.588 415.568C224.137 415.568 223.768 415.938 223.768 416.389C223.768 416.84 224.137 417.209 224.588 417.209ZM223.986 426H225.176V418.631H223.986V426ZM230.433 426.13C232.203 426.13 233.194 425.18 233.495 423.847L233.509 423.771L232.333 423.778L232.319 423.819C232.046 424.64 231.417 425.077 230.426 425.077C229.113 425.077 228.266 423.99 228.266 422.295V422.281C228.266 420.62 229.1 419.554 230.426 419.554C231.485 419.554 232.142 420.142 232.326 420.866L232.333 420.887H233.516L233.509 420.846C233.29 419.533 232.217 418.501 230.426 418.501C228.361 418.501 227.049 419.991 227.049 422.281V422.295C227.049 424.633 228.368 426.13 230.433 426.13ZM237.275 426.13C238.267 426.13 239.039 425.699 239.504 424.913H239.613V426H240.803V420.955C240.803 419.424 239.798 418.501 238 418.501C236.428 418.501 235.307 419.28 235.115 420.436L235.108 420.477H236.298L236.305 420.456C236.496 419.882 237.077 419.554 237.959 419.554C239.06 419.554 239.613 420.046 239.613 420.955V421.625L237.501 421.755C235.785 421.857 234.814 422.616 234.814 423.929V423.942C234.814 425.282 235.874 426.13 237.275 426.13ZM236.031 423.915V423.901C236.031 423.17 236.523 422.773 237.645 422.705L239.613 422.582V423.252C239.613 424.305 238.731 425.098 237.521 425.098C236.667 425.098 236.031 424.66 236.031 423.915ZM245.595 426.055C245.827 426.055 246.053 426.027 246.285 425.986V424.975C246.066 424.995 245.95 425.002 245.738 425.002C244.973 425.002 244.672 424.653 244.672 423.785V419.615H246.285V418.631H244.672V416.724H243.441V418.631H242.279V419.615H243.441V424.086C243.441 425.494 244.077 426.055 245.595 426.055ZM248.691 417.209C249.143 417.209 249.512 416.84 249.512 416.389C249.512 415.938 249.143 415.568 248.691 415.568C248.24 415.568 247.871 415.938 247.871 416.389C247.871 416.84 248.24 417.209 248.691 417.209ZM248.09 426H249.279V418.631H248.09V426ZM254.55 426.13C256.648 426.13 257.947 424.681 257.947 422.322V422.309C257.947 419.943 256.648 418.501 254.55 418.501C252.451 418.501 251.152 419.943 251.152 422.309V422.322C251.152 424.681 252.451 426.13 254.55 426.13ZM254.55 425.077C253.155 425.077 252.369 424.059 252.369 422.322V422.309C252.369 420.565 253.155 419.554 254.55 419.554C255.944 419.554 256.73 420.565 256.73 422.309V422.322C256.73 424.059 255.944 425.077 254.55 425.077ZM259.793 426H260.982V421.639C260.982 420.347 261.728 419.554 262.903 419.554C264.079 419.554 264.626 420.189 264.626 421.516V426H265.815V421.229C265.815 419.479 264.893 418.501 263.238 418.501C262.151 418.501 261.461 418.959 261.092 419.738H260.982V418.631H259.793V426ZM268.447 420.025H269.432L269.575 416.136H268.304L268.447 420.025ZM270.977 420.025H271.961L272.104 416.136H270.833L270.977 420.025ZM273.055 428.509H273.937L275.01 424.619H273.649L273.055 428.509Z" fill="#D15420"/> +</g> +<line x1="85.5" y1="320" x2="85.5" y2="430" stroke="#E7E7E7"/> +<line x1="105.5" y1="388" x2="105.5" y2="430" stroke="#E7E7E7"/> +<path d="M75 235L70 230L80 230L75 235Z" fill="#575757"/> </g> <defs> -<filter id="filter0_d_625_11871" x="68" y="23" width="679" height="511" 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 dy="10"/> -<feGaussianBlur stdDeviation="10"/> -<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.11 0"/> -<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_625_11871"/> -<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_625_11871" result="shape"/> -</filter> -<filter id="filter1_d_625_11871" x="68" y="23" width="679" height="511" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"> +<filter id="filter0_d_625_11871" x="67" y="35" width="679" height="511" 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 dy="10"/> @@ -348,17 +122,7 @@ <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_625_11871"/> <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_625_11871" result="shape"/> </filter> -<filter id="filter2_d_625_11871" x="-14" y="184" width="861" height="333" 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 dy="24"/> -<feGaussianBlur stdDeviation="32"/> -<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.13 0"/> -<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_625_11871"/> -<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_625_11871" result="shape"/> -</filter> -<filter id="filter3_d_625_11871" x="-14" y="184" width="861" height="333" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"> +<filter id="filter1_d_625_11871" x="-13" y="165" width="861" height="371" 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 dy="24"/> @@ -372,10 +136,16 @@ <rect width="725" height="537" fill="white"/> </clipPath> <clipPath id="clip1_625_11871"> -<rect width="24" height="24" fill="white" transform="translate(66 237.4)"/> +<rect width="16" height="16" fill="white" transform="translate(71 261.488)"/> </clipPath> <clipPath id="clip2_625_11871"> -<rect width="650" height="138" fill="white" transform="translate(66 275)"/> +<rect width="16" height="16" fill="white" transform="translate(361 261.488)"/> +</clipPath> +<clipPath id="clip3_625_11871"> +<rect width="16" height="16" fill="white" transform="translate(641 261.488)"/> +</clipPath> +<clipPath id="clip4_625_11871"> +<rect width="661" height="138" fill="white" transform="translate(67 292)"/> </clipPath> </defs> </svg> diff --git a/app/client/src/assets/svg/upgrade/audit-logs/security-and-compliance.svg b/app/client/src/assets/svg/upgrade/audit-logs/security-and-compliance.svg index 69ece50ed883..559fd08b55ed 100644 --- a/app/client/src/assets/svg/upgrade/audit-logs/security-and-compliance.svg +++ b/app/client/src/assets/svg/upgrade/audit-logs/security-and-compliance.svg @@ -1,159 +1,78 @@ -<svg width="725" height="537" viewBox="0 0 725 537" fill="none" xmlns="http://www.w3.org/2000/svg"> +<svg width="734" height="537" viewBox="0 0 734 537" fill="none" xmlns="http://www.w3.org/2000/svg"> <g clip-path="url(#clip0_625_11711)"> <g filter="url(#filter0_d_625_11711)"> -<path d="M86 33H725V504H86V33Z" fill="white"/> +<rect x="98" y="40" width="639" height="471" fill="white"/> +<rect x="98.5" y="40.5" width="638" height="470" stroke="#E7E7E7"/> </g> -<g filter="url(#filter1_d_625_11711)"> -<path fill-rule="evenodd" clip-rule="evenodd" d="M724 34H87V503H724V34ZM86 33V504H725V33H86Z" fill="#E7E7E7"/> -</g> -<path d="M146 137C146 141.971 141.971 146 137 146C132.029 146 128 141.971 128 137C128 132.029 132.029 128 137 128C141.971 128 146 132.029 146 137Z" fill="#FFDEDE"/> +<circle cx="149" cy="144" r="9" fill="#FFDEDE"/> <g opacity="0.7"> -<path d="M176 133H327.334V141.294H176V133Z" fill="#D9D9D9"/> -<path d="M349.83 133H566.606V141.294H349.83V133Z" fill="#D9D9D9"/> -<path d="M645 133H589.102V141.294H645V133Z" fill="#D9D9D9"/> +<rect x="188" y="140" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="361.83" y="140" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 657 140)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M176 170H327.334V178.294H176V170Z" fill="#D9D9D9"/> -<path d="M349.83 170H566.606V178.294H349.83V170Z" fill="#D9D9D9"/> -<path d="M645 170H589.102V178.294H645V170Z" fill="#D9D9D9"/> +<rect x="188" y="177" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="361.83" y="177" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 657 177)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M176 207H327.334V215.294H176V207Z" fill="#D9D9D9"/> -<path d="M349.83 207H566.606V215.294H349.83V207Z" fill="#D9D9D9"/> -<path d="M645 207H589.102V215.294H645V207Z" fill="#D9D9D9"/> +<rect x="188" y="214" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="361.83" y="214" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 657 214)" fill="#D9D9D9"/> </g> -<path d="M145 209C145 213.971 140.971 218 136 218C131.029 218 127 213.971 127 209C127 204.029 131.029 200 136 200C140.971 200 145 204.029 145 209Z" fill="#FFDEDE"/> -<path d="M145 285C145 289.971 140.971 294 136 294C131.029 294 127 289.971 127 285C127 280.029 131.029 276 136 276C140.971 276 145 280.029 145 285Z" fill="#FFDEDE"/> -<path d="M145 322C145 326.971 140.971 331 136 331C131.029 331 127 326.971 127 322C127 317.029 131.029 313 136 313C140.971 313 145 317.029 145 322Z" fill="#FFDEDE"/> -<path d="M145 359C145 363.971 140.971 368 136 368C131.029 368 127 363.971 127 359C127 354.029 131.029 350 136 350C140.971 350 145 354.029 145 359Z" fill="#FFDEDE"/> -<path d="M145 396C145 400.971 140.971 405 136 405C131.029 405 127 400.971 127 396C127 391.029 131.029 387 136 387C140.971 387 145 391.029 145 396Z" fill="#FFDEDE"/> -<path d="M145 433C145 437.971 140.971 442 136 442C131.029 442 127 437.971 127 433C127 428.029 131.029 424 136 424C140.971 424 145 428.029 145 433Z" fill="#FFDEDE"/> -<path d="M145 470C145 474.971 140.971 479 136 479C131.029 479 127 474.971 127 470C127 465.029 131.029 461 136 461C140.971 461 145 465.029 145 470Z" fill="#FFDEDE"/> +<circle cx="148" cy="216" r="9" fill="#FFDEDE"/> +<circle cx="148" cy="292" r="9" fill="#FFDEDE"/> +<circle cx="148" cy="329" r="9" fill="#FFDEDE"/> +<circle cx="148" cy="366" r="9" fill="#FFDEDE"/> +<circle cx="148" cy="403" r="9" fill="#FFDEDE"/> +<circle cx="148" cy="440" r="9" fill="#FFDEDE"/> +<circle cx="148" cy="477" r="9" fill="#FFDEDE"/> <g opacity="0.7"> -<path d="M176 281H327.334V289.294H176V281Z" fill="#D9D9D9"/> -<path d="M349.83 281H566.606V289.294H349.83V281Z" fill="#D9D9D9"/> -<path d="M645 281H589.102V289.294H645V281Z" fill="#D9D9D9"/> +<rect x="188" y="288" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="361.83" y="288" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 657 288)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M176 318H327.334V326.294H176V318Z" fill="#D9D9D9"/> -<path d="M349.83 318H566.606V326.294H349.83V318Z" fill="#D9D9D9"/> -<path d="M645 318H589.102V326.294H645V318Z" fill="#D9D9D9"/> +<rect x="188" y="325" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="361.83" y="325" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 657 325)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M176 355H327.334V363.294H176V355Z" fill="#D9D9D9"/> -<path d="M349.83 355H566.606V363.294H349.83V355Z" fill="#D9D9D9"/> -<path d="M645 355H589.102V363.294H645V355Z" fill="#D9D9D9"/> +<rect x="188" y="362" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="361.83" y="362" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 657 362)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M176 392H327.334V400.294H176V392Z" fill="#D9D9D9"/> -<path d="M349.83 392H566.606V400.294H349.83V392Z" fill="#D9D9D9"/> -<path d="M645 392H589.102V400.294H645V392Z" fill="#D9D9D9"/> +<rect x="188" y="399" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="361.83" y="399" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 657 399)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M176 429H327.334V437.294H176V429Z" fill="#D9D9D9"/> -<path d="M349.83 429H566.606V437.294H349.83V429Z" fill="#D9D9D9"/> -<path d="M645 429H589.102V437.294H645V429Z" fill="#D9D9D9"/> +<rect x="188" y="436" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="361.83" y="436" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 657 436)" fill="#D9D9D9"/> </g> <g opacity="0.7"> -<path d="M176 466H327.334V474.294H176V466Z" fill="#D9D9D9"/> -<path d="M349.83 466H566.606V474.294H349.83V466Z" fill="#D9D9D9"/> -<path d="M645 466H589.102V474.294H645V466Z" fill="#D9D9D9"/> -</g> -<path d="M132.128 89.0002H128.613L135.013 70.8184H139.08L145.489 89.0002H141.974L137.118 74.5471H136.975L132.128 89.0002ZM132.244 81.8713H141.832V84.5169H132.244V81.8713Z" fill="#393939"/> -<path d="M156.433 83.2651V75.3638H159.647V89.0002H156.531V86.5765H156.389C156.081 87.34 155.575 87.9644 154.871 88.4498C154.173 88.9351 153.311 89.1777 152.288 89.1777C151.394 89.1777 150.604 88.9795 149.917 88.5829C149.237 88.1805 148.704 87.5975 148.319 86.834C147.934 86.0646 147.742 85.1354 147.742 84.0463V75.3638H150.956V83.5492C150.956 84.4133 151.193 85.0998 151.666 85.6088C152.14 86.1178 152.761 86.3723 153.53 86.3723C154.004 86.3723 154.463 86.2569 154.906 86.0261C155.35 85.7953 155.714 85.452 155.998 84.9963C156.288 84.5346 156.433 83.9576 156.433 83.2651Z" fill="#393939"/> -<path d="M168.012 89.2399C166.941 89.2399 165.982 88.9647 165.136 88.4142C164.29 87.8638 163.621 87.0648 163.13 86.0172C162.638 84.9696 162.393 83.6971 162.393 82.1998C162.393 80.6846 162.641 79.4062 163.138 78.3645C163.642 77.3169 164.319 76.5268 165.171 75.9941C166.024 75.4556 166.974 75.1863 168.021 75.1863C168.82 75.1863 169.477 75.3224 169.992 75.5946C170.507 75.861 170.915 76.1835 171.217 76.5623C171.519 76.9352 171.753 77.2873 171.919 77.6188H172.052V70.8184H175.274V89.0002H172.114V86.8517H171.919C171.753 87.1832 171.513 87.5353 171.2 87.9082C170.886 88.2752 170.472 88.5888 169.957 88.8493C169.442 89.1097 168.794 89.2399 168.012 89.2399ZM168.909 86.6032C169.59 86.6032 170.17 86.4197 170.649 86.0527C171.129 85.6799 171.493 85.162 171.741 84.4991C171.99 83.8362 172.114 83.0639 172.114 82.182C172.114 81.3001 171.99 80.5337 171.741 79.8826C171.498 79.2316 171.137 78.7256 170.658 78.3645C170.185 78.0035 169.602 77.823 168.909 77.823C168.193 77.823 167.595 78.0094 167.116 78.3823C166.636 78.7551 166.275 79.2701 166.033 79.927C165.79 80.584 165.669 81.3356 165.669 82.182C165.669 83.0343 165.79 83.7948 166.033 84.4636C166.281 85.1265 166.645 85.6503 167.125 86.035C167.61 86.4138 168.205 86.6032 168.909 86.6032Z" fill="#393939"/> -<path d="M178.699 89.0002V75.3638H181.913V89.0002H178.699ZM180.315 73.4284C179.806 73.4284 179.368 73.2598 179.001 72.9224C178.634 72.5791 178.451 72.1678 178.451 71.6884C178.451 71.2031 178.634 70.7917 179.001 70.4544C179.368 70.1111 179.806 69.9395 180.315 69.9395C180.83 69.9395 181.268 70.1111 181.629 70.4544C181.996 70.7917 182.179 71.2031 182.179 71.6884C182.179 72.1678 181.996 72.5791 181.629 72.9224C181.268 73.2598 180.83 73.4284 180.315 73.4284Z" fill="#393939"/> -<path d="M192.027 75.3638V77.8496H184.188V75.3638H192.027ZM186.123 72.0968H189.337V84.8986C189.337 85.3307 189.402 85.6621 189.532 85.8929C189.668 86.1178 189.846 86.2717 190.065 86.3546C190.284 86.4374 190.527 86.4789 190.793 86.4789C190.994 86.4789 191.178 86.4641 191.343 86.4345C191.515 86.4049 191.645 86.3783 191.734 86.3546L192.276 88.867C192.104 88.9262 191.858 88.9913 191.539 89.0623C191.225 89.1333 190.84 89.1748 190.385 89.1866C189.58 89.2103 188.855 89.089 188.209 88.8226C187.564 88.5504 187.052 88.1302 186.674 87.562C186.301 86.9938 186.117 86.2836 186.123 85.4313V72.0968Z" fill="#393939"/> -<path d="M201.058 89.0002V70.8184H204.352V86.2392H212.359V89.0002H201.058Z" fill="#393939"/> -<path d="M221.024 89.2665C219.693 89.2665 218.538 88.9735 217.562 88.3876C216.585 87.8017 215.828 86.9819 215.289 85.9284C214.756 84.8749 214.49 83.6439 214.49 82.2353C214.49 80.8266 214.756 79.5926 215.289 78.5332C215.828 77.4738 216.585 76.6511 217.562 76.0652C218.538 75.4792 219.693 75.1863 221.024 75.1863C222.356 75.1863 223.51 75.4792 224.487 76.0652C225.463 76.6511 226.218 77.4738 226.75 78.5332C227.289 79.5926 227.558 80.8266 227.558 82.2353C227.558 83.6439 227.289 84.8749 226.75 85.9284C226.218 86.9819 225.463 87.8017 224.487 88.3876C223.51 88.9735 222.356 89.2665 221.024 89.2665ZM221.042 86.6919C221.764 86.6919 222.368 86.4937 222.853 86.0971C223.338 85.6947 223.699 85.1561 223.936 84.4814C224.179 83.8066 224.3 83.055 224.3 82.2264C224.3 81.3919 224.179 80.6373 223.936 79.9625C223.699 79.2819 223.338 78.7404 222.853 78.3379C222.368 77.9354 221.764 77.7342 221.042 77.7342C220.302 77.7342 219.687 77.9354 219.195 78.3379C218.71 78.7404 218.346 79.2819 218.103 79.9625C217.867 80.6373 217.748 81.3919 217.748 82.2264C217.748 83.055 217.867 83.8066 218.103 84.4814C218.346 85.1561 218.71 85.6947 219.195 86.0971C219.687 86.4937 220.302 86.6919 221.042 86.6919Z" fill="#393939"/> -<path d="M236.216 94.3979C235.062 94.3979 234.071 94.2411 233.242 93.9274C232.414 93.6196 231.748 93.2053 231.245 92.6845C230.742 92.1636 230.393 91.5866 230.197 90.9533L233.091 90.252C233.222 90.5183 233.411 90.7817 233.66 91.0421C233.908 91.3084 234.243 91.5274 234.663 91.699C235.089 91.8766 235.625 91.9654 236.27 91.9654C237.181 91.9654 237.936 91.7434 238.534 91.2995C239.131 90.8616 239.43 90.1395 239.43 89.1333V86.5499H239.27C239.105 86.8813 238.862 87.2217 238.542 87.5708C238.229 87.92 237.811 88.213 237.291 88.4498C236.776 88.6865 236.128 88.8049 235.346 88.8049C234.299 88.8049 233.349 88.5592 232.497 88.068C231.65 87.5708 230.976 86.831 230.472 85.8485C229.975 84.8601 229.727 83.6232 229.727 82.1376C229.727 80.6402 229.975 79.3766 230.472 78.3468C230.976 77.311 231.653 76.5268 232.505 75.9941C233.358 75.4556 234.308 75.1863 235.355 75.1863C236.154 75.1863 236.811 75.3224 237.326 75.5946C237.847 75.861 238.261 76.1835 238.569 76.5623C238.877 76.9352 239.111 77.2873 239.27 77.6188H239.448V75.3638H242.617V89.2221C242.617 90.3881 242.339 91.3528 241.783 92.1163C241.226 92.8798 240.466 93.4509 239.501 93.8297C238.536 94.2085 237.442 94.3979 236.216 94.3979ZM236.243 86.2836C236.924 86.2836 237.504 86.1178 237.983 85.7864C238.463 85.455 238.827 84.9785 239.075 84.3571C239.324 83.7356 239.448 82.9899 239.448 82.1199C239.448 81.2617 239.324 80.51 239.075 79.8649C238.832 79.2198 238.471 78.7196 237.992 78.3645C237.519 78.0035 236.936 77.823 236.243 77.823C235.527 77.823 234.929 78.0094 234.45 78.3823C233.97 78.7551 233.609 79.2671 233.367 79.9181C233.124 80.5633 233.003 81.2972 233.003 82.1199C233.003 82.9544 233.124 83.6853 233.367 84.3127C233.615 84.9341 233.979 85.4194 234.459 85.7686C234.944 86.1119 235.539 86.2836 236.243 86.2836Z" fill="#393939"/> -<path d="M256.689 78.9682L253.759 79.2878C253.676 78.9919 253.531 78.7137 253.324 78.4533C253.123 78.1929 252.851 77.9828 252.507 77.823C252.164 77.6632 251.744 77.5833 251.247 77.5833C250.578 77.5833 250.016 77.7283 249.56 78.0183C249.11 78.3083 248.888 78.6841 248.894 79.1458C248.888 79.5423 249.033 79.8649 249.329 80.1135C249.631 80.362 250.128 80.5662 250.82 80.726L253.146 81.2232C254.437 81.5014 255.396 81.9423 256.023 82.546C256.656 83.1497 256.976 83.9398 256.982 84.9164C256.976 85.7746 256.724 86.5321 256.227 87.1891C255.736 87.8401 255.052 88.3491 254.176 88.7161C253.3 89.083 252.294 89.2665 251.158 89.2665C249.489 89.2665 248.145 88.9173 247.127 88.2189C246.109 87.5146 245.503 86.5351 245.307 85.2804L248.441 84.9785C248.583 85.594 248.885 86.0587 249.347 86.3723C249.808 86.686 250.409 86.8429 251.149 86.8429C251.912 86.8429 252.525 86.686 252.987 86.3723C253.454 86.0587 253.688 85.671 253.688 85.2093C253.688 84.8187 253.537 84.4962 253.235 84.2417C252.939 83.9872 252.478 83.7918 251.85 83.6557L249.524 83.1674C248.216 82.8952 247.249 82.4365 246.621 81.7914C245.994 81.1403 245.683 80.3176 245.689 79.3233C245.683 78.4829 245.911 77.7549 246.373 77.1394C246.84 76.5179 247.488 76.0385 248.317 75.7012C249.151 75.3579 250.113 75.1863 251.202 75.1863C252.8 75.1863 254.058 75.5266 254.975 76.2072C255.899 76.8878 256.47 77.8082 256.689 78.9682Z" fill="#393939"/> -<g filter="url(#filter2_d_625_11711)"> -<path d="M41 221H774V273H41V221Z" fill="white"/> +<rect x="188" y="473" width="151.334" height="8.29379" fill="#D9D9D9"/> +<rect x="361.83" y="473" width="216.776" height="8.29379" fill="#D9D9D9"/> +<rect width="55.8983" height="8.29379" transform="matrix(-1 0 0 1 657 473)" fill="#D9D9D9"/> </g> -<g filter="url(#filter3_d_625_11711)"> -<path fill-rule="evenodd" clip-rule="evenodd" d="M773 222H42V272H773V222ZM41 221V273H774V221H41Z" fill="#E7E7E7"/> +<path d="M144.128 96H140.613L147.013 77.8182H151.08L157.489 96H153.974L149.118 81.5469H148.975L144.128 96ZM144.244 88.8711H153.832V91.5167H144.244V88.8711ZM168.434 90.2649V82.3636H171.647V96H168.531V93.5763H168.389C168.081 94.3398 167.575 94.9643 166.871 95.4496C166.173 95.9349 165.311 96.1776 164.288 96.1776C163.394 96.1776 162.604 95.9793 161.917 95.5827C161.237 95.1803 160.704 94.5973 160.319 93.8338C159.934 93.0644 159.742 92.1352 159.742 91.0462V82.3636H162.956V90.549C162.956 91.4131 163.193 92.0997 163.666 92.6087C164.14 93.1177 164.761 93.3722 165.53 93.3722C166.004 93.3722 166.463 93.2567 166.907 93.0259C167.35 92.7951 167.714 92.4518 167.998 91.9961C168.289 91.5344 168.434 90.9574 168.434 90.2649ZM180.012 96.2397C178.941 96.2397 177.982 95.9645 177.136 95.4141C176.29 94.8636 175.621 94.0646 175.13 93.017C174.638 91.9695 174.393 90.697 174.393 89.1996C174.393 87.6844 174.641 86.406 175.138 85.3643C175.642 84.3168 176.319 83.5266 177.172 82.994C178.024 82.4554 178.974 82.1861 180.021 82.1861C180.82 82.1861 181.477 82.3222 181.992 82.5945C182.507 82.8608 182.915 83.1834 183.217 83.5621C183.519 83.935 183.753 84.2872 183.919 84.6186H184.052V77.8182H187.275V96H184.114V93.8516H183.919C183.753 94.183 183.513 94.5352 183.2 94.908C182.886 95.275 182.472 95.5887 181.957 95.8491C181.442 96.1095 180.794 96.2397 180.012 96.2397ZM180.909 93.603C181.59 93.603 182.17 93.4195 182.649 93.0526C183.129 92.6797 183.493 92.1618 183.741 91.4989C183.99 90.8361 184.114 90.0637 184.114 89.1818C184.114 88.3 183.99 87.5335 183.741 86.8825C183.498 86.2314 183.137 85.7254 182.658 85.3643C182.185 85.0033 181.602 84.8228 180.909 84.8228C180.193 84.8228 179.595 85.0092 179.116 85.3821C178.636 85.755 178.275 86.2699 178.033 86.9268C177.79 87.5838 177.669 88.3355 177.669 89.1818C177.669 90.0341 177.79 90.7946 178.033 91.4634C178.281 92.1263 178.645 92.6501 179.125 93.0348C179.61 93.4136 180.205 93.603 180.909 93.603ZM190.699 96V82.3636H193.913V96H190.699ZM192.315 80.4283C191.806 80.4283 191.368 80.2596 191.001 79.9222C190.634 79.579 190.451 79.1676 190.451 78.6882C190.451 78.2029 190.634 77.7915 191.001 77.4542C191.368 77.1109 191.806 76.9393 192.315 76.9393C192.83 76.9393 193.268 77.1109 193.629 77.4542C193.996 77.7915 194.179 78.2029 194.179 78.6882C194.179 79.1676 193.996 79.579 193.629 79.9222C193.268 80.2596 192.83 80.4283 192.315 80.4283ZM204.027 82.3636V84.8494H196.188V82.3636H204.027ZM198.123 79.0966H201.337V91.8984C201.337 92.3305 201.402 92.6619 201.532 92.8928C201.668 93.1177 201.846 93.2715 202.065 93.3544C202.284 93.4373 202.527 93.4787 202.793 93.4787C202.994 93.4787 203.178 93.4639 203.343 93.4343C203.515 93.4047 203.645 93.3781 203.734 93.3544L204.276 95.8668C204.104 95.926 203.858 95.9911 203.539 96.0621C203.225 96.1332 202.84 96.1746 202.385 96.1864C201.58 96.2101 200.855 96.0888 200.21 95.8224C199.564 95.5502 199.052 95.13 198.674 94.5618C198.301 93.9936 198.117 93.2834 198.123 92.4311V79.0966ZM213.058 96V77.8182H216.352V93.239H224.359V96H213.058ZM233.024 96.2663C231.693 96.2663 230.538 95.9734 229.562 95.3874C228.585 94.8015 227.828 93.9818 227.289 92.9283C226.756 91.8748 226.49 90.6437 226.49 89.2351C226.49 87.8265 226.756 86.5924 227.289 85.533C227.828 84.4736 228.585 83.6509 229.562 83.065C230.538 82.479 231.693 82.1861 233.024 82.1861C234.356 82.1861 235.51 82.479 236.487 83.065C237.463 83.6509 238.218 84.4736 238.75 85.533C239.289 86.5924 239.558 87.8265 239.558 89.2351C239.558 90.6437 239.289 91.8748 238.75 92.9283C238.218 93.9818 237.463 94.8015 236.487 95.3874C235.51 95.9734 234.356 96.2663 233.024 96.2663ZM233.042 93.6918C233.764 93.6918 234.368 93.4935 234.853 93.0969C235.338 92.6945 235.699 92.1559 235.936 91.4812C236.179 90.8065 236.3 90.0548 236.3 89.2262C236.3 88.3917 236.179 87.6371 235.936 86.9624C235.699 86.2817 235.338 85.7402 234.853 85.3377C234.368 84.9353 233.764 84.734 233.042 84.734C232.302 84.734 231.687 84.9353 231.195 85.3377C230.71 85.7402 230.346 86.2817 230.103 86.9624C229.867 87.6371 229.748 88.3917 229.748 89.2262C229.748 90.0548 229.867 90.8065 230.103 91.4812C230.346 92.1559 230.71 92.6945 231.195 93.0969C231.687 93.4935 232.302 93.6918 233.042 93.6918ZM248.216 101.398C247.062 101.398 246.071 101.241 245.242 100.927C244.414 100.619 243.748 100.205 243.245 99.6843C242.742 99.1635 242.393 98.5864 242.197 97.9531L245.091 97.2518C245.222 97.5181 245.411 97.7815 245.66 98.0419C245.908 98.3082 246.243 98.5272 246.663 98.6989C247.089 98.8764 247.625 98.9652 248.27 98.9652C249.181 98.9652 249.936 98.7433 250.534 98.2994C251.131 97.8614 251.43 97.1393 251.43 96.1332V93.5497H251.27C251.105 93.8812 250.862 94.2215 250.542 94.5707C250.229 94.9199 249.811 95.2128 249.291 95.4496C248.776 95.6863 248.128 95.8047 247.346 95.8047C246.299 95.8047 245.349 95.5591 244.497 95.0678C243.65 94.5707 242.976 93.8308 242.472 92.8484C241.975 91.86 241.727 90.623 241.727 89.1374C241.727 87.64 241.975 86.3764 242.472 85.3466C242.976 84.3108 243.653 83.5266 244.506 82.994C245.358 82.4554 246.308 82.1861 247.355 82.1861C248.154 82.1861 248.811 82.3222 249.326 82.5945C249.847 82.8608 250.261 83.1834 250.569 83.5621C250.877 83.935 251.111 84.2872 251.27 84.6186H251.448V82.3636H254.617V96.2219C254.617 97.3879 254.339 98.3526 253.783 99.1161C253.227 99.8796 252.466 100.451 251.501 100.83C250.537 101.208 249.442 101.398 248.216 101.398ZM248.243 93.2834C248.924 93.2834 249.504 93.1177 249.983 92.7862C250.463 92.4548 250.827 91.9783 251.075 91.3569C251.324 90.7354 251.448 89.9897 251.448 89.1197C251.448 88.2615 251.324 87.5098 251.075 86.8647C250.832 86.2196 250.471 85.7195 249.992 85.3643C249.519 85.0033 248.936 84.8228 248.243 84.8228C247.527 84.8228 246.929 85.0092 246.45 85.3821C245.97 85.755 245.609 86.2669 245.367 86.918C245.124 87.5631 245.003 88.297 245.003 89.1197C245.003 89.9542 245.124 90.6851 245.367 91.3125C245.615 91.9339 245.979 92.4193 246.459 92.7685C246.944 93.1117 247.539 93.2834 248.243 93.2834ZM268.689 85.968L265.759 86.2876C265.676 85.9917 265.531 85.7135 265.324 85.4531C265.123 85.1927 264.851 84.9826 264.507 84.8228C264.164 84.663 263.744 84.5831 263.247 84.5831C262.578 84.5831 262.016 84.7281 261.56 85.0181C261.11 85.3081 260.888 85.6839 260.894 86.1456C260.888 86.5421 261.033 86.8647 261.329 87.1133C261.631 87.3619 262.128 87.5661 262.82 87.7259L265.146 88.223C266.437 88.5012 267.396 88.9421 268.023 89.5458C268.656 90.1495 268.976 90.9396 268.982 91.9162C268.976 92.7744 268.724 93.532 268.227 94.1889C267.736 94.84 267.052 95.349 266.176 95.7159C265.3 96.0829 264.294 96.2663 263.158 96.2663C261.489 96.2663 260.145 95.9171 259.127 95.2188C258.109 94.5144 257.503 93.5349 257.307 92.2802L260.441 91.9783C260.583 92.5939 260.885 93.0585 261.347 93.3722C261.808 93.6858 262.409 93.8427 263.149 93.8427C263.912 93.8427 264.525 93.6858 264.987 93.3722C265.454 93.0585 265.688 92.6708 265.688 92.2092C265.688 91.8185 265.537 91.496 265.235 91.2415C264.939 90.987 264.478 90.7917 263.85 90.6555L261.524 90.1673C260.216 89.895 259.249 89.4363 258.621 88.7912C257.994 88.1402 257.683 87.3175 257.689 86.3232C257.683 85.4827 257.911 84.7547 258.373 84.1392C258.84 83.5178 259.488 83.0384 260.317 82.701C261.151 82.3577 262.113 82.1861 263.202 82.1861C264.8 82.1861 266.058 82.5264 266.975 83.207C267.899 83.8877 268.47 84.808 268.689 85.968Z" fill="#393939"/> +<g filter="url(#filter1_d_625_11711)"> +<rect x="53" y="228" width="733" height="52" fill="white"/> +<rect x="53.5" y="228.5" width="732" height="51" stroke="#E7E7E7"/> </g> +<path d="M79 254L74 259V249L79 254Z" fill="#939393"/> <g clip-path="url(#clip1_625_11711)"> -<path fill-rule="evenodd" clip-rule="evenodd" d="M75.485 237.1L76.9 238.516L67.708 247.708L66.296 247.711L66.294 246.294L75.485 237.1ZM74 254H60V240H69.757L71.757 238H59C58.7348 238 58.4804 238.105 58.2929 238.293C58.1054 238.48 58 238.734 58 239V255C58 255.265 58.1054 255.519 58.2929 255.707C58.4804 255.894 58.7348 256 59 256H75C75.2652 256 75.5196 255.894 75.7071 255.707C75.8946 255.519 76 255.265 76 255V242.243L74 244.243V254Z" fill="#F86A2B"/> +<path d="M109.6 261V251.491L110.4 250.691V262C110.4 262.106 110.358 262.207 110.283 262.282C110.208 262.357 110.106 262.4 110 262.4H94C93.8939 262.4 93.7922 262.357 93.7172 262.282C93.6421 262.207 93.6 262.106 93.6 262V246C93.6 245.894 93.6421 245.792 93.7172 245.717C93.7922 245.642 93.8939 245.6 94 245.6H105.308L104.508 246.4H95H94.4V247V261V261.6H95H109H109.6V261ZM101.894 253.542L110.485 244.948L111.052 245.515L102.459 254.108L101.895 254.109L101.894 253.542Z" stroke="#F86A2B" stroke-width="1.2"/> </g> -<path d="M99.4414 252.239C102.292 252.239 104.042 250.229 104.042 247.071V247.058C104.042 243.893 102.278 241.896 99.4414 241.896C96.6113 241.896 94.834 243.886 94.834 247.058V247.071C94.834 250.236 96.5703 252.239 99.4414 252.239ZM99.4414 250.886C97.541 250.886 96.3994 249.382 96.3994 247.071V247.058C96.3994 244.727 97.5752 243.25 99.4414 243.25C101.308 243.25 102.477 244.727 102.477 247.058V247.071C102.477 249.382 101.314 250.886 99.4414 250.886Z" fill="#393939"/> -<path d="M106.12 252H107.651V242.136H106.12V252Z" fill="#393939"/> -<path d="M110.126 252H113.688C116.627 252 118.329 250.182 118.329 247.051V247.037C118.329 243.94 116.613 242.136 113.688 242.136H110.126V252ZM111.657 250.681V243.455H113.517C115.561 243.455 116.771 244.788 116.771 247.058V247.071C116.771 249.361 115.581 250.681 113.517 250.681H111.657Z" fill="#393939"/> -<path d="M124.454 252.239C126.655 252.239 128.262 250.981 128.549 249.088V249.047H127.031L127.018 249.074C126.737 250.188 125.76 250.886 124.454 250.886C122.677 250.886 121.569 249.416 121.569 247.078V247.064C121.569 244.72 122.677 243.25 124.447 243.25C125.746 243.25 126.737 244.036 127.024 245.246V245.267H128.542L128.549 245.232C128.289 243.271 126.621 241.896 124.447 241.896C121.706 241.896 120.004 243.879 120.004 247.064V247.078C120.004 250.257 121.713 252.239 124.454 252.239Z" fill="#393939"/> -<path d="M133.635 252H135.241L136.137 249.334H139.91L140.799 252H142.412L138.851 242.136H137.196L133.635 252ZM137.962 243.865H138.078L139.5 248.104H136.547L137.962 243.865Z" fill="#393939"/> -<path d="M146.062 252.144C147.143 252.144 147.895 251.679 148.25 250.879H148.366V252H149.843V244.576H148.366V248.931C148.366 250.127 147.73 250.872 146.541 250.872C145.454 250.872 145.003 250.264 145.003 249.033V244.576H143.52V249.382C143.52 251.139 144.388 252.144 146.062 252.144Z" fill="#393939"/> -<path d="M154.785 252.048C155.072 252.048 155.346 252.014 155.585 251.973V250.79C155.38 250.811 155.25 250.817 155.024 250.817C154.293 250.817 153.992 250.489 153.992 249.689V245.745H155.585V244.576H153.992V242.703H152.481V244.576H151.319V245.745H152.481V250.045C152.481 251.474 153.151 252.048 154.785 252.048Z" fill="#393939"/> -<path d="M157.383 252H158.866V247.646C158.866 246.449 159.543 245.704 160.63 245.704C161.717 245.704 162.229 246.312 162.229 247.543V252H163.706V247.194C163.706 245.424 162.79 244.433 161.129 244.433C160.049 244.433 159.338 244.911 158.976 245.704H158.866V241.664H157.383V252Z" fill="#393939"/> -<path d="M168.895 252.144C170.795 252.144 171.82 251.05 172.066 250.072L172.08 250.011L170.651 250.018L170.624 250.072C170.446 250.455 169.879 250.927 168.929 250.927C167.705 250.927 166.926 250.1 166.898 248.678H172.162V248.158C172.162 245.93 170.891 244.433 168.819 244.433C166.748 244.433 165.408 245.984 165.408 248.302V248.309C165.408 250.66 166.721 252.144 168.895 252.144ZM168.826 245.649C169.831 245.649 170.576 246.292 170.692 247.618H166.919C167.049 246.34 167.814 245.649 168.826 245.649Z" fill="#393939"/> -<path d="M173.926 252H175.409V247.646C175.409 246.449 176.086 245.704 177.173 245.704C178.26 245.704 178.772 246.312 178.772 247.543V252H180.249V247.194C180.249 245.424 179.333 244.433 177.672 244.433C176.592 244.433 175.881 244.911 175.519 245.704H175.409V244.576H173.926V252Z" fill="#393939"/> -<path d="M185.123 252.048C185.41 252.048 185.684 252.014 185.923 251.973V250.79C185.718 250.811 185.588 250.817 185.362 250.817C184.631 250.817 184.33 250.489 184.33 249.689V245.745H185.923V244.576H184.33V242.703H182.819V244.576H181.657V245.745H182.819V250.045C182.819 251.474 183.489 252.048 185.123 252.048Z" fill="#393939"/> -<path d="M188.425 243.25C188.931 243.25 189.354 242.833 189.354 242.327C189.354 241.814 188.931 241.397 188.425 241.397C187.912 241.397 187.495 241.814 187.495 242.327C187.495 242.833 187.912 243.25 188.425 243.25ZM187.68 252H189.156V244.576H187.68V252Z" fill="#393939"/> -<path d="M194.44 252.144C196.279 252.144 197.339 251.152 197.605 249.71L197.619 249.648H196.197L196.184 249.683C195.944 250.482 195.37 250.906 194.44 250.906C193.217 250.906 192.458 249.908 192.458 248.268V248.254C192.458 246.654 193.203 245.67 194.44 245.67C195.425 245.67 196.026 246.217 196.19 246.948L196.197 246.969L197.619 246.962V246.928C197.414 245.485 196.3 244.433 194.434 244.433C192.267 244.433 190.947 245.902 190.947 248.254V248.268C190.947 250.667 192.273 252.144 194.44 252.144Z" fill="#393939"/> -<path d="M201.338 252.123C202.322 252.123 203.102 251.699 203.539 250.947H203.655V252H205.125V246.921C205.125 245.362 204.072 244.433 202.206 244.433C200.518 244.433 199.349 245.246 199.171 246.463L199.164 246.511H200.593L200.6 246.483C200.777 245.957 201.317 245.656 202.138 245.656C203.143 245.656 203.655 246.107 203.655 246.921V247.577L201.646 247.693C199.875 247.803 198.877 248.575 198.877 249.901V249.915C198.877 251.262 199.923 252.123 201.338 252.123ZM200.354 249.854V249.84C200.354 249.17 200.818 248.801 201.844 248.739L203.655 248.623V249.259C203.655 250.216 202.842 250.94 201.734 250.94C200.935 250.94 200.354 250.537 200.354 249.854Z" fill="#393939"/> -<path d="M210.02 252.048C210.307 252.048 210.58 252.014 210.819 251.973V250.79C210.614 250.811 210.484 250.817 210.259 250.817C209.527 250.817 209.227 250.489 209.227 249.689V245.745H210.819V244.576H209.227V242.703H207.716V244.576H206.554V245.745H207.716V250.045C207.716 251.474 208.386 252.048 210.02 252.048Z" fill="#393939"/> -<path d="M213.321 243.25C213.827 243.25 214.251 242.833 214.251 242.327C214.251 241.814 213.827 241.397 213.321 241.397C212.809 241.397 212.392 241.814 212.392 242.327C212.392 242.833 212.809 243.25 213.321 243.25ZM212.576 252H214.053V244.576H212.576V252Z" fill="#393939"/> -<path d="M219.357 252.144C221.531 252.144 222.864 250.688 222.864 248.295V248.281C222.864 245.889 221.524 244.433 219.357 244.433C217.184 244.433 215.844 245.896 215.844 248.281V248.295C215.844 250.688 217.177 252.144 219.357 252.144ZM219.357 250.906C218.079 250.906 217.361 249.942 217.361 248.295V248.281C217.361 246.634 218.079 245.67 219.357 245.67C220.629 245.67 221.354 246.634 221.354 248.281V248.295C221.354 249.936 220.629 250.906 219.357 250.906Z" fill="#393939"/> -<path d="M224.635 252H226.118V247.646C226.118 246.449 226.795 245.704 227.882 245.704C228.969 245.704 229.481 246.312 229.481 247.543V252H230.958V247.194C230.958 245.424 230.042 244.433 228.381 244.433C227.301 244.433 226.59 244.911 226.228 245.704H226.118V244.576H224.635V252Z" fill="#393939"/> -<path d="M238.895 252.123C239.879 252.123 240.658 251.699 241.096 250.947H241.212V252H242.682V246.921C242.682 245.362 241.629 244.433 239.763 244.433C238.074 244.433 236.905 245.246 236.728 246.463L236.721 246.511H238.149L238.156 246.483C238.334 245.957 238.874 245.656 239.694 245.656C240.699 245.656 241.212 246.107 241.212 246.921V247.577L239.202 247.693C237.432 247.803 236.434 248.575 236.434 249.901V249.915C236.434 251.262 237.479 252.123 238.895 252.123ZM237.91 249.854V249.84C237.91 249.17 238.375 248.801 239.4 248.739L241.212 248.623V249.259C241.212 250.216 240.398 250.94 239.291 250.94C238.491 250.94 237.91 250.537 237.91 249.854Z" fill="#393939"/> -<path d="M247.48 252.123C248.52 252.123 249.333 251.645 249.764 250.831H249.88V252H251.356V241.664H249.88V245.752H249.764C249.367 244.952 248.499 244.446 247.48 244.446C245.594 244.446 244.404 245.93 244.404 248.281V248.295C244.404 250.626 245.614 252.123 247.48 252.123ZM247.904 250.858C246.66 250.858 245.915 249.888 245.915 248.295V248.281C245.915 246.688 246.66 245.718 247.904 245.718C249.135 245.718 249.9 246.695 249.9 248.281V248.295C249.9 249.881 249.142 250.858 247.904 250.858Z" fill="#393939"/> -<path d="M256.271 252.123C257.311 252.123 258.124 251.645 258.555 250.831H258.671V252H260.147V241.664H258.671V245.752H258.555C258.158 244.952 257.29 244.446 256.271 244.446C254.385 244.446 253.195 245.93 253.195 248.281V248.295C253.195 250.626 254.405 252.123 256.271 252.123ZM256.695 250.858C255.451 250.858 254.706 249.888 254.706 248.295V248.281C254.706 246.688 255.451 245.718 256.695 245.718C257.926 245.718 258.691 246.695 258.691 248.281V248.295C258.691 249.881 257.933 250.858 256.695 250.858Z" fill="#393939"/> -<path d="M265.473 252.144C267.373 252.144 268.398 251.05 268.645 250.072L268.658 250.011L267.229 250.018L267.202 250.072C267.024 250.455 266.457 250.927 265.507 250.927C264.283 250.927 263.504 250.1 263.477 248.678H268.74V248.158C268.74 245.93 267.469 244.433 265.397 244.433C263.326 244.433 261.986 245.984 261.986 248.302V248.309C261.986 250.66 263.299 252.144 265.473 252.144ZM265.404 245.649C266.409 245.649 267.154 246.292 267.271 247.618H263.497C263.627 246.34 264.393 245.649 265.404 245.649Z" fill="#393939"/> -<path d="M273.211 252.123C274.25 252.123 275.063 251.645 275.494 250.831H275.61V252H277.087V241.664H275.61V245.752H275.494C275.098 244.952 274.229 244.446 273.211 244.446C271.324 244.446 270.135 245.93 270.135 248.281V248.295C270.135 250.626 271.345 252.123 273.211 252.123ZM273.635 250.858C272.391 250.858 271.646 249.888 271.646 248.295V248.281C271.646 246.688 272.391 245.718 273.635 245.718C274.865 245.718 275.631 246.695 275.631 248.281V248.295C275.631 249.881 274.872 250.858 273.635 250.858Z" fill="#393939"/> -<path d="M343.723 243.209C344.174 243.209 344.543 242.84 344.543 242.389C344.543 241.938 344.174 241.568 343.723 241.568C343.271 241.568 342.902 241.938 342.902 242.389C342.902 242.84 343.271 243.209 343.723 243.209ZM342.055 254.529C343.6 254.529 344.317 253.88 344.317 252.362V244.631H343.128V252.383C343.128 253.196 342.827 253.477 342.027 253.477H341.85V254.529H342.055Z" fill="#575757"/> -<path d="M348.59 252.13C349.581 252.13 350.354 251.699 350.818 250.913H350.928V252H352.117V246.955C352.117 245.424 351.112 244.501 349.314 244.501C347.742 244.501 346.621 245.28 346.43 246.436L346.423 246.477H347.612L347.619 246.456C347.811 245.882 348.392 245.554 349.273 245.554C350.374 245.554 350.928 246.046 350.928 246.955V247.625L348.815 247.755C347.1 247.857 346.129 248.616 346.129 249.929V249.942C346.129 251.282 347.188 252.13 348.59 252.13ZM347.346 249.915V249.901C347.346 249.17 347.838 248.773 348.959 248.705L350.928 248.582V249.252C350.928 250.305 350.046 251.098 348.836 251.098C347.981 251.098 347.346 250.66 347.346 249.915Z" fill="#575757"/> -<path d="M354.291 252H355.48V247.639C355.48 246.347 356.226 245.554 357.401 245.554C358.577 245.554 359.124 246.189 359.124 247.516V252H360.313V247.229C360.313 245.479 359.391 244.501 357.736 244.501C356.649 244.501 355.959 244.959 355.59 245.738H355.48V244.631H354.291V252Z" fill="#575757"/> -<path d="M365.475 252.13C367.211 252.13 368.264 251.146 368.517 250.147L368.53 250.093H367.341L367.313 250.154C367.115 250.599 366.5 251.07 365.502 251.07C364.189 251.07 363.349 250.182 363.314 248.657H368.619V248.192C368.619 245.991 367.402 244.501 365.399 244.501C363.396 244.501 362.098 246.06 362.098 248.336V248.343C362.098 250.653 363.369 252.13 365.475 252.13ZM365.393 245.561C366.479 245.561 367.286 246.251 367.409 247.707H363.335C363.465 246.306 364.299 245.561 365.393 245.561Z" fill="#575757"/> -<path d="M371.436 252.068C371.928 252.068 372.324 251.665 372.324 251.18C372.324 250.688 371.928 250.291 371.436 250.291C370.95 250.291 370.547 250.688 370.547 251.18C370.547 251.665 370.95 252.068 371.436 252.068Z" fill="#575757"/> -<path d="M377.068 252.13C378.094 252.13 378.914 251.645 379.365 250.824H379.475V252H380.664V241.705H379.475V245.793H379.365C378.962 245.007 378.08 244.501 377.068 244.501C375.195 244.501 373.979 245.998 373.979 248.309V248.322C373.979 250.619 375.202 252.13 377.068 252.13ZM377.342 251.077C375.995 251.077 375.195 250.038 375.195 248.322V248.309C375.195 246.593 375.995 245.554 377.342 245.554C378.682 245.554 379.502 246.606 379.502 248.309V248.322C379.502 250.024 378.682 251.077 377.342 251.077Z" fill="#575757"/> -<path d="M385.976 252.13C388.074 252.13 389.373 250.681 389.373 248.322V248.309C389.373 245.943 388.074 244.501 385.976 244.501C383.877 244.501 382.578 245.943 382.578 248.309V248.322C382.578 250.681 383.877 252.13 385.976 252.13ZM385.976 251.077C384.581 251.077 383.795 250.059 383.795 248.322V248.309C383.795 246.565 384.581 245.554 385.976 245.554C387.37 245.554 388.156 246.565 388.156 248.309V248.322C388.156 250.059 387.37 251.077 385.976 251.077Z" fill="#575757"/> -<path d="M394.227 252.13C395.963 252.13 397.016 251.146 397.269 250.147L397.282 250.093H396.093L396.065 250.154C395.867 250.599 395.252 251.07 394.254 251.07C392.941 251.07 392.101 250.182 392.066 248.657H397.371V248.192C397.371 245.991 396.154 244.501 394.151 244.501C392.148 244.501 390.85 246.06 390.85 248.336V248.343C390.85 250.653 392.121 252.13 394.227 252.13ZM394.145 245.561C395.231 245.561 396.038 246.251 396.161 247.707H392.087C392.217 246.306 393.051 245.561 394.145 245.561Z" fill="#575757"/> -<path d="M404.85 253.6C405.711 253.6 406.538 253.477 407.153 253.265V252.403C406.723 252.602 405.8 252.731 404.863 252.731C401.938 252.731 400.051 250.852 400.051 247.939V247.926C400.051 245.089 401.972 243.052 404.645 243.052C407.379 243.052 409.252 244.74 409.252 247.201V247.215C409.252 248.89 408.698 249.977 407.837 249.977C407.345 249.977 407.064 249.696 407.064 249.218V245.205H406.032V246.039H405.923C405.656 245.444 405.041 245.075 404.323 245.075C402.922 245.075 401.944 246.237 401.944 247.892V247.905C401.944 249.635 402.901 250.804 404.323 250.804C405.123 250.804 405.738 250.414 406.032 249.717H406.142L406.148 249.758C406.258 250.421 406.859 250.865 407.646 250.865C409.218 250.865 410.216 249.45 410.216 247.229V247.215C410.216 244.255 407.967 242.19 404.733 242.19C401.384 242.19 399.087 244.508 399.087 247.885V247.898C399.087 251.385 401.322 253.6 404.85 253.6ZM404.48 249.84C403.585 249.84 403.038 249.115 403.038 247.933V247.919C403.038 246.729 403.578 246.019 404.494 246.019C405.424 246.019 406.019 246.757 406.019 247.919V247.933C406.019 249.095 405.417 249.84 404.48 249.84Z" fill="#575757"/> -<path d="M415.076 252.13C416.812 252.13 417.865 251.146 418.118 250.147L418.132 250.093H416.942L416.915 250.154C416.717 250.599 416.102 251.07 415.104 251.07C413.791 251.07 412.95 250.182 412.916 248.657H418.221V248.192C418.221 245.991 417.004 244.501 415.001 244.501C412.998 244.501 411.699 246.06 411.699 248.336V248.343C411.699 250.653 412.971 252.13 415.076 252.13ZM414.994 245.561C416.081 245.561 416.888 246.251 417.011 247.707H412.937C413.066 246.306 413.9 245.561 414.994 245.561Z" fill="#575757"/> -<path d="M419.205 252H420.538L422.288 249.218H422.397L424.141 252H425.535L422.999 248.268L425.501 244.631H424.168L422.438 247.372H422.329L420.579 244.631H419.178L421.728 248.315L419.205 252Z" fill="#575757"/> -<path d="M429.158 252.13C430.149 252.13 430.922 251.699 431.387 250.913H431.496V252H432.686V246.955C432.686 245.424 431.681 244.501 429.883 244.501C428.311 244.501 427.189 245.28 426.998 246.436L426.991 246.477H428.181L428.188 246.456C428.379 245.882 428.96 245.554 429.842 245.554C430.942 245.554 431.496 246.046 431.496 246.955V247.625L429.384 247.755C427.668 247.857 426.697 248.616 426.697 249.929V249.942C426.697 251.282 427.757 252.13 429.158 252.13ZM427.914 249.915V249.901C427.914 249.17 428.406 248.773 429.527 248.705L431.496 248.582V249.252C431.496 250.305 430.614 251.098 429.404 251.098C428.55 251.098 427.914 250.66 427.914 249.915Z" fill="#575757"/> -<path d="M434.859 252H436.049V247.434C436.049 246.395 436.78 245.554 437.744 245.554C438.674 245.554 439.275 246.121 439.275 246.996V252H440.465V247.263C440.465 246.326 441.142 245.554 442.167 245.554C443.206 245.554 443.705 246.094 443.705 247.181V252H444.895V246.907C444.895 245.362 444.054 244.501 442.55 244.501C441.531 244.501 440.69 245.014 440.294 245.793H440.185C439.843 245.027 439.146 244.501 438.147 244.501C437.184 244.501 436.486 244.959 436.158 245.752H436.049V244.631H434.859V252Z" fill="#575757"/> -<path d="M447.041 254.461H448.23V250.838H448.34C448.743 251.624 449.625 252.13 450.637 252.13C452.51 252.13 453.727 250.633 453.727 248.322V248.309C453.727 246.012 452.503 244.501 450.637 244.501C449.611 244.501 448.791 244.986 448.34 245.807H448.23V244.631H447.041V254.461ZM450.363 251.077C449.023 251.077 448.203 250.024 448.203 248.322V248.309C448.203 246.606 449.023 245.554 450.363 245.554C451.71 245.554 452.51 246.593 452.51 248.309V248.322C452.51 250.038 451.71 251.077 450.363 251.077Z" fill="#575757"/> -<path d="M455.654 252H456.844V241.705H455.654V252Z" fill="#575757"/> -<path d="M462.135 252.13C463.871 252.13 464.924 251.146 465.177 250.147L465.19 250.093H464.001L463.974 250.154C463.775 250.599 463.16 251.07 462.162 251.07C460.85 251.07 460.009 250.182 459.975 248.657H465.279V248.192C465.279 245.991 464.062 244.501 462.06 244.501C460.057 244.501 458.758 246.06 458.758 248.336V248.343C458.758 250.653 460.029 252.13 462.135 252.13ZM462.053 245.561C463.14 245.561 463.946 246.251 464.069 247.707H459.995C460.125 246.306 460.959 245.561 462.053 245.561Z" fill="#575757"/> -<path d="M468.096 252.068C468.588 252.068 468.984 251.665 468.984 251.18C468.984 250.688 468.588 250.291 468.096 250.291C467.61 250.291 467.207 250.688 467.207 251.18C467.207 251.665 467.61 252.068 468.096 252.068Z" fill="#575757"/> -<path d="M474.022 252.13C475.793 252.13 476.784 251.18 477.085 249.847L477.099 249.771L475.923 249.778L475.909 249.819C475.636 250.64 475.007 251.077 474.016 251.077C472.703 251.077 471.855 249.99 471.855 248.295V248.281C471.855 246.62 472.689 245.554 474.016 245.554C475.075 245.554 475.731 246.142 475.916 246.866L475.923 246.887H477.105L477.099 246.846C476.88 245.533 475.807 244.501 474.016 244.501C471.951 244.501 470.639 245.991 470.639 248.281V248.295C470.639 250.633 471.958 252.13 474.022 252.13Z" fill="#575757"/> -<path d="M481.87 252.13C483.969 252.13 485.268 250.681 485.268 248.322V248.309C485.268 245.943 483.969 244.501 481.87 244.501C479.771 244.501 478.473 245.943 478.473 248.309V248.322C478.473 250.681 479.771 252.13 481.87 252.13ZM481.87 251.077C480.476 251.077 479.689 250.059 479.689 248.322V248.309C479.689 246.565 480.476 245.554 481.87 245.554C483.265 245.554 484.051 246.565 484.051 248.309V248.322C484.051 250.059 483.265 251.077 481.87 251.077Z" fill="#575757"/> -<path d="M487.113 252H488.303V247.434C488.303 246.395 489.034 245.554 489.998 245.554C490.928 245.554 491.529 246.121 491.529 246.996V252H492.719V247.263C492.719 246.326 493.396 245.554 494.421 245.554C495.46 245.554 495.959 246.094 495.959 247.181V252H497.148V246.907C497.148 245.362 496.308 244.501 494.804 244.501C493.785 244.501 492.944 245.014 492.548 245.793H492.438C492.097 245.027 491.399 244.501 490.401 244.501C489.438 244.501 488.74 244.959 488.412 245.752H488.303V244.631H487.113V252Z" fill="#575757"/> -<path d="M557.37 253.232C559.195 253.232 560.275 252.125 560.275 250.259V243.136H559.045V250.245C559.045 251.448 558.457 252.098 557.363 252.098C556.386 252.098 555.9 251.476 555.825 250.73L555.818 250.662H554.588L554.595 250.758C554.697 252.173 555.661 253.232 557.37 253.232Z" fill="#575757"/> -<path d="M565.108 253.13C566.188 253.13 566.934 252.686 567.296 251.899H567.405V253H568.595V245.631H567.405V249.992C567.405 251.284 566.715 252.077 565.416 252.077C564.24 252.077 563.762 251.441 563.762 250.115V245.631H562.572V250.402C562.572 252.146 563.434 253.13 565.108 253.13Z" fill="#575757"/> -<path d="M570.885 253H572.074V242.705H570.885V253Z" fill="#575757"/> -<path d="M581.528 253.232C583.531 253.232 584.96 251.845 584.96 249.855V249.842C584.96 247.935 583.627 246.547 581.774 246.547C580.879 246.547 580.106 246.909 579.669 247.572H579.56L579.895 244.236H584.413V243.136H578.924L578.404 248.803H579.471C579.594 248.57 579.751 248.379 579.922 248.215C580.346 247.812 580.906 247.613 581.562 247.613C582.841 247.613 583.757 248.55 583.757 249.862V249.876C583.757 251.209 582.854 252.146 581.542 252.146C580.387 252.146 579.532 251.394 579.416 250.45L579.409 250.396H578.227L578.233 250.471C578.377 252.05 579.689 253.232 581.528 253.232Z" fill="#575757"/> -<path d="M593.293 253H594.523V243.136H593.3L590.675 245.022V246.321L593.184 244.503H593.293V253Z" fill="#575757"/> -<path d="M597.374 253H603.759V251.893H599.083V251.783L601.325 249.466C603.109 247.627 603.595 246.807 603.595 245.679V245.665C603.595 244.072 602.275 242.903 600.553 242.903C598.666 242.903 597.312 244.161 597.306 245.911L597.319 245.918L598.495 245.925L598.502 245.911C598.502 244.749 599.288 243.977 600.471 243.977C601.633 243.977 602.337 244.756 602.337 245.795V245.809C602.337 246.67 601.968 247.183 600.71 248.543L597.374 252.152V253Z" fill="#575757"/> -<path d="M606.801 246.308C607.293 246.308 607.689 245.904 607.689 245.419C607.689 244.927 607.293 244.53 606.801 244.53C606.315 244.53 605.912 244.927 605.912 245.419C605.912 245.904 606.315 246.308 606.801 246.308ZM606.801 251.599C607.293 251.599 607.689 251.195 607.689 250.71C607.689 250.218 607.293 249.821 606.801 249.821C606.315 249.821 605.912 250.218 605.912 250.71C605.912 251.195 606.315 251.599 606.801 251.599Z" fill="#575757"/> -<path d="M613.452 253.232C615.455 253.232 616.884 251.845 616.884 249.855V249.842C616.884 247.935 615.551 246.547 613.698 246.547C612.803 246.547 612.03 246.909 611.593 247.572H611.483L611.818 244.236H616.337V243.136H610.848L610.328 248.803H611.395C611.518 248.57 611.675 248.379 611.846 248.215C612.27 247.812 612.83 247.613 613.486 247.613C614.765 247.613 615.681 248.55 615.681 249.862V249.876C615.681 251.209 614.778 252.146 613.466 252.146C612.311 252.146 611.456 251.394 611.34 250.45L611.333 250.396H610.15L610.157 250.471C610.301 252.05 611.613 253.232 613.452 253.232Z" fill="#575757"/> -<path d="M622.223 253.164C624.198 253.164 625.647 251.947 625.647 250.3V250.286C625.647 248.885 624.67 247.989 623.234 247.866V247.839C624.465 247.579 625.326 246.745 625.326 245.528V245.515C625.326 244.018 624.089 242.972 622.209 242.972C620.363 242.972 619.092 244.045 618.935 245.651L618.928 245.72H620.11L620.117 245.651C620.22 244.653 621.047 244.038 622.209 244.038C623.412 244.038 624.089 244.633 624.089 245.665V245.679C624.089 246.663 623.269 247.388 622.093 247.388H620.91V248.427H622.147C623.528 248.427 624.396 249.104 624.396 250.313V250.327C624.396 251.373 623.515 252.098 622.223 252.098C620.91 252.098 620.015 251.428 619.919 250.457L619.912 250.389H618.729L618.736 250.471C618.866 252.029 620.186 253.164 622.223 253.164Z" fill="#575757"/> -<path d="M628.621 246.308C629.113 246.308 629.51 245.904 629.51 245.419C629.51 244.927 629.113 244.53 628.621 244.53C628.136 244.53 627.732 244.927 627.732 245.419C627.732 245.904 628.136 246.308 628.621 246.308ZM628.621 251.599C629.113 251.599 629.51 251.195 629.51 250.71C629.51 250.218 629.113 249.821 628.621 249.821C628.136 249.821 627.732 250.218 627.732 250.71C627.732 251.195 628.136 251.599 628.621 251.599Z" fill="#575757"/> -<path d="M635.102 253.232C637.282 253.232 638.595 251.243 638.595 248.071V248.058C638.595 244.886 637.282 242.903 635.102 242.903C632.921 242.903 631.622 244.886 631.622 248.058V248.071C631.622 251.243 632.921 253.232 635.102 253.232ZM635.102 252.159C633.687 252.159 632.859 250.587 632.859 248.071V248.058C632.859 245.542 633.687 243.983 635.102 243.983C636.517 243.983 637.357 245.542 637.357 248.058V248.071C637.357 250.587 636.517 252.159 635.102 252.159Z" fill="#575757"/> -<path d="M643.92 253.232C646.101 253.232 647.413 251.243 647.413 248.071V248.058C647.413 244.886 646.101 242.903 643.92 242.903C641.739 242.903 640.44 244.886 640.44 248.058V248.071C640.44 251.243 641.739 253.232 643.92 253.232ZM643.92 252.159C642.505 252.159 641.678 250.587 641.678 248.071V248.058C641.678 245.542 642.505 243.983 643.92 243.983C645.335 243.983 646.176 245.542 646.176 248.058V248.071C646.176 250.587 645.335 252.159 643.92 252.159Z" fill="#575757"/> -<path d="M657.619 253.232C660.142 253.232 661.81 251.619 661.81 249.186V247.982H657.811V249.062H660.579V249.302C660.579 250.97 659.39 252.098 657.626 252.098C655.644 252.098 654.406 250.553 654.406 248.071V248.058C654.406 245.61 655.664 244.038 657.619 244.038C659.089 244.038 660.08 244.735 660.483 246.007L660.504 246.075H661.748L661.734 246.007C661.345 244.134 659.807 242.903 657.619 242.903C654.919 242.903 653.148 244.947 653.148 248.058V248.071C653.148 251.223 654.892 253.232 657.619 253.232Z" fill="#575757"/> -<path d="M663.99 253H665.139V245.467H665.214L668.331 253H669.37L672.487 245.467H672.562V253H673.711V243.136H672.282L668.905 251.366H668.796L665.419 243.136H663.99V253Z" fill="#575757"/> -<path d="M678.79 253H680.021V244.243H683.199V243.136H675.611V244.243H678.79V253Z" fill="#575757"/> -<path d="M688.572 249.582H691.635V252.713H692.742V249.582H695.805V248.475H692.742V245.344H691.635V248.475H688.572V249.582Z" fill="#575757"/> -<path d="M704.876 253.232C706.879 253.232 708.308 251.845 708.308 249.855V249.842C708.308 247.935 706.975 246.547 705.122 246.547C704.227 246.547 703.454 246.909 703.017 247.572H702.907L703.242 244.236H707.761V243.136H702.271L701.752 248.803H702.818C702.941 248.57 703.099 248.379 703.27 248.215C703.693 247.812 704.254 247.613 704.91 247.613C706.188 247.613 707.104 248.55 707.104 249.862V249.876C707.104 251.209 706.202 252.146 704.89 252.146C703.734 252.146 702.88 251.394 702.764 250.45L702.757 250.396H701.574L701.581 250.471C701.725 252.05 703.037 253.232 704.876 253.232Z" fill="#575757"/> -<path d="M711.268 246.308C711.76 246.308 712.156 245.904 712.156 245.419C712.156 244.927 711.76 244.53 711.268 244.53C710.782 244.53 710.379 244.927 710.379 245.419C710.379 245.904 710.782 246.308 711.268 246.308ZM711.268 251.599C711.76 251.599 712.156 251.195 712.156 250.71C712.156 250.218 711.76 249.821 711.268 249.821C710.782 249.821 710.379 250.218 710.379 250.71C710.379 251.195 710.782 251.599 711.268 251.599Z" fill="#575757"/> -<path d="M717.734 253.164C719.71 253.164 721.159 251.947 721.159 250.3V250.286C721.159 248.885 720.182 247.989 718.746 247.866V247.839C719.977 247.579 720.838 246.745 720.838 245.528V245.515C720.838 244.018 719.601 242.972 717.721 242.972C715.875 242.972 714.604 244.045 714.446 245.651L714.439 245.72H715.622L715.629 245.651C715.731 244.653 716.559 244.038 717.721 244.038C718.924 244.038 719.601 244.633 719.601 245.665V245.679C719.601 246.663 718.78 247.388 717.604 247.388H716.422V248.427H717.659C719.04 248.427 719.908 249.104 719.908 250.313V250.327C719.908 251.373 719.026 252.098 717.734 252.098C716.422 252.098 715.526 251.428 715.431 250.457L715.424 250.389H714.241L714.248 250.471C714.378 252.029 715.697 253.164 717.734 253.164Z" fill="#575757"/> -<path d="M726.457 253.232C728.638 253.232 729.95 251.243 729.95 248.071V248.058C729.95 244.886 728.638 242.903 726.457 242.903C724.276 242.903 722.978 244.886 722.978 248.058V248.071C722.978 251.243 724.276 253.232 726.457 253.232ZM726.457 252.159C725.042 252.159 724.215 250.587 724.215 248.071V248.058C724.215 245.542 725.042 243.983 726.457 243.983C727.872 243.983 728.713 245.542 728.713 248.058V248.071C728.713 250.587 727.872 252.159 726.457 252.159Z" fill="#575757"/> -<path d="M146 172C146 176.971 141.971 181 137 181C132.029 181 128 176.971 128 172C128 167.029 132.029 163 137 163C141.971 163 146 167.029 146 172Z" fill="#FFDEDE"/> +<path d="M135.441 258.739C138.292 258.739 140.042 256.729 140.042 253.571V253.558C140.042 250.393 138.278 248.396 135.441 248.396C132.611 248.396 130.834 250.386 130.834 253.558V253.571C130.834 256.736 132.57 258.739 135.441 258.739ZM135.441 257.386C133.541 257.386 132.399 255.882 132.399 253.571V253.558C132.399 251.227 133.575 249.75 135.441 249.75C137.308 249.75 138.477 251.227 138.477 253.558V253.571C138.477 255.882 137.314 257.386 135.441 257.386ZM142.12 258.5H143.651V248.636H142.12V258.5ZM146.126 258.5H149.688C152.627 258.5 154.329 256.682 154.329 253.551V253.537C154.329 250.44 152.613 248.636 149.688 248.636H146.126V258.5ZM147.657 257.181V249.955H149.517C151.561 249.955 152.771 251.288 152.771 253.558V253.571C152.771 255.861 151.581 257.181 149.517 257.181H147.657ZM160.454 258.739C162.655 258.739 164.262 257.481 164.549 255.588V255.547H163.031L163.018 255.574C162.737 256.688 161.76 257.386 160.454 257.386C158.677 257.386 157.569 255.916 157.569 253.578V253.564C157.569 251.22 158.677 249.75 160.447 249.75C161.746 249.75 162.737 250.536 163.024 251.746V251.767H164.542L164.549 251.732C164.289 249.771 162.621 248.396 160.447 248.396C157.706 248.396 156.004 250.379 156.004 253.564V253.578C156.004 256.757 157.713 258.739 160.454 258.739ZM172.26 258.623C173.244 258.623 174.023 258.199 174.461 257.447H174.577V258.5H176.047V253.421C176.047 251.862 174.994 250.933 173.128 250.933C171.439 250.933 170.271 251.746 170.093 252.963L170.086 253.011H171.515L171.521 252.983C171.699 252.457 172.239 252.156 173.06 252.156C174.064 252.156 174.577 252.607 174.577 253.421V254.077L172.567 254.193C170.797 254.303 169.799 255.075 169.799 256.401V256.415C169.799 257.762 170.845 258.623 172.26 258.623ZM171.275 256.354V256.34C171.275 255.67 171.74 255.301 172.766 255.239L174.577 255.123V255.759C174.577 256.716 173.764 257.44 172.656 257.44C171.856 257.44 171.275 257.037 171.275 256.354ZM180.613 258.644C181.693 258.644 182.445 258.179 182.801 257.379H182.917V258.5H184.394V251.076H182.917V255.431C182.917 256.627 182.281 257.372 181.092 257.372C180.005 257.372 179.554 256.764 179.554 255.533V251.076H178.07V255.882C178.07 257.639 178.938 258.644 180.613 258.644ZM189.336 258.548C189.623 258.548 189.896 258.514 190.136 258.473V257.29C189.931 257.311 189.801 257.317 189.575 257.317C188.844 257.317 188.543 256.989 188.543 256.189V252.245H190.136V251.076H188.543V249.203H187.032V251.076H185.87V252.245H187.032V256.545C187.032 257.974 187.702 258.548 189.336 258.548ZM191.934 258.5H193.417V254.146C193.417 252.949 194.094 252.204 195.181 252.204C196.268 252.204 196.78 252.812 196.78 254.043V258.5H198.257V253.694C198.257 251.924 197.341 250.933 195.68 250.933C194.6 250.933 193.889 251.411 193.526 252.204H193.417V248.164H191.934V258.5ZM203.445 258.644C205.346 258.644 206.371 257.55 206.617 256.572L206.631 256.511L205.202 256.518L205.175 256.572C204.997 256.955 204.43 257.427 203.479 257.427C202.256 257.427 201.477 256.6 201.449 255.178H206.713V254.658C206.713 252.43 205.441 250.933 203.37 250.933C201.299 250.933 199.959 252.484 199.959 254.802V254.809C199.959 257.16 201.271 258.644 203.445 258.644ZM203.377 252.149C204.382 252.149 205.127 252.792 205.243 254.118H201.47C201.6 252.84 202.365 252.149 203.377 252.149ZM208.477 258.5H209.96V254.146C209.96 252.949 210.637 252.204 211.724 252.204C212.811 252.204 213.323 252.812 213.323 254.043V258.5H214.8V253.694C214.8 251.924 213.884 250.933 212.223 250.933C211.143 250.933 210.432 251.411 210.069 252.204H209.96V251.076H208.477V258.5ZM219.674 258.548C219.961 258.548 220.234 258.514 220.474 258.473V257.29C220.269 257.311 220.139 257.317 219.913 257.317C219.182 257.317 218.881 256.989 218.881 256.189V252.245H220.474V251.076H218.881V249.203H217.37V251.076H216.208V252.245H217.37V256.545C217.37 257.974 218.04 258.548 219.674 258.548ZM222.976 249.75C223.481 249.75 223.905 249.333 223.905 248.827C223.905 248.314 223.481 247.897 222.976 247.897C222.463 247.897 222.046 248.314 222.046 248.827C222.046 249.333 222.463 249.75 222.976 249.75ZM222.23 258.5H223.707V251.076H222.23V258.5ZM228.991 258.644C230.83 258.644 231.89 257.652 232.156 256.21L232.17 256.148H230.748L230.734 256.183C230.495 256.982 229.921 257.406 228.991 257.406C227.768 257.406 227.009 256.408 227.009 254.768V254.754C227.009 253.154 227.754 252.17 228.991 252.17C229.976 252.17 230.577 252.717 230.741 253.448L230.748 253.469L232.17 253.462V253.428C231.965 251.985 230.851 250.933 228.984 250.933C226.817 250.933 225.498 252.402 225.498 254.754V254.768C225.498 257.167 226.824 258.644 228.991 258.644ZM235.889 258.623C236.873 258.623 237.652 258.199 238.09 257.447H238.206V258.5H239.676V253.421C239.676 251.862 238.623 250.933 236.757 250.933C235.068 250.933 233.899 251.746 233.722 252.963L233.715 253.011H235.144L235.15 252.983C235.328 252.457 235.868 252.156 236.688 252.156C237.693 252.156 238.206 252.607 238.206 253.421V254.077L236.196 254.193C234.426 254.303 233.428 255.075 233.428 256.401V256.415C233.428 257.762 234.474 258.623 235.889 258.623ZM234.904 256.354V256.34C234.904 255.67 235.369 255.301 236.395 255.239L238.206 255.123V255.759C238.206 256.716 237.393 257.44 236.285 257.44C235.485 257.44 234.904 257.037 234.904 256.354ZM244.57 258.548C244.857 258.548 245.131 258.514 245.37 258.473V257.29C245.165 257.311 245.035 257.317 244.81 257.317C244.078 257.317 243.777 256.989 243.777 256.189V252.245H245.37V251.076H243.777V249.203H242.267V251.076H241.104V252.245H242.267V256.545C242.267 257.974 242.937 258.548 244.57 258.548ZM247.872 249.75C248.378 249.75 248.802 249.333 248.802 248.827C248.802 248.314 248.378 247.897 247.872 247.897C247.359 247.897 246.942 248.314 246.942 248.827C246.942 249.333 247.359 249.75 247.872 249.75ZM247.127 258.5H248.604V251.076H247.127V258.5ZM253.908 258.644C256.082 258.644 257.415 257.188 257.415 254.795V254.781C257.415 252.389 256.075 250.933 253.908 250.933C251.734 250.933 250.395 252.396 250.395 254.781V254.795C250.395 257.188 251.728 258.644 253.908 258.644ZM253.908 257.406C252.63 257.406 251.912 256.442 251.912 254.795V254.781C251.912 253.134 252.63 252.17 253.908 252.17C255.18 252.17 255.904 253.134 255.904 254.781V254.795C255.904 256.436 255.18 257.406 253.908 257.406ZM259.186 258.5H260.669V254.146C260.669 252.949 261.346 252.204 262.433 252.204C263.52 252.204 264.032 252.812 264.032 254.043V258.5H265.509V253.694C265.509 251.924 264.593 250.933 262.932 250.933C261.852 250.933 261.141 251.411 260.778 252.204H260.669V251.076H259.186V258.5ZM274.532 258.644C276.371 258.644 277.431 257.652 277.697 256.21L277.711 256.148H276.289L276.275 256.183C276.036 256.982 275.462 257.406 274.532 257.406C273.309 257.406 272.55 256.408 272.55 254.768V254.754C272.55 253.154 273.295 252.17 274.532 252.17C275.517 252.17 276.118 252.717 276.282 253.448L276.289 253.469L277.711 253.462V253.428C277.506 251.985 276.392 250.933 274.525 250.933C272.358 250.933 271.039 252.402 271.039 254.754V254.768C271.039 257.167 272.365 258.644 274.532 258.644ZM282.537 258.644C284.711 258.644 286.044 257.188 286.044 254.795V254.781C286.044 252.389 284.704 250.933 282.537 250.933C280.363 250.933 279.023 252.396 279.023 254.781V254.795C279.023 257.188 280.356 258.644 282.537 258.644ZM282.537 257.406C281.259 257.406 280.541 256.442 280.541 254.795V254.781C280.541 253.134 281.259 252.17 282.537 252.17C283.809 252.17 284.533 253.134 284.533 254.781V254.795C284.533 256.436 283.809 257.406 282.537 257.406ZM287.814 258.5H289.298V254.146C289.298 252.949 289.975 252.204 291.062 252.204C292.148 252.204 292.661 252.812 292.661 254.043V258.5H294.138V253.694C294.138 251.924 293.222 250.933 291.561 250.933C290.48 250.933 289.77 251.411 289.407 252.204H289.298V251.076H287.814V258.5ZM296.735 258.5H298.212V252.245H299.846V251.076H298.198V250.365C298.198 249.613 298.52 249.217 299.34 249.217C299.572 249.217 299.771 249.23 299.907 249.251V248.164C299.654 248.123 299.367 248.096 299.032 248.096C297.487 248.096 296.735 248.82 296.735 250.297V251.076H295.512V252.245H296.735V258.5ZM302.286 249.75C302.792 249.75 303.216 249.333 303.216 248.827C303.216 248.314 302.792 247.897 302.286 247.897C301.773 247.897 301.356 248.314 301.356 248.827C301.356 249.333 301.773 249.75 302.286 249.75ZM301.541 258.5H303.018V251.076H301.541V258.5ZM308.315 261.118C310.421 261.118 311.754 260.038 311.754 258.35V251.076H310.277V252.293H310.188C309.758 251.459 308.951 250.946 307.912 250.946C305.984 250.946 304.802 252.443 304.802 254.562V254.576C304.802 256.668 305.978 258.138 307.885 258.138C308.903 258.138 309.724 257.687 310.175 256.88H310.284V258.343C310.284 259.354 309.56 259.929 308.336 259.929C307.331 259.929 306.729 259.566 306.606 259.054L306.6 259.04H305.103L305.089 259.054C305.267 260.291 306.429 261.118 308.315 261.118ZM308.295 256.914C307.03 256.914 306.319 255.95 306.319 254.569V254.556C306.319 253.175 307.03 252.204 308.295 252.204C309.546 252.204 310.312 253.175 310.312 254.556V254.569C310.312 255.957 309.553 256.914 308.295 256.914ZM316.361 258.644C317.441 258.644 318.193 258.179 318.549 257.379H318.665V258.5H320.142V251.076H318.665V255.431C318.665 256.627 318.029 257.372 316.84 257.372C315.753 257.372 315.302 256.764 315.302 255.533V251.076H313.818V255.882C313.818 257.639 314.687 258.644 316.361 258.644ZM322.281 258.5H323.765V254.063C323.765 252.99 324.537 252.293 325.672 252.293C325.952 252.293 326.205 252.327 326.472 252.382V251.015C326.321 250.98 326.062 250.946 325.822 250.946C324.831 250.946 324.141 251.411 323.874 252.197H323.765V251.076H322.281V258.5ZM330.812 258.644C332.713 258.644 333.738 257.55 333.984 256.572L333.998 256.511L332.569 256.518L332.542 256.572C332.364 256.955 331.797 257.427 330.847 257.427C329.623 257.427 328.844 256.6 328.816 255.178H334.08V254.658C334.08 252.43 332.809 250.933 330.737 250.933C328.666 250.933 327.326 252.484 327.326 254.802V254.809C327.326 257.16 328.639 258.644 330.812 258.644ZM330.744 252.149C331.749 252.149 332.494 252.792 332.61 254.118H328.837C328.967 252.84 329.732 252.149 330.744 252.149ZM338.551 258.623C339.59 258.623 340.403 258.145 340.834 257.331H340.95V258.5H342.427V248.164H340.95V252.252H340.834C340.438 251.452 339.569 250.946 338.551 250.946C336.664 250.946 335.475 252.43 335.475 254.781V254.795C335.475 257.126 336.685 258.623 338.551 258.623ZM338.975 257.358C337.73 257.358 336.985 256.388 336.985 254.795V254.781C336.985 253.188 337.73 252.218 338.975 252.218C340.205 252.218 340.971 253.195 340.971 254.781V254.795C340.971 256.381 340.212 257.358 338.975 257.358Z" fill="#393939"/> +<path d="M361.723 250.209C362.174 250.209 362.543 249.84 362.543 249.389C362.543 248.938 362.174 248.568 361.723 248.568C361.271 248.568 360.902 248.938 360.902 249.389C360.902 249.84 361.271 250.209 361.723 250.209ZM360.055 261.529C361.6 261.529 362.317 260.88 362.317 259.362V251.631H361.128V259.383C361.128 260.196 360.827 260.477 360.027 260.477H359.85V261.529H360.055ZM366.59 259.13C367.581 259.13 368.354 258.699 368.818 257.913H368.928V259H370.117V253.955C370.117 252.424 369.112 251.501 367.314 251.501C365.742 251.501 364.621 252.28 364.43 253.436L364.423 253.477H365.612L365.619 253.456C365.811 252.882 366.392 252.554 367.273 252.554C368.374 252.554 368.928 253.046 368.928 253.955V254.625L366.815 254.755C365.1 254.857 364.129 255.616 364.129 256.929V256.942C364.129 258.282 365.188 259.13 366.59 259.13ZM365.346 256.915V256.901C365.346 256.17 365.838 255.773 366.959 255.705L368.928 255.582V256.252C368.928 257.305 368.046 258.098 366.836 258.098C365.981 258.098 365.346 257.66 365.346 256.915ZM372.291 259H373.48V254.639C373.48 253.347 374.226 252.554 375.401 252.554C376.577 252.554 377.124 253.189 377.124 254.516V259H378.313V254.229C378.313 252.479 377.391 251.501 375.736 251.501C374.649 251.501 373.959 251.959 373.59 252.738H373.48V251.631H372.291V259ZM383.475 259.13C385.211 259.13 386.264 258.146 386.517 257.147L386.53 257.093H385.341L385.313 257.154C385.115 257.599 384.5 258.07 383.502 258.07C382.189 258.07 381.349 257.182 381.314 255.657H386.619V255.192C386.619 252.991 385.402 251.501 383.399 251.501C381.396 251.501 380.098 253.06 380.098 255.336V255.343C380.098 257.653 381.369 259.13 383.475 259.13ZM383.393 252.561C384.479 252.561 385.286 253.251 385.409 254.707H381.335C381.465 253.306 382.299 252.561 383.393 252.561ZM389.436 259.068C389.928 259.068 390.324 258.665 390.324 258.18C390.324 257.688 389.928 257.291 389.436 257.291C388.95 257.291 388.547 257.688 388.547 258.18C388.547 258.665 388.95 259.068 389.436 259.068ZM395.068 259.13C396.094 259.13 396.914 258.645 397.365 257.824H397.475V259H398.664V248.705H397.475V252.793H397.365C396.962 252.007 396.08 251.501 395.068 251.501C393.195 251.501 391.979 252.998 391.979 255.309V255.322C391.979 257.619 393.202 259.13 395.068 259.13ZM395.342 258.077C393.995 258.077 393.195 257.038 393.195 255.322V255.309C393.195 253.593 393.995 252.554 395.342 252.554C396.682 252.554 397.502 253.606 397.502 255.309V255.322C397.502 257.024 396.682 258.077 395.342 258.077ZM403.976 259.13C406.074 259.13 407.373 257.681 407.373 255.322V255.309C407.373 252.943 406.074 251.501 403.976 251.501C401.877 251.501 400.578 252.943 400.578 255.309V255.322C400.578 257.681 401.877 259.13 403.976 259.13ZM403.976 258.077C402.581 258.077 401.795 257.059 401.795 255.322V255.309C401.795 253.565 402.581 252.554 403.976 252.554C405.37 252.554 406.156 253.565 406.156 255.309V255.322C406.156 257.059 405.37 258.077 403.976 258.077ZM412.227 259.13C413.963 259.13 415.016 258.146 415.269 257.147L415.282 257.093H414.093L414.065 257.154C413.867 257.599 413.252 258.07 412.254 258.07C410.941 258.07 410.101 257.182 410.066 255.657H415.371V255.192C415.371 252.991 414.154 251.501 412.151 251.501C410.148 251.501 408.85 253.06 408.85 255.336V255.343C408.85 257.653 410.121 259.13 412.227 259.13ZM412.145 252.561C413.231 252.561 414.038 253.251 414.161 254.707H410.087C410.217 253.306 411.051 252.561 412.145 252.561ZM422.85 260.6C423.711 260.6 424.538 260.477 425.153 260.265V259.403C424.723 259.602 423.8 259.731 422.863 259.731C419.938 259.731 418.051 257.852 418.051 254.939V254.926C418.051 252.089 419.972 250.052 422.645 250.052C425.379 250.052 427.252 251.74 427.252 254.201V254.215C427.252 255.89 426.698 256.977 425.837 256.977C425.345 256.977 425.064 256.696 425.064 256.218V252.205H424.032V253.039H423.923C423.656 252.444 423.041 252.075 422.323 252.075C420.922 252.075 419.944 253.237 419.944 254.892V254.905C419.944 256.635 420.901 257.804 422.323 257.804C423.123 257.804 423.738 257.414 424.032 256.717H424.142L424.148 256.758C424.258 257.421 424.859 257.865 425.646 257.865C427.218 257.865 428.216 256.45 428.216 254.229V254.215C428.216 251.255 425.967 249.19 422.733 249.19C419.384 249.19 417.087 251.508 417.087 254.885V254.898C417.087 258.385 419.322 260.6 422.85 260.6ZM422.48 256.84C421.585 256.84 421.038 256.115 421.038 254.933V254.919C421.038 253.729 421.578 253.019 422.494 253.019C423.424 253.019 424.019 253.757 424.019 254.919V254.933C424.019 256.095 423.417 256.84 422.48 256.84ZM433.076 259.13C434.812 259.13 435.865 258.146 436.118 257.147L436.132 257.093H434.942L434.915 257.154C434.717 257.599 434.102 258.07 433.104 258.07C431.791 258.07 430.95 257.182 430.916 255.657H436.221V255.192C436.221 252.991 435.004 251.501 433.001 251.501C430.998 251.501 429.699 253.06 429.699 255.336V255.343C429.699 257.653 430.971 259.13 433.076 259.13ZM432.994 252.561C434.081 252.561 434.888 253.251 435.011 254.707H430.937C431.066 253.306 431.9 252.561 432.994 252.561ZM437.205 259H438.538L440.288 256.218H440.397L442.141 259H443.535L440.999 255.268L443.501 251.631H442.168L440.438 254.372H440.329L438.579 251.631H437.178L439.728 255.315L437.205 259ZM447.158 259.13C448.149 259.13 448.922 258.699 449.387 257.913H449.496V259H450.686V253.955C450.686 252.424 449.681 251.501 447.883 251.501C446.311 251.501 445.189 252.28 444.998 253.436L444.991 253.477H446.181L446.188 253.456C446.379 252.882 446.96 252.554 447.842 252.554C448.942 252.554 449.496 253.046 449.496 253.955V254.625L447.384 254.755C445.668 254.857 444.697 255.616 444.697 256.929V256.942C444.697 258.282 445.757 259.13 447.158 259.13ZM445.914 256.915V256.901C445.914 256.17 446.406 255.773 447.527 255.705L449.496 255.582V256.252C449.496 257.305 448.614 258.098 447.404 258.098C446.55 258.098 445.914 257.66 445.914 256.915ZM452.859 259H454.049V254.434C454.049 253.395 454.78 252.554 455.744 252.554C456.674 252.554 457.275 253.121 457.275 253.996V259H458.465V254.263C458.465 253.326 459.142 252.554 460.167 252.554C461.206 252.554 461.705 253.094 461.705 254.181V259H462.895V253.907C462.895 252.362 462.054 251.501 460.55 251.501C459.531 251.501 458.69 252.014 458.294 252.793H458.185C457.843 252.027 457.146 251.501 456.147 251.501C455.184 251.501 454.486 251.959 454.158 252.752H454.049V251.631H452.859V259ZM465.041 261.461H466.23V257.838H466.34C466.743 258.624 467.625 259.13 468.637 259.13C470.51 259.13 471.727 257.633 471.727 255.322V255.309C471.727 253.012 470.503 251.501 468.637 251.501C467.611 251.501 466.791 251.986 466.34 252.807H466.23V251.631H465.041V261.461ZM468.363 258.077C467.023 258.077 466.203 257.024 466.203 255.322V255.309C466.203 253.606 467.023 252.554 468.363 252.554C469.71 252.554 470.51 253.593 470.51 255.309V255.322C470.51 257.038 469.71 258.077 468.363 258.077ZM473.654 259H474.844V248.705H473.654V259ZM480.135 259.13C481.871 259.13 482.924 258.146 483.177 257.147L483.19 257.093H482.001L481.974 257.154C481.775 257.599 481.16 258.07 480.162 258.07C478.85 258.07 478.009 257.182 477.975 255.657H483.279V255.192C483.279 252.991 482.062 251.501 480.06 251.501C478.057 251.501 476.758 253.06 476.758 255.336V255.343C476.758 257.653 478.029 259.13 480.135 259.13ZM480.053 252.561C481.14 252.561 481.946 253.251 482.069 254.707H477.995C478.125 253.306 478.959 252.561 480.053 252.561ZM486.096 259.068C486.588 259.068 486.984 258.665 486.984 258.18C486.984 257.688 486.588 257.291 486.096 257.291C485.61 257.291 485.207 257.688 485.207 258.18C485.207 258.665 485.61 259.068 486.096 259.068ZM492.022 259.13C493.793 259.13 494.784 258.18 495.085 256.847L495.099 256.771L493.923 256.778L493.909 256.819C493.636 257.64 493.007 258.077 492.016 258.077C490.703 258.077 489.855 256.99 489.855 255.295V255.281C489.855 253.62 490.689 252.554 492.016 252.554C493.075 252.554 493.731 253.142 493.916 253.866L493.923 253.887H495.105L495.099 253.846C494.88 252.533 493.807 251.501 492.016 251.501C489.951 251.501 488.639 252.991 488.639 255.281V255.295C488.639 257.633 489.958 259.13 492.022 259.13ZM499.87 259.13C501.969 259.13 503.268 257.681 503.268 255.322V255.309C503.268 252.943 501.969 251.501 499.87 251.501C497.771 251.501 496.473 252.943 496.473 255.309V255.322C496.473 257.681 497.771 259.13 499.87 259.13ZM499.87 258.077C498.476 258.077 497.689 257.059 497.689 255.322V255.309C497.689 253.565 498.476 252.554 499.87 252.554C501.265 252.554 502.051 253.565 502.051 255.309V255.322C502.051 257.059 501.265 258.077 499.87 258.077ZM505.113 259H506.303V254.434C506.303 253.395 507.034 252.554 507.998 252.554C508.928 252.554 509.529 253.121 509.529 253.996V259H510.719V254.263C510.719 253.326 511.396 252.554 512.421 252.554C513.46 252.554 513.959 253.094 513.959 254.181V259H515.148V253.907C515.148 252.362 514.308 251.501 512.804 251.501C511.785 251.501 510.944 252.014 510.548 252.793H510.438C510.097 252.027 509.399 251.501 508.401 251.501C507.438 251.501 506.74 251.959 506.412 252.752H506.303V251.631H505.113V259Z" fill="#575757"/> +<path d="M537.491 259.232C539.692 259.232 541.135 258.084 541.135 256.238V256.231C541.135 254.81 540.321 253.982 538.264 253.524L537.17 253.278C535.83 252.984 535.29 252.451 535.29 251.665V251.658C535.29 250.626 536.24 250.045 537.471 250.038C538.756 250.031 539.576 250.674 539.713 251.542L539.727 251.631H540.957L540.95 251.535C540.848 250.065 539.474 248.903 537.505 248.903C535.468 248.903 534.039 250.059 534.032 251.692V251.699C534.032 253.128 534.887 254.037 536.862 254.475L537.956 254.714C539.31 255.015 539.877 255.575 539.877 256.396V256.402C539.877 257.407 538.899 258.098 537.56 258.098C536.138 258.098 535.112 257.476 535.023 256.491L535.017 256.416H533.786L533.793 256.491C533.937 258.098 535.331 259.232 537.491 259.232ZM546.043 259.13C547.779 259.13 548.832 258.146 549.085 257.147L549.099 257.093H547.909L547.882 257.154C547.684 257.599 547.068 258.07 546.07 258.07C544.758 258.07 543.917 257.182 543.883 255.657H549.188V255.192C549.188 252.991 547.971 251.501 545.968 251.501C543.965 251.501 542.666 253.06 542.666 255.336V255.343C542.666 257.653 543.938 259.13 546.043 259.13ZM545.961 252.561C547.048 252.561 547.854 253.251 547.978 254.707H543.903C544.033 253.306 544.867 252.561 545.961 252.561ZM551.033 261.461H552.223V257.838H552.332C552.735 258.624 553.617 259.13 554.629 259.13C556.502 259.13 557.719 257.633 557.719 255.322V255.309C557.719 253.012 556.495 251.501 554.629 251.501C553.604 251.501 552.783 251.986 552.332 252.807H552.223V251.631H551.033V261.461ZM554.355 258.077C553.016 258.077 552.195 257.024 552.195 255.322V255.309C552.195 253.606 553.016 252.554 554.355 252.554C555.702 252.554 556.502 253.593 556.502 255.309V255.322C556.502 257.038 555.702 258.077 554.355 258.077ZM563.509 259H569.894V257.893H565.218V257.783L567.46 255.466C569.244 253.627 569.729 252.807 569.729 251.679V251.665C569.729 250.072 568.41 248.903 566.688 248.903C564.801 248.903 563.447 250.161 563.44 251.911L563.454 251.918L564.63 251.925L564.637 251.911C564.637 250.749 565.423 249.977 566.605 249.977C567.768 249.977 568.472 250.756 568.472 251.795V251.809C568.472 252.67 568.103 253.183 566.845 254.543L563.509 258.152V259ZM578.309 259H579.539V249.136H578.315L575.69 251.022V252.321L578.199 250.503H578.309V259ZM582.39 259H588.774V257.893H584.099V257.783L586.341 255.466C588.125 253.627 588.61 252.807 588.61 251.679V251.665C588.61 250.072 587.291 248.903 585.568 248.903C583.682 248.903 582.328 250.161 582.321 251.911L582.335 251.918L583.511 251.925L583.518 251.911C583.518 250.749 584.304 249.977 585.486 249.977C586.648 249.977 587.353 250.756 587.353 251.795V251.809C587.353 252.67 586.983 253.183 585.726 254.543L582.39 258.152V259ZM591.816 252.308C592.309 252.308 592.705 251.904 592.705 251.419C592.705 250.927 592.309 250.53 591.816 250.53C591.331 250.53 590.928 250.927 590.928 251.419C590.928 251.904 591.331 252.308 591.816 252.308ZM591.816 257.599C592.309 257.599 592.705 257.195 592.705 256.71C592.705 256.218 592.309 255.821 591.816 255.821C591.331 255.821 590.928 256.218 590.928 256.71C590.928 257.195 591.331 257.599 591.816 257.599ZM598.468 259.232C600.471 259.232 601.899 257.845 601.899 255.855V255.842C601.899 253.935 600.566 252.547 598.714 252.547C597.818 252.547 597.046 252.909 596.608 253.572H596.499L596.834 250.236H601.353V249.136H595.863L595.344 254.803H596.41C596.533 254.57 596.69 254.379 596.861 254.215C597.285 253.812 597.846 253.613 598.502 253.613C599.78 253.613 600.696 254.55 600.696 255.862V255.876C600.696 257.209 599.794 258.146 598.481 258.146C597.326 258.146 596.472 257.394 596.355 256.45L596.349 256.396H595.166L595.173 256.471C595.316 258.05 596.629 259.232 598.468 259.232ZM607.238 259.164C609.214 259.164 610.663 257.947 610.663 256.3V256.286C610.663 254.885 609.686 253.989 608.25 253.866V253.839C609.48 253.579 610.342 252.745 610.342 251.528V251.515C610.342 250.018 609.104 248.972 607.225 248.972C605.379 248.972 604.107 250.045 603.95 251.651L603.943 251.72H605.126L605.133 251.651C605.235 250.653 606.062 250.038 607.225 250.038C608.428 250.038 609.104 250.633 609.104 251.665V251.679C609.104 252.663 608.284 253.388 607.108 253.388H605.926V254.427H607.163C608.544 254.427 609.412 255.104 609.412 256.313V256.327C609.412 257.373 608.53 258.098 607.238 258.098C605.926 258.098 605.03 257.428 604.935 256.457L604.928 256.389H603.745L603.752 256.471C603.882 258.029 605.201 259.164 607.238 259.164ZM613.637 252.308C614.129 252.308 614.525 251.904 614.525 251.419C614.525 250.927 614.129 250.53 613.637 250.53C613.151 250.53 612.748 250.927 612.748 251.419C612.748 251.904 613.151 252.308 613.637 252.308ZM613.637 257.599C614.129 257.599 614.525 257.195 614.525 256.71C614.525 256.218 614.129 255.821 613.637 255.821C613.151 255.821 612.748 256.218 612.748 256.71C612.748 257.195 613.151 257.599 613.637 257.599ZM620.117 259.232C622.298 259.232 623.61 257.243 623.61 254.071V254.058C623.61 250.886 622.298 248.903 620.117 248.903C617.937 248.903 616.638 250.886 616.638 254.058V254.071C616.638 257.243 617.937 259.232 620.117 259.232ZM620.117 258.159C618.702 258.159 617.875 256.587 617.875 254.071V254.058C617.875 251.542 618.702 249.983 620.117 249.983C621.532 249.983 622.373 251.542 622.373 254.058V254.071C622.373 256.587 621.532 258.159 620.117 258.159ZM628.936 259.232C631.116 259.232 632.429 257.243 632.429 254.071V254.058C632.429 250.886 631.116 248.903 628.936 248.903C626.755 248.903 625.456 250.886 625.456 254.058V254.071C625.456 257.243 626.755 259.232 628.936 259.232ZM628.936 258.159C627.521 258.159 626.693 256.587 626.693 254.071V254.058C626.693 251.542 627.521 249.983 628.936 249.983C630.351 249.983 631.191 251.542 631.191 254.058V254.071C631.191 256.587 630.351 258.159 628.936 258.159ZM642.635 259.232C645.157 259.232 646.825 257.619 646.825 255.186V253.982H642.826V255.062H645.595V255.302C645.595 256.97 644.405 258.098 642.642 258.098C640.659 258.098 639.422 256.553 639.422 254.071V254.058C639.422 251.61 640.68 250.038 642.635 250.038C644.104 250.038 645.096 250.735 645.499 252.007L645.52 252.075H646.764L646.75 252.007C646.36 250.134 644.822 248.903 642.635 248.903C639.935 248.903 638.164 250.947 638.164 254.058V254.071C638.164 257.223 639.907 259.232 642.635 259.232ZM649.006 259H650.154V251.467H650.229L653.347 259H654.386L657.503 251.467H657.578V259H658.727V249.136H657.298L653.921 257.366H653.812L650.435 249.136H649.006V259ZM663.806 259H665.036V250.243H668.215V249.136H660.627V250.243H663.806V259ZM673.588 255.582H676.65V258.713H677.758V255.582H680.82V254.475H677.758V251.344H676.65V254.475H673.588V255.582ZM689.892 259.232C691.895 259.232 693.323 257.845 693.323 255.855V255.842C693.323 253.935 691.99 252.547 690.138 252.547C689.242 252.547 688.47 252.909 688.032 253.572H687.923L688.258 250.236H692.776V249.136H687.287L686.768 254.803H687.834C687.957 254.57 688.114 254.379 688.285 254.215C688.709 253.812 689.27 253.613 689.926 253.613C691.204 253.613 692.12 254.55 692.12 255.862V255.876C692.12 257.209 691.218 258.146 689.905 258.146C688.75 258.146 687.896 257.394 687.779 256.45L687.772 256.396H686.59L686.597 256.471C686.74 258.05 688.053 259.232 689.892 259.232ZM696.283 252.308C696.775 252.308 697.172 251.904 697.172 251.419C697.172 250.927 696.775 250.53 696.283 250.53C695.798 250.53 695.395 250.927 695.395 251.419C695.395 251.904 695.798 252.308 696.283 252.308ZM696.283 257.599C696.775 257.599 697.172 257.195 697.172 256.71C697.172 256.218 696.775 255.821 696.283 255.821C695.798 255.821 695.395 256.218 695.395 256.71C695.395 257.195 695.798 257.599 696.283 257.599ZM702.75 259.164C704.726 259.164 706.175 257.947 706.175 256.3V256.286C706.175 254.885 705.197 253.989 703.762 253.866V253.839C704.992 253.579 705.854 252.745 705.854 251.528V251.515C705.854 250.018 704.616 248.972 702.736 248.972C700.891 248.972 699.619 250.045 699.462 251.651L699.455 251.72H700.638L700.645 251.651C700.747 250.653 701.574 250.038 702.736 250.038C703.939 250.038 704.616 250.633 704.616 251.665V251.679C704.616 252.663 703.796 253.388 702.62 253.388H701.438V254.427H702.675C704.056 254.427 704.924 255.104 704.924 256.313V256.327C704.924 257.373 704.042 258.098 702.75 258.098C701.438 258.098 700.542 257.428 700.446 256.457L700.439 256.389H699.257L699.264 256.471C699.394 258.029 700.713 259.164 702.75 259.164ZM711.473 259.232C713.653 259.232 714.966 257.243 714.966 254.071V254.058C714.966 250.886 713.653 248.903 711.473 248.903C709.292 248.903 707.993 250.886 707.993 254.058V254.071C707.993 257.243 709.292 259.232 711.473 259.232ZM711.473 258.159C710.058 258.159 709.23 256.587 709.23 254.071V254.058C709.23 251.542 710.058 249.983 711.473 249.983C712.888 249.983 713.729 251.542 713.729 254.058V254.071C713.729 256.587 712.888 258.159 711.473 258.159Z" fill="#575757"/> +<circle cx="149" cy="179" r="9" fill="#FFDEDE"/> </g> <defs> -<filter id="filter0_d_625_11711" x="66" y="23" width="679" height="511" 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 dy="10"/> -<feGaussianBlur stdDeviation="10"/> -<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.11 0"/> -<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_625_11711"/> -<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_625_11711" result="shape"/> -</filter> -<filter id="filter1_d_625_11711" x="66" y="23" width="679" height="511" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"> +<filter id="filter0_d_625_11711" x="78" y="30" width="679" height="511" 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 dy="10"/> @@ -163,17 +82,7 @@ <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_625_11711"/> <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_625_11711" result="shape"/> </filter> -<filter id="filter2_d_625_11711" x="-23" y="181" width="861" height="180" 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 dy="24"/> -<feGaussianBlur stdDeviation="32"/> -<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.13 0"/> -<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_625_11711"/> -<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_625_11711" result="shape"/> -</filter> -<filter id="filter3_d_625_11711" x="-23" y="181" width="861" height="180" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"> +<filter id="filter1_d_625_11711" x="-11" y="188" width="861" height="180" 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 dy="24"/> @@ -184,10 +93,10 @@ <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_625_11711" result="shape"/> </filter> <clipPath id="clip0_625_11711"> -<rect width="725" height="537" fill="white"/> +<rect width="734" height="537" fill="white"/> </clipPath> <clipPath id="clip1_625_11711"> -<rect width="24" height="24" fill="white" transform="translate(55 235)"/> +<rect width="24" height="24" fill="white" transform="translate(90 242)"/> </clipPath> </defs> </svg> diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index 10b5b5a06352..a8c428bd814d 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -1022,8 +1022,29 @@ export const DISCONNECT_AUTH_ERROR = () => export const MANDATORY_FIELDS_ERROR = () => "Mandatory fields cannot be empty"; // Audit logs begin -export const AUDIT_LOGS = () => "Audit logs"; +export const AUDIT_LOGS = () => "Audit Logs"; export const TRY_AGAIN_WITH_YOUR_FILTER = () => "Try again with your filter"; + +// Audit logs Upgrade page begin +export const INTRODUCING = (featureName: string) => + `Introducing ${featureName}`; +export const AUDIT_LOGS_UPGRADE_PAGE_SUB_HEADING = () => + "See a timestamped trail of events in your workspace. Filter by type of event, user, resource ID, and time. Drill down into each event to investigate further."; +export const SECURITY_AND_COMPLIANCE = () => "Security & Compliance"; +export const SECURITY_AND_COMPLIANCE_DETAIL1 = () => + "Proactively derisk misconfigured permissions, roll back changes from a critical security event, and keep checks against your compliance policies."; +export const SECURITY_AND_COMPLIANCE_DETAIL2 = () => + "Exports to popular compliance tools coming soon"; +export const DEBUGGING = () => "Debugging"; +export const DEBUGGING_DETAIL1 = () => + "Debug with a timeline of events filtered by user and resource ID, correlate them with end-user and app developer actions, and investigate back to the last known good state of your app."; +export const INCIDENT_MANAGEMENT = () => "Incident Management"; +export const INCIDENT_MANAGEMENT_DETAIL1 = () => + "Go back in time from an incident to see who did what, correlate events with breaking changes, and run RCAs to remediate incidents for now and the future."; +export const AVAILABLE_ON_BUSINESS = () => "Available on a business plan only"; +export const EXCLUSIVE_TO_BUSINESS = (featureName: string) => + `The ${featureName} feature is exclusive to workspaces on the Enterprise Plan`; +// Audit logs Upgrade page end // Audit logs end // diff --git a/app/client/src/ce/pages/Upgrade/AuditLogsUpgradePage.tsx b/app/client/src/ce/pages/Upgrade/AuditLogsUpgradePage.tsx index 4dc89ca9b33c..c9a0b277c95a 100644 --- a/app/client/src/ce/pages/Upgrade/AuditLogsUpgradePage.tsx +++ b/app/client/src/ce/pages/Upgrade/AuditLogsUpgradePage.tsx @@ -6,39 +6,48 @@ import IncidentManagementImage from "assets/svg/upgrade/audit-logs/incident-mana import SecurityAndComplianceImage from "assets/svg/upgrade/audit-logs/security-and-compliance.svg"; import AnalyticsUtil from "../../../utils/AnalyticsUtil"; import { getAppsmithConfigs } from "../../configs"; -import { createMessage, UPGRADE } from "../../constants/messages"; +import { createMessage } from "design-system/build/constants/messages"; +import { + AUDIT_LOGS, + AUDIT_LOGS_UPGRADE_PAGE_SUB_HEADING, + DEBUGGING, + DEBUGGING_DETAIL1, + EXCLUSIVE_TO_BUSINESS, + INCIDENT_MANAGEMENT, + INCIDENT_MANAGEMENT_DETAIL1, + INTRODUCING, + SECURITY_AND_COMPLIANCE, + SECURITY_AND_COMPLIANCE_DETAIL1, + SECURITY_AND_COMPLIANCE_DETAIL2, + UPGRADE, +} from "../../constants/messages"; const { intercomAppID } = getAppsmithConfigs(); export function AuditLogsUpgradePage() { const header: Header = { - heading: "Audit Logs", - subHeadings: [ - "Your workspace audit log gives Workspace owners access to detailed information about security and safety-related activity.", - ], + heading: createMessage(INTRODUCING, createMessage(AUDIT_LOGS)), + subHeadings: [createMessage(AUDIT_LOGS_UPGRADE_PAGE_SUB_HEADING)], }; const carousel = { triggers: [ { icon: "lock-2-line", - heading: "Security & Compliance", + heading: createMessage(SECURITY_AND_COMPLIANCE), details: [ - "Debug with a timeline of events filtered by user and resource ID, correlate them with end-user and app developer actions, and investigate back to the last known good state of your app.", + createMessage(SECURITY_AND_COMPLIANCE_DETAIL1), + createMessage(SECURITY_AND_COMPLIANCE_DETAIL2), ], }, { icon: "search-eye-line", - heading: "Debugging", - details: [ - "Debug with a timeline of events filtered by user and resource ID, correlate them with end-user and app developer actions, and investigate back to the last known good state of your app.", - ], + heading: createMessage(DEBUGGING), + details: [createMessage(DEBUGGING_DETAIL1)], }, { icon: "alert-line", - heading: "Incident management", - details: [ - "Debug with a timeline of events filtered by user and resource ID, correlate them with end-user and app developer actions, and investigate back to the last known good state of your app.", - ], + heading: createMessage(INCIDENT_MANAGEMENT), + details: [createMessage(INCIDENT_MANAGEMENT_DETAIL1)], }, ], targets: [ @@ -65,8 +74,7 @@ export function AuditLogsUpgradePage() { window.Intercom("showNewMessage", createMessage(UPGRADE)); } }, - message: - "The audit log feature is exclusive to workspaces on the Enterprise Plan", + message: createMessage(EXCLUSIVE_TO_BUSINESS, ["audit logs"]), }; const props = { header, carousel, footer }; return <UpgradePage {...props} />; diff --git a/app/client/src/ce/pages/Upgrade/Footer.tsx b/app/client/src/ce/pages/Upgrade/Footer.tsx index 47a50842c1b5..c52d58a05e23 100644 --- a/app/client/src/ce/pages/Upgrade/Footer.tsx +++ b/app/client/src/ce/pages/Upgrade/Footer.tsx @@ -3,6 +3,8 @@ import React from "react"; import { Button, Size, Text, TextType } from "design-system"; import { Variant } from "design-system/build/constants/variants"; import { FooterProps } from "./types"; +import { createMessage } from "design-system/build/constants/messages"; +import { AVAILABLE_ON_BUSINESS, UPGRADE } from "../../constants/messages"; const FooterContainer = styled.div` position: fixed; @@ -24,10 +26,6 @@ const FooterContainer = styled.div` flex-grow: 9; display: flex; flex-direction: column; - - //& .text-container { - // width: 288px; - //} } & .right { @@ -44,7 +42,7 @@ export function FooterComponent(props: FooterProps) { > <div className="left"> <div className="heading-container"> - <Text type={TextType.H1}>Available on a business plan only</Text> + <Text type={TextType.H1}>{createMessage(AVAILABLE_ON_BUSINESS)}</Text> </div> <div className="text-container"> <Text type={TextType.P1}>{message}</Text> @@ -54,7 +52,7 @@ export function FooterComponent(props: FooterProps) { <Button onClick={onClick} size={Size.large} - text="UPGRADE" + text={createMessage(UPGRADE)} type="button" variant={Variant.info} /> diff --git a/app/client/src/ce/pages/Upgrade/UpgradePage.tsx b/app/client/src/ce/pages/Upgrade/UpgradePage.tsx index a294e8d1f8be..6039668764b3 100644 --- a/app/client/src/ce/pages/Upgrade/UpgradePage.tsx +++ b/app/client/src/ce/pages/Upgrade/UpgradePage.tsx @@ -14,7 +14,6 @@ export const ExternalContainer = styled.div` max-height: 100vh; border-left: thin solid var(--appsmith-color-black-50); background-color: var(--ads-color-black-50); - //width: 1180px; `; export const InternalContainer = styled.div`
cc620b3ab33ab806ef82ee6288b1034be7f82beb
2024-01-29 19:51:01
Aman Agarwal
feat: removing delete multiple apps feature (#30661)
false
removing delete multiple apps feature (#30661)
feat
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteMultipleApplications.ts b/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteMultipleApplications.ts deleted file mode 100644 index d745604457d9..000000000000 --- a/app/client/cypress/e2e/Regression/ClientSide/Workspace/DeleteMultipleApplications.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { - agHelper, - homePage, - assertHelper, - inviteModal, -} from "../../../../support/Objects/ObjectsCore"; -import { featureFlagIntercept } from "../../../../support/Objects/FeatureFlags"; - -const timestamp = Date.now(); - -const workspaceName = `w_${timestamp}`; -const firstApplicationName = `app_${timestamp}_1`; -const secondApplicationName = `app_${timestamp}_2`; - -const UnableToDeleteWorkspace = { - workspaceName: `w_${timestamp}_3`, - applicationName: `app_${timestamp}_3`, -}; - -describe( - "Delete multiple application", - { tags: ["@tag.Workspace"] }, - function () { - before(() => { - homePage.CreateNewWorkspace(workspaceName, true); - homePage.CreateAppInWorkspace(workspaceName, firstApplicationName); - homePage.NavigateToHome(); - homePage.CreateAppInWorkspace(workspaceName, secondApplicationName); - }); - - it("1. Should select & cancel delete multiple applications in different workspace & other action items should not be visible when selection mode is on", function () { - homePage.NavigateToHome(); - homePage.SelectWorkspace(workspaceName); - - homePage.SelectMultipleApplicationToDelete(firstApplicationName); - homePage.SelectMultipleApplicationToDelete(secondApplicationName); - - // Asserting all the other share & create new app button not visible - agHelper.AssertElementVisibility(homePage._newIcon, false); - - agHelper.AssertElementAbsence(homePage._newButtonCreateApplication); - - agHelper.ClickButton("Cancel"); - agHelper.AssertElementAbsence(homePage._multipleSelectedApplication); - agHelper.AssertElementExist(homePage._appCard(firstApplicationName)); - agHelper.AssertElementExist(homePage._appCard(secondApplicationName)); - }); - - it("2. Should select & delete multiple applications in different workspace", function () { - homePage.SelectMultipleApplicationToDelete(firstApplicationName); - homePage.SelectMultipleApplicationToDelete(secondApplicationName); - agHelper.ClickButton("Delete"); - agHelper.ClickButton("Yes"); - assertHelper.WaitForNetworkCall("@deleteMultipleApp").then((response) => { - expect(response?.body?.data?.length).to.be.equal(2); - agHelper.AssertElementAbsence(homePage._appCard(firstApplicationName)); - agHelper.AssertElementAbsence(homePage._appCard(secondApplicationName)); - }); - }); - - it("3. Unable to select to multiple delete if not enough permissions to delete", function () { - featureFlagIntercept({ license_gac_enabled: true }); - cy.wait(2000); - homePage.LogintoApp(Cypress.env("USERNAME"), Cypress.env("PASSWORD")); - homePage.CreateNewWorkspace(UnableToDeleteWorkspace.workspaceName); - homePage.CreateAppInWorkspace( - UnableToDeleteWorkspace.workspaceName, - UnableToDeleteWorkspace.applicationName, - ); - - agHelper.GetNClick(inviteModal.locators._shareButton, 0, true); - homePage.InviteUserToApplication( - Cypress.env("TESTUSERNAME1"), - "App Viewer", - ); - homePage.LogOutviaAPI(); - - homePage.LogintoApp( - Cypress.env("TESTUSERNAME1"), - Cypress.env("TESTPASSWORD1"), - "App Viewer", - ); - - homePage.SelectWorkspace(UnableToDeleteWorkspace.workspaceName); - - homePage.SelectMultipleApplicationToDeleteByCard( - UnableToDeleteWorkspace.applicationName, - "topLeft", - ); - agHelper.ValidateToastMessage( - "You don't have permission to delete this application", - ); - }); - }, -); diff --git a/app/client/cypress/support/Pages/HomePage.ts b/app/client/cypress/support/Pages/HomePage.ts index 77ff61b6c785..4b6e176c2138 100644 --- a/app/client/cypress/support/Pages/HomePage.ts +++ b/app/client/cypress/support/Pages/HomePage.ts @@ -116,7 +116,6 @@ export class HomePage { _importFromGitBtn = "div.t--import-json-card + div"; _helpButton = ".t--help-menu-option"; private signupUsername = "input[name='email']"; - _multipleSelectedApplication = ".t--application-card-selected"; private _applicationEditedText = (applicationName: string) => this._appCard(applicationName) + "//div[contains(@class, 't--application-edited-text')]"; @@ -129,10 +128,6 @@ export class HomePage { public _searchWorkspaceLocator = (workspaceName: string) => `[data-testid="${workspaceName}"]`; - private _applicationMultiSelectionCheckbox = (applicationName: string) => - this._appCard(applicationName) + - "//label[contains(@class, 't--app-multi-select-checkbox')]"; - public SwitchToAppsTab() { this.agHelper.GetNClick(this._homeTab); } @@ -770,30 +765,6 @@ export class HomePage { } }); } - - public SelectMultipleApplicationToDelete(applicationName: string) { - this.agHelper - .GetElement(this._appCard(applicationName)) - .first() - .realHover(); - this.agHelper.GetNClick( - this._applicationMultiSelectionCheckbox(applicationName), - ); - } - public SelectMultipleApplicationToDeleteByCard( - applicationName: string, - position: Cypress.PositionType = "center", - ) { - this.agHelper.GetNClick( - this._appCard(applicationName), - 0, - true, - 500, - false, - true, - position, - ); - } public SelectWorkspace(workspaceName: string, networkCallAlias = true) { this.agHelper .GetElement(this._leftPanel) diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js index 4553ae9d7754..64d836675694 100644 --- a/app/client/cypress/support/commands.js +++ b/app/client/cypress/support/commands.js @@ -931,9 +931,6 @@ Cypress.Commands.add("startServerAndRoutes", () => { "makePageDefault", ); cy.intercept("DELETE", "/api/v1/applications/*").as("deleteApp"); - cy.intercept("POST", "/api/v1/applications/delete-apps").as( - "deleteMultipleApp", - ); cy.intercept("DELETE", "/api/v1/pages/*").as("deletePage"); //cy.intercept("POST", "/api/v1/datasources").as("createDatasource"); cy.intercept("DELETE", "/api/v1/datasources/*").as("deleteDatasource"); diff --git a/app/client/src/ce/api/ApplicationApi.tsx b/app/client/src/ce/api/ApplicationApi.tsx index 758eafe81bc1..777ddaee27e0 100644 --- a/app/client/src/ce/api/ApplicationApi.tsx +++ b/app/client/src/ce/api/ApplicationApi.tsx @@ -379,12 +379,6 @@ export class ApplicationApi extends Api { ); } - static async deleteMultipleApps(request: { - ids: string[]; - }): Promise<AxiosPromise<ApiResponse>> { - return Api.post(`${ApplicationApi.baseURL}/delete-apps`, request.ids); - } - static async importApplicationToWorkspace( request: ImportApplicationRequest, ): Promise<AxiosPromise<ApiResponse>> { diff --git a/app/client/src/ce/constants/ReduxActionConstants.tsx b/app/client/src/ce/constants/ReduxActionConstants.tsx index 05e21d037e94..4e301bde5c0e 100644 --- a/app/client/src/ce/constants/ReduxActionConstants.tsx +++ b/app/client/src/ce/constants/ReduxActionConstants.tsx @@ -870,10 +870,6 @@ const ActionTypes = { "SET_PUBLISHED_APP_TO_COMMUNITY_PORTAL", FORM_EVALUATION_EMPTY_BUFFER: "FORM_EVALUATION_EMPTY_BUFFER", CLEAR_CACHE: "CLEAR_CACHE", - DELETE_MULTIPLE_APPS_INIT: "DELETE_MULTIPLE_APPS_INIT", - DELETE_MULTIPLE_APPS_TOGGLE: "DELETE_MULTIPLE_APPS_TOGGLE", - DELETE_MULTIPLE_APPLICATION_SUCCESS: "DELETE_MULTIPLE_APPLICATION_SUCCESS", - DELETE_MULTIPLE_APPLICATION_CANCEL: "DELETE_MULTIPLE_APPLICATION_CANCEL", TRIGGER_EVAL: "TRIGGER_EVAL", UPDATE_ACTION_DATA: "UPDATE_ACTION_DATA", SET_ACTIVE_EDITOR_FIELD: "SET_ACTIVE_EDITOR_FIELD", @@ -1098,7 +1094,6 @@ export const ReduxActionErrorTypes = { FETCH_PRODUCT_ALERT_FAILED: "FETCH_PRODUCT_ALERT_FAILED", PUBLISH_APP_AS_COMMUNITY_TEMPLATE_ERROR: "PUBLISH_APP_AS_COMMUNITY_TEMPLATE_ERROR", - DELETE_MULTIPLE_APPLICATION_ERROR: "DELETE_MULTIPLE_APPLICATION_ERROR", IMPORT_TEMPLATE_TO_APPLICATION_ONBOARDING_FLOW_ERROR: "IMPORT_TEMPLATE_TO_APPLICATION_ONBOARDING_FLOW_ERROR", SETUP_PAGE_ERROR: "SETUP_PAGE_ERROR", diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index 9697f02074a1..11584ab9312c 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -220,16 +220,6 @@ export const USER_RESET_PASSWORD = () => "Reset password"; export const CREATE_PASSWORD_RESET_SUCCESS = () => `Your password has been set`; export const CREATE_PASSWORD_RESET_SUCCESS_LOGIN_LINK = () => `Login`; -export const DELETING_MULTIPLE_APPLICATION = () => - `Deleting multiple applications...`; -export const NO_PERMISSION_TO_SELECT_FOR_DELETE = () => - `You don't have permission to delete this application`; - -export const DELETING_MULTIPLE_APPLICATION_MODAL_TITLE = () => - `Delete Confirmation`; -export const DELETING_MULTIPLE_APPLICATION_MODAL_DESC = () => - `Are you sure you want to delete selected applications?`; - export const FORGOT_PASSWORD_PAGE_LOGIN_LINK = () => `Back to sign in`; export const ADD_API_TO_PAGE_SUCCESS_MESSAGE = (actionName: string) => `${actionName} API added to page`; diff --git a/app/client/src/ce/pages/Applications/ResourceListLoader.tsx b/app/client/src/ce/pages/Applications/ResourceListLoader.tsx index 4b0805fdbaa3..3007567db227 100644 --- a/app/client/src/ce/pages/Applications/ResourceListLoader.tsx +++ b/app/client/src/ce/pages/Applications/ResourceListLoader.tsx @@ -30,7 +30,6 @@ function ResourceListLoader({ isMobile, resources }: ResourcesLoaderProps) { hasReadPermission icon={DEFAULT_ICON} isContextMenuOpen={false} - isEnabledMultipleSelection={false} isFetching isMobile={isMobile} moreActionItems={[]} diff --git a/app/client/src/ce/pages/Applications/index.tsx b/app/client/src/ce/pages/Applications/index.tsx index 00670d2daa54..24b81a5d15fc 100644 --- a/app/client/src/ce/pages/Applications/index.tsx +++ b/app/client/src/ce/pages/Applications/index.tsx @@ -20,7 +20,6 @@ import { getApplicationSearchKeyword, getCreateApplicationError, getCurrentApplicationIdForCreateNewApp, - getDeletingMultipleApps, getIsCreatingApplication, getIsDeletingApplication, } from "@appsmith/selectors/applicationSelectors"; @@ -74,7 +73,6 @@ import { NO_APPS_FOUND, NO_WORKSPACE_DESCRIPTION, NO_WORKSPACE_HEADING, - SEARCH_APPS, WORKSPACES_HEADING, } from "@appsmith/constants/messages"; @@ -117,7 +115,6 @@ import { getIsFetchingWorkspaces, getIsSavingWorkspaceInfo, } from "@appsmith/selectors/workspaceSelectors"; -import ApplicationsSubHeader from "pages/common/SubHeader"; import type { Workspace } from "@appsmith/constants/workspaceConstants"; import { getPackagesList } from "@appsmith/selectors/packageSelectors"; import { @@ -188,10 +185,9 @@ export const ItemWrapper = styled.div` export const StyledIcon = styled(Icon)` margin-right: 11px; `; -export const WorkspaceShareUsers = styled.div<{ isHidden?: boolean }>` +export const WorkspaceShareUsers = styled.div` display: flex; align-items: center; - ${(props) => props.isHidden && "opacity: 0; visibility: hidden;"} & .t--options-icon { margin-left: 8px; @@ -506,9 +502,6 @@ export function ApplicationsSection(props: any) { const creatingApplicationMap = useSelector(getIsCreatingApplication); const currentUser = useSelector(getCurrentUser); const isMobile = useIsMobileDevice(); - const deleteMultipleApplicationObject = useSelector(getDeletingMultipleApps); - const isEnabledMultipleSelection = - !!deleteMultipleApplicationObject.list?.length; const deleteApplication = (applicationId: string) => { if (applicationId && applicationId.length > 0) { dispatch({ @@ -733,7 +726,7 @@ export function ApplicationsSection(props: any) { /> )} {!isLoadingResources && ( - <WorkspaceShareUsers isHidden={isEnabledMultipleSelection}> + <WorkspaceShareUsers> <SharedUserList /> {canInviteToWorkspace && !isMobile && ( <FormDialogComponent @@ -841,7 +834,7 @@ export function ApplicationsSection(props: any) { } export const ApplictionsMainPage = (props: any) => { - const { searchApplications, searchKeyword } = props; + const { searchKeyword } = props; const location = useLocation(); const urlParams = new URLSearchParams(location.search); const workspaceIdFromQueryParams = urlParams.get("workspaceId"); @@ -939,13 +932,6 @@ export const ApplictionsMainPage = (props: any) => { </Select> </WorkspaceSelectorWrapper> )} - <ApplicationsSubHeader - search={{ - placeholder: createMessage(SEARCH_APPS), - queryFn: searchApplications, - defaultValue: searchKeyword, - }} - /> <ApplicationsSection activeWorkspaceId={activeWorkspaceId} applications={fetchedApplications} diff --git a/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx b/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx index 90525bace20e..73094e57419a 100644 --- a/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx +++ b/app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx @@ -47,7 +47,6 @@ export const initialState: ApplicationsReduxState = { isErrorSavingNavigationSetting: false, isUploadingNavigationLogo: false, isDeletingNavigationLogo: false, - deletingMultipleApps: {}, loadingStates: { isFetchingAllRoles: false, isFetchingAllUsers: false, @@ -81,70 +80,6 @@ export const handlers = { ) => { return { ...state, deletingApplication: false }; }, - [ReduxActionTypes.DELETE_MULTIPLE_APPS_TOGGLE]: ( - state: ApplicationsReduxState, - action: ReduxAction<{ id: string }>, - ) => { - let deleteMultipleAppsList = state.deletingMultipleApps.list || []; - if (deleteMultipleAppsList.includes(action.payload.id)) { - deleteMultipleAppsList = deleteMultipleAppsList.filter( - (i) => i !== action.payload.id, - ); - } else { - deleteMultipleAppsList = [...deleteMultipleAppsList, action.payload.id]; - } - return { - ...state, - deletingMultipleApps: { - list: deleteMultipleAppsList, - }, - }; - }, - [ReduxActionTypes.DELETE_MULTIPLE_APPS_INIT]: ( - state: ApplicationsReduxState, - ) => { - return { - ...state, - deletingMultipleApps: { - list: state.deletingMultipleApps.list, - isDeleting: true, - }, - }; - }, - [ReduxActionTypes.DELETE_MULTIPLE_APPLICATION_SUCCESS]: ( - state: ApplicationsReduxState, - // eslint-disable-next-line - action: ReduxAction<ApplicationPayload[]>, - ) => { - return { - ...state, - deletingMultipleApps: { - list: [], - isDeleting: false, - }, - }; - }, - [ReduxActionTypes.DELETE_MULTIPLE_APPLICATION_CANCEL]: ( - state: ApplicationsReduxState, - ) => { - return { - ...state, - deletingMultipleApps: { - list: [], - isDeleting: false, - }, - }; - }, - [ReduxActionErrorTypes.DELETE_MULTIPLE_APPLICATION_ERROR]: ( - state: ApplicationsReduxState, - ) => { - return { - ...state, - deletingMultipleApps: { - isDeleting: false, - }, - }; - }, [ReduxActionTypes.CHANGE_APPVIEW_ACCESS_INIT]: ( state: ApplicationsReduxState, ) => ({ ...state, isChangingViewAccess: true }), @@ -766,11 +701,6 @@ const applicationsReducer = createReducer(initialState, handlers); export type creatingApplicationMap = Record<string, boolean>; -export interface DeletingMultipleApps { - list?: string[]; - isDeleting?: boolean; -} - export interface ApplicationsReduxState { applicationList: ApplicationPayload[]; searchKeyword?: string; @@ -794,7 +724,6 @@ export interface ApplicationsReduxState { isErrorSavingNavigationSetting: boolean; isUploadingNavigationLogo: boolean; isDeletingNavigationLogo: boolean; - deletingMultipleApps: DeletingMultipleApps; loadingStates: { isFetchingAllRoles: boolean; isFetchingAllUsers: boolean; diff --git a/app/client/src/ce/reducers/uiReducers/selectedWorkspaceReducer.ts b/app/client/src/ce/reducers/uiReducers/selectedWorkspaceReducer.ts index d8302286e615..f0beca260ab3 100644 --- a/app/client/src/ce/reducers/uiReducers/selectedWorkspaceReducer.ts +++ b/app/client/src/ce/reducers/uiReducers/selectedWorkspaceReducer.ts @@ -61,16 +61,6 @@ export const handlers = { ) => { draftState.loadingStates.isFetchingApplications = false; }, - [ReduxActionTypes.DELETE_MULTIPLE_APPLICATION_SUCCESS]: ( - draftState: SelectedWorkspaceReduxState, - action: ReduxAction<ApplicationPayload[]>, - ) => { - const deletedApplicationIds = action.payload.map((app) => app.id); - const applications = draftState.applications.filter( - (app) => !deletedApplicationIds.includes(app.id), - ); - draftState.applications = applications; - }, [ReduxActionTypes.DELETE_APPLICATION_SUCCESS]: ( draftState: SelectedWorkspaceReduxState, action: ReduxAction<ApplicationPayload>, diff --git a/app/client/src/ce/sagas/ApplicationSagas.tsx b/app/client/src/ce/sagas/ApplicationSagas.tsx index 6f095a0de883..a4dc46faf37f 100644 --- a/app/client/src/ce/sagas/ApplicationSagas.tsx +++ b/app/client/src/ce/sagas/ApplicationSagas.tsx @@ -33,10 +33,7 @@ import ApplicationApi from "@appsmith/api/ApplicationApi"; import { all, call, put, select, take } from "redux-saga/effects"; import { validateResponse } from "sagas/ErrorSagas"; -import { - getCurrentApplicationIdForCreateNewApp, - getDeletingMultipleApps, -} from "@appsmith/selectors/applicationSelectors"; +import { getCurrentApplicationIdForCreateNewApp } from "@appsmith/selectors/applicationSelectors"; import type { ApiResponse } from "api/ApiResponses"; import history from "utils/history"; import type { AppState } from "@appsmith/reducers"; @@ -63,7 +60,6 @@ import { import AnalyticsUtil from "utils/AnalyticsUtil"; import { createMessage, - DELETING_MULTIPLE_APPLICATION, ERROR_IMPORTING_APPLICATION_TO_WORKSPACE, } from "@appsmith/constants/messages"; import { APP_MODE } from "entities/App"; @@ -118,7 +114,6 @@ import { } from "constants/AppConstants"; import { setAllEntityCollapsibleStates } from "actions/editorContextActions"; import { getCurrentEnvironmentId } from "@appsmith/selectors/environmentSelectors"; -import type { DeletingMultipleApps } from "@appsmith/reducers/uiReducers/applicationsReducer"; import { selectFeatureFlagCheck } from "@appsmith/selectors/featureFlagsSelectors"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { LayoutSystemTypes } from "layoutSystems/types"; @@ -492,40 +487,6 @@ export function* deleteApplicationSaga( } } -export function* deleteMultipleApplicationSaga() { - try { - toast.show(createMessage(DELETING_MULTIPLE_APPLICATION)); - const deleteMultipleAppsObject: DeletingMultipleApps = yield select( - getDeletingMultipleApps, - ); - - if (deleteMultipleAppsObject.list?.length) { - const response: ApiResponse = yield call( - ApplicationApi.deleteMultipleApps, - { ids: deleteMultipleAppsObject.list }, - ); - const isValidResponse: boolean = yield validateResponse(response); - if (isValidResponse) { - yield put({ - type: ReduxActionTypes.DELETE_MULTIPLE_APPLICATION_SUCCESS, - payload: response.data, - }); - deleteMultipleAppsObject.list.forEach(function* (id) { - yield call(deleteRecentAppEntities, id); - }); - toast.dismiss(); - } - } - } catch (error) { - yield put({ - type: ReduxActionErrorTypes.DELETE_MULTIPLE_APPLICATION_ERROR, - payload: { - error, - }, - }); - } -} - export function* changeAppViewAccessSaga( requestAction: ReduxAction<ChangeAppViewAccessRequest>, ) { diff --git a/app/client/src/ce/selectors/applicationSelectors.tsx b/app/client/src/ce/selectors/applicationSelectors.tsx index 93be32fc6252..9c7fc0326675 100644 --- a/app/client/src/ce/selectors/applicationSelectors.tsx +++ b/app/client/src/ce/selectors/applicationSelectors.tsx @@ -184,10 +184,6 @@ export const selectEvaluationVersion = (state: AppState) => state.ui.applications.currentApplication?.evaluationVersion || DEFAULT_EVALUATION_VERSION; -export const getDeletingMultipleApps = (state: AppState) => { - return state.ui.applications.deletingMultipleApps; -}; - export const getApplicationLoadingStates = (state: AppState) => { return state.ui.applications?.loadingStates; }; diff --git a/app/client/src/components/common/Card.tsx b/app/client/src/components/common/Card.tsx index afbab4141312..a45638508731 100644 --- a/app/client/src/components/common/Card.tsx +++ b/app/client/src/components/common/Card.tsx @@ -5,19 +5,16 @@ import { omit } from "lodash"; import { AppIcon, Size, TextType, Text } from "design-system-old"; import type { PropsWithChildren } from "react"; import type { HTMLDivProps, ICardProps } from "@blueprintjs/core"; -import { Button, Checkbox, type MenuItemProps } from "design-system"; +import { Button, type MenuItemProps } from "design-system"; import GitConnectedBadge from "./GitConnectedBadge"; -import { noop } from "utils/AppsmithUtils"; type CardProps = PropsWithChildren<{ backgroundColor: string; contextMenu: React.ReactNode; editedByText: string; - handleMultipleSelection?: (e: any) => void; hasReadPermission: boolean; icon: string; - isEnabledMultipleSelection: boolean; isContextMenuOpen: boolean; isFetching: boolean; isMobile?: boolean; @@ -181,46 +178,6 @@ const NameWrapper = styled((props: HTMLDivProps & NameWrapperProps) => ( border-radius: var(--ads-v2-border-radius); &:hover { border-color: var(--ads-v2-color-gray-100); - .t--app-multi-select-checkbox { - display: inline; - animation: multi-select-check 0.5s; - animation-fill-mode: forwards; - } - } - - ${(props) => `&.${props.testId}-selected { - border-color: var(--ads-v2-color-blue-300); - .t--app-multi-select-checkbox { - display: inline; - animation: multi-select-check 0.5s; - animation-fill-mode: forwards; - } - }`} - - .t--app-multi-select-checkbox { - display: none; - height: 14px; - visibility: hidden; - opacity: 0; - margin-left: -24px; - &.t--app-multi-select-mode-checkbox { - display: inline; - animation: multi-select-check 0.5s; - animation-fill-mode: forwards; - } - } - - @keyframes multi-select-check { - from { - margin-left: -24px; - visibility: hidden; - opacity: 0; - } - to { - visibility: visible; - opacity: 1; - margin-left: 4px; - } } `; @@ -355,15 +312,12 @@ function Card({ children, contextMenu, editedByText, - handleMultipleSelection, hasEditPermission, hasReadPermission, icon, isContextMenuOpen, - isEnabledMultipleSelection, isFetching, isMobile, - isSelected, moreActionItems, primaryAction, setShowOverlay, @@ -374,16 +328,9 @@ function Card({ titleTestId, }: CardProps) { return ( - <Container - isMobile={isMobile} - onClick={ - isEnabledMultipleSelection && handleMultipleSelection - ? handleMultipleSelection - : primaryAction - } - > + <Container isMobile={isMobile} onClick={primaryAction}> <NameWrapper - className={`${testId} ${isSelected ? `${testId}-selected` : ""}`} + className={testId} hasReadPermission={hasReadPermission} isContextMenuOpen={isContextMenuOpen} onMouseEnter={() => { @@ -422,23 +369,6 @@ function Card({ )} </Wrapper> <CardFooter> - {handleMultipleSelection && ( - <div - onClick={ - isEnabledMultipleSelection ? noop : handleMultipleSelection - } - > - <Checkbox - aria-label="Multiple Selection" - className={`t--app-multi-select-checkbox ${ - isEnabledMultipleSelection - ? "t--app-multi-select-mode-checkbox" - : "" - }`} - isSelected={isSelected} - /> - </div> - )} {hasEditPermission ? ( <ModifiedDataComponent className="t--application-edited-text"> {editedByText} diff --git a/app/client/src/ee/sagas/ApplicationSagas.tsx b/app/client/src/ee/sagas/ApplicationSagas.tsx index 5409606e678d..92a47483d23b 100644 --- a/app/client/src/ee/sagas/ApplicationSagas.tsx +++ b/app/client/src/ee/sagas/ApplicationSagas.tsx @@ -16,7 +16,6 @@ import { fetchUnconfiguredDatasourceList, uploadNavigationLogoSaga, deleteNavigationLogoSaga, - deleteMultipleApplicationSaga, fetchAllApplicationsOfWorkspaceSaga, } from "ce/sagas/ApplicationSagas"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; @@ -46,10 +45,6 @@ export default function* applicationSagas() { setDefaultApplicationPageSaga, ), takeLatest(ReduxActionTypes.DELETE_APPLICATION_INIT, deleteApplicationSaga), - takeLatest( - ReduxActionTypes.DELETE_MULTIPLE_APPS_INIT, - deleteMultipleApplicationSaga, - ), takeLatest(ReduxActionTypes.IMPORT_APPLICATION_INIT, importApplicationSaga), takeLatest( ReduxActionTypes.UPLOAD_NAVIGATION_LOGO_INIT, diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx index b6b39553c911..b8f9beb29119 100644 --- a/app/client/src/pages/Applications/ApplicationCard.tsx +++ b/app/client/src/pages/Applications/ApplicationCard.tsx @@ -7,7 +7,6 @@ import React, { } from "react"; import styled, { ThemeContext } from "styled-components"; import type { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants"; -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { hasDeleteApplicationPermission, isPermitted, @@ -43,7 +42,6 @@ import type { import { getIsSavingAppName, getIsErroredSavingAppName, - getDeletingMultipleApps, } from "@appsmith/selectors/applicationSelectors"; import ForkApplicationModal from "./ForkApplicationModal"; import { getExportAppAPIRoute } from "@appsmith/constants/ApiConstants"; @@ -56,10 +54,6 @@ import { addItemsInContextMenu } from "@appsmith/utils"; import { getCurrentUser } from "actions/authActions"; import Card, { ContextMenuTrigger } from "components/common/Card"; import { generateEditedByText } from "./helpers"; -import { - NO_PERMISSION_TO_SELECT_FOR_DELETE, - createMessage, -} from "@appsmith/constants/messages"; import { noop } from "lodash"; const { cloudHosting } = getAppsmithConfigs(); @@ -128,12 +122,6 @@ export function ApplicationCard(props: ApplicationCardProps) { const applicationId = props.application?.id; const showGitBadge = props.application?.gitApplicationMetadata?.branchName; - const deleteMultipleApplicationObject = useSelector(getDeletingMultipleApps); - const isApplicationSelected = - deleteMultipleApplicationObject.list?.includes(applicationId); - const isEnabledMultipleSelection = - !!deleteMultipleApplicationObject.list?.length; - useEffect(() => { let colorCode; if (props.application.color) { @@ -318,7 +306,6 @@ export function ApplicationCard(props: ApplicationCardProps) { <ContextMenuTrigger className="m-0.5" data-testid="t--application-card-context-menu" - isHidden={isEnabledMultipleSelection} isIconButton kind="tertiary" size="sm" @@ -479,40 +466,22 @@ export function ApplicationCard(props: ApplicationCardProps) { dispatch(getCurrentUser()); }, [props.application.defaultPageId]); - const handleMultipleSelection = (event: MouseEvent) => { - if (typeof event === "object" && event.stopImmediatePropagation) - event.stopImmediatePropagation(); - if (!hasDeletePermission) { - toast.show(createMessage(NO_PERMISSION_TO_SELECT_FOR_DELETE), { - kind: "error", - }); - return; - } - dispatch({ - type: ReduxActionTypes.DELETE_MULTIPLE_APPS_TOGGLE, - payload: { id: applicationId }, - }); - }; - return ( <Card backgroundColor={selectedColor} contextMenu={contextMenu} editedByText={editedByText} - handleMultipleSelection={handleMultipleSelection} hasEditPermission={hasEditPermission} hasReadPermission={hasReadPermission} icon={appIcon} isContextMenuOpen={isMenuOpen} - isEnabledMultipleSelection={isEnabledMultipleSelection} isFetching={isFetchingApplications} isMobile={props.isMobile} - isSelected={!!isApplicationSelected} moreActionItems={moreActionItems} primaryAction={props.isMobile ? launchApp : noop} setShowOverlay={setShowOverlay} showGitBadge={Boolean(showGitBadge)} - showOverlay={showOverlay && !isEnabledMultipleSelection} + showOverlay={showOverlay} testId={`t--application-card ${props.application.name}`} title={props.application.name} titleTestId="t--app-card-name" diff --git a/app/client/src/pages/common/SubHeader.tsx b/app/client/src/pages/common/SubHeader.tsx deleted file mode 100644 index e68bbddbd455..000000000000 --- a/app/client/src/pages/common/SubHeader.tsx +++ /dev/null @@ -1,170 +0,0 @@ -import type { ReactNode } from "react"; -import React, { useState } from "react"; -import styled from "styled-components"; -import { - Button, - Modal, - ModalContent, - ModalBody, - ModalHeader, - ModalFooter, -} from "design-system"; -import { useDispatch, useSelector } from "react-redux"; -import { getDeletingMultipleApps } from "@appsmith/selectors/applicationSelectors"; -import { Indices } from "constants/Layers"; -import { useIsMobileDevice } from "utils/hooks/useDeviceDetect"; -import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; -import { - DELETING_MULTIPLE_APPLICATION_MODAL_DESC, - DELETING_MULTIPLE_APPLICATION_MODAL_TITLE, - createMessage, -} from "@appsmith/constants/messages"; -import { CONTAINER_WRAPPER_PADDING } from "@appsmith/pages/Applications"; - -const SubHeaderWrapper = styled.div<{ - isMobile?: boolean; - isBannerVisible?: boolean; - isVisible?: boolean; -}>` - width: 100%; - display: flex; - justify-content: flex-end; - background: var(--ads-v2-color-bg); - z-index: ${({ isMobile }) => (isMobile ? Indices.Layer8 : Indices.Layer9)}; - ${({ isBannerVisible, isMobile }) => - isMobile - ? `padding: 12px 16px; - position: sticky; ${ - isBannerVisible ? "top: 80px; margin-top: 80px" : "top: 0; margin: 0" - }; - ` - : `padding: ${CONTAINER_WRAPPER_PADDING} ${CONTAINER_WRAPPER_PADDING} 12px ${CONTAINER_WRAPPER_PADDING} ; position: sticky; ${ - isBannerVisible ? "top: 40px; margin-top: 40px" : "top: 0" - }; align-items: center;`} -`; - -const MultipleDeleteWrapper = styled.div` - display: flex; - gap: 8px; -`; - -interface SubHeaderProps { - add?: { - form: ReactNode; - title: string; - formName: string; - isAdding: boolean; - formSubmitIntent: string; - errorAdding?: string; - formSubmitText: string; - onClick: () => void; - }; - search?: { - placeholder: string; - debounce?: boolean; - queryFn?: (keyword: string) => void; - defaultValue?: string; - }; - isBannerVisible?: boolean; -} - -export function ApplicationsSubHeader(props: SubHeaderProps) { - const [showModal, setShowModal] = useState(false); - const [showConfirmationModal, setShowConfirmationModal] = useState(false); - const isMobile = useIsMobileDevice(); - const dispatch = useDispatch(); - const deleteMultipleApplicationObject = useSelector(getDeletingMultipleApps); - - const handleMultipleDelete = () => { - setShowConfirmationModal(false); - dispatch({ - type: ReduxActionTypes.DELETE_MULTIPLE_APPS_INIT, - }); - }; - const handleCancelMultipleDelete = () => { - dispatch({ - type: ReduxActionTypes.DELETE_MULTIPLE_APPLICATION_CANCEL, - }); - }; - const handleClose = (isOpen: boolean) => { - if (!isOpen) { - setShowConfirmationModal(false); - handleCancelMultipleDelete(); - } - }; - - const isEnabledMultipleSelection = - !!deleteMultipleApplicationObject.list?.length; - - return ( - <SubHeaderWrapper - isBannerVisible={props.isBannerVisible} - isMobile={isMobile} - isVisible={!!(isEnabledMultipleSelection || props.add)} - > - {isEnabledMultipleSelection && ( - <MultipleDeleteWrapper> - <Button - isLoading={deleteMultipleApplicationObject.isDeleting} - kind="error" - onClick={() => setShowConfirmationModal(true)} - size="md" - startIcon="delete-bin-line" - > - Delete {deleteMultipleApplicationObject.list?.length} apps - </Button> - <Button - kind="secondary" - onClick={handleCancelMultipleDelete} - size="md" - startIcon="close" - > - Cancel - </Button> - <Modal onOpenChange={handleClose} open={showConfirmationModal}> - <ModalContent - data-testid="t--query-run-confirmation-modal" - style={{ width: "600px" }} - > - <ModalHeader> - {createMessage(DELETING_MULTIPLE_APPLICATION_MODAL_TITLE)} - </ModalHeader> - <ModalBody> - {createMessage(DELETING_MULTIPLE_APPLICATION_MODAL_DESC)} - </ModalBody> - <ModalFooter> - <Button - kind="secondary" - onClick={() => handleClose(false)} - size="md" - > - No - </Button> - <Button kind="primary" onClick={handleMultipleDelete} size="md"> - Yes - </Button> - </ModalFooter> - </ModalContent> - </Modal> - </MultipleDeleteWrapper> - )} - - {props.add && !isEnabledMultipleSelection && ( - <> - <Button size="md">{props.add.title}</Button> - <Modal - onOpenChange={(isOpen) => setShowModal(isOpen)} - open={showModal} - > - <ModalContent style={{ width: "640px" }}> - <ModalHeader>{props.add.title}</ModalHeader> - <ModalBody>{props.add.form}</ModalBody> - </ModalContent> - </Modal> - </> - )} - </SubHeaderWrapper> - ); -} - -export default ApplicationsSubHeader; diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java index 0a79cebda4ea..68b37c0298b0 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ApplicationControllerCE.java @@ -161,14 +161,6 @@ public Mono<ResponseDTO<Application>> delete( .map(deletedResource -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResource, null)); } - @JsonView(Views.Public.class) - @PostMapping("/delete-apps") - public Mono<ResponseDTO<List<Application>>> deleteMultipleApps(@Valid @RequestBody List<String> ids) { - return applicationPageService - .deleteMultipleApps(ids) - .map(deletedResources -> new ResponseDTO<>(HttpStatus.OK.value(), deletedResources, null)); - } - @Deprecated @JsonView(Views.Public.class) @GetMapping("/new") diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java index 8d964e57bceb..021a4883781a 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCE.java @@ -9,8 +9,6 @@ import com.mongodb.client.result.UpdateResult; import reactor.core.publisher.Mono; -import java.util.List; - public interface ApplicationPageServiceCE { Mono<PageDTO> createPage(PageDTO page); @@ -42,8 +40,6 @@ Mono<PageDTO> getPageAndMigrateDslByBranchAndDefaultPageId( Mono<Application> deleteApplication(String id); - Mono<List<Application>> deleteMultipleApps(List<String> ids); - Mono<PageDTO> clonePage(String pageId, ClonePageMetaDTO clonePageMetaDTO); Mono<PageDTO> clonePageByDefaultPageIdAndBranch(String defaultPageId, String branchName); diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java index 985fe4d7eb16..86cab1c64973 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java @@ -572,13 +572,6 @@ public Mono<Application> deleteApplication(String id) { }); } - @Override - public Mono<List<Application>> deleteMultipleApps(List<String> ids) { - log.debug("Archiving application with ids: {}", ids.toString()); - - return Flux.fromIterable(ids).flatMap(id -> deleteApplication(id)).collectList(); - } - @Override public Mono<Application> deleteApplicationByResource(Application application) { log.debug("Archiving actionCollections, actions, pages and themes for applicationId: {}", application.getId());
6981a589daa8750c00982f2274a3481d3bde4f0f
2021-10-04 11:40:24
Pili Sánchez
docs: Update tutorials link on readme (#8139)
false
Update tutorials link on readme (#8139)
docs
diff --git a/README.md b/README.md index c928364bd29d..34eb0ca6ae53 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ • <a href="https://community.appsmith.com/">Community</a> • - <a href="https://github.com/appsmithorg/appsmith/tree/update/readme#tutorials">Tutorials</a> + <a href="https://docs.appsmith.com/tutorials">Tutorials</a> • <a href="https://app.appsmith.com/applications/602b8aef12ba0d29d3ec151c/pages/602b8aef12ba0d29d3ec151e">Events</a> •
8197ebf297d79140056430639ecd16e98d124eb9
2022-02-01 12:32:55
Mojtaba Zarezadeh
fix: add single imports
false
add single imports
fix
diff --git a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java index f038dd9bfe0f..f42a37d8bc13 100644 --- a/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java +++ b/app/server/appsmith-plugins/mysqlPlugin/src/main/java/com/external/plugins/MySqlPlugin.java @@ -7,13 +7,32 @@ import com.appsmith.external.exceptions.pluginExceptions.StaleConnectionException; import com.appsmith.external.helpers.DataTypeStringUtils; import com.appsmith.external.helpers.MustacheHelper; -import com.appsmith.external.models.*; +import com.appsmith.external.models.ActionConfiguration; +import com.appsmith.external.models.ActionExecutionRequest; +import com.appsmith.external.models.ActionExecutionResult; +import com.appsmith.external.models.DBAuth; +import com.appsmith.external.models.DatasourceConfiguration; +import com.appsmith.external.models.DatasourceStructure; +import com.appsmith.external.models.DatasourceTestResult; +import com.appsmith.external.models.Endpoint; +import com.appsmith.external.models.Property; +import com.appsmith.external.models.PsParameterDTO; +import com.appsmith.external.models.RequestParamDTO; +import com.appsmith.external.models.SSLDetails; import com.appsmith.external.plugins.BasePlugin; import com.appsmith.external.plugins.PluginExecutor; import com.appsmith.external.plugins.SmartSubstitutionInterface; import com.external.utils.QueryUtils; +import io.r2dbc.spi.ColumnMetadata; import io.r2dbc.spi.Connection; -import io.r2dbc.spi.*; +import io.r2dbc.spi.ConnectionFactories; +import io.r2dbc.spi.ConnectionFactoryOptions; +import io.r2dbc.spi.Option; +import io.r2dbc.spi.Result; +import io.r2dbc.spi.Row; +import io.r2dbc.spi.RowMetadata; +import io.r2dbc.spi.Statement; +import io.r2dbc.spi.ValidationDepth; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.ObjectUtils; import org.pf4j.Extension; @@ -31,13 +50,24 @@ import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.AbstractMap.SimpleEntry; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; import java.util.stream.IntStream; import static com.appsmith.external.constants.ActionConstants.ACTION_CONFIGURATION_BODY; -import static com.appsmith.external.helpers.PluginUtils.*; +import static com.appsmith.external.helpers.PluginUtils.MATCH_QUOTED_WORDS_REGEX; +import static com.appsmith.external.helpers.PluginUtils.getIdenticalColumns; +import static com.appsmith.external.helpers.PluginUtils.getPSParamLabel; import static com.appsmith.external.helpers.SmartSubstitutionHelper.replaceQuestionMarkWithDollarIndex; import static io.r2dbc.spi.ConnectionFactoryOptions.SSL; import static java.lang.Boolean.FALSE;
84fbdde5c1a23af60b219c5ded8a354ddad3977a
2024-08-27 15:53:29
Anagh Hegde
ci: use git merge for syncing changes from release (#35902)
false
use git merge for syncing changes from release (#35902)
ci
diff --git a/.github/workflows/sync-release-to-pg.yml b/.github/workflows/sync-release-to-pg.yml index 981f124261d2..0748ef9a40c6 100644 --- a/.github/workflows/sync-release-to-pg.yml +++ b/.github/workflows/sync-release-to-pg.yml @@ -16,63 +16,53 @@ jobs: ref: release # Checkout the release branch - name: Fetch all branches - run: git fetch --all + run: git fetch pg - name: Checkout pg branch run: git checkout pg - - name: Get new commits from release - id: get_commits + - name: Merge release to pg + id: merge_commits run: | - # Compare the heads of pg and release + PG_HEAD=$(git rev-parse pg) RELEASE_HEAD=$(git rev-parse release) - echo "PG_HEAD=$PG_HEAD" >> $GITHUB_ENV - echo "RELEASE_HEAD=$RELEASE_HEAD" >> $GITHUB_ENV - - # Get new commits on release that are not yet in pg - COMMITS=$(git log --reverse --pretty=format:"%H" $PG_HEAD..$RELEASE_HEAD) - echo "COMMITS=$COMMITS" >> $GITHUB_ENV + echo "PG_HEAD=$PG_HEAD" + echo "RELEASE_HEAD=$RELEASE_HEAD" - - name: Merge commits one by one - id: merge_commits - run: | - # Initialize an empty list for conflicted commits - conflicted_commits=() + # Checkout the pg branch + git checkout pg - # Convert the string of commits to an array - IFS=' ' read -r -a commit_array <<< "$COMMITS" + # Attempt to merge release into pg + if ! git merge release; then + echo "Merge conflict detected during merge" - # Loop through each commit - for commit in "${commit_array[@]}"; do - echo "Attempting to cherry-pick commit $commit" - if ! git cherry-pick $commit; then - echo "Conflict detected with commit $commit" - conflicted_commits+=($commit) - git cherry-pick --abort - fi - done + # Capture the conflicting commit SHAs (both HEAD of pg and the merge commit from release) + CONFLICTING_COMMIT=$(git log -1 --pretty=format:"%H") + echo "CONFLICTING_COMMIT=$CONFLICTING_COMMIT" >> $GITHUB_ENV - # Save conflicted commits to environment variable - echo "CONFLICTED_COMMITS=\"${conflicted_commits[@]}\"" >> $GITHUB_ENV + git merge --abort + echo "MERGE_CONFLICT=true" >> $GITHUB_ENV + else + echo "MERGE_CONFLICT=false" >> $GITHUB_ENV + fi - name: Push changes - if: success() && steps.merge_commits.outputs.CONFLICTED_COMMITS == '' + if: env.MERGE_CONFLICT == 'false' run: | git push origin pg - name: Notify on merge conflicts - if: failure() + if: env.MERGE_CONFLICT == 'true' env: REPOSITORY_URL: ${{ github.repositoryUrl }} + CONFLICTING_COMMIT: ${{ env.CONFLICTING_COMMIT }} run: | # Prepare the message for Slack message="Merge conflict detected while merging release into pg branch. Conflicted commits:\n" - for commit in $CONFLICTED_COMMITS; do - commit_url="$REPOSITORY_URL/commit/$commit" - message+="$commit_url\n" - done + commit_url="$REPOSITORY_URL/commit/$CONFLICTING_COMMIT" + message+="$commit_url\n" # Send the message to Slack # This unwieldy horror of a sed command, converts standard Markdown links to Slack's unwieldy link syntax.
a114518cc0d1eaf3557d21e80d40160b608a7bfc
2024-06-11 17:40:18
Manish Kumar
chore: added index for application (#34175)
false
added index for application (#34175)
chore
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration056AddBranchNameAndDefaultArtifactIndexToApplication.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration056AddBranchNameAndDefaultArtifactIndexToApplication.java new file mode 100644 index 000000000000..76d0f639b062 --- /dev/null +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/migrations/db/ce/Migration056AddBranchNameAndDefaultArtifactIndexToApplication.java @@ -0,0 +1,45 @@ +package com.appsmith.server.migrations.db.ce; + +import com.appsmith.server.domains.Application; +import io.mongock.api.annotations.ChangeUnit; +import io.mongock.api.annotations.Execution; +import io.mongock.api.annotations.RollbackExecution; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.index.Index; + +import static com.appsmith.server.migrations.DatabaseChangelog1.dropIndexIfExists; +import static com.appsmith.server.migrations.DatabaseChangelog1.ensureIndexes; +import static com.appsmith.server.migrations.DatabaseChangelog1.makeIndex; + +@Slf4j +@ChangeUnit(order = "056", id = "add-idx-branch-name-default-artifact-id", author = " ") +public class Migration056AddBranchNameAndDefaultArtifactIndexToApplication { + + private final MongoTemplate mongoTemplate; + + public static final String BRANCH_NAME_DEFAULT_ARTIFACT_ID_INDEX = "branchName_defaultArtifactId_deletedAt_deleted"; + + public Migration056AddBranchNameAndDefaultArtifactIndexToApplication(MongoTemplate mongoTemplate) { + this.mongoTemplate = mongoTemplate; + } + + @RollbackExecution + public void rollbackExecution() {} + + @Execution + public void createIndexForApplication() { + + // drop the index if this exists already + dropIndexIfExists(mongoTemplate, Application.class, BRANCH_NAME_DEFAULT_ARTIFACT_ID_INDEX); + + Index defaultArtifactIdIndex = makeIndex( + Application.Fields.gitApplicationMetadata_branchName, + Application.Fields.gitApplicationMetadata_defaultArtifactId, + Application.Fields.deletedAt, + Application.Fields.deleted) + .named(BRANCH_NAME_DEFAULT_ARTIFACT_ID_INDEX); + + ensureIndexes(mongoTemplate, Application.class, defaultArtifactIdIndex); + } +}
ef9c8e0aa368e2ba550e40dd8e5731e8b4f40ecf
2022-01-13 10:54:12
Aswath K
feat: Add Jest Test for propertyPaneConfiguration validation (#8773)
false
Add Jest Test for propertyPaneConfiguration validation (#8773)
feat
diff --git a/app/client/cypress/fixtures/testdata.json b/app/client/cypress/fixtures/testdata.json index 79451cae1770..b278c86a4217 100644 --- a/app/client/cypress/fixtures/testdata.json +++ b/app/client/cypress/fixtures/testdata.json @@ -107,7 +107,7 @@ "momentDate": "{{moment()}}", "defaultRowIndexBinding": "{{Table1.selectedRowIndex", "bindingAlign": "{{currentRow.userName.indexOf('Michael') > -1 ? 'LEFT' : 'RIGHT'}}", - "bindingSize": "{{currentRow.userName.indexOf('Michael') > -1 ? 'PARAGRAGH' : 'HEADING1'}}", + "bindingSize": "{{currentRow.userName.indexOf('Michael') > -1 ? 'PARAGRAPH' : 'HEADING1'}}", "bindingVerticalAlig": "{{currentRow.userName.indexOf('Michael') > -1 ? 'TOP' : 'BOTTOM'}}", "bindingTextColor": "{{currentRow.userName.indexOf('Michael') > -1 ? 'GREEN' : 'RED'}}", "bindingButton": "{{currentRow.userName.indexOf('Michael') > -1 ? 'Discount' : 'NoDiscount'}}", diff --git a/app/client/src/entities/Widget/utils.test.ts b/app/client/src/entities/Widget/utils.test.ts index 03c06ce94835..8172b42dd009 100644 --- a/app/client/src/entities/Widget/utils.test.ts +++ b/app/client/src/entities/Widget/utils.test.ts @@ -4,6 +4,7 @@ import tablePropertyPaneConfig from "widgets/TableWidget/widget/propertyConfig"; import chartPorpertyConfig from "widgets/ChartWidget/widget/propertyConfig"; import { EvaluationSubstitutionType } from "entities/DataTree/dataTreeFactory"; import { AutocompleteDataType } from "utils/autocomplete/TernServer"; +import { ValidationTypes } from "constants/WidgetValidation"; describe("getAllPathsFromPropertyConfig", () => { it("works as expected for table widget", () => { @@ -219,6 +220,222 @@ describe("getAllPathsFromPropertyConfig", () => { default: [], }, }, + "primaryColumns.createdAt.isCellVisible": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.BOOLEAN, + }, + }, + "primaryColumns.name.isCellVisible": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.BOOLEAN, + }, + }, + "primaryColumns.status.isCellVisible": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.BOOLEAN, + }, + }, + "primaryColumns.status.isDisabled": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.BOOLEAN, + }, + }, + "primaryColumns.createdAt.inputFormat": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: [ + "Epoch", + "Milliseconds", + "YYYY-MM-DD", + "YYYY-MM-DD HH:mm", + "YYYY-MM-DDTHH:mm:ss.sssZ", + "YYYY-MM-DDTHH:mm:ss", + "YYYY-MM-DD hh:mm:ss", + "Do MMM YYYY", + "DD/MM/YYYY", + "DD/MM/YYYY HH:mm", + "LLL", + "LL", + "D MMMM, YYYY", + "H:mm A D MMMM, YYYY", + "MM-DD-YYYY", + "DD-MM-YYYY", + "MM/DD/YYYY", + "DD/MM/YYYY", + "DD/MM/YY", + "MM/DD/YY", + ], + }, + }, + }, + "primaryColumns.createdAt.outputFormat": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: [ + "Epoch", + "Milliseconds", + "YYYY-MM-DD", + "YYYY-MM-DD HH:mm", + "YYYY-MM-DDTHH:mm:ss.sssZ", + "YYYY-MM-DDTHH:mm:ss", + "YYYY-MM-DD hh:mm:ss", + "Do MMM YYYY", + "DD/MM/YYYY", + "DD/MM/YYYY HH:mm", + "LLL", + "LL", + "D MMMM, YYYY", + "H:mm A D MMMM, YYYY", + "MM-DD-YYYY", + "DD-MM-YYYY", + "MM/DD/YYYY", + "DD/MM/YYYY", + "DD/MM/YY", + "MM/DD/YY", + ], + }, + }, + }, + "primaryColumns.name.horizontalAlignment": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: ["LEFT", "CENTER", "RIGHT"], + }, + }, + }, + "primaryColumns.createdAt.horizontalAlignment": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: ["LEFT", "CENTER", "RIGHT"], + }, + }, + }, + "primaryColumns.name.textSize": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: [ + "HEADING1", + "HEADING2", + "HEADING3", + "PARAGRAPH", + "PARAGRAPH2", + ], + }, + }, + }, + "primaryColumns.createdAt.textSize": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: [ + "HEADING1", + "HEADING2", + "HEADING3", + "PARAGRAPH", + "PARAGRAPH2", + ], + }, + }, + }, + "primaryColumns.createdAt.fontStyle": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + }, + }, + "primaryColumns.name.fontStyle": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + }, + }, + "primaryColumns.createdAt.verticalAlignment": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: ["TOP", "CENTER", "BOTTOM"], + }, + }, + }, + "primaryColumns.name.verticalAlignment": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: ["TOP", "CENTER", "BOTTOM"], + }, + }, + }, + "primaryColumns.createdAt.textColor": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, + "primaryColumns.name.textColor": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, + "primaryColumns.createdAt.cellBackground": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, + "primaryColumns.name.cellBackground": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, + "primaryColumns.status.buttonColor": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, + "primaryColumns.status.buttonLabelColor": { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, }, }; diff --git a/app/client/src/utils/WidgetRegistry.tsx b/app/client/src/utils/WidgetRegistry.tsx index 9e2d291f1da6..60e3d2467d5e 100644 --- a/app/client/src/utils/WidgetRegistry.tsx +++ b/app/client/src/utils/WidgetRegistry.tsx @@ -1,4 +1,4 @@ -import { registerWidget } from "./WidgetRegisterHelpers"; +import { registerWidget, WidgetConfiguration } from "./WidgetRegisterHelpers"; import CanvasWidget, { CONFIG as CANVAS_WIDGET_CONFIG, } from "widgets/CanvasWidget"; @@ -123,53 +123,59 @@ import MapChartWidget, { import log from "loglevel"; +export const ALL_WDIGETS_AND_CONFIG = [ + [CanvasWidget, CANVAS_WIDGET_CONFIG], + [SkeletonWidget, SKELETON_WIDGET_CONFIG], + [ContainerWidget, CONTAINER_WIDGET_CONFIG], + [TextWidget, TEXT_WIDGET_CONFIG], + [TableWidget, TABLE_WIDGET_CONFIG], + [CheckboxWidget, CHECKBOX_WIDGET_CONFIG], + [RadioGroupWidget, RADIO_GROUP_WIDGET_CONFIG], + [ButtonWidget, BUTTON_WIDGET_CONFIG], + [DropdownWidget, DROPDOWN_WIDGET_CONFIG], + [ImageWidget, IMAGE_WIDGET_CONFIG], + [VideoWidget, VIDEO_WIDGET_CONFIG], + [TabsWidget, TABS_WIDGET_CONFIG], + [InputWidget, INPUT_WIDGET_CONFIG], + [ModalWidget, MODAL_WIDGET_CONFIG], + [ChartWidget, CHART_WIDGET_CONFIG], + [MapWidget, MAP_WIDGET_CONFIG], + [FilePickerWidget, FILEPICKER_WIDGET_CONFIG], + [RichTextEditorWidget, RICH_TEXT_EDITOR_WIDGET_CONFIG], + [DatePickerWidget, DATE_PICKER_WIDGET_CONFIG], + [DatePickerWidget2, DATE_PICKER_WIDGET_2_CONFIG], + [SwitchWidget, SWITCH_WIDGET_CONFIG], + [FormWidget, FORM_WIDGET_CONFIG], + [FormButtonWidget, FORM_BUTTON_WIDGET_CONFIG], + [IconWidget, ICON_WIDGET_CONFIG], + [ListWidget, LIST_WIDGET_CONFIG], + [RateWidget, RATE_WIDGET_CONFIG], + [IframeWidget, IFRAME_WIDGET_CONFIG], + [TabsMigratorWidget, TABS_MIGRATOR_WIDGET_CONFIG], + [DividerWidget, DIVIDER_WIDGET_CONFIG], + [MenuButtonWidget, MENU_BUTTON_WIDGET_CONFIG], + [MultiSelectWidget, MULTI_SELECT_WIDGET_CONFIG], + [IconButtonWidget, ICON_BUTTON_WIDGET_CONFIG], + [CheckboxGroupWidget, CHECKBOX_GROUP_WIDGET_CONFIG], + [FilePickerWidgetV2, FILEPICKER_WIDGET_V2_CONFIG], + [StatboxWidget, STATBOX_WIDGET_CONFIG], + [AudioRecorderWidget, AUDIO_RECORDER_WIDGET_CONFIG], + [DocumentViewerWidget, DOCUMENT_VIEWER_WIDGET_CONFIG], + [ButtonGroupWidget, BUTTON_GROUP_CONFIG], + [MultiSelectTreeWidget, MULTI_SELECT_TREE_WIDGET_CONFIG], + [SingleSelectTreeWidget, SINGLE_SELECT_TREE_WIDGET_CONFIG], + [SwitchGroupWidget, SWITCH_GROUP_WIDGET_CONFIG], + [AudioWidget, AUDIO_WIDGET_CONFIG], + [ProgressBarWidget, PROGRESSBAR_WIDGET_CONFIG], + [CameraWidget, CAMERA_WIDGET_CONFIG], + [MapChartWidget, MAP_CHART_WIDGET_CONFIG], +]; + export const registerWidgets = () => { const start = performance.now(); - registerWidget(CanvasWidget, CANVAS_WIDGET_CONFIG); - registerWidget(SkeletonWidget, SKELETON_WIDGET_CONFIG); - registerWidget(ContainerWidget, CONTAINER_WIDGET_CONFIG); - registerWidget(TextWidget, TEXT_WIDGET_CONFIG); - registerWidget(TableWidget, TABLE_WIDGET_CONFIG); - registerWidget(CheckboxWidget, CHECKBOX_WIDGET_CONFIG); - registerWidget(RadioGroupWidget, RADIO_GROUP_WIDGET_CONFIG); - registerWidget(ButtonWidget, BUTTON_WIDGET_CONFIG); - registerWidget(DropdownWidget, DROPDOWN_WIDGET_CONFIG); - registerWidget(ImageWidget, IMAGE_WIDGET_CONFIG); - registerWidget(VideoWidget, VIDEO_WIDGET_CONFIG); - registerWidget(TabsWidget, TABS_WIDGET_CONFIG); - registerWidget(InputWidget, INPUT_WIDGET_CONFIG); - registerWidget(ModalWidget, MODAL_WIDGET_CONFIG); - registerWidget(ChartWidget, CHART_WIDGET_CONFIG); - registerWidget(MapWidget, MAP_WIDGET_CONFIG); - registerWidget(FilePickerWidget, FILEPICKER_WIDGET_CONFIG); - registerWidget(RichTextEditorWidget, RICH_TEXT_EDITOR_WIDGET_CONFIG); - registerWidget(DatePickerWidget, DATE_PICKER_WIDGET_CONFIG); - registerWidget(DatePickerWidget2, DATE_PICKER_WIDGET_2_CONFIG); - registerWidget(SwitchWidget, SWITCH_WIDGET_CONFIG); - registerWidget(FormWidget, FORM_WIDGET_CONFIG); - registerWidget(FormButtonWidget, FORM_BUTTON_WIDGET_CONFIG); - registerWidget(IconWidget, ICON_WIDGET_CONFIG); - registerWidget(ListWidget, LIST_WIDGET_CONFIG); - registerWidget(RateWidget, RATE_WIDGET_CONFIG); - registerWidget(IframeWidget, IFRAME_WIDGET_CONFIG); - registerWidget(TabsMigratorWidget, TABS_MIGRATOR_WIDGET_CONFIG); - registerWidget(DividerWidget, DIVIDER_WIDGET_CONFIG); - registerWidget(MenuButtonWidget, MENU_BUTTON_WIDGET_CONFIG); - registerWidget(MultiSelectWidget, MULTI_SELECT_WIDGET_CONFIG); - registerWidget(IconButtonWidget, ICON_BUTTON_WIDGET_CONFIG); - registerWidget(CheckboxGroupWidget, CHECKBOX_GROUP_WIDGET_CONFIG); - registerWidget(FilePickerWidgetV2, FILEPICKER_WIDGET_V2_CONFIG); - registerWidget(StatboxWidget, STATBOX_WIDGET_CONFIG); - registerWidget(AudioRecorderWidget, AUDIO_RECORDER_WIDGET_CONFIG); - registerWidget(DocumentViewerWidget, DOCUMENT_VIEWER_WIDGET_CONFIG); - registerWidget(ButtonGroupWidget, BUTTON_GROUP_CONFIG); - registerWidget(MultiSelectTreeWidget, MULTI_SELECT_TREE_WIDGET_CONFIG); - registerWidget(SingleSelectTreeWidget, SINGLE_SELECT_TREE_WIDGET_CONFIG); - registerWidget(SwitchGroupWidget, SWITCH_GROUP_WIDGET_CONFIG); - registerWidget(AudioWidget, AUDIO_WIDGET_CONFIG); - registerWidget(ProgressBarWidget, PROGRESSBAR_WIDGET_CONFIG); - registerWidget(CameraWidget, CAMERA_WIDGET_CONFIG); - registerWidget(MapChartWidget, MAP_CHART_WIDGET_CONFIG); + for (const widget of ALL_WDIGETS_AND_CONFIG) { + registerWidget(widget[0], widget[1] as WidgetConfiguration); + } log.debug("Widget registration took: ", performance.now() - start, "ms"); }; diff --git a/app/client/src/utils/testPropertyPaneConfig.test.ts b/app/client/src/utils/testPropertyPaneConfig.test.ts new file mode 100644 index 000000000000..3a6953f79d6f --- /dev/null +++ b/app/client/src/utils/testPropertyPaneConfig.test.ts @@ -0,0 +1,89 @@ +import { + PropertyPaneConfig, + PropertyPaneControlConfig, + ValidationConfig, +} from "constants/PropertyControlConstants"; +import { ValidationTypes } from "constants/WidgetValidation"; +import { ALL_WDIGETS_AND_CONFIG } from "./WidgetRegistry"; + +function validatePropertyPaneConfig(config: PropertyPaneConfig[]) { + for (const sectionOrControlConfig of config) { + if (sectionOrControlConfig.children) { + for (const propertyControlConfig of sectionOrControlConfig.children) { + const propertyControlValidation = validatePropertyControl( + propertyControlConfig, + ); + if (propertyControlValidation !== true) + return propertyControlValidation; + } + } + } + + return true; +} + +function validatePropertyControl(config: PropertyPaneConfig): boolean | string { + const _config = config as PropertyPaneControlConfig; + const controls = ["INPUT_TEXT"]; + + if ( + (_config.isJSConvertible || controls.includes(_config.controlType)) && + !_config.isTriggerProperty + ) { + if (!_config.isBindProperty) + return `${ + _config.propertyName + }: isBindProperty should be true if isJSConvertible is true or when control type is [${controls.join( + " | ", + )}]`; + if (!_config.validation) + return `${ + _config.propertyName + }: validation should be defined if isJSConvertible is true or when control type is [${controls.join( + " | ", + )}]`; + } + + if (_config.validation !== undefined) { + const res = validateValidationStructure(_config.validation); + if (res !== true) return `${_config.propertyName}: ${res}`; + } + if (_config.children) { + for (const child of _config.children) { + const res = validatePropertyControl(child); + if (res !== true) return `${_config.propertyName}.${res}`; + } + } + if (_config.panelConfig) { + const res = validatePropertyPaneConfig(_config.panelConfig.children); + if (res !== true) return `${_config.propertyName}.${res}`; + } + return true; +} + +function validateValidationStructure( + config: ValidationConfig, +): boolean | string { + if ( + config.type === ValidationTypes.FUNCTION && + config.params && + config.params.fn + ) { + if (!config.params.expected) + return `For a ${ValidationTypes.FUNCTION} type validation, expected type and example are mandatory`; + } + return true; +} + +describe("Tests all widget's propertyPane config", () => { + ALL_WDIGETS_AND_CONFIG.forEach((widgetAndConfig) => { + const widget: any = widgetAndConfig[0]; + it(`Checks ${widget.getWidgetType()}'s propertyPaneConfig`, () => { + const propertyPaneConfig = widget.getPropertyPaneConfig(); + const validatedPropertyPaneConfig = validatePropertyPaneConfig( + propertyPaneConfig, + ); + expect(validatedPropertyPaneConfig).toStrictEqual(true); + }); + }); +}); diff --git a/app/client/src/widgets/ButtonGroupWidget/widget/index.tsx b/app/client/src/widgets/ButtonGroupWidget/widget/index.tsx index a06488c0c928..bfdef23b3d22 100644 --- a/app/client/src/widgets/ButtonGroupWidget/widget/index.tsx +++ b/app/client/src/widgets/ButtonGroupWidget/widget/index.tsx @@ -132,9 +132,14 @@ class ButtonGroupWidget extends BaseWidget< }, ], isJSConvertible: true, - isBindProperty: false, + isBindProperty: true, isTriggerProperty: false, - validation: { type: ValidationTypes.TEXT }, + validation: { + type: ValidationTypes.TEXT, + params: { + allowedValues: ["SIMPLE", "MENU"], + }, + }, }, { propertyName: "buttonColor", diff --git a/app/client/src/widgets/DatePickerWidget/widget/index.tsx b/app/client/src/widgets/DatePickerWidget/widget/index.tsx index cecf8e638121..e04c6a50b985 100644 --- a/app/client/src/widgets/DatePickerWidget/widget/index.tsx +++ b/app/client/src/widgets/DatePickerWidget/widget/index.tsx @@ -207,7 +207,7 @@ class DatePickerWidget extends BaseWidget<DatePickerWidgetProps, WidgetState> { ], isBindProperty: true, isTriggerProperty: false, - dateFormat: { type: ValidationTypes.TEXT }, + validation: { type: ValidationTypes.TEXT }, }, { propertyName: "isRequired", diff --git a/app/client/src/widgets/DividerWidget/widget/index.tsx b/app/client/src/widgets/DividerWidget/widget/index.tsx index 6c43fdf036c4..7f6946726775 100644 --- a/app/client/src/widgets/DividerWidget/widget/index.tsx +++ b/app/client/src/widgets/DividerWidget/widget/index.tsx @@ -106,9 +106,15 @@ class DividerWidget extends BaseWidget<DividerWidgetProps, WidgetState> { propertyName: "dividerColor", label: "Divider Color", controlType: "COLOR_PICKER", - isBindProperty: false, + isBindProperty: true, isJSConvertible: true, isTriggerProperty: false, + validation: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, }, { helpText: "Controls the type of divider cap", @@ -136,8 +142,16 @@ class DividerWidget extends BaseWidget<DividerWidgetProps, WidgetState> { iconSize: "large", }, ], - isBindProperty: false, + isBindProperty: true, isTriggerProperty: false, + validation: { + type: ValidationTypes.TEXT, + params: { + allowedValues: ["nc", "arrow", "dot"], + required: true, + default: "arrow", + }, + }, }, { helpText: diff --git a/app/client/src/widgets/FormButtonWidget/widget/index.tsx b/app/client/src/widgets/FormButtonWidget/widget/index.tsx index e7dccf5cb56e..9083c1eedef5 100644 --- a/app/client/src/widgets/FormButtonWidget/widget/index.tsx +++ b/app/client/src/widgets/FormButtonWidget/widget/index.tsx @@ -55,7 +55,7 @@ class FormButtonWidget extends ButtonWidget { label: "Disabled Invalid Forms", controlType: "SWITCH", isJSConvertible: true, - isBindProperty: false, + isBindProperty: true, isTriggerProperty: false, validation: { type: ValidationTypes.BOOLEAN }, }, diff --git a/app/client/src/widgets/ProgressBarWidget/widget/index.tsx b/app/client/src/widgets/ProgressBarWidget/widget/index.tsx index 92cf878a298c..5d3293ef0283 100644 --- a/app/client/src/widgets/ProgressBarWidget/widget/index.tsx +++ b/app/client/src/widgets/ProgressBarWidget/widget/index.tsx @@ -104,6 +104,12 @@ class ProgressBarWidget extends BaseWidget< isBindProperty: true, isJSConvertible: true, isTriggerProperty: false, + validation: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, }, ], }, diff --git a/app/client/src/widgets/TableWidget/widget/propertyConfig.ts b/app/client/src/widgets/TableWidget/widget/propertyConfig.ts index 8dd4b7e10757..2ae96a6909b5 100644 --- a/app/client/src/widgets/TableWidget/widget/propertyConfig.ts +++ b/app/client/src/widgets/TableWidget/widget/propertyConfig.ts @@ -197,6 +197,12 @@ export default [ isJSConvertible: true, isBindProperty: true, isTriggerProperty: false, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.BOOLEAN, + }, + }, }, { propertyName: "isDisabled", @@ -208,6 +214,12 @@ export default [ isJSConvertible: true, isBindProperty: true, isTriggerProperty: false, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.BOOLEAN, + }, + }, dependencies: [ "primaryColumns", "derivedColumns", @@ -230,6 +242,12 @@ export default [ customJSControl: "COMPUTE_VALUE", isJSConvertible: true, isBindProperty: true, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.BOOLEAN, + }, + }, isTriggerProperty: false, dependencies: [ "primaryColumns", @@ -347,6 +365,36 @@ export default [ "columnOrder", ], isBindProperty: true, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: [ + "Epoch", + "Milliseconds", + "YYYY-MM-DD", + "YYYY-MM-DD HH:mm", + "YYYY-MM-DDTHH:mm:ss.sssZ", + "YYYY-MM-DDTHH:mm:ss", + "YYYY-MM-DD hh:mm:ss", + "Do MMM YYYY", + "DD/MM/YYYY", + "DD/MM/YYYY HH:mm", + "LLL", + "LL", + "D MMMM, YYYY", + "H:mm A D MMMM, YYYY", + "MM-DD-YYYY", + "DD-MM-YYYY", + "MM/DD/YYYY", + "DD/MM/YYYY", + "DD/MM/YY", + "MM/DD/YY", + ], + }, + }, + }, isTriggerProperty: false, }, { @@ -454,6 +502,36 @@ export default [ "columnType", ], isBindProperty: true, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: [ + "Epoch", + "Milliseconds", + "YYYY-MM-DD", + "YYYY-MM-DD HH:mm", + "YYYY-MM-DDTHH:mm:ss.sssZ", + "YYYY-MM-DDTHH:mm:ss", + "YYYY-MM-DD hh:mm:ss", + "Do MMM YYYY", + "DD/MM/YYYY", + "DD/MM/YYYY HH:mm", + "LLL", + "LL", + "D MMMM, YYYY", + "H:mm A D MMMM, YYYY", + "MM-DD-YYYY", + "DD-MM-YYYY", + "MM/DD/YYYY", + "DD/MM/YYYY", + "DD/MM/YY", + "MM/DD/YY", + ], + }, + }, + }, isTriggerProperty: false, }, { @@ -526,6 +604,15 @@ export default [ "columnOrder", ], isBindProperty: true, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: ["LEFT", "CENTER", "RIGHT"], + }, + }, + }, isTriggerProperty: false, }, { @@ -574,6 +661,21 @@ export default [ ], isBindProperty: true, isTriggerProperty: false, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: [ + "HEADING1", + "HEADING2", + "HEADING3", + "PARAGRAPH", + "PARAGRAPH2", + ], + }, + }, + }, }, { propertyName: "fontStyle", @@ -603,6 +705,12 @@ export default [ ], isBindProperty: true, isTriggerProperty: false, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + }, + }, }, { propertyName: "verticalAlignment", @@ -632,6 +740,15 @@ export default [ "columnOrder", ], isBindProperty: true, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + allowedValues: ["TOP", "CENTER", "BOTTOM"], + }, + }, + }, isTriggerProperty: false, }, { @@ -647,6 +764,15 @@ export default [ "columnOrder", ], isBindProperty: true, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, isTriggerProperty: false, }, { @@ -662,6 +788,15 @@ export default [ "columnOrder", ], isBindProperty: true, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, isTriggerProperty: false, }, ], @@ -797,6 +932,15 @@ export default [ "columnOrder", ], isBindProperty: true, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, isTriggerProperty: false, }, { @@ -872,12 +1016,15 @@ export default [ "derivedColumns", "columnOrder", ], - isBindProperty: false, + isBindProperty: true, isTriggerProperty: false, validation: { - type: ValidationTypes.TEXT, + type: ValidationTypes.TABLE_PROPERTY, params: { - allowedValues: ["CIRCLE", "SHARP", "ROUNDED"], + type: ValidationTypes.TEXT, + params: { + allowedValues: ["CIRCLE", "SHARP", "ROUNDED"], + }, }, }, }, @@ -899,19 +1046,22 @@ export default [ "derivedColumns", "columnOrder", ], - isBindProperty: false, + isBindProperty: true, isTriggerProperty: false, validation: { - type: ValidationTypes.TEXT, + type: ValidationTypes.TABLE_PROPERTY, params: { - allowedValues: [ - "NONE", - "VARIANT1", - "VARIANT2", - "VARIANT3", - "VARIANT4", - "VARIANT5", - ], + type: ValidationTypes.TEXT, + params: { + allowedValues: [ + "NONE", + "VARIANT1", + "VARIANT2", + "VARIANT3", + "VARIANT4", + "VARIANT5", + ], + }, }, }, }, @@ -932,7 +1082,16 @@ export default [ "derivedColumns", "columnOrder", ], - isBindProperty: false, + isBindProperty: true, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, isTriggerProperty: false, }, { @@ -954,6 +1113,15 @@ export default [ updateHook: updateDerivedColumnsHook, isBindProperty: true, isTriggerProperty: false, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, }, { @@ -962,11 +1130,19 @@ export default [ "Sets the custom color preset based on the menu button variant", label: "Menu Color", controlType: "COLOR_PICKER", - isBindProperty: false, + isBindProperty: true, isTriggerProperty: false, isJSConvertible: true, placeholderText: "#FFFFFF / Gray / rgb(255, 99, 71)", - validation: { type: ValidationTypes.TEXT }, + validation: { + type: ValidationTypes.TABLE_PROPERTY, + params: { + type: ValidationTypes.TEXT, + params: { + regex: /^(?![<|{{]).+/, + }, + }, + }, hidden: (props: TableWidgetProps, propertyPath: string) => { return hideByColumnType(props, propertyPath, [ ColumnTypes.MENU_BUTTON,
9dda476efa0eb26bf247d81a1672c0ff4a93f932
2022-09-16 15:57:35
Aman Agarwal
fix: updated design for save as datasource button (#16700)
false
updated design for save as datasource button (#16700)
fix
diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index e71d5a0aea87..23365a69074e 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -259,7 +259,7 @@ export const DATASOURCE_UPDATE = (dsName: string) => export const DATASOURCE_VALID = (dsName: string) => `${dsName} datasource is valid`; export const EDIT_DATASOURCE = () => "Edit Datasource"; -export const SAVE_DATASOURCE = () => "Save Datasource"; +export const SAVE_DATASOURCE = () => "Save as Datasource"; export const SAVE_DATASOURCE_MESSAGE = () => "Save API as datasource to setup authentication"; export const EDIT_DATASOURCE_MESSAGE = () => diff --git a/app/client/src/components/editorComponents/StoreAsDatasource.tsx b/app/client/src/components/editorComponents/StoreAsDatasource.tsx index ab085702e128..c24b4c25fafc 100644 --- a/app/client/src/components/editorComponents/StoreAsDatasource.tsx +++ b/app/client/src/components/editorComponents/StoreAsDatasource.tsx @@ -1,25 +1,38 @@ import React from "react"; import styled, { css } from "styled-components"; -import { storeAsDatasource } from "actions/datasourceActions"; -import { useDispatch } from "react-redux"; -import { Text, TextType } from "design-system"; -import { Icon, IconSize } from "design-system"; +import { + setDatsourceEditorMode, + storeAsDatasource, +} from "actions/datasourceActions"; +import { connect, useDispatch, useSelector } from "react-redux"; +import history from "utils/history"; +import { FontWeight, Text, TextType } from "design-system"; +import { datasourcesEditorIdURL } from "RouteBuilder"; +import CloudLine from "remixicon-react/CloudLineIcon"; +import Edit2Line from "remixicon-react/Edit2LineIcon"; import { Classes } from "components/ads/common"; +import { getQueryParams } from "utils/URLUtils"; +import { Colors } from "constants/Colors"; +import { getCurrentPageId } from "selectors/editorSelectors"; +import { + createMessage, + EDIT_DATASOURCE, + SAVE_DATASOURCE, +} from "ce/constants/messages"; -export const DatasourceIcon = styled.div<{ enable?: boolean }>` +export const StoreDatasourceWrapper = styled.div<{ enable?: boolean }>` display: flex; align-items: center; cursor: pointer; - margin-left: 10px; - height: 100%; + height: auto; min-height: 37px; .${Classes.TEXT} { - color: ${(props) => props.theme.colors.apiPane.settings.textColor}; + color: ${Colors.GRAY_700}; } .${Classes.ICON} { margin-right: 5px; path { - fill: ${(props) => props.theme.colors.icon.hover}; + fill: ${Colors.GRAY}; } } ${(props) => (props.enable ? "" : disabled)} @@ -32,22 +45,60 @@ const disabled = css` `; type storeDataSourceProps = { + datasourceId?: string; enable: boolean; + shouldSave: boolean; + setDatasourceEditorMode: (id: string, viewMode: boolean) => void; }; +interface ReduxDispatchProps { + setDatasourceEditorMode: (id: string, viewMode: boolean) => void; +} + function StoreAsDatasource(props: storeDataSourceProps) { const dispatch = useDispatch(); + const pageId = useSelector(getCurrentPageId); + + const saveOrEditDatasource = () => { + if (props.shouldSave) { + dispatch(storeAsDatasource()); + } else { + if (props.datasourceId) { + props.setDatasourceEditorMode(props.datasourceId, false); + history.push( + datasourcesEditorIdURL({ + pageId, + datasourceId: props.datasourceId, + params: getQueryParams(), + }), + ); + } + } + }; return ( - <DatasourceIcon + <StoreDatasourceWrapper className="t--store-as-datasource" enable={props.enable} - onClick={() => dispatch(storeAsDatasource())} + onClick={saveOrEditDatasource} > - <Icon name="datasource" size={IconSize.LARGE} /> - <Text type={TextType.P1}>Save As Datasource</Text> - </DatasourceIcon> + {props.shouldSave ? ( + <CloudLine className={Classes.ICON} size={14} /> + ) : ( + <Edit2Line className={Classes.ICON} size={14} /> + )} + <Text type={TextType.P3} weight={FontWeight.BOLD}> + {props.shouldSave + ? createMessage(SAVE_DATASOURCE) + : createMessage(EDIT_DATASOURCE)} + </Text> + </StoreDatasourceWrapper> ); } -export default StoreAsDatasource; +const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({ + setDatasourceEditorMode: (id: string, viewMode: boolean) => + dispatch(setDatsourceEditorMode({ id, viewMode })), +}); + +export default connect(null, mapDispatchToProps)(StoreAsDatasource); diff --git a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx index 450cafe31548..75c403b0be33 100644 --- a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx +++ b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx @@ -30,17 +30,12 @@ import { } from "components/editorComponents/CodeEditor/EditorConfig"; import { bindingMarker } from "components/editorComponents/CodeEditor/markHelpers"; import { bindingHint } from "components/editorComponents/CodeEditor/hintHelpers"; -import StoreAsDatasource, { - DatasourceIcon, -} from "components/editorComponents/StoreAsDatasource"; +import StoreAsDatasource from "components/editorComponents/StoreAsDatasource"; import { urlGroupsRegexExp } from "constants/AppsmithActionConstants/ActionConstants"; import styled from "styled-components"; -import { Icon, IconSize } from "design-system"; import { Text, FontWeight, TextType } from "design-system"; -import history from "utils/history"; import { getDatasourceInfo } from "pages/Editor/APIEditor/ApiRightPane"; import * as FontFamilies from "constants/Fonts"; -import { getQueryParams } from "utils/URLUtils"; import { AuthType } from "entities/Datasource/RestAPIForm"; import { setDatsourceEditorMode } from "actions/datasourceActions"; @@ -57,14 +52,12 @@ import { getDatasource, getDatasourcesByPluginId, } from "selectors/entitiesSelector"; -import { datasourcesEditorIdURL } from "RouteBuilder"; import { extractApiUrlPath } from "transformers/RestActionTransformer"; type ReduxStateProps = { workspaceId: string; datasource: Datasource | EmbeddedRestDatasource; datasourceList: Datasource[]; - currentPageId?: string; applicationId?: string; dataTree: DataTree; actionName: string; @@ -98,6 +91,10 @@ const DatasourceContainer = styled.div` z-index: ${Indices.Layer5}; } } + + .t--store-as-datasource { + margin-left: 10px; + } `; const CustomToolTip = styled.span<{ width?: number }>` @@ -504,26 +501,15 @@ class EmbeddedDatasourcePathComponent extends React.Component< </Text> </CustomToolTip> )} - {displayValue && datasource && !("id" in datasource) ? ( - <StoreAsDatasource enable={!!displayValue} /> - ) : datasource && "id" in datasource ? ( - <DatasourceIcon + {displayValue && ( + <StoreAsDatasource + datasourceId={ + datasource && "id" in datasource ? datasource.id : undefined + } enable - onClick={() => { - this.props.setDatasourceEditorMode(datasource.id, false); - history.push( - datasourcesEditorIdURL({ - pageId: this.props.currentPageId ?? "", - datasourceId: datasource.id, - params: getQueryParams(), - }), - ); - }} - > - <Icon name="edit-line" size={IconSize.XXL} /> - <Text type={TextType.P1}>Edit Datasource</Text> - </DatasourceIcon> - ) : null} + shouldSave={datasource && !("id" in datasource)} + /> + )} </DatasourceContainer> ); } @@ -555,7 +541,6 @@ const mapStateToProps = ( workspaceId: state.ui.workspaces.currentWorkspace.id, datasource: datasourceMerged, datasourceList: getDatasourcesByPluginId(state, ownProps.pluginId), - currentPageId: state.entities.pageList.currentPageId, applicationId: getCurrentApplicationId(state), dataTree: getDataTree(state), actionName: ownProps.actionName, diff --git a/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx b/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx index 59f219f13656..b017241c113f 100644 --- a/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx +++ b/app/client/src/pages/Editor/APIEditor/ApiAuthentication.tsx @@ -2,38 +2,25 @@ import React from "react"; import { Datasource, EmbeddedRestDatasource } from "entities/Datasource"; import { get, merge } from "lodash"; import styled from "styled-components"; -import { connect, useDispatch, useSelector } from "react-redux"; -import { Button, Category, Size, Text, TextType } from "design-system"; -import { - setDatsourceEditorMode, - storeAsDatasource, -} from "actions/datasourceActions"; -import history from "utils/history"; -import { getQueryParams } from "utils/URLUtils"; +import { connect } from "react-redux"; +import { Text, TextType } from "design-system"; import { AuthType } from "entities/Datasource/RestAPIForm"; import { formValueSelector } from "redux-form"; import { AppState } from "@appsmith/reducers"; import { ReactComponent as SheildSuccess } from "assets/icons/ads/shield-success.svg"; import { ReactComponent as SheildError } from "assets/icons/ads/shield-error.svg"; import { - EDIT_DATASOURCE, EDIT_DATASOURCE_MESSAGE, OAUTH_2_0, OAUTH_ERROR, - SAVE_DATASOURCE, SAVE_DATASOURCE_MESSAGE, createMessage, } from "@appsmith/constants/messages"; -import { datasourcesEditorIdURL } from "RouteBuilder"; -import { getCurrentPageId } from "selectors/editorSelectors"; +import StoreAsDatasource from "components/editorComponents/StoreAsDatasource"; interface ReduxStateProps { datasource: EmbeddedRestDatasource | Datasource; } -interface ReduxDispatchProps { - setDatasourceEditorMode: (id: string, viewMode: boolean) => void; -} - const AuthContainer = styled.div` width: 100%; height: 100%; @@ -74,39 +61,21 @@ function OAuthLabel(props: ErrorProps) { ); } -type Props = ReduxStateProps & ReduxDispatchProps; +type Props = ReduxStateProps; function ApiAuthentication(props: Props): JSX.Element { - const dispatch = useDispatch(); const { datasource } = props; const authType = get( datasource, "datasourceConfiguration.authentication.authenticationType", "", ); - const pageId = useSelector(getCurrentPageId); - - const datasourceUrl = get(datasource, "datasourceConfiguration.url", ""); const hasError = !get(datasource, "isValid", true); const shouldSave = datasource && !("id" in datasource); - const onClick = () => { - if (shouldSave) { - dispatch(storeAsDatasource()); - } else { - const id = get(datasource, "id"); - props.setDatasourceEditorMode(id, false); - history.push( - datasourcesEditorIdURL({ - pageId, - datasourceId: id, - params: getQueryParams(), - }), - ); - } - }; + const datasourceId = get(datasource, "id"); return ( <AuthContainer> @@ -116,17 +85,10 @@ function ApiAuthentication(props: Props): JSX.Element { ? createMessage(SAVE_DATASOURCE_MESSAGE) : createMessage(EDIT_DATASOURCE_MESSAGE)} </DescriptionText> - <Button - category={Category.tertiary} - disabled={!datasourceUrl} - onClick={onClick} - size={Size.medium} - tag="button" - text={ - shouldSave - ? createMessage(SAVE_DATASOURCE) - : createMessage(EDIT_DATASOURCE) - } + <StoreAsDatasource + datasourceId={datasourceId} + enable + shouldSave={shouldSave} /> </AuthContainer> ); @@ -154,14 +116,8 @@ const mapStateToProps = (state: AppState, ownProps: any): ReduxStateProps => { }; }; -const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({ - setDatasourceEditorMode: (id: string, viewMode: boolean) => - dispatch(setDatsourceEditorMode({ id, viewMode })), -}); - -const ApiAuthenticationConnectedComponent = connect( - mapStateToProps, - mapDispatchToProps, -)(ApiAuthentication); +const ApiAuthenticationConnectedComponent = connect(mapStateToProps)( + ApiAuthentication, +); export default ApiAuthenticationConnectedComponent;
62fb99929e69c8ea7da97136a11ceeaf3e3f3b92
2022-10-20 11:33:33
Sangeeth Sivan
feat: code split permission helpers and added null check for some selectors (#17718)
false
code split permission helpers and added null check for some selectors (#17718)
feat
diff --git a/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx b/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx index d60453c0f1bf..8e5a319f3533 100644 --- a/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx +++ b/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx @@ -40,7 +40,7 @@ import { isEmail } from "utils/formhelpers"; import { isPermitted, PERMISSION_TYPE, -} from "pages/Applications/permissionHelpers"; +} from "@appsmith/utils/permissionHelpers"; import { getAppsmithConfigs } from "@appsmith/configs"; import { ReactComponent as NoEmailConfigImage } from "assets/images/email-not-configured.svg"; import AnalyticsUtil from "utils/AnalyticsUtil"; diff --git a/app/client/src/ce/sagas/tenantSagas.tsx b/app/client/src/ce/sagas/tenantSagas.tsx index 624d635810a8..56ff39134b51 100644 --- a/app/client/src/ce/sagas/tenantSagas.tsx +++ b/app/client/src/ce/sagas/tenantSagas.tsx @@ -2,7 +2,7 @@ import { ReduxActionTypes, ReduxActionErrorTypes, } from "@appsmith/constants/ReduxActionConstants"; -import { PERMISSION_TYPE } from "pages/Applications/permissionHelpers"; +import { PERMISSION_TYPE } from "@appsmith/utils/permissionHelpers"; import { put } from "redux-saga/effects"; // On CE we don't expose tenant config so this shouldn't make any API calls and should just return necessary permissions for the user diff --git a/app/client/src/ce/selectors/tenantSelectors.tsx b/app/client/src/ce/selectors/tenantSelectors.tsx index 687595572f07..ce35412c835b 100644 --- a/app/client/src/ce/selectors/tenantSelectors.tsx +++ b/app/client/src/ce/selectors/tenantSelectors.tsx @@ -1,5 +1,5 @@ import { AppState } from "@appsmith/reducers"; export const getTenantPermissions = (state: AppState) => { - return state.tenant.userPermissions; + return state.tenant?.userPermissions; }; diff --git a/app/client/src/ce/utils/permissionHelpers.tsx b/app/client/src/ce/utils/permissionHelpers.tsx new file mode 100644 index 000000000000..6adca2c528d0 --- /dev/null +++ b/app/client/src/ce/utils/permissionHelpers.tsx @@ -0,0 +1,50 @@ +export enum PERMISSION_TYPE { + /* Workspace permissions */ + CREATE_WORKSPACE = "create:workspaces", + MANAGE_WORKSPACE = "manage:workspaces", + READ_WORKSPACE = "read:workspaces", + INVITE_USER_TO_WORKSPACE = "inviteUsers:workspace", + /* Application permissions */ + CREATE_APPLICATION = "manage:workspaceApplications", + MANAGE_APPLICATION = "manage:applications", + EXPORT_APPLICATION = "export:applications", + READ_APPLICATION = "read:applications", + MAKE_PUBLIC_APPLICATION = "makePublic:applications", + PUBLISH_APPLICATION = "publish:workspaceApplications", + /* Datasource permissions */ + CREATE_DATASOURCES = "create:datasources", + EXECUTE_DATASOURCES = "execute:datasources", + CREATE_DATASOURCE_ACTIONS = "create:datasourceActions", + DELETE_DATASOURCES = "delete:datasources", + MANAGE_DATASOURCES = "manage:datasources", + EXECUTE_WORKSPACE_DATASOURCES = "execute:workspaceDatasources", + /* Page permissions */ + CREATE_PAGES = "create:pages", + MANAGE_PAGES = "manage:pages", + DELETE_PAGES = "delete:pages", + /* Query permissions */ + CREATE_ACTIONS = "create:pageActions", + MANAGE_ACTIONS = "manage:actions", + DELETE_ACTIONS = "delete:actions", + EXECUTE_ACTIONS = "execute:actions", +} + +export enum LOGIC_FILTER { + AND = "AND", + OR = "OR", +} + +export const isPermitted = ( + permissions: string[] = [], + type: string | string[], + filter: LOGIC_FILTER = LOGIC_FILTER.AND, +) => { + if (Array.isArray(type)) { + if (filter === LOGIC_FILTER.AND) { + return type.every((t) => permissions.includes(t)); + } else { + return type.some((t) => permissions.includes(t)); + } + } + return permissions.includes(type); +}; diff --git a/app/client/src/components/editorComponents/form/FormDialogComponent.tsx b/app/client/src/components/editorComponents/form/FormDialogComponent.tsx index 91b7652185b4..2f4f3e8b437a 100644 --- a/app/client/src/components/editorComponents/form/FormDialogComponent.tsx +++ b/app/client/src/components/editorComponents/form/FormDialogComponent.tsx @@ -1,5 +1,5 @@ import React, { ReactNode, useState, useEffect } from "react"; -import { isPermitted } from "pages/Applications/permissionHelpers"; +import { isPermitted } from "@appsmith/utils/permissionHelpers"; import { useDispatch } from "react-redux"; import { setShowAppInviteUsersDialog } from "actions/applicationActions"; import { diff --git a/app/client/src/ee/utils/permissionHelpers.tsx b/app/client/src/ee/utils/permissionHelpers.tsx new file mode 100644 index 000000000000..a3174a7d382d --- /dev/null +++ b/app/client/src/ee/utils/permissionHelpers.tsx @@ -0,0 +1,6 @@ +export * from "ce/utils/permissionHelpers"; +import { PERMISSION_TYPE as CE_PERMISSION_TYPE } from "ce/utils/permissionHelpers"; + +export const PERMISSION_TYPE = { + ...CE_PERMISSION_TYPE, +}; diff --git a/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx b/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx index d9b7693695a7..3bad29d682c6 100644 --- a/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx +++ b/app/client/src/pages/AppViewer/AppViewerPageContainer.tsx @@ -14,7 +14,7 @@ import { getCurrentApplication } from "selectors/applicationSelectors"; import { isPermitted, PERMISSION_TYPE, -} from "../Applications/permissionHelpers"; +} from "@appsmith/utils/permissionHelpers"; import { builderURL } from "RouteBuilder"; import { getCanvasWidgetsStructure } from "selectors/entitiesSelector"; import equal from "fast-deep-equal/es6"; diff --git a/app/client/src/pages/AppViewer/PrimaryCTA.tsx b/app/client/src/pages/AppViewer/PrimaryCTA.tsx index a34fabaab120..996e3019a0b0 100644 --- a/app/client/src/pages/AppViewer/PrimaryCTA.tsx +++ b/app/client/src/pages/AppViewer/PrimaryCTA.tsx @@ -6,7 +6,7 @@ import { AUTH_LOGIN_URL } from "constants/routes"; import { PERMISSION_TYPE, isPermitted, -} from "pages/Applications/permissionHelpers"; +} from "@appsmith/utils/permissionHelpers"; import { getCurrentApplication, getCurrentPageId, diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx index c28a66435827..6727ace612fc 100644 --- a/app/client/src/pages/Applications/ApplicationCard.tsx +++ b/app/client/src/pages/Applications/ApplicationCard.tsx @@ -18,7 +18,7 @@ import { ApplicationPayload } from "@appsmith/constants/ReduxActionConstants"; import { isPermitted, PERMISSION_TYPE, -} from "pages/Applications/permissionHelpers"; +} from "@appsmith/utils/permissionHelpers"; import { getInitialsAndColorCode, getApplicationIcon, diff --git a/app/client/src/pages/Applications/ForkApplicationModal.tsx b/app/client/src/pages/Applications/ForkApplicationModal.tsx index 6a92fa31ec24..0742c15b1439 100644 --- a/app/client/src/pages/Applications/ForkApplicationModal.tsx +++ b/app/client/src/pages/Applications/ForkApplicationModal.tsx @@ -2,7 +2,10 @@ import React, { useState, useMemo, useEffect } from "react"; import { useDispatch } from "react-redux"; import { useSelector } from "store"; import { getUserApplicationsWorkspaces } from "selectors/applicationSelectors"; -import { isPermitted, PERMISSION_TYPE } from "./permissionHelpers"; +import { + isPermitted, + PERMISSION_TYPE, +} from "@appsmith/utils/permissionHelpers"; import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants"; import { AppState } from "@appsmith/reducers"; import { diff --git a/app/client/src/pages/Applications/index.tsx b/app/client/src/pages/Applications/index.tsx index e1d03a62ce00..1b8c515dca40 100644 --- a/app/client/src/pages/Applications/index.tsx +++ b/app/client/src/pages/Applications/index.tsx @@ -36,7 +36,6 @@ import PageWrapper from "pages/common/PageWrapper"; import SubHeader from "pages/common/SubHeader"; import ApplicationCard from "./ApplicationCard"; import WorkspaceInviteUsersForm from "@appsmith/pages/workspace/WorkspaceInviteUsersForm"; -import { isPermitted, PERMISSION_TYPE } from "./permissionHelpers"; import FormDialogComponent from "components/editorComponents/form/FormDialogComponent"; import { User } from "constants/userConstants"; import { getCurrentUser, selectFeatureFlags } from "selectors/usersSelectors"; @@ -103,6 +102,10 @@ import { MOBILE_MAX_WIDTH } from "constants/AppConstants"; import urlBuilder from "entities/URLRedirect/URLAssembly"; import RepoLimitExceededErrorModal from "../Editor/gitSync/RepoLimitExceededErrorModal"; import { resetEditorRequest } from "actions/initActions"; +import { + isPermitted, + PERMISSION_TYPE, +} from "@appsmith/utils/permissionHelpers"; const WorkspaceDropDown = styled.div<{ isMobile?: boolean }>` display: flex; diff --git a/app/client/src/pages/Applications/permissionHelpers.tsx b/app/client/src/pages/Applications/permissionHelpers.tsx deleted file mode 100644 index affca79d4bf5..000000000000 --- a/app/client/src/pages/Applications/permissionHelpers.tsx +++ /dev/null @@ -1,16 +0,0 @@ -export enum PERMISSION_TYPE { - CREATE_WORKSPACE = "create:workspaces", - MANAGE_WORKSPACE = "manage:workspaces", - CREATE_APPLICATION = "manage:workspaceApplications", - MANAGE_APPLICATION = "manage:applications", - EXPORT_APPLICATION = "export:applications", - READ_APPLICATION = "read:applications", - READ_WORKSPACE = "read:workspaces", - INVITE_USER_TO_WORKSPACE = "inviteUsers:workspace", - MAKE_PUBLIC_APPLICATION = "makePublic:applications", - PUBLISH_APPLICATION = "publish:workspaceApplications", -} - -export const isPermitted = (permissions: string[], type: string) => { - return permissions.includes(type); -}; diff --git a/app/client/src/pages/Editor/EditorAppName/NavigationMenuData.ts b/app/client/src/pages/Editor/EditorAppName/NavigationMenuData.ts index 647bc84e6c9e..9045e45fd874 100644 --- a/app/client/src/pages/Editor/EditorAppName/NavigationMenuData.ts +++ b/app/client/src/pages/Editor/EditorAppName/NavigationMenuData.ts @@ -15,7 +15,7 @@ import { getExportAppAPIRoute } from "@appsmith/constants/ApiConstants"; import { isPermitted, PERMISSION_TYPE, -} from "../../Applications/permissionHelpers"; +} from "@appsmith/utils/permissionHelpers"; import { getCurrentApplication } from "selectors/applicationSelectors"; import { Colors } from "constants/Colors"; import { setIsGitSyncModalOpen } from "actions/gitSyncActions"; diff --git a/app/client/src/pages/workspace/AppInviteUsersForm.tsx b/app/client/src/pages/workspace/AppInviteUsersForm.tsx index dbb3b5a21bc0..1f9d619b85a0 100644 --- a/app/client/src/pages/workspace/AppInviteUsersForm.tsx +++ b/app/client/src/pages/workspace/AppInviteUsersForm.tsx @@ -8,7 +8,7 @@ import { CopyToClipboard } from "design-system"; import { isPermitted, PERMISSION_TYPE, -} from "../Applications/permissionHelpers"; +} from "@appsmith/utils/permissionHelpers"; import WorkspaceInviteUsersForm, { InviteButtonWidth, } from "@appsmith/pages/workspace/WorkspaceInviteUsersForm"; diff --git a/app/client/src/selectors/applicationSelectors.tsx b/app/client/src/selectors/applicationSelectors.tsx index 4cc65f181e6b..626744a6b1bb 100644 --- a/app/client/src/selectors/applicationSelectors.tsx +++ b/app/client/src/selectors/applicationSelectors.tsx @@ -14,7 +14,7 @@ import { GitApplicationMetadata } from "api/ApplicationApi"; import { isPermitted, PERMISSION_TYPE, -} from "pages/Applications/permissionHelpers"; +} from "@appsmith/utils/permissionHelpers"; const fuzzySearchOptions = { keys: ["applications.name", "workspace.name"], diff --git a/app/client/src/selectors/onboardingSelectors.tsx b/app/client/src/selectors/onboardingSelectors.tsx index 3367f4c330b2..1264e07f48af 100644 --- a/app/client/src/selectors/onboardingSelectors.tsx +++ b/app/client/src/selectors/onboardingSelectors.tsx @@ -1,7 +1,7 @@ import { isPermitted, PERMISSION_TYPE, -} from "pages/Applications/permissionHelpers"; +} from "@appsmith/utils/permissionHelpers"; import { AppState } from "@appsmith/reducers"; import { createSelector } from "reselect"; import { getUserApplicationsWorkspaces } from "./applicationSelectors"; diff --git a/app/client/src/selectors/usersSelectors.tsx b/app/client/src/selectors/usersSelectors.tsx index d8e1f47ca704..6b24bcd942d0 100644 --- a/app/client/src/selectors/usersSelectors.tsx +++ b/app/client/src/selectors/usersSelectors.tsx @@ -3,7 +3,7 @@ import { User } from "constants/userConstants"; import { PropertyPanePositionConfig } from "reducers/uiReducers/usersReducer"; export const getCurrentUser = (state: AppState): User | undefined => - state.ui.users.currentUser; + state.ui?.users?.currentUser; export const getUserAuthError = (state: AppState): string => state.ui.users.error; export const getUsers = (state: AppState): User[] => state.ui.users.users; diff --git a/app/client/src/utils/helpers.tsx b/app/client/src/utils/helpers.tsx index 036eec3d8c6d..6fc0e9b0277d 100644 --- a/app/client/src/utils/helpers.tsx +++ b/app/client/src/utils/helpers.tsx @@ -14,7 +14,7 @@ import { Workspace } from "constants/workspaceConstants"; import { isPermitted, PERMISSION_TYPE, -} from "pages/Applications/permissionHelpers"; +} from "@appsmith/utils/permissionHelpers"; import moment from "moment"; import { extraLibrariesNames, isDynamicValue } from "./DynamicBindingUtils"; import { ApiResponse } from "api/ApiResponses";
8caa3c7acdf4d43a6d42d8ce1fee32fd6a6586af
2022-10-04 17:35:32
Souma Ghosh
fix: Default value of input's text is undefined (#17175)
false
Default value of input's text is undefined (#17175)
fix
diff --git a/app/client/src/widgets/InputWidgetV2/widget/index.tsx b/app/client/src/widgets/InputWidgetV2/widget/index.tsx index 418c67e70693..6c62f2e73d9b 100644 --- a/app/client/src/widgets/InputWidgetV2/widget/index.tsx +++ b/app/client/src/widgets/InputWidgetV2/widget/index.tsx @@ -375,7 +375,8 @@ class InputWidget extends BaseInputWidget<InputWidgetProps, WidgetState> { static getMetaPropertiesMap(): Record<string, any> { return merge(super.getMetaPropertiesMap(), { - inputText: undefined, + inputText: "", + text: "", }); }
2fb73c326066fc9b8ea35952eeef3e934600f3a6
2023-11-13 13:37:18
Rudraprasad Das
fix: remove feature flag and minor fixes for git branch protection (#28770)
false
remove feature flag and minor fixes for git branch protection (#28770)
fix
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBranchProtect_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBranchProtect_spec.ts index 91f342963c5f..5f53ebffacb6 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBranchProtect_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitBranchProtect_spec.ts @@ -2,37 +2,9 @@ import { featureFlagIntercept } from "../../../../../support/Objects/FeatureFlag import * as _ from "../../../../../support/Objects/ObjectsCore"; let guid: any; -let repoName1: any; -let repoName2: any; +let repoName: any; describe("Git Branch Protection", function () { - it("Issue 28056 - 1 : Check if protection is not enabled when feature flag is disabled", function () { - _.agHelper.GenerateUUID(); - cy.get("@guid").then((uid) => { - guid = uid; - const wsName = "GitBranchProtect-1" + uid; - const appName = "GitBranchProtect-1" + uid; - _.homePage.CreateNewWorkspace(wsName, true); - _.homePage.CreateAppInWorkspace(wsName, appName); - featureFlagIntercept({ - release_git_connect_v2_enabled: true, - release_git_branch_protection_enabled: false, - }); - cy.wait(1000); - _.gitSync.CreateNConnectToGitV2(); - cy.get("@gitRepoName").then((repName) => { - repoName1 = repName; - _.agHelper.AssertElementExist(_.entityExplorer._entityExplorerWrapper); - _.agHelper.AssertElementExist(_.propPane._propertyPaneSidebar); - _.agHelper.AssertElementEnabledDisabled( - _.gitSync._bottomBarCommit, - 0, - false, - ); - }); - }); - }); - it("Issue 28056 - 2 : Check if protection is enabled when feature flag is enabled", function () { _.agHelper.GenerateUUID(); cy.get("@guid").then((uid) => { @@ -43,7 +15,6 @@ describe("Git Branch Protection", function () { _.homePage.CreateAppInWorkspace(wsName, appName); featureFlagIntercept({ release_git_connect_v2_enabled: true, - release_git_branch_protection_enabled: true, }); cy.wait(1000); @@ -54,7 +25,7 @@ describe("Git Branch Protection", function () { _.gitSync.CreateNConnectToGitV2(); cy.get("@gitRepoName").then((repName) => { - repoName2 = repName; + repoName = repName; cy.wait("@gitProtectApi").then((res1) => { expect(res1.response).to.have.property("statusCode", 200); _.agHelper.AssertElementVisibility( @@ -76,7 +47,6 @@ describe("Git Branch Protection", function () { }); after(() => { - _.gitSync.DeleteTestGithubRepo(repoName1); - _.gitSync.DeleteTestGithubRepo(repoName2); + _.gitSync.DeleteTestGithubRepo(repoName); }); }); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitConnectV2_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitConnectV2_spec.ts index 79950ddb471d..cfcc8788709b 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitConnectV2_spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/GitSync/GitConnectV2_spec.ts @@ -5,6 +5,7 @@ let ws1Name: string; let ws2Name: string; let app1Name: string; let repoName: any; +let branchName: any; describe("Git Connect V2", function () { before(() => { @@ -36,17 +37,21 @@ describe("Git Connect V2", function () { release_git_connect_v2_enabled: true, }); - _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TEXT, 300, 300); - _.propPane.RenameWidget("Text1", "MyText"); - _.propPane.UpdatePropertyFieldValue("Text", "Hello World"); - _.gitSync.CommitAndPush(); - - _.gitSync.ImportAppFromGitV2(ws2Name, repoName); - - _.entityExplorer.ExpandCollapseEntity("Widgets"); - _.entityExplorer.AssertEntityPresenceInExplorer("MyText"); - _.entityExplorer.SelectEntityByName("MyText"); - _.propPane.ValidatePropertyFieldValue("Text", "Hello World"); + _.gitSync.CreateGitBranch("test", true); + cy.get("@gitbranchName").then((bName) => { + branchName = bName; + _.entityExplorer.DragDropWidgetNVerify(_.draggableWidgets.TEXT, 300, 300); + _.propPane.RenameWidget("Text1", "MyText"); + _.propPane.UpdatePropertyFieldValue("Text", "Hello World"); + _.gitSync.CommitAndPush(); + + _.gitSync.ImportAppFromGitV2(ws2Name, repoName); + _.gitSync.SwitchGitBranch(branchName); + _.entityExplorer.ExpandCollapseEntity("Widgets"); + _.entityExplorer.AssertEntityPresenceInExplorer("MyText"); + _.entityExplorer.SelectEntityByName("MyText"); + _.propPane.ValidatePropertyFieldValue("Text", "Hello World"); + }); }); after(() => { diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index 5a075b4d372f..1b27f43a3c31 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -1034,7 +1034,7 @@ export const ADD_DEPLOY_KEY_STEP_TITLE = () => export const HOW_TO_ADD_DEPLOY_KEY = () => "How to paste SSH Key in repo and give write access?"; export const CONSENT_ADDED_DEPLOY_KEY = () => - "I've added deploy key and gave it write access"; + "I've added the deploy key and gave it write access"; export const PREVIOUS_STEP = () => "Previous step"; export const GIT_CONNECT_SUCCESS_TITLE = () => "Successfully connected to your Git remote repository"; @@ -1083,7 +1083,7 @@ export const BRANCH_PROTECTION_CHANGE_RULE = () => "You can remove protection on your default branch in Git settings."; export const BRANCH_TOOLTIP_TITLE = () => "🚫 This is a protected branch"; export const BRANCH_TOOLTIP_MESSAGE = () => - "You can remove protection on your default branch in Git settings."; + "Please create a new branch or checkout an existing one to edit the app."; export const GO_TO_SETTINGS = () => "Go to settings"; export const NOW_PROTECT_BRANCH = () => "You can now protect your default branch."; diff --git a/app/client/src/ce/entities/FeatureFlag.ts b/app/client/src/ce/entities/FeatureFlag.ts index 3eeb97db6398..c6eb13dde05c 100644 --- a/app/client/src/ce/entities/FeatureFlag.ts +++ b/app/client/src/ce/entities/FeatureFlag.ts @@ -28,8 +28,6 @@ export const FEATURE_FLAG = { ab_show_templates_instead_of_blank_canvas_enabled: "ab_show_templates_instead_of_blank_canvas_enabled", release_app_sidebar_enabled: "release_app_sidebar_enabled", - release_git_branch_protection_enabled: - "release_git_branch_protection_enabled", license_git_branch_protection_enabled: "license_git_branch_protection_enabled", license_widget_rtl_support_enabled: "license_widget_rtl_support_enabled", @@ -66,7 +64,6 @@ export const DEFAULT_FEATURE_FLAG_VALUE: FeatureFlags = { release_anvil_enabled: false, ab_show_templates_instead_of_blank_canvas_enabled: false, release_app_sidebar_enabled: false, - release_git_branch_protection_enabled: false, license_git_branch_protection_enabled: false, license_widget_rtl_support_enabled: false, ab_onboarding_flow_start_with_data_dev_only_enabled: false, diff --git a/app/client/src/ce/utils/analyticsUtilTypes.ts b/app/client/src/ce/utils/analyticsUtilTypes.ts index 0659596ff1c2..684f7b08618b 100644 --- a/app/client/src/ce/utils/analyticsUtilTypes.ts +++ b/app/client/src/ce/utils/analyticsUtilTypes.ts @@ -185,6 +185,9 @@ export type EventName = | "GS_GENERATE_KEY_BUTTON_CLICK" | "GS_CONNECT_BUTTON_ON_GIT_SYNC_MODAL_CLICK" | "GS_START_USING_GIT" + | "GS_DEFAULT_BRANCH_UPDATE" + | "GS_PROTECTED_BRANCHES_UPDATE" + | "GS_OPEN_GIT_SETTINGS" | "GIT_DISCARD_WARNING" | "GIT_DISCARD_CANCEL" | "GIT_DISCARD" diff --git a/app/client/src/constants/ThirdPartyConstants.tsx b/app/client/src/constants/ThirdPartyConstants.tsx index 2c995eab26fd..f03e68f8273d 100644 --- a/app/client/src/constants/ThirdPartyConstants.tsx +++ b/app/client/src/constants/ThirdPartyConstants.tsx @@ -27,6 +27,10 @@ export const PROVISIONING_SETUP_DOC = "http://docs.appsmith.com/advanced-concepts/user-provisioning-group-sync"; export const DISCORD_URL = "https://discord.gg/rBTTVJp"; export const ENTERPRISE_PRICING_PAGE = "https://www.appsmith.com/enterprise"; +export const DOCS_BRANCH_PROTECTION_URL = + "https://docs.appsmith.com/advanced-concepts/version-control-with-git/working-with-branches#branch-protection"; +export const DOCS_DEFAULT_BRANCH_URL = + "https://docs.appsmith.com/advanced-concepts/version-control-with-git/working-with-branches#default-branch"; export const PRICING_PAGE_URL = ( URL: string, diff --git a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx index 5ef6f74b52d9..a2176be174ab 100644 --- a/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx +++ b/app/client/src/pages/Editor/gitSync/QuickGitActions/index.tsx @@ -130,18 +130,11 @@ function QuickActionButton({ ); } -const getPullBtnStatus = ( - gitStatus: any, - pullFailed: boolean, - isProtected: boolean, -) => { +const getPullBtnStatus = (gitStatus: any, pullFailed: boolean) => { const { behindCount, isClean } = gitStatus || {}; let message = createMessage(NO_COMMITS_TO_PULL); let disabled = behindCount === 0; - if (isProtected) { - disabled = false; - message = createMessage(PULL_CHANGES); - } else if (!isClean) { + if (!isClean) { disabled = true; message = createMessage(CANNOT_PULL_WITH_LOCAL_UNCOMMITTED_CHANGES); } else if (pullFailed) { @@ -322,7 +315,7 @@ export default function QuickGitActions() { const isProtectedMode = useSelector(protectedModeSelector); const { disabled: pullDisabled, message: pullTooltipMessage } = - getPullBtnStatus(gitStatus, !!pullFailed, isProtectedMode); + getPullBtnStatus(gitStatus, !!pullFailed); const isPullInProgress = useSelector(getPullInProgress); const isFetchingGitStatus = useSelector(getIsFetchingGitStatus); diff --git a/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx b/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx index 83f86190bf66..6dca220f0aea 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/ConnectionSuccess.tsx @@ -8,7 +8,6 @@ import { BRANCH_PROTECTION_RULE_1, BRANCH_PROTECTION_RULE_2, BRANCH_PROTECTION_RULE_3, - GIT_CONNECT_SUCCESS_MESSAGE, GIT_CONNECT_SUCCESS_TITLE, OPEN_GIT_SETTINGS, START_USING_GIT, @@ -21,10 +20,6 @@ import { useDispatch, useSelector } from "react-redux"; import styled from "styled-components"; import { getCurrentAppGitMetaData } from "@appsmith/selectors/applicationSelectors"; import AnalyticsUtil from "utils/AnalyticsUtil"; -import { - getDefaultGitBranchName, - getIsGitProtectedFeatureEnabled, -} from "selectors/gitSyncSelectors"; const Container = styled.div``; @@ -77,10 +72,6 @@ const features = [ function ConnectionSuccess() { const gitMetadata = useSelector(getCurrentAppGitMetaData); - const defaultBranchName = useSelector(getDefaultGitBranchName); - const isGitProtectedFeatureEnabled = useSelector( - getIsGitProtectedFeatureEnabled, - ); const dispatch = useDispatch(); useEffect(() => { @@ -105,24 +96,20 @@ function ConnectionSuccess() { tab: GitSyncModalTab.SETTINGS, }), ); - AnalyticsUtil.logEvent("GS_START_USING_GIT", { + AnalyticsUtil.logEvent("GS_OPEN_GIT_SETTINGS", { repoUrl: gitMetadata?.remoteUrl, }); }; - const preBranchProtectionContent = () => { - return ( - <Text renderAs="p">{createMessage(GIT_CONNECT_SUCCESS_MESSAGE)}</Text> - ); - }; - - const postBranchProtectionContent = () => { + const branchProtectionContent = () => { return ( <> <DefaultBranchMessage renderAs="p"> Right now,{" "} - <BranchTag isClosable={false}>{defaultBranchName}</BranchTag> is set - as the default branch and it is protected. + <BranchTag isClosable={false}> + {gitMetadata?.defaultBranchName} + </BranchTag>{" "} + is set as the default branch and it is protected. </DefaultBranchMessage> <ProtectionRulesTitle renderAs="p"> {createMessage(BRANCH_PROTECTION_RULES_AS_FOLLOWS)} @@ -144,19 +131,7 @@ function ConnectionSuccess() { ); }; - const preBranchProtectionActions = () => { - return ( - <Button - data-testid="t--start-using-git-button" - onClick={handleStartGit} - size="md" - > - {createMessage(START_USING_GIT)} - </Button> - ); - }; - - const postBranchProtectionActions = () => { + const branchProtectionActions = () => { return ( <> <Button @@ -184,16 +159,10 @@ function ConnectionSuccess() { {createMessage(GIT_CONNECT_SUCCESS_TITLE)} </TitleText> </TitleContainer> - {isGitProtectedFeatureEnabled - ? postBranchProtectionContent() - : preBranchProtectionContent()} + {branchProtectionContent()} </Container> </ModalBody> - <ModalFooter> - {isGitProtectedFeatureEnabled - ? postBranchProtectionActions() - : preBranchProtectionActions()} - </ModalFooter> + <ModalFooter>{branchProtectionActions()}</ModalFooter> </> ); } diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitDefaultBranch.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitDefaultBranch.tsx index 0380b181f8a1..525f14e04b9d 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitDefaultBranch.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitDefaultBranch.tsx @@ -14,6 +14,7 @@ import styled from "styled-components"; import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { useAppsmithEnterpriseLink } from "./hooks"; +import AnalyticsUtil from "utils/AnalyticsUtil"; const Container = styled.div` padding-top: 16px; @@ -70,6 +71,10 @@ function GitDefaultBranch() { const handleUpdate = () => { if (selectedValue) { + AnalyticsUtil.logEvent("GS_DEFAULT_BRANCH_UPDATE", { + old_branch: currentDefaultBranch, + new_branch: selectedValue, + }); dispatch(updateGitDefaultBranch({ branchName: selectedValue })); } }; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitProtectedBranches.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitProtectedBranches.tsx index dc6fd581a3cc..870b9fb670e9 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitProtectedBranches.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/GitProtectedBranches.tsx @@ -2,12 +2,13 @@ import { APPSMITH_ENTERPRISE, BRANCH_PROTECTION, BRANCH_PROTECTION_DESC, + LEARN_MORE, UPDATE, createMessage, } from "@appsmith/constants/messages"; import { updateGitProtectedBranchesInit } from "actions/gitSyncActions"; import { Button, Link, Option, Select, Text } from "design-system"; -import { union, xor } from "lodash"; +import { xor } from "lodash"; import React, { useEffect, useMemo, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { @@ -21,6 +22,8 @@ import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { useAppsmithEnterpriseLink } from "./hooks"; import { REMOTE_BRANCH_PREFIX } from "../../constants"; +import AnalyticsUtil from "utils/AnalyticsUtil"; +import { DOCS_BRANCH_PROTECTION_URL } from "constants/ThirdPartyConstants"; const Container = styled.div` padding-top: 16px; @@ -60,25 +63,25 @@ function GitProtectedBranches() { const defaultBranch = useSelector(getDefaultGitBranchName); const branchNames = useMemo(() => { - const remoteBranchNames = []; - const localBranchNames = []; + const returnVal: string[] = []; for (const unfilteredBranch of unfilteredBranches) { if (unfilteredBranch.branchName === defaultBranch) { - continue; - } - if (unfilteredBranch.branchName.includes(REMOTE_BRANCH_PREFIX)) { - remoteBranchNames.push( - unfilteredBranch.branchName.replace(REMOTE_BRANCH_PREFIX, ""), + returnVal.unshift(unfilteredBranch.branchName); + } else if (unfilteredBranch.branchName.includes(REMOTE_BRANCH_PREFIX)) { + const localBranchName = unfilteredBranch.branchName.replace( + REMOTE_BRANCH_PREFIX, + "", ); + if (!returnVal.includes(localBranchName)) { + returnVal.push( + unfilteredBranch.branchName.replace(REMOTE_BRANCH_PREFIX, ""), + ); + } } else { - localBranchNames.push(unfilteredBranch.branchName); + returnVal.push(unfilteredBranch.branchName); } } - const branchNames = union(localBranchNames, remoteBranchNames); - if (defaultBranch) { - branchNames.unshift(defaultBranch); - } - return branchNames; + return returnVal; }, [unfilteredBranches, defaultBranch]); const isGitProtectedFeatureLicensed = useFeatureFlag( @@ -86,7 +89,7 @@ function GitProtectedBranches() { ); const protectedBranches = useSelector(getProtectedBranchesSelector); const isUpdateLoading = useSelector(getIsUpdateProtectedBranchesLoading); - const [selectedValues, setSelectedValues] = useState<string[]>(); + const [selectedValues, setSelectedValues] = useState<string[]>([]); const enterprisePricingLink = useAppsmithEnterpriseLink( "git_branch_protection", @@ -103,6 +106,7 @@ function GitProtectedBranches() { const updateIsDisabled = !areProtectedBranchesDifferent; const handleUpdate = () => { + sendAnalyticsEvent(); dispatch( updateGitProtectedBranchesInit({ protectedBranches: selectedValues ?? [], @@ -110,6 +114,25 @@ function GitProtectedBranches() { ); }; + const sendAnalyticsEvent = () => { + const eventData = { + branches_added: [] as string[], + branches_removed: [] as string[], + protected_branches: selectedValues, + }; + for (const val of selectedValues) { + if (!protectedBranches.includes(val)) { + eventData.branches_added.push(val); + } + } + for (const val of protectedBranches) { + if (!selectedValues.includes(val)) { + eventData.branches_removed.push(val); + } + } + AnalyticsUtil.logEvent("GS_PROTECTED_BRANCHES_UPDATE", eventData); + }; + return ( <Container> <HeadContainer> @@ -117,7 +140,10 @@ function GitProtectedBranches() { {createMessage(BRANCH_PROTECTION)} </SectionTitle> <SectionDesc kind="body-m" renderAs="p"> - {createMessage(BRANCH_PROTECTION_DESC)} + {createMessage(BRANCH_PROTECTION_DESC)}{" "} + <StyledLink target="_blank" to={DOCS_BRANCH_PROTECTION_URL}> + {createMessage(LEARN_MORE)} + </StyledLink> </SectionDesc> {!isGitProtectedFeatureLicensed && ( <SectionDesc kind="body-m" renderAs="p"> diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/index.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/index.tsx index 48f7eaf01d1c..40ebbfbbb2b7 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/index.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitSettings/index.tsx @@ -5,8 +5,6 @@ import styled from "styled-components"; import { Divider, ModalBody } from "design-system"; import GitDefaultBranch from "./GitDefaultBranch"; import GitProtectedBranches from "./GitProtectedBranches"; -import { useSelector } from "react-redux"; -import { getIsGitProtectedFeatureEnabled } from "selectors/gitSyncSelectors"; import { useIsGitAdmin } from "../../hooks/useIsGitAdmin"; const Container = styled.div` @@ -21,16 +19,13 @@ const StyledDivider = styled(Divider)` `; function GitSettings() { - const isGitProtectedFeatureEnabled = useSelector( - getIsGitProtectedFeatureEnabled, - ); const isGitAdmin = useIsGitAdmin(); return ( <ModalBody> <Container> <GitUserSettings /> - {isGitProtectedFeatureEnabled && isGitAdmin ? ( + {isGitAdmin ? ( <> <StyledDivider /> <GitDefaultBranch /> diff --git a/app/client/src/sagas/GitSyncSagas.ts b/app/client/src/sagas/GitSyncSagas.ts index 8a0c5a8850d3..df2e59308da1 100644 --- a/app/client/src/sagas/GitSyncSagas.ts +++ b/app/client/src/sagas/GitSyncSagas.ts @@ -98,7 +98,7 @@ import { addBranchParam, GIT_BRANCH_QUERY_KEY } from "constants/routes"; import { getCurrentGitBranch, getDisconnectingGitApplication, - getIsGitProtectedFeatureEnabled, + getIsGitConnectV2Enabled, getIsGitStatusLiteEnabled, } from "selectors/gitSyncSelectors"; import { initEditor } from "actions/initActions"; @@ -221,6 +221,9 @@ function* connectToGitSaga(action: ConnectToGitReduxAction) { const applicationId: string = yield select(getCurrentApplicationId); const currentPageId: string = yield select(getCurrentPageId); response = yield GitSyncAPI.connect(action.payload, applicationId); + const isGitConnectV2Enabled: boolean = yield select( + getIsGitConnectV2Enabled, + ); const isValidResponse: boolean = yield validateResponse( response, @@ -233,10 +236,7 @@ function* connectToGitSaga(action: ConnectToGitReduxAction) { yield put(connectToGitSuccess(response?.data)); const defaultBranch = response?.data?.gitApplicationMetadata?.branchName; - const isGitProtectedFeatureEnabled: boolean = yield select( - getIsGitProtectedFeatureEnabled, - ); - if (isGitProtectedFeatureEnabled) { + if (isGitConnectV2Enabled) { yield put( updateGitProtectedBranchesInit({ protectedBranches: defaultBranch ? [defaultBranch] : [], @@ -1069,12 +1069,6 @@ function* discardChanges({ } function* fetchGitProtectedBranchesSaga() { - const isGitProtectedFeatureEnabled: boolean = yield select( - getIsGitProtectedFeatureEnabled, - ); - if (!isGitProtectedFeatureEnabled) { - return; - } let response: ApiResponse<string[]>; try { const appId: string = yield select(getCurrentApplicationId); @@ -1111,12 +1105,6 @@ function* fetchGitProtectedBranchesSaga() { function* updateGitProtectedBranchesSaga({ payload, }: ReduxAction<{ protectedBranches: string[] }>) { - const isGitProtectedFeatureEnabled: boolean = yield select( - getIsGitProtectedFeatureEnabled, - ); - if (!isGitProtectedFeatureEnabled) { - return; - } const { protectedBranches } = payload; const applicationId: string = yield select(getCurrentApplicationId); let response: ApiResponse<string[]>; diff --git a/app/client/src/selectors/gitSyncSelectors.tsx b/app/client/src/selectors/gitSyncSelectors.tsx index e96dc1558c1d..9403e99666bd 100644 --- a/app/client/src/selectors/gitSyncSelectors.tsx +++ b/app/client/src/selectors/gitSyncSelectors.tsx @@ -239,8 +239,3 @@ export const getIsUpdateProtectedBranchesLoading = (state: AppState) => { state.ui.gitSync.protectedBranchesLoading ); }; - -export const getIsGitProtectedFeatureEnabled = createSelector( - selectFeatureFlags, - (flags) => !!flags?.release_git_branch_protection_enabled, -);
49182e7060eb4d9c6c7b0b9659502c9e7180ec43
2021-10-01 20:39:41
Abhijeet
chore: Update success asset urls for generate page (#7579)
false
Update success asset urls for generate page (#7579)
chore
diff --git a/app/client/src/comments/CommentsShowcaseCarousel/index.tsx b/app/client/src/comments/CommentsShowcaseCarousel/index.tsx index 54e22b136b1f..e781122c6989 100644 --- a/app/client/src/comments/CommentsShowcaseCarousel/index.tsx +++ b/app/client/src/comments/CommentsShowcaseCarousel/index.tsx @@ -24,7 +24,7 @@ import { setCommentsIntroSeen } from "utils/storage"; import { updateUserDetails } from "actions/userActions"; -import { S3_BUCKET_URL } from "constants/ThirdPartyConstants"; +import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants"; import { getCurrentAppOrg } from "selectors/organizationSelectors"; import useOrg from "utils/hooks/useOrg"; @@ -37,7 +37,7 @@ import { setCommentModeInUrl } from "pages/Editor/ToggleModeButton"; import AnalyticsUtil from "utils/AnalyticsUtil"; const getBanner = (step: number) => - `${S3_BUCKET_URL}/comments/step-${step}.png`; + `${ASSETS_CDN_URL}/comments/step-${step}.png`; enum IntroStepsTypesEditor { INTRODUCING_LIVE_COMMENTS, diff --git a/app/client/src/constants/ThirdPartyConstants.tsx b/app/client/src/constants/ThirdPartyConstants.tsx index e4834810bc7a..d5920e90261e 100644 --- a/app/client/src/constants/ThirdPartyConstants.tsx +++ b/app/client/src/constants/ThirdPartyConstants.tsx @@ -1,6 +1,5 @@ export type ENVIRONMENT = "PRODUCTION" | "STAGING" | "LOCAL"; -export const S3_BUCKET_URL = - "https://s3.us-east-2.amazonaws.com/assets.appsmith.com"; + export const DOCS_BASE_URL = "https://docs.appsmith.com/"; export const TELEMETRY_URL = `${DOCS_BASE_URL}telemetry`; export const ASSETS_CDN_URL = "https://assets.appsmith.com"; diff --git a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx index bffaca4d00ab..398a24e2cbc8 100644 --- a/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx +++ b/app/client/src/pages/Editor/GeneratePage/components/CrudInfoModal.tsx @@ -8,7 +8,7 @@ import Text, { TextType } from "components/ads/Text"; import { getCrudInfoModalData } from "selectors/crudInfoModalSelectors"; import { setCrudInfoModalData } from "actions/crudInfoModalActions"; import { Colors } from "constants/Colors"; -import { S3_BUCKET_URL } from "constants/ThirdPartyConstants"; +import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants"; import Dialog from "components/ads/DialogComponent"; import { GenerateCRUDSuccessInfoData } from "../../../../reducers/uiReducers/crudInfoModalReducer"; @@ -25,7 +25,7 @@ type Props = { generateCRUDSuccessInfo: GenerateCRUDSuccessInfoData | null; }; -const getSuccessGIF = () => `${S3_BUCKET_URL}/crud/check_mark_verified.gif`; +const getSuccessGIF = () => `${ASSETS_CDN_URL}/crud/check_mark_verified.gif`; const Heading = styled.div` color: ${Colors.CODE_GRAY}; @@ -108,12 +108,19 @@ const STEP = { SHOW_INFO: "show_info", }; +const getInfoImage = (): string => + `${ASSETS_CDN_URL}/crud/working-flow-chart.png`; + +const DELAY_TIME = 6000; + function InfoContent({ onClose, + successImageUrl, successMessage, }: { onClose: () => void; successMessage: string; + successImageUrl: string; }) { return ( <> @@ -126,7 +133,7 @@ function InfoContent({ type={TextType.P1} /> <ImageWrapper> - <InfoImage alt="CRUD Info" src={getInfoImage()} /> + <InfoImage alt="CRUD Info" src={successImageUrl} /> </ImageWrapper> </Content> @@ -143,8 +150,6 @@ function InfoContent({ </> ); } -const getInfoImage = (): string => - `${S3_BUCKET_URL}/crud/working-flow-chart.png`; function GenCRUDSuccessModal(props: Props) { const { crudInfoModalOpen, generateCRUDSuccessInfo } = props; @@ -161,10 +166,14 @@ function GenCRUDSuccessModal(props: Props) { (generateCRUDSuccessInfo && generateCRUDSuccessInfo.successMessage) || createMessage(GEN_CRUD_INFO_DIALOG_SUBTITLE); + const successImageUrl = + (generateCRUDSuccessInfo && generateCRUDSuccessInfo.successImageUrl) || + getInfoImage(); + useEffect(() => { const timerId = setTimeout(() => { setStep(STEP.SHOW_INFO); - }, 2000); + }, DELAY_TIME); return () => { if (timerId) clearTimeout(timerId); }; @@ -186,7 +195,11 @@ function GenCRUDSuccessModal(props: Props) { </SuccessContentWrapper> ) : null} {step === STEP.SHOW_INFO ? ( - <InfoContent onClose={onClose} successMessage={successMessage} /> + <InfoContent + onClose={onClose} + successImageUrl={successImageUrl} + successMessage={successMessage} + /> ) : null} </Wrapper> </Dialog> diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Assets.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Assets.java new file mode 100644 index 000000000000..a3b81f64cf3b --- /dev/null +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Assets.java @@ -0,0 +1,7 @@ +package com.appsmith.server.constants; + +public class Assets { + + public static final String GENERATE_CRUD_PAGE_SUCCESS_URL_TABULAR = "https://s3.us-east-2.amazonaws.com/assets.appsmith.com/crud/workflow_sql.svg"; + public static final String GENERATE_CRUD_PAGE_SUCCESS_URL_S3 = "https://s3.us-east-2.amazonaws.com/assets.appsmith.com/crud/workflow_s3.svg"; +} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Resources.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Resources.java deleted file mode 100644 index 588daaa0ea34..000000000000 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/constants/Resources.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.appsmith.server.constants; - -public class Resources { - - public static final String GENERATE_CRUD_PAGE_SUCCESS_URL_TABULAR = "https://assets.appsmith.com/crud/working-flow-chart.png"; - -} diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolution.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolution.java index f33ab3e1ea69..77abd7eebe9e 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolution.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/CreateDBTablePageSolution.java @@ -11,7 +11,7 @@ import com.appsmith.server.constants.AnalyticsEvents; import com.appsmith.server.constants.Entity; import com.appsmith.server.constants.FieldName; -import com.appsmith.server.constants.Resources; +import com.appsmith.server.constants.Assets; import com.appsmith.server.domains.ApplicationJson; import com.appsmith.external.models.Datasource; import com.appsmith.server.domains.Layout; @@ -354,9 +354,7 @@ public Mono<CRUDPageResponseDTO> createPageFromDBTable(String pageId, CRUDPageRe .flatMap(pageDTO -> { CRUDPageResponseDTO crudPage = new CRUDPageResponseDTO(); crudPage.setPage(pageDTO); - crudPage.setSuccessMessage(createSuccessMessage(plugin)); - // Update the S3 image once received - crudPage.setSuccessImageUrl(Resources.GENERATE_CRUD_PAGE_SUCCESS_URL_TABULAR); + createSuccessMessageAndSetAsset(plugin, crudPage); return sendGenerateCRUDPageAnalyticsEvent(crudPage, datasource, plugin.getName()); }) ); @@ -957,17 +955,22 @@ private void removeUnwantedFieldRefFromFormData(Map<String, Object> formData, } } - private String createSuccessMessage(Plugin plugin) { + private void createSuccessMessageAndSetAsset(Plugin plugin, CRUDPageResponseDTO crudPage) { String displayWidget = Entity.S3_PLUGIN_PACKAGE_NAME.equals(plugin.getPackageName()) ? "LIST" : "TABLE"; String updateWidget = Entity.S3_PLUGIN_PACKAGE_NAME.equals(plugin.getPackageName()) ? "FILEPICKER" : "FORM"; + String successUrl = Entity.S3_PLUGIN_PACKAGE_NAME.equals(plugin.getPackageName()) ? + Assets.GENERATE_CRUD_PAGE_SUCCESS_URL_S3 : Assets.GENERATE_CRUD_PAGE_SUCCESS_URL_TABULAR; + crudPage.setSuccessImageUrl(successUrl); + + // Field used to send success message after the successful page creation String successMessage = "We have generated the <b>" + displayWidget + "</b> from the <b>" + plugin.getName() + " Datasource</b>. You can use the <b>" + updateWidget + "</b> to modify it. Since all your " + "data is already connected you can add more queries and modify the bindings"; - return successMessage; + crudPage.setSuccessMessage(successMessage); } private Mono<CRUDPageResponseDTO> sendGenerateCRUDPageAnalyticsEvent(CRUDPageResponseDTO crudPage, Datasource datasource, String pluginName) {
0b2cffb3b752de1fe2035becf1befc7769293e79
2024-11-05 17:11:02
NandanAnantharamu
test: fixed datepicker skipped tests set 2 (#37126)
false
fixed datepicker skipped tests set 2 (#37126)
test
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Binding/DatePicker_Text_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Binding/DatePicker_Text_spec.js index 037e637f8cd7..52c699902baf 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Binding/DatePicker_Text_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Binding/DatePicker_Text_spec.js @@ -14,7 +14,7 @@ describe( _.agHelper.AddDsl("uiBindDsl"); }); // Skipping tests due to issue - https://www.notion.so/appsmith/f353d8c6bd664f79ad858a42010cdfc8?v=f04cde23f6424aeb9d5a6e389cd172bd&p=0717892d43684c40bae4e2c87b8308cb&pm=s - it.skip("1. DatePicker-Text, Validate selectedDate functionality", function () { + it("1. DatePicker-Text, Validate selectedDate functionality", function () { /** * Bind DatePicker1 to Text for "selectedDate" */ @@ -25,9 +25,8 @@ describe( * Set the Calender for today's date in DatePicker1 */ cy.openPropertyPane("datepickerwidget"); - cy.get(formWidgetsPage.defaultDate).click(); - cy.ClearDateFooter(); - cy.SetDateToToday(); + cy.get(formWidgetsPage.datepickerWidget).first().click(); + cy.get(formWidgetsPage.datepickerFooter).contains("Today").click(); cy.getDate(1, "YYYY-MM-DD").then((date) => { cy.log("retured date" + date); @@ -43,15 +42,15 @@ describe( cy.get(publishPage.datepickerWidget + commonlocators.inputField) .eq(0) .click(); - cy.ClearDateFooter(); - cy.setDate(1, "ddd MMM DD YYYY"); + cy.SetDateToToday(); + cy.setDate(1, "ddd MMM DD YYYY", "v1"); cy.get(commonlocators.labelTextStyle).should("contain", nextDay); }); cy.get(commonlocators.backToEditor).click(); }); - it.skip("2. DatePicker1-text: Change the date in DatePicker1 and Validate the same in text widget", function () { + it("2. DatePicker1-text: Change the date in DatePicker1 and Validate the same in text widget", function () { cy.openPropertyPane("textwidget"); /** @@ -75,9 +74,9 @@ describe( */ cy.openPropertyPane("datepickerwidget"); cy.get(formWidgetsPage.defaultDate).click(); - cy.ClearDateFooter(); - cy.setDate(1, "ddd MMM DD YYYY"); - // cy.get(commonlocators.onDateSelectedField).click(); + cy.get(formWidgetsPage.dayPickerToday).click(); + cy.get(formWidgetsPage.defaultDate).click(); + cy.setDate(1); /** *Validate the date in text widget @@ -89,7 +88,7 @@ describe( }); }); - it.skip("3. Validate the Date is not changed in DatePicker2", function () { + it("3. Validate the Date is not changed in DatePicker2", function () { cy.log("dateDp2:" + dateDp2); cy.get(formWidgetsPage.datepickerWidget + commonlocators.inputField) .eq(1) @@ -124,7 +123,7 @@ describe( _.deployMode.NavigateBacktoEditor(); }); - it.skip("5. Checks if on deselection of date triggers the onDateSelected action or not.", function () { + it("5. Checks if on deselection of date triggers the onDateSelected action or not.", function () { /** * bind datepicker to show a message "Hello" on date selected */ @@ -135,7 +134,6 @@ describe( * checking if on selecting the date triggers the message */ cy.get(formWidgetsPage.datepickerWidget).first().click(); - cy.ClearDateFooter(); cy.SetDateToToday(); cy.get(commonlocators.toastmsg).contains("hello"); diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker2_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker2_spec.js index a84f5c06692d..065f0c7a9e4f 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker2_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker2_spec.js @@ -22,7 +22,7 @@ describe( it("DatePicker-Date Name validation", function () { // changing the date to today cy.get(formWidgetsPage.defaultDate).click(); - cy.SetDateToToday(); + cy.get(formWidgetsPage.dayPickerToday).click(); //changing the Button Name cy.widgetText( diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_With_Switch_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_With_Switch_spec.js index d48e5ce34c9e..f5257949830a 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_With_Switch_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Datepicker/DatePicker_With_Switch_spec.js @@ -28,11 +28,14 @@ describe( cy.closePropertyPane(); }); // Skipping tests due to issue - https://www.notion.so/appsmith/f353d8c6bd664f79ad858a42010cdfc8?v=f04cde23f6424aeb9d5a6e389cd172bd&p=0717892d43684c40bae4e2c87b8308cb&pm=s - it.skip("Date Widget with Reset widget being switch widget", function () { + it("Date Widget with Reset widget being switch widget", function () { EditorNavigation.SelectEntityByName("DatePicker1", EntityType.Widget); + cy.get(formWidgetsPage.datePickerInput).click(); + _.agHelper.GetNClick(widgetsPage.todayText); + cy.get(formWidgetsPage.defaultDate).click(); + _.agHelper.GetNClick(".ads-v2-datepicker__calender-today"); cy.get(formWidgetsPage.defaultDate).click(); - cy.SetDateToToday(); cy.setDate(1, "ddd MMM DD YYYY"); const nextDay = dayjs().format("DD/MM/YYYY"); cy.log(nextDay); @@ -51,18 +54,10 @@ describe( cy.get(widgetsPage.switchWidgetInactive).should("be.visible"); }); - it.skip("DatePicker-Date change and validate switch widget status", function () { + it("DatePicker-Date change and validate switch widget status", function () { cy.get(widgetsPage.datepickerInput).click({ force: true }); - cy.SetDateToToday(); - cy.get(widgetsPage.switchWidgetActive).should("be.visible"); - cy.get(".t--toast-action span") - .last() - .invoke("text") - .then((text) => { - const toasttext = text; - cy.log(toasttext); - expect(text.trim()).to.equal(toasttext.trim()); - }); + _.agHelper.GetNClick(widgetsPage.todayText); + _.agHelper.AssertClassExists(".bp3-switch", "t--switch-widget-active"); }); }, ); diff --git a/app/client/cypress/fixtures/uiBindnewDsl.json b/app/client/cypress/fixtures/uiBindnewDsl.json new file mode 100644 index 000000000000..6d45729acce7 --- /dev/null +++ b/app/client/cypress/fixtures/uiBindnewDsl.json @@ -0,0 +1,540 @@ +{ + "dsl": { + "widgetName": "MainContainer", + "backgroundColor": "none", + "rightColumn": 4896, + "snapColumns": 64, + "detachFromLayout": true, + "widgetId": "0", + "topRow": 0, + "bottomRow": 600, + "containerStyle": "none", + "snapRows": 124, + "parentRowSpace": 1, + "type": "CANVAS_WIDGET", + "canExtend": true, + "version": 90, + "minHeight": 1292, + "parentColumnSpace": 1, + "dynamicBindingPathList": [], + "leftColumn": 0, + "children": [ + { + "boxShadow": "none", + "widgetName": "Container1", + "topRow": 0, + "bottomRow": 60, + "parentRowSpace": 38, + "type": "CONTAINER_WIDGET", + "parentColumnSpace": 75.25, + "dynamicBindingPathList": [], + "leftColumn": 0, + "children": [ + { + "labelTextSize": "0.875rem", + "boxShadow": "none", + "backgroundColor": "#FFFFFF", + "widgetName": "utncsu66ty", + "rightColumn": 2408, + "orientation": "VERTICAL", + "snapColumns": 16, + "detachFromLayout": true, + "widgetId": "acizsl94my", + "containerStyle": "none", + "topRow": 0, + "bottomRow": 380, + "parentRowSpace": 1, + "isVisible": true, + "type": "CANVAS_WIDGET", + "canExtend": false, + "version": 1, + "isLoading": false, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "borderRadius": "0px", + "children": [ + { + "boxShadow": "none", + "widgetName": "Text5", + "topRow": 28, + "bottomRow": 32, + "parentRowSpace": 38, + "type": "TEXT_WIDGET", + "parentColumnSpace": 62.484375, + "overflow": "NONE", + "fontFamily": "System Default", + "dynamicTriggerPathList": [], + "leftColumn": 16, + "dynamicBindingPathList": [ + { + "key": "text" + } + ], + "text": "{{DatePicker1.selectedDate}}", + "labelTextSize": "0.875rem", + "rightColumn": 32, + "textAlign": "LEFT", + "dynamicHeight": "FIXED", + "widgetId": "t7c7i4gv0f", + "isVisible": true, + "fontStyle": "BOLD", + "version": 1, + "textColor": "#231F20", + "parentId": "acizsl94my", + "isLoading": false, + "borderRadius": "0px", + "maxDynamicHeight": 9000, + "fontSize": "0.875rem", + "minDynamicHeight": 4 + }, + { + "needsErrorInfo": false, + "boxShadow": "none", + "mobileBottomRow": 12, + "widgetName": "DatePicker1", + "minDate": "1920-12-31T18:30:00.000Z", + "dateFormat": "YYYY-MM-DD HH:mm", + "topRow": 5, + "bottomRow": 12, + "shortcuts": false, + "parentRowSpace": 10, + "labelWidth": 5, + "type": "DATE_PICKER_WIDGET2", + "mobileRightColumn": 30, + "animateLoading": true, + "parentColumnSpace": 7.26171875, + "leftColumn": 10, + "dynamicBindingPathList": [ + { + "key": "accentColor" + }, + { + "key": "borderRadius" + } + ], + "labelPosition": "Top", + "isDisabled": false, + "key": "frcocd42ul", + "labelTextSize": "0.875rem", + "isRequired": false, + "defaultDate": "2024-10-24T07:39:07.659Z", + "rightColumn": 30, + "dynamicHeight": "FIXED", + "widgetId": "pwo88q4udx", + "accentColor": "{{appsmith.theme.colors.primaryColor}}", + "minWidth": 450, + "isVisible": true, + "datePickerType": "DATE_PICKER", + "label": "Label", + "version": 2, + "parentId": "acizsl94my", + "labelAlignment": "left", + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 5, + "timePrecision": "minute", + "responsiveBehavior": "fill", + "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", + "mobileLeftColumn": 10, + "maxDynamicHeight": 9000, + "firstDayOfWeek": 0, + "closeOnSelection": true, + "maxDate": "2121-12-31T18:29:00.000Z", + "minDynamicHeight": 4 + }, + { + "needsErrorInfo": false, + "boxShadow": "none", + "mobileBottomRow": 22, + "widgetName": "DatePicker2", + "minDate": "1920-12-31T18:30:00.000Z", + "dateFormat": "YYYY-MM-DD HH:mm", + "topRow": 14, + "bottomRow": 21, + "shortcuts": false, + "parentRowSpace": 10, + "labelWidth": 5, + "type": "DATE_PICKER_WIDGET2", + "mobileRightColumn": 29, + "animateLoading": true, + "parentColumnSpace": 7.26171875, + "leftColumn": 10, + "dynamicBindingPathList": [ + { + "key": "accentColor" + }, + { + "key": "borderRadius" + } + ], + "labelPosition": "Top", + "isDisabled": false, + "key": "frcocd42ul", + "labelTextSize": "0.875rem", + "isRequired": false, + "defaultDate": "2024-10-24T07:39:07.659Z", + "rightColumn": 30, + "dynamicHeight": "FIXED", + "widgetId": "gwcu42z6yn", + "accentColor": "{{appsmith.theme.colors.primaryColor}}", + "minWidth": 450, + "isVisible": true, + "datePickerType": "DATE_PICKER", + "label": "Label", + "version": 2, + "parentId": "acizsl94my", + "labelAlignment": "left", + "renderMode": "CANVAS", + "isLoading": false, + "mobileTopRow": 15, + "timePrecision": "minute", + "responsiveBehavior": "fill", + "borderRadius": "{{appsmith.theme.borderRadius.appBorderRadius}}", + "mobileLeftColumn": 9, + "maxDynamicHeight": 9000, + "firstDayOfWeek": 0, + "closeOnSelection": true, + "maxDate": "2121-12-31T18:29:00.000Z", + "minDynamicHeight": 4 + } + ] + } + ], + "labelTextSize": "0.875rem", + "backgroundColor": "#FFFFFF", + "rightColumn": 56, + "orientation": "VERTICAL", + "snapColumns": 16, + "dynamicHeight": "FIXED", + "widgetId": "mp429a7dl3", + "containerStyle": "card", + "isVisible": true, + "version": 1, + "isLoading": false, + "borderRadius": "0px", + "maxDynamicHeight": 9000, + "minDynamicHeight": 4 + }, + { + "boxShadow": "none", + "widgetName": "Modal1", + "topRow": 0, + "bottomRow": 0, + "parentRowSpace": 1, + "type": "MODAL_WIDGET", + "shouldScrollContents": true, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "children": [ + { + "boxShadow": "none", + "widgetName": "Canvas1", + "topRow": 0, + "bottomRow": 240, + "parentRowSpace": 1, + "canExtend": true, + "type": "CANVAS_WIDGET", + "shouldScrollContents": false, + "minHeight": 0, + "parentColumnSpace": 1, + "leftColumn": 0, + "dynamicBindingPathList": [], + "children": [ + { + "labelTextSize": "0.875rem", + "isRequired": false, + "boxShadow": "none", + "widgetName": "Icon1", + "rightColumn": 64, + "onClick": "{{closeModal(Modal1.name)}}", + "iconName": "cross", + "buttonColor": "#2E3D49", + "widgetId": "t3sjfihdb1", + "topRow": 0, + "bottomRow": 4, + "isVisible": true, + "type": "ICON_BUTTON_WIDGET", + "version": 1, + "parentId": "cwamdbv44c", + "isLoading": false, + "leftColumn": 60, + "dynamicBindingPathList": [], + "borderRadius": "0px", + "buttonVariant": "TERTIARY", + "iconSize": 24 + }, + { + "boxShadow": "none", + "widgetName": "Text4", + "dynamicPropertyPathList": [ + { + "key": "fontSize" + } + ], + "topRow": 0, + "bottomRow": 4, + "type": "TEXT_WIDGET", + "overflow": "NONE", + "fontFamily": "System Default", + "leftColumn": 0, + "dynamicBindingPathList": [], + "text": "Modal Title", + "labelTextSize": "0.875rem", + "rightColumn": 60, + "dynamicHeight": "FIXED", + "widgetId": "x893ud3zjh", + "isVisible": true, + "fontStyle": "BOLD", + "version": 1, + "textColor": "#231F20", + "parentId": "cwamdbv44c", + "isLoading": false, + "borderRadius": "0px", + "maxDynamicHeight": 9000, + "fontSize": "1.5rem", + "minDynamicHeight": 4 + }, + { + "labelTextSize": "0.875rem", + "boxShadow": "none", + "widgetName": "Button2", + "rightColumn": 52, + "isDefaultClickDisabled": true, + "buttonColor": "#03B365", + "widgetId": "q9snwskqan", + "topRow": 16, + "bottomRow": 20, + "isVisible": true, + "type": "BUTTON_WIDGET", + "version": 1, + "recaptchaType": "V3", + "parentId": "cwamdbv44c", + "isLoading": false, + "leftColumn": 40, + "dynamicBindingPathList": [], + "borderRadius": "0px", + "buttonVariant": "PRIMARY", + "text": "Cancel", + "isDisabled": false + }, + { + "labelTextSize": "0.875rem", + "boxShadow": "none", + "widgetName": "Button3", + "rightColumn": 64, + "isDefaultClickDisabled": true, + "buttonColor": "#03B365", + "widgetId": "tufuj2kdpz", + "topRow": 16, + "bottomRow": 20, + "isVisible": true, + "type": "BUTTON_WIDGET", + "version": 1, + "recaptchaType": "V3", + "parentId": "cwamdbv44c", + "isLoading": false, + "leftColumn": 52, + "dynamicBindingPathList": [], + "borderRadius": "0px", + "buttonVariant": "PRIMARY", + "text": "Confirm", + "isDisabled": false + } + ], + "isDisabled": false, + "labelTextSize": "0.875rem", + "rightColumn": 0, + "detachFromLayout": true, + "widgetId": "cwamdbv44c", + "isVisible": true, + "version": 1, + "parentId": "bx9a2jg08o", + "blueprint": { + "view": [ + { + "type": "ICON_WIDGET", + "position": { + "left": 15, + "top": 0 + }, + "size": { + "rows": 1, + "cols": 1 + }, + "props": { + "iconName": "cross", + "iconSize": 24, + "color": "#040627" + } + }, + { + "type": "TEXT_WIDGET", + "position": { + "left": 0, + "top": 0 + }, + "size": { + "rows": 1, + "cols": 15 + }, + "props": { + "text": "Modal Title", + "textStyle": "HEADING" + } + }, + { + "type": "BUTTON_WIDGET", + "position": { + "left": 10, + "top": 4 + }, + "size": { + "rows": 1, + "cols": 3 + }, + "props": { + "text": "Cancel", + "buttonStyle": "SECONDARY_BUTTON" + } + }, + { + "type": "BUTTON_WIDGET", + "position": { + "left": 13, + "top": 4 + }, + "size": { + "rows": 1, + "cols": 3 + }, + "props": { + "text": "Confirm", + "buttonStyle": "PRIMARY_BUTTON" + } + } + ], + "operations": [ + { + "type": "MODIFY_PROPS" + } + ] + }, + "isLoading": false, + "borderRadius": "0px" + } + ], + "height": 240, + "labelTextSize": "0.875rem", + "rightColumn": 0, + "detachFromLayout": true, + "dynamicHeight": "FIXED", + "widgetId": "bx9a2jg08o", + "isVisible": false, + "canOutsideClickClose": true, + "canEscapeKeyClose": true, + "version": 2, + "parentId": "0", + "blueprint": { + "view": [ + { + "type": "CANVAS_WIDGET", + "position": { + "left": 0, + "top": 0 + }, + "props": { + "detachFromLayout": true, + "canExtend": true, + "isVisible": true, + "isDisabled": false, + "shouldScrollContents": false, + "children": [], + "blueprint": { + "view": [ + { + "type": "ICON_WIDGET", + "position": { + "left": 15, + "top": 0 + }, + "size": { + "rows": 1, + "cols": 1 + }, + "props": { + "iconName": "cross", + "iconSize": 24, + "color": "#040627" + } + }, + { + "type": "TEXT_WIDGET", + "position": { + "left": 0, + "top": 0 + }, + "size": { + "rows": 1, + "cols": 15 + }, + "props": { + "text": "Modal Title", + "textStyle": "HEADING" + } + }, + { + "type": "BUTTON_WIDGET", + "position": { + "left": 10, + "top": 4 + }, + "size": { + "rows": 1, + "cols": 3 + }, + "props": { + "text": "Cancel", + "buttonStyle": "SECONDARY_BUTTON" + } + }, + { + "type": "BUTTON_WIDGET", + "position": { + "left": 13, + "top": 4 + }, + "size": { + "rows": 1, + "cols": 3 + }, + "props": { + "text": "Confirm", + "buttonStyle": "PRIMARY_BUTTON" + } + } + ], + "operations": [ + { + "type": "MODIFY_PROPS" + } + ] + } + } + } + ] + }, + "isLoading": false, + "borderRadius": "0px", + "maxDynamicHeight": 9000, + "width": 456, + "minDynamicHeight": 4 + } + ] + }, + "layoutOnLoadActions": [], + "layoutOnLoadActionErrors": [], + "actionUpdates": [], + "messages": [] +} diff --git a/app/client/cypress/locators/FormWidgets.json b/app/client/cypress/locators/FormWidgets.json index db603de7b8c0..43462381c2da 100644 --- a/app/client/cypress/locators/FormWidgets.json +++ b/app/client/cypress/locators/FormWidgets.json @@ -78,5 +78,6 @@ "minDateTextArea" : ".t--property-control-mindate .CodeMirror textarea", "minDateInput" : ".t--property-control-mindate .ads-v2-input__input-section-input", "datePickerInput": ".t--widget-datepickerwidget2 .bp3-input", - "dayPickerNextButton": ".DayPicker-NavButton--next" + "dayPickerNextButton": ".DayPicker-NavButton--next", + "dayPickerToday": ".ads-v2-datepicker__calender-today" } diff --git a/app/client/cypress/locators/Widgets.json b/app/client/cypress/locators/Widgets.json index 92b161d141b2..4dcb4ce330bf 100644 --- a/app/client/cypress/locators/Widgets.json +++ b/app/client/cypress/locators/Widgets.json @@ -234,5 +234,7 @@ "propertyPaneSaveButton": ".t--property-pane-section-collapse-savebutton", "firstEditInput":"[data-colindex=0][data-rowindex=0] .t--inlined-cell-editor input.bp3-input", "cellControlSwitch" : ".t--property-control-cellwrapping .ads-v2-switch", - "propertyControlLabel" : ".t--property-control-label" + "propertyControlLabel" : ".t--property-control-label", + "todayText": "span:contains('Today')", + "dayPickerToday": ".DayPicker-Day--today" } diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js index d922a6f902fe..c088b90d8680 100644 --- a/app/client/cypress/support/commands.js +++ b/app/client/cypress/support/commands.js @@ -526,9 +526,17 @@ Cypress.Commands.add("getDate", (date, dateFormate) => { return eDate; }); -Cypress.Commands.add("setDate", (date) => { - const expDate = dayjs().add(date, "days").format("dddd, MMMM Do, YYYY"); - cy.get(`.react-datepicker__day[aria-label^="Choose ${expDate}"]`).click(); +Cypress.Commands.add("setDate", (date, dateFormate, ver = "v2") => { + if (ver == "v2") { + const expDate = dayjs().add(date, "days").format("dddd, MMMM D"); + cy.get(`.react-datepicker__day[aria-label^="Choose ${expDate}"]`) + .first() + .click(); + } else if (ver == "v1") { + const expDate = dayjs().add(date, "days").format(dateFormate); + const sel = `.DayPicker-Day[aria-label=\"${expDate}\"]`; + cy.get(sel).click(); + } }); Cypress.Commands.add("validateDisableWidget", (widgetCss, disableCss) => { diff --git a/app/client/cypress/support/widgetCommands.js b/app/client/cypress/support/widgetCommands.js index fd0772748f6f..23d1d828f6a4 100644 --- a/app/client/cypress/support/widgetCommands.js +++ b/app/client/cypress/support/widgetCommands.js @@ -837,7 +837,7 @@ Cypress.Commands.add("selectWidgetForReset", (value) => { }); Cypress.Commands.add("SetDateToToday", () => { - cy.get(".react-datepicker .react-datepicker__day--today").click({ + cy.get("button:contains('Today')").click({ force: true, }); agHelper.AssertAutoSave();
80c5b41746e412180c9d7f6285e62112261ee5e4
2023-05-29 18:00:19
Pawan Kumar
chore: Make tooltip more accessiblity (#23717)
false
Make tooltip more accessiblity (#23717)
chore
diff --git a/app/client/packages/design-system/headless/src/components/Button/Button.tsx b/app/client/packages/design-system/headless/src/components/Button/Button.tsx index 390b188a9261..940b6d46591f 100644 --- a/app/client/packages/design-system/headless/src/components/Button/Button.tsx +++ b/app/client/packages/design-system/headless/src/components/Button/Button.tsx @@ -7,6 +7,10 @@ import type { AriaButtonProps as SpectrumAriaBaseButtonProps } from "@react-type export interface ButtonProps extends SpectrumAriaBaseButtonProps { className?: string; + /** + * If true, the button will be disabled visually and functionally. + * Note: Visually disabled button can be focused. + */ visuallyDisabled?: boolean; } @@ -14,22 +18,54 @@ export type ButtonRef = React.Ref<HTMLButtonElement>; type ButtonRefObject = React.RefObject<HTMLButtonElement>; export const Button = forwardRef((props: ButtonProps, ref: ButtonRef) => { - const { autoFocus, children, className, isDisabled } = props; - const { buttonProps, isPressed } = useButton(props, ref as ButtonRefObject); + const { autoFocus, children, className, isDisabled, visuallyDisabled } = + props; + props = useVisuallyDisabled(props); const { hoverProps, isHovered } = useHover({ isDisabled }); const { focusProps, isFocusVisible } = useFocusRing({ autoFocus }); + const { buttonProps, isPressed } = useButton(props, ref as ButtonRefObject); return ( <button {...mergeProps(buttonProps, hoverProps, focusProps)} + aria-disabled={visuallyDisabled ? true : undefined} className={className} data-active={isPressed ? "" : undefined} data-disabled={isDisabled ? "" : undefined} data-focused={isFocusVisible ? "" : undefined} data-hovered={isHovered ? "" : undefined} + disabled={visuallyDisabled ? undefined : isDisabled} ref={ref} > {children} </button> ); }); + +/** + * This hook is used to disable all click/press events on a button + * when the button is visually disabled + * + * @param props + * @returns + */ +const useVisuallyDisabled = (props: ButtonProps) => { + let computedProps = props; + + if (props.visuallyDisabled) { + computedProps = { + ...props, + isDisabled: false, + // disabling click/press events + onPress: undefined, + onPressStart: undefined, + onPressEnd: undefined, + onPressChange: undefined, + onPressUp: undefined, + onKeyDown: undefined, + onKeyUp: undefined, + }; + } + + return computedProps; +}; diff --git a/app/client/packages/design-system/headless/src/components/Tooltip/TooltipTrigger.tsx b/app/client/packages/design-system/headless/src/components/Tooltip/TooltipTrigger.tsx index 03531e7043aa..eb1fa52cc951 100644 --- a/app/client/packages/design-system/headless/src/components/Tooltip/TooltipTrigger.tsx +++ b/app/client/packages/design-system/headless/src/components/Tooltip/TooltipTrigger.tsx @@ -16,18 +16,17 @@ export const TooltipTrigger = React.forwardRef(function TooltipTrigger( const ref = useMergeRefs([context.refs.setReference, propRef, childrenRef]); if (React.isValidElement(children)) { - return ( - <div - {...context.getReferenceProps({ - ref, - ...rest, - ...children.props, - "data-tooltip-trigger": "", - "data-state": context.open ? "open" : "closed", - })} - > - {children} - </div> + return React.cloneElement( + children, + context.getReferenceProps({ + ref, + ...rest, + ...children.props, + "data-state": context.open ? "open" : "closed", + // when the trigger is disabled, we want to make sure that the tooltip is + // accessible with keyboard but visually disabled only + visuallyDisabled: children.props.isDisabled ? true : undefined, + }), ); } diff --git a/app/client/packages/design-system/theming/src/utils/TokensAccessor/LightModeTheme.ts b/app/client/packages/design-system/theming/src/utils/TokensAccessor/LightModeTheme.ts index 1fa57836e94f..902e80dad81d 100644 --- a/app/client/packages/design-system/theming/src/utils/TokensAccessor/LightModeTheme.ts +++ b/app/client/packages/design-system/theming/src/utils/TokensAccessor/LightModeTheme.ts @@ -46,7 +46,7 @@ export class LightModeTheme implements ColorModeTheme { bgAccentSubtleActive: this.bgAccentSubtleActive.toString({ format: "hex", }), - bgAssistive: this.bgAssistive.toString({ format: "hex" }), + bgAssistive: this.bgAssistive.toString(), // fg fg: this.fg.toString({ format: "hex" }), fgAccent: this.fgAccent.toString({ format: "hex" }), diff --git a/app/client/packages/design-system/widgets/src/components/Button/index.styled.tsx b/app/client/packages/design-system/widgets/src/components/Button/index.styled.tsx index 15ce147d818c..eab1fa94f82f 100644 --- a/app/client/packages/design-system/widgets/src/components/Button/index.styled.tsx +++ b/app/client/packages/design-system/widgets/src/components/Button/index.styled.tsx @@ -72,8 +72,9 @@ export const StyledButton = styled(HeadlessButton)<ButtonProps>` box-shadow: 0 0 0 2px var(--color-bg), 0 0 0 4px var(--color-bd-focus); } - &[data-disabled] { - pointer-events: none; + &[data-disabled], + &[aria-disabled] { + cursor: default; opacity: var(--opacity-disabled); } diff --git a/app/client/packages/design-system/widgets/src/components/ButtonGroup/index.styled.tsx b/app/client/packages/design-system/widgets/src/components/ButtonGroup/index.styled.tsx index 2495ea4cb559..b5fe780214c5 100644 --- a/app/client/packages/design-system/widgets/src/components/ButtonGroup/index.styled.tsx +++ b/app/client/packages/design-system/widgets/src/components/ButtonGroup/index.styled.tsx @@ -14,50 +14,42 @@ export const StyledContainer = styled.div<ButtonGroupProps>` flex-direction: column; } - & > :is([data-button], div) { + & [data-button] { // increasing z index to make sure the focused button is on top of the others - &:is([data-button])[data-focused]:not([data-disabled]), - &:is(div) [data-button][data-focused]:not([data-disabled]) { + &:not([data-disabled]):focus { z-index: 1; } - &:first-child:is([data-button]), - &:first-child:is(div) [data-button] { + &:first-child { border-bottom-right-radius: 0; } - &:last-of-type:is([data-button]), - &:last-of-type:is(div) [data-button] { + &:last-of-type { border-top-left-radius: 0; } - &:not(:first-child):not(:last-of-type):is([data-button]), - &:not(:first-child):not(:last-of-type):is(div) [data-button] { + &:not(:first-child):not(:last-of-type) { border-radius: 0; } } - &:not([data-orientation="vertical"]) > :is([data-button], div) { - &:first-child:is([data-button]), - &:first-child:is(div) [data-button] { + &:not([data-orientation="vertical"]) [data-button] { + &:first-child { border-top-right-radius: 0; border-right-width: calc(var(--border-width-1) / 2); } - &:last-of-type:is([data-button]), - &:last-of-type:is(div) [data-button] { + &:last-of-type { border-bottom-left-radius: 0; border-left-width: calc(var(--border-width-1) / 2); } - &:not(:first-child):not(:last-of-type):is([data-button]), - &:not(:first-child):not(:last-of-type):is(div) [data-button] { + &:not(:first-child):not(:last-of-type) { border-left-width: calc(var(--border-width-1) / 2); border-right-width: calc(var(--border-width-1) / 2); } - &:is([data-button]) + [data-button], - &:is(div) + div { + & + [data-button] { margin-left: calc(var(--border-width-1) * -1); @media (min-resolution: 192dpi) { @@ -67,26 +59,22 @@ export const StyledContainer = styled.div<ButtonGroupProps>` } &[data-orientation="vertical"] [data-button] { - &:first-child:is([data-button]), - &:first-child:is(div) [data-button] { + &:first-child { border-bottom-left-radius: 0; border-bottom-width: calc(var(--border-width-1) / 2); } - &:last-of-type:is([data-button]), - &:last-of-type:is(div) [data-button] { + &:last-of-type { border-top-right-radius: 0; border-top-width: calc(var(--border-width-1) / 2); } - &:not(:first-child):not(:last-of-type):is([data-button]), - &:not(:first-child):not(:last-of-type):is(div) [data-button] { + &:not(:first-child):not(:last-of-type) { border-top-width: calc(var(--border-width-1) / 2); border-bottom-width: calc(var(--border-width-1) / 2); } - &:is([data-button]) + [data-button], - &:is(div) + div { + & + [data-button] { margin-top: calc(var(--border-width-1) * -1); @media (min-resolution: 192dpi) { diff --git a/app/client/packages/design-system/widgets/src/components/Tooltip/Tooltip.stories.mdx b/app/client/packages/design-system/widgets/src/components/Tooltip/Tooltip.stories.mdx index 167fe191a89d..87a4ef75e054 100644 --- a/app/client/packages/design-system/widgets/src/components/Tooltip/Tooltip.stories.mdx +++ b/app/client/packages/design-system/widgets/src/components/Tooltip/Tooltip.stories.mdx @@ -75,7 +75,14 @@ If the trigger is disabled, the tooltip will not be displayed. <Story name="Tooltip disabled"> <Tooltip> <TooltipTrigger> - <Button isDisabled>My trigger</Button> + <Button + isDisabled + onKeyUp={() => alert("keyup")} + onPressStart={() => alert("press start")} + onPress={() => alert("hello")} + > + My trigger + </Button> </TooltipTrigger> <TooltipContent>My tooltip</TooltipContent> </Tooltip>
ab8e4ba146e7d45e4840cc409164e771a952059e
2023-12-01 17:16:30
sneha122
feat: onboarding start with data cancel cta (#29228)
false
onboarding start with data cancel cta (#29228)
feat
diff --git a/app/client/src/ce/utils/analyticsUtilTypes.ts b/app/client/src/ce/utils/analyticsUtilTypes.ts index f4f32cc9f38b..de18603225dc 100644 --- a/app/client/src/ce/utils/analyticsUtilTypes.ts +++ b/app/client/src/ce/utils/analyticsUtilTypes.ts @@ -360,7 +360,8 @@ export type ONBOARDING_FLOW_EVENTS = | "ONBOARDING_FLOW_CLICK_BACK_BUTTON_CREATE_NEW_APP_PAGE" | "ONBOARDING_CREATE_APP_FLOW" | "ONBOARDING_FLOW_CLICK_BACK_BUTTON_START_FROM_DATA_PAGE" - | "ONBOARDING_FLOW_CLICK_BACK_BUTTON_DATASOURCE_FORM_PAGE"; + | "ONBOARDING_FLOW_CLICK_BACK_BUTTON_DATASOURCE_FORM_PAGE" + | "ONBOARDING_FLOW_DATASOURCE_FORM_CANCEL_CLICK"; export type DATASOURCE_SCHEMA_EVENTS = | "DATASOURCE_SCHEMA_SEARCH" diff --git a/app/client/src/pages/Editor/DataSourceEditor/index.tsx b/app/client/src/pages/Editor/DataSourceEditor/index.tsx index 3f911737218a..a1575817a2b2 100644 --- a/app/client/src/pages/Editor/DataSourceEditor/index.tsx +++ b/app/client/src/pages/Editor/DataSourceEditor/index.tsx @@ -1016,6 +1016,7 @@ class DatasourceEditorRouter extends React.Component<Props, State> { isFormDirty={this.props.isFormDirty} isInsideReconnectModal={isInsideReconnectModal} isInvalid={this.validateForm()} + isOnboardingFlow={isOnboardingFlow} isSaving={isSaving} isTesting={isTesting} onCancel={() => this.onCancel()} diff --git a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx index 6d0990d96e00..35ee300b3a54 100644 --- a/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx +++ b/app/client/src/pages/Editor/SaaSEditor/DatasourceForm.tsx @@ -560,6 +560,7 @@ class DatasourceSaaSEditor extends JSONtoForm<Props, State> { hiddenHeader, isDeleting, isInsideReconnectModal, + isOnboardingFlow, isPluginAuthFailed, isPluginAuthorized, isSaving, @@ -685,6 +686,7 @@ class DatasourceSaaSEditor extends JSONtoForm<Props, State> { getSanitizedFormData={memoize(this.getSanitizedData)} isInsideReconnectModal={isInsideReconnectModal} isInvalid={validate(this.props.requiredFields, formData)} + isOnboardingFlow={isOnboardingFlow} isSaving={isSaving} isTesting={isTesting} onCancel={() => this.onCancel()} diff --git a/app/client/src/pages/common/datasourceAuth/index.tsx b/app/client/src/pages/common/datasourceAuth/index.tsx index 8e806a6e769b..b4758d4a7502 100644 --- a/app/client/src/pages/common/datasourceAuth/index.tsx +++ b/app/client/src/pages/common/datasourceAuth/index.tsx @@ -38,6 +38,7 @@ import { getCurrentEnvironmentDetails } from "@appsmith/selectors/environmentSel import { useFeatureFlag } from "utils/hooks/useFeatureFlag"; import { FEATURE_FLAG } from "@appsmith/entities/FeatureFlag"; import { getHasManageDatasourcePermission } from "@appsmith/utils/BusinessFeatures/permissionPageHelpers"; +import { resetCurrentPluginIdForCreateNewApp } from "actions/onboardingActions"; interface Props { datasource: Datasource; @@ -65,6 +66,7 @@ interface Props { isFormDirty?: boolean; scopeValue?: string; onCancel: () => void; + isOnboardingFlow?: boolean; } export type DatasourceFormButtonTypes = Record<string, string[]>; @@ -137,6 +139,7 @@ function DatasourceAuth({ isFormDirty, isInsideReconnectModal, isInvalid, + isOnboardingFlow, isSaving, isTesting, onCancel, @@ -343,12 +346,20 @@ function DatasourceAuth({ kind="tertiary" onClick={() => { if (createMode) { - const URL = integrationEditorURL({ - pageId, - selectedTab: INTEGRATION_TABS.NEW, - params: getQueryParams(), - }); - history.push(URL); + if (!!isOnboardingFlow) { + // Going back from start from data screen + AnalyticsUtil.logEvent( + "ONBOARDING_FLOW_DATASOURCE_FORM_CANCEL_CLICK", + ); + dispatch(resetCurrentPluginIdForCreateNewApp()); + } else { + const URL = integrationEditorURL({ + pageId, + selectedTab: INTEGRATION_TABS.NEW, + params: getQueryParams(), + }); + history.push(URL); + } } else { !!onCancel && onCancel(); }
be3809ff7e5ed8a1f97f0423d77a3f330998f302
2025-02-12 18:23:57
sneha122
fix: enable allow clear options for single select dropdown (#39213)
false
enable allow clear options for single select dropdown (#39213)
fix
diff --git a/app/client/src/components/formControls/DropDownControl.test.tsx b/app/client/src/components/formControls/DropDownControl.test.tsx index 8eb31760a523..c8c5f0b13029 100644 --- a/app/client/src/components/formControls/DropDownControl.test.tsx +++ b/app/client/src/components/formControls/DropDownControl.test.tsx @@ -220,3 +220,77 @@ describe("DropDownControl grouping tests", () => { expect(screen.getByText("Option 2")).toBeInTheDocument(); }); }); + +describe("DropdownControl Single select tests", () => { + // TODO: Fix this the next time the file is edited + // eslint-disable-next-line @typescript-eslint/no-explicit-any + let store: any; + + const initialValuesSingleSelect = { + actionConfiguration: { + testPath: "option1", + }, + }; + + const mockActionSingleSelect = { + type: "API_ACTION", + name: "Test API Action", + datasource: { + id: "datasource1", + name: "Datasource 1", + }, + actionConfiguration: { + body: "", + headers: [], + testPath: "option1", + }, + }; + + const dropDownPropsSingleSelect = { + options: mockOptions, + placeholderText: "Select Columns", + configProperty: "actionConfiguration.testPath", + controlType: "PROJECTION", + propertyValue: "", + label: "Columns", + id: "column", + formName: "", + isValid: true, + formValues: mockActionSingleSelect, + isLoading: false, + maxTagCount: 3, + isAllowClear: true, + }; + + beforeEach(() => { + store = mockStore({ + form: { + TestForm: { + values: initialValuesSingleSelect, + }, + }, + appState: {}, + }); + }); + it("should clear selected option", async () => { + render( + <Provider store={store}> + <ReduxFormDecorator> + <DropDownControl {...dropDownPropsSingleSelect} /> + </ReduxFormDecorator> + </Provider>, + ); + + const clearAllButton = document.querySelector(".rc-select-clear"); + + expect(clearAllButton).toBeInTheDocument(); + + fireEvent.click(clearAllButton!); + + await waitFor(() => { + const options = screen.queryAllByText(/Option.../); + + expect(options.length).toBe(0); + }); + }); +}); diff --git a/app/client/src/components/formControls/DropDownControl.tsx b/app/client/src/components/formControls/DropDownControl.tsx index fa3e8a999556..4d0ba27fd8f8 100644 --- a/app/client/src/components/formControls/DropDownControl.tsx +++ b/app/client/src/components/formControls/DropDownControl.tsx @@ -304,7 +304,9 @@ function renderDropdown( return ( <Select - allowClear={props.isMultiSelect && !isEmpty(selectedValue)} + allowClear={ + (props.isMultiSelect || props.isAllowClear) && !isEmpty(selectedValue) + } data-testid={`t--dropdown-${props?.configProperty}`} defaultValue={props.initialValue} isDisabled={props.disabled} @@ -365,6 +367,7 @@ export interface DropDownControlProps extends ControlProps { formValues: Partial<Action>; setFirstOptionAsDefault?: boolean; maxTagCount?: number; + isAllowClear?: boolean; } interface ReduxDispatchProps {
01c6ef1dda772d58cbbfe4fc9b05f93e1874640b
2023-01-09 16:44:01
ChandanBalajiBP
ci: Add host gateway to connect cloud services (#19541)
false
Add host gateway to connect cloud services (#19541)
ci
diff --git a/.github/workflows/integration-tests-command.yml b/.github/workflows/integration-tests-command.yml index 8576e585f06a..ece7112df8b4 100644 --- a/.github/workflows/integration-tests-command.yml +++ b/.github/workflows/integration-tests-command.yml @@ -226,6 +226,7 @@ jobs: -v "$PWD/stacks:/appsmith-stacks" -e APPSMITH_LICENSE_KEY=$APPSMITH_LICENSE_KEY \ -e APPSMITH_AUDITLOG_ENABLED=true \ -e APPSMITH_CLOUD_SERVICES_BASE_URL=http://host.docker.internal:5001 \ + --add-host=host.docker.internal:host-gateway \ fatcontainer - name: Use Node.js 16.14.0 diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml index d14abe4a834f..38301b0b209f 100644 --- a/.github/workflows/test-build-docker-image.yml +++ b/.github/workflows/test-build-docker-image.yml @@ -807,8 +807,9 @@ jobs: cd fatcontainerlocal docker run -d --name appsmith -p 80:80 -p 9001:9001 \ -v "$PWD/stacks:/appsmith-stacks" -e APPSMITH_LICENSE_KEY=$APPSMITH_LICENSE_KEY \ - -e APPSMITH_CLOUD_SERVICES_BASE_URL=http://host.docker.internal:5001 \ -e APPSMITH_AUDITLOG_ENABLED=true \ + -e APPSMITH_CLOUD_SERVICES_BASE_URL=http://host.docker.internal:5001 \ + --add-host=host.docker.internal:host-gateway \ fatcontainer - name: Use Node.js 16.14.0
1f45c67edf2bd8b29f43f62fed84231153e54ac4
2022-03-15 12:19:30
Arsalan
fix: added iconAlign dependency to iconName prop
false
added iconAlign dependency to iconName prop
fix
diff --git a/app/client/src/widgets/ButtonWidget/widget/index.tsx b/app/client/src/widgets/ButtonWidget/widget/index.tsx index bb9a62028ff3..29f13d278e1d 100644 --- a/app/client/src/widgets/ButtonWidget/widget/index.tsx +++ b/app/client/src/widgets/ButtonWidget/widget/index.tsx @@ -259,6 +259,7 @@ class ButtonWidget extends BaseWidget<ButtonWidgetProps, ButtonWidgetState> { } return propertiesToUpdate; }, + dependencies: ["iconAlign"], validation: { type: ValidationTypes.TEXT, },
6c44573fb8cafe12e05aba83cac7096bfa9b2527
2021-10-25 11:26:14
Parthiv Makwana
chore: Updated Code Blocks in ServerSetup.md (#8747)
false
Updated Code Blocks in ServerSetup.md (#8747)
chore
diff --git a/contributions/ServerSetup.md b/contributions/ServerSetup.md index d27151066e46..ae2184ecb005 100644 --- a/contributions/ServerSetup.md +++ b/contributions/ServerSetup.md @@ -23,20 +23,20 @@ You can run the server codebase in a docker container. This is the easiest way t ## Steps for setup 1. Clone the Appsmith repository and `cd` into it -``` +```console git clone https://github.com/appsmithorg/appsmith.git cd appsmith ``` 2. Change your directory to `app/server` -``` +```console cd app/server ``` 3. Create a copy of the `envs/docker.env.example` -``` +```console cp envs/docker.env.example envs/docker.env ``` 4. Start up the containers -``` +```console docker-compose up -d ``` 5. Have fun! @@ -60,7 +60,7 @@ This document doesn't provide instructions to install Java and Maven because the The following command will start a MongoDB docker instance locally: -```sh +```console docker run -p 127.0.0.1:27017:27017 --name appsmith-mongodb -e MONGO_INITDB_DATABASE=appsmith -v /path/to/store/data:/data/db mongo ``` @@ -74,7 +74,7 @@ MongoDB will now be running on `mongodb://localhost:27017/appsmith`. The following command will start a Redis docker instance locally: -```sh +```console docker run -p 127.0.0.1:6379:6379 --name appsmith-redis redis ``` @@ -88,7 +88,7 @@ With the prerequisites met, let's build the code. 2. Change your directory to `app/server`. 3. Run the following command: -```sh +```console mvn clean compile ``` @@ -96,7 +96,7 @@ This generates a bunch of classes required by IntelliJ for compiling the rest of 4. Create a copy of the `envs/dev.env.example` -```sh +```console cp envs/dev.env.example .env ``` @@ -106,7 +106,7 @@ This command creates a `.env` file in the `app/server` folder. All run scripts p 6. Run the following command to create the final JAR for the Appsmith server: -``` +```console ./build.sh ``` This command will create a `dist` folder which contains the final packaged jar along with multiple jars for plugins as well. @@ -115,11 +115,11 @@ Note: - If you want to skip tests, you can pass `-DskipTests` flag to the build cmd. - On Ubuntu Linux environment docker needs root privilege, hence ./build.sh script needs to be run with root privilege as well. - On Ubuntu Linux environment, the script may not be able to read .env file, so it is advised that you run the cmd like: -``` +```console sudo APPSMITH_MONGODB_URI="mongodb://localhost:27017/appsmith" APPSMITH_REDIS_URL="redis://127.0.0.1:6379" APPSMITH_MAIL_ENABLED=false APPSMITH_ENCRYPTION_PASSWORD=abcd APPSMITH_ENCRYPTION_SALT=abcd ./build.sh ``` - If the volume containing docker's data root path (macOS: `~/Library/Containers/com.docker.docker/Data/vms/0/`, Ubuntu: `/var/lib/docker/`) has less than 2 GB of free space, then the script may fail with the following error: -``` +```console Check failed: Docker environment should have more than 2GB free disk space. ``` There are two ways to resolve this issue: (1) free up more space (2) change docker's data root path. @@ -127,7 +127,7 @@ There are two ways to resolve this issue: (1) free up more space (2) change dock 7. Start the Java server by running -``` +```console ./scripts/start-dev-server.sh ``` @@ -172,7 +172,7 @@ Happy hacking ✌️ #### Note: In case the server doesn't work with the above config, please try re-compiling the code using the steps -```sh +```console mvn -B clean compile && ./build.sh -DskipTests ``` ## Running Tests on Server @@ -180,7 +180,7 @@ mvn -B clean compile && ./build.sh -DskipTests 1. Ensure that you have Redis running on your local system. 2. Run the command to execute tests -```bash +```console cd app/server mvn clean package ```
dfc788557becfb8d28f0cbaa7c9cb0b1df375cdc
2023-01-31 14:53:39
Ankita Kinger
fix: Refactoring the code of the Upgrade flow for OIDC and SAML (#20246)
false
Refactoring the code of the Upgrade flow for OIDC and SAML (#20246)
fix
diff --git a/app/client/src/ce/pages/AdminSettings/config/authentication/AuthPage.tsx b/app/client/src/ce/pages/AdminSettings/config/authentication/AuthPage.tsx index a79f764fb2cf..df4eb9d42244 100644 --- a/app/client/src/ce/pages/AdminSettings/config/authentication/AuthPage.tsx +++ b/app/client/src/ce/pages/AdminSettings/config/authentication/AuthPage.tsx @@ -124,19 +124,14 @@ const Label = styled.span<{ business?: boolean }>` font-size: 12px; `; -export function Upgrade(message: string, method: string) { +export function ActionButton({ method }: { method: AuthMethodType }) { + const history = useHistory(); const { onUpgrade } = useOnUpgrade({ logEventName: "ADMIN_SETTINGS_UPGRADE_AUTH_METHOD", - logEventData: { method }, - intercomMessage: message, + logEventData: { method: method.label }, + intercomMessage: createMessage(UPGRADE_TO_EE, method.label), }); - return onUpgrade(); -} - -export function AuthPage({ authMethods }: { authMethods: AuthMethodType[] }) { - const history = useHistory(); - const onClickHandler = (method: AuthMethodType) => { if (!method.needsUpgrade || method.isConnected) { AnalyticsUtil.logEvent( @@ -154,10 +149,26 @@ export function AuthPage({ authMethods }: { authMethods: AuthMethodType[] }) { }), ); } else { - Upgrade(createMessage(UPGRADE_TO_EE, method.label), method.label); + onUpgrade(); } }; + return ( + <StyledAuthButton + category={method.isConnected ? Category.primary : Category.secondary} + className={`t--settings-sub-category-${ + method.needsUpgrade ? `upgrade-${method.category}` : method.category + }`} + data-cy="btn-auth-account" + onClick={() => onClickHandler(method)} + text={createMessage( + method.isConnected ? EDIT : !!method.needsUpgrade ? UPGRADE : ENABLE, + )} + /> + ); +} + +export function AuthPage({ authMethods }: { authMethods: AuthMethodType[] }) { return ( <Wrapper> <SettingsFormWrapper> @@ -210,25 +221,7 @@ export function AuthPage({ authMethods }: { authMethods: AuthMethodType[] }) { /> )} </MethodDetailsWrapper> - <StyledAuthButton - category={ - method.isConnected ? Category.primary : Category.secondary - } - className={`t--settings-sub-category-${ - method.needsUpgrade - ? `upgrade-${method.category}` - : method.category - }`} - data-cy="btn-auth-account" - onClick={() => onClickHandler(method)} - text={createMessage( - method.isConnected - ? EDIT - : !!method.needsUpgrade - ? UPGRADE - : ENABLE, - )} - /> + <ActionButton method={method} /> </MethodCard> ); })}
62383c975cfcc62cda571e357c87048b51850335
2023-10-30 13:32:37
Satish Gandham
fix: Refactor preloads to fix an issue with CDN on EE (#28402)
false
Refactor preloads to fix an issue with CDN on EE (#28402)
fix
diff --git a/app/client/src/ce/utils/preloadHelpers.ts b/app/client/src/ce/utils/preloadHelpers.ts new file mode 100644 index 000000000000..9a10415c80bd --- /dev/null +++ b/app/client/src/ce/utils/preloadHelpers.ts @@ -0,0 +1,3 @@ +export const getBaseURL = () => { + return "/"; +}; diff --git a/app/client/src/ee/utils/preloadHelpers.ts b/app/client/src/ee/utils/preloadHelpers.ts new file mode 100644 index 000000000000..bf16f1638e81 --- /dev/null +++ b/app/client/src/ee/utils/preloadHelpers.ts @@ -0,0 +1 @@ +export * from "ce/utils/preloadHelpers"; diff --git a/app/client/src/preload-route-chunks.ts b/app/client/src/preload-route-chunks.ts index d150c06835f7..a874caf1f449 100644 --- a/app/client/src/preload-route-chunks.ts +++ b/app/client/src/preload-route-chunks.ts @@ -1,3 +1,4 @@ +import { getBaseURL } from "@appsmith/utils/preloadHelpers"; // This file preloads chunks for the edit and view modes ahead of the import() // call that will actually require them. This puts these chunks into HTTP cache // (so they can be executed immediately) but doesn’t execute them (so that the @@ -27,9 +28,9 @@ if ( window.__APPSMITH_CHUNKS_TO_PRELOAD && currentMode ) { + const BASE_URL = getBaseURL(); window.__APPSMITH_CHUNKS_TO_PRELOAD[currentMode] - // @ts-expect-error __webpack_public_path__ might be set on runtime when the CDN is used in EE - .map((url) => __webpack_public_path__ + url) + .map((url) => BASE_URL + url) .forEach((url) => { const link = document.createElement("link"); link.rel = "preload";
d45a6bfb9797e2bb122e232a1312968161e74e99
2022-07-22 10:45:48
Souma Ghosh
fix: Compact property not functional for menu type in table widget v2 (#15302)
false
Compact property not functional for menu type in table widget v2 (#15302)
fix
diff --git a/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx b/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx index 784feada4ec3..98772ca6f206 100644 --- a/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx +++ b/app/client/src/widgets/TableWidgetV2/component/cellComponents/menuButtonTableComponent.tsx @@ -182,8 +182,8 @@ const BaseMenuItem = styled(MenuItem)<ThemeProp & BaseStyleProps>` ${({ isCompact }) => isCompact && ` - padding-top: 3px; - padding-bottom: 3px; + padding-top: 3px !important; + padding-bottom: 3px !important; font-size: 12px; `} `;
121b1eb8e46b625c2a2eb5fb30909cee3d0a4101
2022-09-09 01:43:03
Arpit Mohan
ci: Swap docker for depot (#16658)
false
Swap docker for depot (#16658)
ci
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 623bbcf97952..6306ce8f380d 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -190,11 +190,17 @@ jobs: needs: [prelude, buildClient, buildServer, buildRts] runs-on: ubuntu-latest + permissions: + contents: read + id-token: write steps: - name: Checkout the merged commit from PR and base branch uses: actions/checkout@v2 + - name: Set up Depot CLI + uses: depot/setup-action@v1 + - name: Download the client build artifact uses: actions/download-artifact@v2 with: @@ -219,12 +225,6 @@ jobs: name: rts-build-deps path: app/rts/node_modules/ - - name: Set up QEMU (needed for docker buildx) - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub uses: docker/login-action@v1 with: @@ -232,53 +232,87 @@ jobs: password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Build and push client image - working-directory: app/client - run: | - docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{needs.prelude.outputs.tag}} . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{needs.prelude.outputs.tag}} - - # Only build & tag with latest if the tag doesn't contain beta - if [[ ! ${{needs.prelude.outputs.tag}} == *"beta"* ]]; then - docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:latest . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:latest - fi + uses: depot/build-push-action@v1 + with: + context: app/client + push: true + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{needs.prelude.outputs.tag}} + + # Only build & tag with latest if the tag doesn't contain beta + - name: Build and push client image latest + if: '!contains(needs.prelude.outputs.tag, "beta")' + uses: depot/build-push-action@v1 + with: + context: app/client + push: true + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:latest - name: Build and push fat image - run: | - tag_args="--tag ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:${{needs.prelude.outputs.tag}}" - - # Only build & tag with latest if the tag doesn't contain beta - if [[ ! ${{needs.prelude.outputs.tag}} == *"beta"* ]]; then - tag_args="$tag_args --tag ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:latest" - fi - - docker buildx build \ - --platform linux/arm64,linux/amd64 \ - --push \ - --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} \ - $tag_args \ - . + uses: depot/build-push-action@v1 + with: + context: . + push: true + platforms: linux/arm64,linux/amd64 + build-args: | + APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:${{needs.prelude.outputs.tag}} + + # Only build & tag with latest if the tag doesn't contain beta + - name: Build and push fat image latest + if: '!contains(needs.prelude.outputs.tag, "beta")' + uses: depot/build-push-action@v1 + with: + context: . + push: true + platforms: linux/arm64,linux/amd64 + build-args: | + APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:latest - name: Build and push server image - working-directory: app/server - run: | - docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{needs.prelude.outputs.tag}} . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{needs.prelude.outputs.tag}} - - # Only build & tag with latest if the tag doesn't contain beta - if [[ ! ${{needs.prelude.outputs.tag}} == *"beta"* ]]; then - docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:latest . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:latest - fi + uses: depot/build-push-action@v1 + with: + context: app/server + push: true + build-args: | + APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{needs.prelude.outputs.tag}} + + # Only build & tag with latest if the tag doesn't contain beta + - name: Build and push server image latest + if: '!contains(needs.prelude.outputs.tag, "beta")' + uses: depot/build-push-action@v1 + with: + context: app/server + push: true + platforms: linux/arm64,linux/amd64 + build-args: | + APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:latest - name: Build and push RTS image - working-directory: app/rts - run: | - docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{needs.prelude.outputs.tag}} . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{needs.prelude.outputs.tag}} - - # Only build & tag with latest if the tag doesn't contain beta - if [[ ! ${{needs.prelude.outputs.tag}} == *"beta"* ]]; then - docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:latest . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:latest - fi + uses: depot/build-push-action@v1 + with: + context: app/rts + push: true + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{needs.prelude.outputs.tag}} + + # Only build & tag with latest if the tag doesn't contain beta + - name: Build and push RTS image latest + if: '!contains(needs.prelude.outputs.tag, "beta")' + uses: depot/build-push-action@v1 + with: + context: app/rts + push: true + platforms: linux/arm64,linux/amd64 + build-args: | + APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:latest diff --git a/.github/workflows/integration-tests-command.yml b/.github/workflows/integration-tests-command.yml index 4052042a66c1..27da4bebd43f 100644 --- a/.github/workflows/integration-tests-command.yml +++ b/.github/workflows/integration-tests-command.yml @@ -29,6 +29,9 @@ jobs: # Only run if the build step is successful if: success() runs-on: ubuntu-latest + permissions: + contents: read + id-token: write defaults: run: shell: bash @@ -52,6 +55,9 @@ jobs: - 27017:27017 steps: + - name: Set up Depot CLI + uses: depot/setup-action@v1 + # Check out merge commit - name: Fork based /ok-to-test checkout uses: actions/checkout@v2 @@ -132,11 +138,14 @@ jobs: name: rts-build path: app/rts/dist/ - - name: Build docker image - if: steps.run_result.outputs.run_result != 'success' - working-directory: "." - run: | - docker build -t fatcontainer . + - name: Build docker image + uses: depot/build-push-action@v1 + with: + context: . + push: false + load: true + tags: | + fatcontainer - name: Create folder if: steps.run_result.outputs.run_result != 'success' @@ -880,11 +889,9 @@ jobs: PAYLOAD_CONTEXT: ${{ toJson(github.event.client_payload) }} run: echo "$PAYLOAD_CONTEXT" -<<<<<<< HEAD -======= package: needs: [ui-test, fat-container-test] - runs-on: buildjet-4vcpu-ubuntu-2004 + runs-on: ubuntu-latest defaults: run: working-directory: app/client @@ -950,246 +957,11 @@ jobs: return result; } ->>>>>>> 4d609a5b4d5e203c84aba12475a44ac6770eff0d perf-test: needs: [client-build, server-build, rts-build] # Only run if the build step is successful if: success() -<<<<<<< HEAD name: perf-test uses: ./.github/workflows/perf-test.yml with: pr: ${{ github.event.client_payload.pull_request.number }} -======= - runs-on: buildjet-4vcpu-ubuntu-2004 - - defaults: - run: - working-directory: app/client - shell: bash - - # Service containers to run with this job. Required for running tests - services: - # Label used to access the service container - redis: - # Docker Hub image for Redis - image: redis - ports: - # Opens tcp port 6379 on the host and service container - - 6379:6379 - mongo: - image: mongo - ports: - - 27017:27017 - steps: - # Check out merge commitGIT BRANCH - - name: Fork based /ok-to-test-perf checkout - uses: actions/checkout@v2 - with: - ref: "refs/pull/${{ github.event.client_payload.pull_request.number }}/merge" - - # Timestamp will be used to create cache key - - id: timestamp - run: echo "::set-output name=timestamp::$(timestamp +'%Y-%m-%dT%H:%M:%S')" - - # In case this is second attempt try restoring status of the prior attempt from cache - - name: Restore the previous run result - uses: actions/cache@v2 - with: - path: | - ~/run_result - key: ${{ github.run_id }}-${{ github.job }}-${{ steps.timestamp.outputs.timestamp }} - restore-keys: | - ${{ github.run_id }}-${{ github.job }}- - - # Fetch prior run result - - name: Get the previous run result - id: run_result - run: cat ~/run_result 2>/dev/null || echo 'default' - - # Incase of prior failure run the job - - if: steps.run_result.outputs.run_result != 'success' - run: echo "I'm alive!" && exit 0 - - # Set status = success - - run: echo "::set-output name=run_result::success" > ~/run_result - - - name: Use Node.js 16.14.0 - if: steps.run_result.outputs.run_result != 'success' - uses: actions/setup-node@v1 - with: - node-version: "16.14.0" - - - name: Get yarn cache directory path - if: steps.run_result.outputs.run_result != 'success' - id: yarn-dep-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - # Retrieve npm dependencies from cache. After a successful run, these dependencies are cached again - - name: Cache npm dependencies - if: steps.run_result.outputs.run_result != 'success' - id: yarn-dep-cache - uses: actions/cache@v2 - env: - cache-name: cache-yarn-dependencies - with: - path: | - ${{ steps.yarn-dep-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-dep-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn-dep- - - # Install all the dependencies - - name: Install dependencies - if: steps.run_result.outputs.run_result != 'success' - run: yarn install --frozen-lockfile - - - name: Download the react build artifact - if: steps.run_result.outputs.run_result != 'success' - uses: actions/download-artifact@v2 - with: - name: build - path: app/client/build - - - name: Download the server build artifact - if: steps.run_result.outputs.run_result != 'success' - uses: actions/download-artifact@v2 - with: - name: build - path: app/server/dist - - # Start server - - name: start server - if: steps.run_result.outputs.run_result != 'success' - working-directory: app/server - env: - APPSMITH_MONGODB_URI: "mongodb://localhost:27017/mobtools" - APPSMITH_REDIS_URL: "redis://127.0.0.1:6379" - APPSMITH_ENCRYPTION_PASSWORD: "password" - APPSMITH_ENCRYPTION_SALT: "salt" - APPSMITH_IS_SELF_HOSTED: false - APPSMITH_CLOUD_SERVICES_BASE_URL: https://release-cs.appsmith.com - APPSMITH_CLOUD_SERVICES_USERNAME: "" - APPSMITH_CLOUD_SERVICES_PASSWORD: "" - APPSMITH_GIT_ROOT: "./container-volumes/git-storage" - run: | - ls -l - ls -l scripts/ - ls -l dist/ - # Run the server in the background and redirect logs to a log file - ./scripts/start-dev-server.sh &> server-logs.log & - - - name: Wait for 30 seconds for server to start - if: steps.run_result.outputs.run_result != 'success' - run: | - sleep 30s - - - name: Exit if Server hasnt started - if: steps.run_result.outputs.run_result != 'success' - run: | - if [[ `ps -ef | grep "server-1.0-SNAPSHOT" | grep java |wc -l` == 0 ]]; then - echo "Server Not Started"; - exit 1; - else - echo "Server Found"; - fi - - - name: Installing Yarn serve - if: steps.run_result.outputs.run_result != 'success' - run: | - yarn global add serve - echo "$(yarn global bin)" >> $GITHUB_PATH - - - name: Setting up the perf tests - if: steps.run_result.outputs.run_result != 'success' - shell: bash - env: - APPSMITH_SSL_CERTIFICATE: ${{ secrets.APPSMITH_SSL_CERTIFICATE }} - APPSMITH_SSL_KEY: ${{ secrets.APPSMITH_SSL_KEY }} - CYPRESS_URL: ${{ secrets.CYPRESS_URL }} - CYPRESS_USERNAME: ${{ secrets.CYPRESS_USERNAME }} - CYPRESS_PASSWORD: ${{ secrets.CYPRESS_PASSWORD }} - CYPRESS_TESTUSERNAME1: ${{ secrets.CYPRESS_TESTUSERNAME1 }} - CYPRESS_TESTPASSWORD1: ${{ secrets.CYPRESS_TESTPASSWORD1 }} - CYPRESS_TESTUSERNAME2: ${{ secrets.CYPRESS_TESTUSERNAME2 }} - CYPRESS_TESTPASSWORD2: ${{ secrets.CYPRESS_TESTPASSWORD1 }} - CYPRESS_S3_ACCESS_KEY: ${{ secrets.CYPRESS_S3_ACCESS_KEY }} - CYPRESS_S3_SECRET_KEY: ${{ secrets.CYPRESS_S3_SECRET_KEY }} - CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_ID: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_ID }} - CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET }} - CYPRESS_APPSMITH_OAUTH2_GITHUB_CLIENT_ID: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GITHUB_CLIENT_ID }} - CYPRESS_APPSMITH_OAUTH2_GITHUB_CLIENT_SECRET: ${{ secrets.CYPRESS_APPSMITH_OAUTH2_GITHUB_CLIENT_SECRET }} - APPSMITH_DISABLE_TELEMETRY: true - APPSMITH_GOOGLE_MAPS_API_KEY: ${{ secrets.APPSMITH_GOOGLE_MAPS_API_KEY }} - POSTGRES_PASSWORD: postgres - run: | - ./cypress/setup-test.sh - - - name: Checkout Performance Infra code - uses: actions/checkout@v3 - with: - repository: appsmithorg/performance-infra - token: ${{ secrets.APPSMITH_PERF_INFRA_REPO_PAT }} - ref: main - path: app/client/perf - - - name: Installing performance tests dependencies - if: steps.run_result.outputs.run_result != 'success' - working-directory: app/client/perf - shell: bash - run: yarn install --frozen-lockfile - - - name: Change test script permissions - if: steps.run_result.outputs.run_result != 'success' - working-directory: app/client/perf - run: chmod +x ./start-test.sh - - - name: Run performance tests - if: steps.run_result.outputs.run_result != 'success' - working-directory: app/client/perf - shell: bash - env: - APPSMITH_SSL_CERTIFICATE: ${{ secrets.APPSMITH_SSL_CERTIFICATE }} - APPSMITH_SSL_KEY: ${{ secrets.APPSMITH_SSL_KEY }} - CYPRESS_TESTUSERNAME1: ${{ secrets.CYPRESS_TESTUSERNAME9 }} - CYPRESS_TESTPASSWORD1: ${{ secrets.CYPRESS_TESTPASSWORD9 }} - APPSMITH_PERFORMANCE_DB_CONFIG: ${{ secrets.APPSMITH_PERFORMANCE_DB_CONFIG }} - PERF_GITHUB_PAT: ${{ secrets.APPSMITH_PERF_INFRA_REPO_PAT }} - APPSMITH_DISABLE_TELEMETRY: true - POSTGRES_PASSWORD: postgres - NODE_TLS_REJECT_UNAUTHORIZED: "0" - run: ./start-test.sh - - # Restore the previous built bundle if present. If not push the newly built into the cache - - name: Restore the previous bundle - uses: actions/cache@v2 - with: - path: | - app/client/perf/traces - key: ${{ github.run_id }}-${{ github.job }}-${{ steps.timestamp.outputs.timestamp }} - restore-keys: | - ${{ github.run_id }}-${{ github.job }} - - - uses: actions/upload-artifact@v2 - with: - name: performance-summaries - path: app/client/perf/traces - - - name: Read summary file - id: read_summary - uses: andstor/file-reader-action@v1 - with: - path: app/client/perf/traces/reports/summary.md - - - name: Add a comment with the results on the PR with link to workflow run - uses: peter-evans/create-or-update-comment@v1 - with: - issue-number: ${{ github.event.client_payload.pull_request.number }} - body: | - UI Performance test run logs and artifacts: <https://github.com/appsmithorg/appsmith/actions/runs/${{ github.run_id }}>. - Commit: `${{ github.event.client_payload.slash_command.sha }}`. - Results: ${{ steps.read_summary.outputs.contents }} - - # Set status = success - - run: echo "::set-output name=run_result::success" > ~/run_result ->>>>>>> 4d609a5b4d5e203c84aba12475a44ac6770eff0d diff --git a/.github/workflows/rts-build.yml b/.github/workflows/rts-build.yml index e8655e58dd94..c998a9646d39 100644 --- a/.github/workflows/rts-build.yml +++ b/.github/workflows/rts-build.yml @@ -57,6 +57,9 @@ jobs: - name: Print the Github event run: echo ${{ github.event_name }} + - name: Set up Depot CLI + uses: depot/setup-action@v1 + # Timestamp will be used to create cache key - id: timestamp run: echo "::set-output name=timestamp::$(timestamp +'%Y-%m-%dT%H:%M:%S')" diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml index 5ec19ca16fe9..6567b9f50e95 100644 --- a/.github/workflows/test-build-docker-image.yml +++ b/.github/workflows/test-build-docker-image.yml @@ -629,6 +629,10 @@ jobs: github.event.review.state == 'approved' && github.event.pull_request.head.repo.full_name == github.repository)) runs-on: buildjet-4vcpu-ubuntu-2004 + permissions: + contents: read + id-token: write + defaults: run: shell: bash @@ -652,6 +656,9 @@ jobs: - 27017:27017 steps: + - name: Set up Depot CLI + uses: depot/setup-action@v1 + # Checkout the code - name: Checkout the merged commit from PR and base branch if: github.event_name == 'pull_request_review' @@ -745,9 +752,13 @@ jobs: - name: Build docker image if: steps.run_result.outputs.run_result != 'success' - working-directory: "." - run: | - docker build -t fatcontainer . + uses: depot/build-push-action@v1 + with: + context: . + push: false + load: true + tags: | + fatcontainer - name: Create folder if: steps.run_result.outputs.run_result != 'success' @@ -1549,12 +1560,6 @@ jobs: id: vars run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11}) - - name: Set up QEMU (needed for docker buildx) - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub uses: docker/login-action@v1 with: @@ -1564,45 +1569,48 @@ jobs: # Build release Docker image and push to Docker Hub - name: Push client release image to Docker Hub if: success() && github.ref == 'refs/heads/release' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') - working-directory: app/client - run: | - docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.vars.outputs.tag}} . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.vars.outputs.tag}} + uses: depot/build-push-action@v1 + with: + context: app/client + push: true + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${{steps.vars.outputs.tag}} # Build master Docker image and push to Docker Hub - name: Push client master image to Docker Hub with commit tag if: success() && github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') - working-directory: app/client - run: | - docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${GITHUB_SHA} . - docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:nightly . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${GITHUB_SHA} - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:nightly + uses: depot/build-push-action@v1 + with: + context: app/client + push: true + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:${GITHUB_SHA} + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-editor:nightly - name: Build and push release image to Docker Hub if: success() && github.ref == 'refs/heads/release' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') - working-directory: "." - run: | - tag_args="--tag ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:${{steps.vars.outputs.tag}}" - docker buildx build \ - --platform linux/arm64,linux/amd64 \ - --push \ - --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY_RELEASE }} \ - $tag_args \ - . + uses: depot/build-push-action@v1 + with: + context: . + push: true + platforms: linux/arm64,linux/amd64 + build_args: | + APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY_RELEASE }} + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:${{steps.vars.outputs.tag}} - name: Build and push master image to Docker Hub with commit tag if: success() && github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') - working-directory: "." - run: | - tag_args="--tag ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:${GITHUB_SHA}" - tag_args="$tag_args --tag ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:nightly" - docker buildx build \ - --platform linux/arm64,linux/amd64 \ - --push \ - --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} \ - $tag_args \ - . + uses: depot/build-push-action@v1 + with: + context: . + push: true + platforms: linux/arm64,linux/amd64 + build_args: | + APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:${GITHUB_SHA} + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-ce:nightly # - name: Check and push fat image to Docker Hub with commit tag # if: success() && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/release') && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') @@ -1629,35 +1637,45 @@ jobs: # Build release Docker image and push to Docker Hub - name: Push server release image to Docker Hub if: success() && github.ref == 'refs/heads/release' - working-directory: app/server - run: | - docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY_RELEASE }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}} . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}} + uses: depot/build-push-action@v1 + with: + context: app/server + push: true + build_args: | + APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY_RELEASE }} + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${{steps.vars.outputs.tag}} # Build master Docker image and push to Docker Hub - name: Push server master image to Docker Hub with commit tag if: success() && github.ref == 'refs/heads/master' - working-directory: app/server - run: | - docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${GITHUB_SHA} . - docker build --build-arg APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:nightly . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${GITHUB_SHA} - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:nightly + uses: depot/build-push-action@v1 + with: + context: app/server + push: true + build_args: | + APPSMITH_SEGMENT_CE_KEY=${{ secrets.APPSMITH_SEGMENT_CE_KEY }} + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:${GITHUB_SHA} + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-server:nightly # Build release Docker image and push to Docker Hub - name: Push RTS release image to Docker Hub if: success() && github.ref == 'refs/heads/release' - working-directory: app/rts - run: | - docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}} . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}} + uses: depot/build-push-action@v1 + with: + context: app/rts + push: true + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${{steps.vars.outputs.tag}} # Build master Docker image and push to Docker Hub - name: Push RTS master image to Docker Hub with commit tag if: success() && github.ref == 'refs/heads/master' - working-directory: app/rts - run: | - docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${GITHUB_SHA} . - docker build -t ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:nightly . - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${GITHUB_SHA} - docker push ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:nightly + uses: depot/build-push-action@v1 + with: + context: app/rts + push: true + tags: | + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:${GITHUB_SHA} + ${{ secrets.DOCKER_HUB_ORGANIZATION }}/appsmith-rts:nightly diff --git a/depot.json b/depot.json new file mode 100644 index 000000000000..f1c56eca2987 --- /dev/null +++ b/depot.json @@ -0,0 +1 @@ +{"id":"ts81441f91"}
59898e270a706475de3c2642e8232fe3ef11ac5f
2023-09-13 16:27:48
Shubham Saxena
fix: fix incorrect parsing of email ID in login rate limit (#27107)
false
fix incorrect parsing of email ID in login rate limit (#27107)
fix
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/PreAuth.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/PreAuth.java index 21ea1aded62f..20f998d1e560 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/PreAuth.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/filters/PreAuth.java @@ -12,7 +12,6 @@ import reactor.core.publisher.Mono; import java.net.URI; -import java.net.URLDecoder; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -33,7 +32,7 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) { return rateLimitService .tryIncreaseCounter(RateLimitConstants.BUCKET_KEY_FOR_LOGIN_API, username) .flatMap(counterIncreaseAttemptSuccessful -> { - if (!counterIncreaseAttemptSuccessful) { + if (Boolean.FALSE.equals(counterIncreaseAttemptSuccessful)) { log.error("Rate limit exceeded. Redirecting to login page."); return handleRateLimitExceeded(exchange); } @@ -48,14 +47,9 @@ public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) { } private Mono<String> getUsername(ServerWebExchange exchange) { - return exchange.getFormData().flatMap(formData -> { - String username = formData.getFirst(FieldName.USERNAME.toString()); - if (username != null && !username.isEmpty()) { - return Mono.just(URLDecoder.decode(username, StandardCharsets.UTF_8)); - } - - return Mono.just(""); - }); + return exchange.getFormData() + .map(formData -> formData.getFirst(FieldName.USERNAME.toString())) + .defaultIfEmpty(""); } private Mono<Void> handleRateLimitExceeded(ServerWebExchange exchange) {
6b704be2b0b489ee305cc8a3c20653ec542d7d6f
2023-08-02 12:35:50
Anagh Hegde
chore: update file lock error message (#25861)
false
update file lock error message (#25861)
chore
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java index bff6b5b389ee..aecd13ed733c 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/exceptions/AppsmithError.java @@ -869,7 +869,7 @@ public enum AppsmithError { GIT_FILE_IN_USE( 500, AppsmithErrorCode.GIT_FILE_IN_USE.getCode(), - "Your Git repo is in use by another member of your team. Usually, this takes a few seconds. Please try again a little later.", + "We were unable to place a lock on the file system to perform #commandName command. This error can occur when another operation is in progress. Please try again later.", AppsmithErrorAction.DEFAULT, "Git repo is locked", ErrorType.GIT_ACTION_EXECUTION_ERROR,
a4dec4bb6e8ddd388f53e2330afbf795934c7ae8
2023-05-08 14:43:23
Hetu Nandu
feat: Update order of action file operations (#22754)
false
Update order of action file operations (#22754)
feat
diff --git a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js index 2747f7219ac9..42cf832365af 100644 --- a/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js +++ b/app/client/cypress/integration/Regression_TestSuite/ClientSideTests/OtherUIFeatures/Omnibar_spec.js @@ -3,7 +3,7 @@ const dsl = require("../../../../fixtures/omnibarDsl.json"); const commonlocators = require("../../../../locators/commonlocators.json"); import { ObjectsRegistry } from "../../../../support/Objects/Registry"; -const locators = ObjectsRegistry.CommonLocators; +const ee = ObjectsRegistry.EntityExplorer; describe("Omnibar functionality test cases", () => { const apiName = "Omnibar1"; @@ -81,31 +81,34 @@ describe("Omnibar functionality test cases", () => { "createNewJSCollection", ); cy.get(omnibar.categoryTitle).eq(1).click(); + // create new api, js object and cURL import from omnibar - cy.get(omnibar.createNew).eq(0).should("have.text", "New Blank API"); - // 2 is the index value of the JS Object in omnibar ui - cy.get(omnibar.createNew).eq(2).should("have.text", "New JS Object"); + // 0 is the index value of the JS Object in omnibar ui + cy.get(omnibar.createNew).eq(0).should("have.text", "New JS Object"); + // 1 is the index value of the JS Object in omnibar ui + cy.get(omnibar.createNew).eq(1).should("have.text", "New Blank API"); // 3 is the index value of the Curl import in omnibar ui cy.get(omnibar.createNew).eq(3).should("have.text", "New cURL Import"); + cy.get(omnibar.createNew).eq(0).click(); cy.wait(1000); - cy.wait("@createNewApi"); - cy.renameWithInPane(apiName); + cy.wait("@createNewJSCollection"); + cy.wait(1000); + cy.get(".t--js-action-name-edit-field").type(jsObjectName).wait(1000); cy.get(omnibar.globalSearch).click({ force: true }); cy.get(omnibar.categoryTitle).eq(1).click(); - // 2 is the index value of the JS Object in omnibar ui - cy.get(omnibar.createNew).eq(2).click(); cy.wait(1000); - cy.wait("@createNewJSCollection"); + + cy.get(omnibar.createNew).eq(1).click(); cy.wait(1000); - cy.get(".t--js-action-name-edit-field").type(jsObjectName).wait(1000); + cy.wait("@createNewApi"); + cy.renameWithInPane(apiName); cy.get(omnibar.globalSearch).click({ force: true }); cy.get(omnibar.categoryTitle).eq(1).click(); + cy.wait(1000); - // 3 is the index value of the JS Object in omnibar ui cy.get(omnibar.createNew).eq(3).click(); - cy.wait(1000); cy.url().should("include", "curl-import?"); cy.get('p:contains("Import from CURL")').should("be.visible"); }); @@ -133,8 +136,7 @@ describe("Omnibar functionality test cases", () => { }); it("6. Verify Navigate section shows recently opened widgets and datasources", function () { - cy.get(".bp3-icon-chevron-left").click({ force: true }); - cy.openPropertyPane("buttonwidget"); + ee.SelectEntityByName("Button1", "Widgets"); cy.get(omnibar.globalSearch).click({ force: true }); cy.get(omnibar.categoryTitle).eq(0).click(); // verify recently opened items with their subtext i.e page name @@ -146,13 +148,13 @@ describe("Omnibar functionality test cases", () => { cy.xpath(omnibar.recentlyopenItem) .eq(1) - .should("have.text", "Omnibar2") + .should("have.text", "Omnibar1") .next() .should("have.text", "Page1"); cy.xpath(omnibar.recentlyopenItem) .eq(2) - .should("have.text", "Omnibar1") + .should("have.text", "Omnibar2") .next() .should("have.text", "Page1"); diff --git a/app/client/cypress/support/Pages/EntityExplorer.ts b/app/client/cypress/support/Pages/EntityExplorer.ts index e2851e3c7c0a..4982c511417f 100644 --- a/app/client/cypress/support/Pages/EntityExplorer.ts +++ b/app/client/cypress/support/Pages/EntityExplorer.ts @@ -234,9 +234,13 @@ export class EntityExplorer { public CreateNewDsQuery(dsName: string, isQuery = true) { cy.get(this.locator._createNew).last().click({ force: true }); - let overlayItem = isQuery - ? this._visibleTextSpan(dsName + " Query") - : this._visibleTextSpan(dsName); + const searchText = isQuery ? dsName + " query" : dsName; + this.SearchAndClickOmnibar(searchText); + } + + public SearchAndClickOmnibar(searchText: string) { + cy.get(`[data-testId="t--search-file-operation"]`).type(searchText); + let overlayItem = this._visibleTextSpan(searchText); this.agHelper.GetNClick(overlayItem); } diff --git a/app/client/cypress/support/commands.js b/app/client/cypress/support/commands.js index 95dc602846d0..01eafa92246c 100644 --- a/app/client/cypress/support/commands.js +++ b/app/client/cypress/support/commands.js @@ -706,8 +706,8 @@ Cypress.Commands.add("NavigateToWidgetsInExplorer", () => { Cypress.Commands.add("NavigateToJSEditor", () => { cy.get(explorer.createNew).click({ force: true }); - // 2 is the index value of the JS Object in omnibar ui - cy.get(".t--file-operation").eq(2).click({ force: true }); + cy.get(`[data-testId="t--search-file-operation"]`).type("New JS Object"); + cy.get(".t--file-operation").eq(0).click({ force: true }); }); Cypress.Commands.add("importCurl", () => { diff --git a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.test.ts b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.test.ts new file mode 100644 index 000000000000..6a22227a482e --- /dev/null +++ b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.test.ts @@ -0,0 +1,249 @@ +import { getFilteredAndSortedFileOperations } from "./GlobalSearchHooks"; +import type { Datasource } from "entities/Datasource"; +import { SEARCH_ITEM_TYPES } from "./utils"; + +describe("getFilteredAndSortedFileOperations", () => { + it("works without any datasources", () => { + const fileOptions = getFilteredAndSortedFileOperations(""); + + expect(fileOptions[0]).toEqual( + expect.objectContaining({ + title: "New JS Object", + }), + ); + + expect(fileOptions[1]).toEqual( + expect.objectContaining({ + title: "New Blank API", + }), + ); + + expect(fileOptions[2]).toEqual( + expect.objectContaining({ + title: "New Blank GraphQL API", + }), + ); + + expect(fileOptions[3]).toEqual( + expect.objectContaining({ + title: "New cURL Import", + }), + ); + + expect(fileOptions[4]).toEqual( + expect.objectContaining({ + title: "New Datasource", + }), + ); + }); + it("works without permissions", () => { + const actionOperationsWithoutCreate = getFilteredAndSortedFileOperations( + "", + [], + [], + {}, + false, + ); + + expect(actionOperationsWithoutCreate.length).toEqual(0); + + const actionOperationsWithoutDatasourcePermission = + getFilteredAndSortedFileOperations("", [], [], {}, true, false); + + expect(actionOperationsWithoutDatasourcePermission.length).toEqual(4); + }); + + it("shows app datasources before other datasources", () => { + const appDatasource: Datasource = { + datasourceConfiguration: { + url: "", + }, + id: "", + isValid: true, + pluginId: "", + workspaceId: "", + name: "App datasource", + }; + + const otherDatasource: Datasource = { + datasourceConfiguration: { + url: "", + }, + id: "", + isValid: false, + pluginId: "", + workspaceId: "", + name: "Other datasource", + }; + + const fileOptions = getFilteredAndSortedFileOperations( + "", + [appDatasource], + [otherDatasource], + {}, + true, + true, + ); + + expect(fileOptions[0]).toEqual( + expect.objectContaining({ + title: "New JS Object", + }), + ); + + expect(fileOptions[1]).toEqual( + expect.objectContaining({ + title: "CREATE A QUERY", + kind: SEARCH_ITEM_TYPES.sectionTitle, + }), + ); + + expect(fileOptions[2]).toEqual( + expect.objectContaining({ + title: "New App datasource query", + }), + ); + + expect(fileOptions[3]).toEqual( + expect.objectContaining({ + title: "New Other datasource query", + }), + ); + }); + + it("sorts datasources based on recency", () => { + const appDatasource: Datasource = { + datasourceConfiguration: { + url: "", + }, + id: "123", + isValid: true, + pluginId: "", + workspaceId: "", + name: "App datasource", + }; + + const otherDatasource: Datasource = { + datasourceConfiguration: { + url: "", + }, + id: "abc", + isValid: false, + pluginId: "", + workspaceId: "", + name: "Other datasource", + }; + + const fileOptions = getFilteredAndSortedFileOperations( + "", + [appDatasource], + [otherDatasource], + { abc: 1, "123": 3 }, + true, + true, + ); + + expect(fileOptions[0]).toEqual( + expect.objectContaining({ + title: "New JS Object", + }), + ); + + expect(fileOptions[1]).toEqual( + expect.objectContaining({ + title: "CREATE A QUERY", + kind: SEARCH_ITEM_TYPES.sectionTitle, + }), + ); + + expect(fileOptions[2]).toEqual( + expect.objectContaining({ + title: "New Other datasource query", + }), + ); + + expect(fileOptions[3]).toEqual( + expect.objectContaining({ + title: "New App datasource query", + }), + ); + }); + + it("filters with a query", () => { + const appDatasource: Datasource = { + datasourceConfiguration: { + url: "", + }, + id: "", + isValid: true, + pluginId: "", + workspaceId: "", + name: "App datasource", + }; + + const otherDatasource: Datasource = { + datasourceConfiguration: { + url: "", + }, + id: "", + isValid: false, + pluginId: "", + workspaceId: "", + name: "Other datasource", + }; + + const fileOptions = getFilteredAndSortedFileOperations( + "App", + [appDatasource], + [otherDatasource], + {}, + true, + true, + ); + + expect(fileOptions[0]).toEqual( + expect.objectContaining({ + title: "New App datasource query", + }), + ); + }); + + it("Non matching query shows on datasource creation", () => { + const appDatasource: Datasource = { + datasourceConfiguration: { + url: "", + }, + id: "", + isValid: true, + pluginId: "", + workspaceId: "", + name: "App datasource", + }; + + const otherDatasource: Datasource = { + datasourceConfiguration: { + url: "", + }, + id: "", + isValid: false, + pluginId: "", + workspaceId: "", + name: "Other datasource", + }; + + const fileOptions = getFilteredAndSortedFileOperations( + "zzzz", + [appDatasource], + [otherDatasource], + {}, + true, + true, + ); + + expect(fileOptions[0]).toEqual( + expect.objectContaining({ + title: "New Datasource", + }), + ); + }); +}); diff --git a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx index c46eb85de33d..e3df5e24a1d9 100644 --- a/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx +++ b/app/client/src/components/editorComponents/GlobalSearch/GlobalSearchHooks.tsx @@ -10,10 +10,12 @@ import { getAllPageWidgets, getJSCollections, getPlugins, + getRecentDatasourceIds, } from "selectors/entitiesSelector"; import { useSelector } from "react-redux"; import type { EventLocation } from "utils/AnalyticsUtil"; import history from "utils/history"; +import type { ActionOperation } from "./utils"; import { actionOperations, attachKind, @@ -35,9 +37,18 @@ import { getCurrentAppWorkspace } from "@appsmith/selectors/workspaceSelectors"; export const useFilteredFileOperations = (query = "") => { const { appWideDS = [], otherDS = [] } = useAppWideAndOtherDatasource(); + const recentDatasourceIds = useSelector(getRecentDatasourceIds); + // helper map for sorting based on recent usage + const recentlyUsedOrderMap = recentDatasourceIds.reduce( + (map: Record<string, number>, id, index) => { + map[id] = index; + return map; + }, + {}, + ); /** * Work around to get the rest api cloud image. - * We don't have it store as an svg + * We don't have it store as a svg */ const plugins = useSelector(getPlugins); const restApiPlugin = plugins.find( @@ -62,101 +73,118 @@ export const useFilteredFileOperations = (query = "") => { userWorkspacePermissions, ); - return useMemo(() => { - let fileOperations: any = - (canCreateActions && - actionOperations.filter((op) => - op.title.toLowerCase().includes(query.toLowerCase()), - )) || - []; - const filteredAppWideDS = appWideDS.filter((ds: Datasource) => - ds.name.toLowerCase().includes(query.toLowerCase()), - ); - const otherFilteredDS = otherDS.filter((ds: Datasource) => - ds.name.toLowerCase().includes(query.toLowerCase()), + return useMemo( + () => + getFilteredAndSortedFileOperations( + query, + appWideDS, + otherDS, + recentlyUsedOrderMap, + canCreateActions, + canCreateDatasource, + pagePermissions, + ), + [query, appWideDS, otherDS], + ); +}; + +export const getFilteredAndSortedFileOperations = ( + query: string, + appWideDS: Datasource[] = [], + otherDS: Datasource[] = [], + recentlyUsedOrderMap: Record<string, number> = {}, + canCreateActions = true, + canCreateDatasource = true, + pagePermissions: string[] = [], +) => { + const fileOperations: ActionOperation[] = []; + if (!canCreateActions) return fileOperations; + + // Add JS object operation + fileOperations.push(actionOperations[2]); + // Add app datasources + if (appWideDS.length > 0 || otherDS.length > 0) { + const showCreateQuery = [...appWideDS, ...otherDS].some((ds: Datasource) => + hasCreateDatasourceActionPermission([ + ...(ds.userPermissions ?? []), + ...pagePermissions, + ]), ); - if (filteredAppWideDS.length > 0 || otherFilteredDS.length > 0) { - const showCreateQuery = [...filteredAppWideDS, ...otherFilteredDS].some( - (ds: Datasource) => - hasCreateDatasourceActionPermission([ - ...(ds.userPermissions ?? []), - ...pagePermissions, - ]), - ); - - fileOperations = [ - ...fileOperations, - showCreateQuery && { - title: "CREATE A QUERY", - kind: SEARCH_ITEM_TYPES.sectionTitle, - }, - ]; - } - if (filteredAppWideDS.length > 0) { - fileOperations = [ - ...fileOperations, - ...filteredAppWideDS.map((ds) => { - return hasCreateDatasourceActionPermission([ - ...(ds.userPermissions ?? []), - ...pagePermissions, - ]) - ? { - title: `New ${ds.name} Query`, - shortTitle: `${ds.name} Query`, - desc: `Create a query in ${ds.name}`, - pluginId: ds.pluginId, - kind: SEARCH_ITEM_TYPES.actionOperation, - action: (pageId: string, from: EventLocation) => - createNewQueryAction(pageId, from, ds.id), - } - : null; - }), - ]; + if (showCreateQuery) { + fileOperations.push({ + desc: "", + title: "CREATE A QUERY", + kind: SEARCH_ITEM_TYPES.sectionTitle, + }); } - if (otherFilteredDS.length > 0) { - fileOperations = [ - ...fileOperations, - ...otherFilteredDS.map((ds) => { - return hasCreateDatasourceActionPermission([ - ...(ds.userPermissions ?? []), - ...pagePermissions, - ]) - ? { - title: `New ${ds.name} Query`, - shortTitle: `${ds.name} Query`, - desc: `Create a query in ${ds.name}`, - kind: SEARCH_ITEM_TYPES.actionOperation, - pluginId: ds.pluginId, - action: (pageId: string, from: EventLocation) => - createNewQueryAction(pageId, from, ds.id), - } - : null; - }), - ]; + } + + // get all datasources, app ds listed first + const datasources = [...appWideDS, ...otherDS].filter((ds) => + hasCreateDatasourceActionPermission([ + ...(ds.userPermissions ?? []), + ...pagePermissions, + ]), + ); + + // Sort datasources based on recency + datasources.sort((a, b) => { + const orderA = recentlyUsedOrderMap[a.id]; + const orderB = recentlyUsedOrderMap[b.id]; + if (orderA !== undefined && orderB !== undefined) { + return orderA - orderB; + } else if (orderA !== undefined) { + return -1; + } else if (orderB !== undefined) { + return 1; + } else { + return 0; } - fileOperations = [ - ...fileOperations, - canCreateDatasource && { - title: "New Datasource", - icon: ( - <EntityIcon> - <AddLineIcon size={22} /> - </EntityIcon> - ), - kind: SEARCH_ITEM_TYPES.actionOperation, - redirect: (pageId: string) => { - history.push( - integrationEditorURL({ - pageId, - selectedTab: INTEGRATION_TABS.NEW, - }), - ); - }, + }); + + // map into operations + const dsOperations = datasources.map((ds) => ({ + title: `New ${ds.name} query`, + shortTitle: `${ds.name} query`, + desc: `Create a query in ${ds.name}`, + pluginId: ds.pluginId, + kind: SEARCH_ITEM_TYPES.actionOperation, + action: (pageId: string, from: EventLocation) => + createNewQueryAction(pageId, from, ds.id), + })); + fileOperations.push(...dsOperations); + + // Add generic action creation + fileOperations.push( + ...actionOperations.filter((op) => op.title !== actionOperations[2].title), + ); + // Filter out based on query + const filteredFileOperations = fileOperations + .filter(Boolean) + .filter((ds) => ds.title.toLowerCase().includes(query.toLowerCase())); + // Add genetic datasource creation + if (canCreateDatasource) { + filteredFileOperations.push({ + desc: "Create a new datasource in the organisation", + title: "New Datasource", + icon: ( + <EntityIcon> + <AddLineIcon size={22} /> + </EntityIcon> + ), + kind: SEARCH_ITEM_TYPES.actionOperation, + redirect: (pageId: string) => { + history.push( + integrationEditorURL({ + pageId, + selectedTab: INTEGRATION_TABS.NEW, + }), + ); }, - ]; - return fileOperations.filter(Boolean); - }, [query, appWideDS, otherDS]); + }); + } + return filteredFileOperations; }; export const useFilteredWidgets = (query: string) => { diff --git a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx index a0cf65c7e2b5..ffd903d9b006 100644 --- a/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx +++ b/app/client/src/pages/Editor/Explorer/Files/Submenu.tsx @@ -160,6 +160,7 @@ export default function ExplorerSubMenu({ autoComplete="off" autoFocus className="flex-grow text-sm py-2 text-gray-800 bg-transparent placeholder-trueGray-500" + data-testId="t--search-file-operation" onChange={onChange} placeholder="Search datasources" type="text" diff --git a/app/client/src/reducers/entityReducers/datasourceReducer.ts b/app/client/src/reducers/entityReducers/datasourceReducer.ts index be35cc4f8528..c5b0cb9bbe47 100644 --- a/app/client/src/reducers/entityReducers/datasourceReducer.ts +++ b/app/client/src/reducers/entityReducers/datasourceReducer.ts @@ -38,6 +38,7 @@ export interface DatasourceDataState { isFetchingSheets: boolean; isFetchingColumns: boolean; }; + recentDatasources: string[]; } const initialState: DatasourceDataState = { @@ -65,6 +66,7 @@ const initialState: DatasourceDataState = { isFetchingSheets: false, isFetchingColumns: false, }, + recentDatasources: [], }; const datasourceReducer = createReducer(initialState, { @@ -271,6 +273,7 @@ const datasourceReducer = createReducer(initialState, { list: state.list.concat(action.payload), isDatasourceBeingSaved: false, isDatasourceBeingSavedFromPopup: false, + recentDatasources: [action.payload.id, ...state.recentDatasources], }; }, [ReduxActionTypes.UPDATE_DATASOURCE_SUCCESS]: ( @@ -290,6 +293,10 @@ const datasourceReducer = createReducer(initialState, { return datasource; }), + recentDatasources: [ + action.payload.id, + ...state.recentDatasources.filter((ds) => ds !== action.payload.id), + ], }; }, [ReduxActionTypes.UPDATE_DATASOURCE_IMPORT_SUCCESS]: ( diff --git a/app/client/src/selectors/entitiesSelector.ts b/app/client/src/selectors/entitiesSelector.ts index ef2f65208358..d90a401cf72f 100644 --- a/app/client/src/selectors/entitiesSelector.ts +++ b/app/client/src/selectors/entitiesSelector.ts @@ -48,6 +48,10 @@ export const getDatasources = (state: AppState): Datasource[] => { return state.entities.datasources.list; }; +export const getRecentDatasourceIds = (state: AppState): string[] => { + return state.entities.datasources.recentDatasources; +}; + export const getDatasourcesStructure = ( state: AppState, ): Record<string, DatasourceStructure> => {
1983fbe174734cdbcda94642b243e2c36964dab7
2023-10-30 21:08:01
Anagh Hegde
fix: replace default object mapper due to the serilisation of Json views (#28484)
false
replace default object mapper due to the serilisation of Json views (#28484)
fix
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java index ee8ac1b7bbfa..107a4c79ae09 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ApplicationTemplateServiceCEImpl.java @@ -21,6 +21,7 @@ import com.appsmith.util.WebClientUtils; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; @@ -343,8 +344,13 @@ private Mono<ApplicationTemplate> uploadCommunityTemplateToCS(CommunityTemplateU String authHeader = "Authorization"; String payload; try { - ObjectWriter ow = objectMapper.writer().withDefaultPrettyPrinter(); - payload = ow.writeValueAsString(communityTemplate); + // Please don't use the default ObjectMapper. + // The default mapper is registered with views.public.class and removes few attributes due to this + // The templates flow has different requirement hence not using the same + ObjectMapper ow = new ObjectMapper(); + ow.registerModule(new JavaTimeModule()); + ObjectWriter writer = ow.writer().withDefaultPrettyPrinter(); + payload = writer.writeValueAsString(communityTemplate); } catch (Exception e) { return Mono.error(e); }
52a51b882c83c49b8cf92074e4f26f322a80c0d8
2022-04-11 18:20:01
Tolulope Adetula
fix: select widget virtualization not rendering first top items (#12768)
false
select widget virtualization not rendering first top items (#12768)
fix
diff --git a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/select_Widget_Bug_spec.js b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/select_Widget_Bug_spec.js index 1cc745072797..b35e11991e23 100644 --- a/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/select_Widget_Bug_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite/ClientSideTests/DisplayWidgets/select_Widget_Bug_spec.js @@ -3,6 +3,7 @@ const widgetsPage = require("../../../../locators/Widgets.json"); const commonlocators = require("../../../../locators/commonlocators.json"); const publish = require("../../../../locators/publishWidgetspage.json"); const dsl = require("../../../../fixtures/formSelectDsl.json"); +const formWidgetsPage = require("../../../../locators/FormWidgets.json"); describe("Select Widget Functionality", function() { before(() => { @@ -18,6 +19,139 @@ describe("Select Widget Functionality", function() { ); }); + it("should check that virtualization works well", () => { + cy.openPropertyPane("selectwidget"); + cy.updateCodeInput( + ".t--property-control-options", + `[ + { + "label": "RANDOM", + "value": "RANDOM" + }, + { + "label": "RANDOM1", + "value": "RANDOM1" + }, + { + "label": "RANDOM2", + "value": "RANDOM2" + }, + { + "label": "RANDOM3", + "value": "RANDOM3" + }, + { + "label": "RANDOM4", + "value": "RANDOM4" + }, + { + "label": "RANDOM5", + "value": "RANDOM5" + } + ]`, + ); + cy.get(".t--property-control-options .t--codemirror-has-error").should( + "not.exist", + ); + // Changing the option to the last item + cy.get(formWidgetsPage.selectWidget) + .find(widgetsPage.dropdownSingleSelect) + .click({ + force: true, + }); + cy.get(commonlocators.singleSelectWidgetMenuItem) + .contains("RANDOM5") + .click({ + force: true, + }); + cy.wait(500); + // Verifying the top items still renders + cy.get(formWidgetsPage.selectWidget) + .find(widgetsPage.dropdownSingleSelect) + .click({ + force: true, + }); + cy.get(commonlocators.singleSelectWidgetMenuItem) + .contains("RANDOM1") + .click({ + force: true, + }); + // Add a longer list of item + cy.updateCodeInput( + ".t--property-control-options", + `[ + { + "label": "RANDOM", + "value": "RANDOM" + }, + { + "label": "RANDOM1", + "value": "RANDOM1" + }, + { + "label": "RANDOM2", + "value": "RANDOM2" + }, + { + "label": "RANDOM3", + "value": "RANDOM3" + }, + { + "label": "RANDOM4", + "value": "RANDOM4" + }, + { + "label": "RANDOM5", + "value": "RANDOM5" + }, + { + "label": "RANDOM6", + "value": "RANDOM6" + }, + { + "label": "RANDOM7", + "value": "RANDOM7" + }, + { + "label": "RANDOM8", + "value": "RANDOM8" + }, + { + "label": "RANDOM9", + "value": "RANDOM9" + }, + { + "label": "RANDOM10", + "value": "RANDOM10" + }, + { + "label": "RANDOM11", + "value": "RANDOM11" + } + + ]`, + ); + cy.get(formWidgetsPage.selectWidget) + .find(widgetsPage.dropdownSingleSelect) + .click({ + force: true, + }); + cy.get(commonlocators.singleSelectWidgetMenuItem) + .contains("RANDOM1") + .click({ + force: true, + }); + cy.wait(500); + cy.get(formWidgetsPage.selectWidget) + .find(widgetsPage.dropdownSingleSelect) + .click({ + force: true, + }); + cy.get(commonlocators.singleSelectWidgetMenuItem) + .contains("RANDOM11") + .should("not.exist"); + }); + it("Disable the widget and check in publish mode", function() { cy.get(widgetsPage.disable).scrollIntoView({ force: true }); cy.get(widgetsPage.selectWidgetDisabled).click({ force: true }); @@ -33,6 +167,15 @@ describe("Select Widget Functionality", function() { cy.get(widgetsPage.disable).scrollIntoView({ force: true }); cy.get(widgetsPage.selectWidgetDisabled).click({ force: true }); cy.get(".bp3-button").should("be.visible"); + + // Set default value as RANDOM11 + cy.updateCodeInput( + ".t--property-control-defaultvalue", + `{ + "label": "RANDOM11", + "value": "RANDOM11" + }`, + ); cy.PublishtheApp(); cy.get(".bp3-button") .eq(0) @@ -40,7 +183,7 @@ describe("Select Widget Functionality", function() { .click({ force: true }); cy.get(commonlocators.singleSelectActiveMenuItem).should( "contain.text", - "Active", + "RANDOM11", ); cy.goToEditFromPublish(); }); diff --git a/app/client/src/widgets/SelectWidget/component/index.tsx b/app/client/src/widgets/SelectWidget/component/index.tsx index 6503c777145a..63dc24a613c2 100644 --- a/app/client/src/widgets/SelectWidget/component/index.tsx +++ b/app/client/src/widgets/SelectWidget/component/index.tsx @@ -35,6 +35,7 @@ const FUSE_OPTIONS = { const DEBOUNCE_TIMEOUT = 800; const ITEM_SIZE = 40; +const MAX_RENDER_MENU_ITEMS_HEIGHT = 300; interface SelectComponentState { activeItemIndex: number | undefined; @@ -185,15 +186,18 @@ class SelectComponent extends React.Component< props.renderItem, ); }; - menuListStyle = { height: "auto", maxHeight: 300 }; + menuListStyle = { height: "auto", maxHeight: MAX_RENDER_MENU_ITEMS_HEIGHT }; renderList = ( items: DropdownOption[], activeItemIndex: number | null, renderItem: (item: any, index: number) => JSX.Element | null, ): JSX.Element | null => { // Don't scroll if the list is filtered. + const optionsCount = this.props.options.length; const scrollOffset: number = - !this.state.query && isNumber(activeItemIndex) + !this.state.query && + isNumber(activeItemIndex) && + optionsCount * ITEM_SIZE > MAX_RENDER_MENU_ITEMS_HEIGHT ? activeItemIndex * ITEM_SIZE : 0; const RowRenderer = (itemProps: any) => ( @@ -204,7 +208,7 @@ class SelectComponent extends React.Component< return ( <FixedSizeList className="menu-virtual-list" - height={300} + height={MAX_RENDER_MENU_ITEMS_HEIGHT} initialScrollOffset={scrollOffset} itemCount={items.length} itemSize={ITEM_SIZE}
8b75ac54f0d38644a1f54dc0562a4beb2300742b
2023-10-25 09:13:29
Nayan
fix: Failing unit tests in import service (#28338)
false
Failing unit tests in import service (#28338)
fix
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportApplicationServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportApplicationServiceCEImpl.java index e77cdb07d843..ca73be9f7489 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportApplicationServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/imports/internal/ImportApplicationServiceCEImpl.java @@ -523,7 +523,14 @@ private Mono<Application> importApplicationInWorkspace( // Start the stopwatch to log the execution time Stopwatch stopwatch = new Stopwatch(AnalyticsEvents.IMPORT.getEventName()); - final Mono<Application> importedApplicationMono = applicationSpecificImportedEntitiesMono + + /* + Calling the workspaceMono first to avoid creating multiple mongo transactions. + If the first db call inside a transaction is a Flux, then there's a chance of creating multiple mongo + transactions which will lead to NoSuchTransaction exception. + */ + final Mono<Application> importedApplicationMono = workspaceMono + .then(applicationSpecificImportedEntitiesMono) .then(getImportApplicationMono( importedApplication, importingMetaDTO, mappedImportableResourcesDTO, currUserMono)) .cache();
3e7b933382cf02123ba8b5799110501a397d2a62
2025-03-25 16:48:49
Trisha Anand
chore: Client side changes to send organizationId in verify email flow (#39898)
false
Client side changes to send organizationId in verify email flow (#39898)
chore
diff --git a/app/client/src/pages/UserAuth/VerifyUser.tsx b/app/client/src/pages/UserAuth/VerifyUser.tsx index 8800a8e60ee2..81e669c49d25 100644 --- a/app/client/src/pages/UserAuth/VerifyUser.tsx +++ b/app/client/src/pages/UserAuth/VerifyUser.tsx @@ -13,6 +13,7 @@ const VerifyUser = ( email: string; token: string; redirectUrl: string; + organizationId: string; }>, ) => { const queryParams = new URLSearchParams(props.location.search); diff --git a/app/client/src/sagas/InitSagas.ts b/app/client/src/sagas/InitSagas.ts index 3b3f635ec929..edf4e42df07a 100644 --- a/app/client/src/sagas/InitSagas.ts +++ b/app/client/src/sagas/InitSagas.ts @@ -92,6 +92,7 @@ import { import type { ApplicationPayload } from "entities/Application"; import type { Page } from "entities/Page"; import type { PACKAGE_PULL_STATUS } from "ee/constants/ModuleConstants"; +import { validateSessionToken } from "utils/SessionUtils"; export const URL_CHANGE_ACTIONS = [ ReduxActionTypes.CURRENT_APPLICATION_NAME_UPDATE, @@ -462,6 +463,15 @@ function* appEngineSaga(action: ReduxAction<AppEnginePayload>) { } function* eagerPageInitSaga() { + try { + // Validate session token if present + yield call(validateSessionToken); + } catch (error) { + // Log error but don't block the rest of the initialization + log.error("Error validating session token:", error); + Sentry.captureException(error); + } + const url = window.location.pathname; const search = window.location.search; diff --git a/app/client/src/utils/SessionUtils.ts b/app/client/src/utils/SessionUtils.ts new file mode 100644 index 000000000000..7855b68ea122 --- /dev/null +++ b/app/client/src/utils/SessionUtils.ts @@ -0,0 +1,42 @@ +import Api from "api/Api"; +import type { ApiResponse } from "api/types"; + +export const SESSION_TOKEN_PARAM = "sessionToken"; + +/** + * Validates a session token from the URL and sets up the session. + * This is used during cross-domain session transfers. + * + * @returns A promise that resolves to true if the session was validated successfully + */ +export const validateSessionToken = async (): Promise<boolean> => { + try { + const urlParams = new URLSearchParams(window.location.search); + const sessionToken = urlParams.get("sessionToken"); + + if (!sessionToken) { + return false; + } + + // Get the response from the API + const response = (await Api.get( + `v1/session/validate?sessionToken=${sessionToken}`, + )) as unknown as ApiResponse<boolean>; + + // Check if the request was successful + if (!response?.responseMeta?.success) { + return false; + } + + // Remove the session token from the URL + const url = new URL(window.location.href); + + url.searchParams.delete("sessionToken"); + window.history.replaceState({}, "", url.toString()); + + // The data field contains the boolean result directly + return !!response.data; + } catch (error) { + return false; + } +};
bd2cc8d6127d1b59b94831d74ef41d3e2d287835
2023-05-04 11:26:17
Anand Srinivasan
fix: display picture - prevent invalid files (#22900)
false
display picture - prevent invalid files (#22900)
fix
⚠️ Rate limited after 3 attempts
f477f610aa4a0d3841a050e10dfaf4f0092a4de2
2025-02-06 12:11:53
Hetu Nandu
fix: State inspector shows canvas widgets (#39023)
false
State inspector shows canvas widgets (#39023)
fix
diff --git a/app/client/src/actions/errorActions.ts b/app/client/src/actions/errorActions.ts index 55ab979e57a8..1c3bd72f702c 100644 --- a/app/client/src/actions/errorActions.ts +++ b/app/client/src/actions/errorActions.ts @@ -1,6 +1,5 @@ import { ReduxActionTypes } from "ee/constants/ReduxActionConstants"; import type { ERROR_CODES } from "ee/constants/ApiConstants"; -import type { ErrorPayloadType } from "sagas/ErrorSagas"; export const safeCrashAppRequest = (code?: ERROR_CODES) => { return { @@ -11,6 +10,12 @@ export const safeCrashAppRequest = (code?: ERROR_CODES) => { }; }; +export interface ErrorPayloadType { + code?: number | string; + message?: string; + crash?: boolean; +} + export const safeCrashApp = (payload: ErrorPayloadType) => { return { type: ReduxActionTypes.SAFE_CRASH_APPSMITH, diff --git a/app/client/src/ce/selectors/entitiesSelector.ts b/app/client/src/ce/selectors/entitiesSelector.ts index 10b30bc32b90..e49dcd57d530 100644 --- a/app/client/src/ce/selectors/entitiesSelector.ts +++ b/app/client/src/ce/selectors/entitiesSelector.ts @@ -19,10 +19,7 @@ import { isStoredDatasource } from "entities/Action"; import { countBy, find, get, groupBy, keyBy, sortBy } from "lodash"; import ImageAlt from "assets/images/placeholder-image.svg"; import type { CanvasWidgetsReduxState } from "reducers/entityReducers/canvasWidgetsReducer"; -import { - MAIN_CONTAINER_WIDGET_ID, - MAIN_CONTAINER_WIDGET_NAME, -} from "constants/WidgetConstants"; +import { MAIN_CONTAINER_WIDGET_ID } from "constants/WidgetConstants"; import type { AppStoreState } from "reducers/entityReducers/appReducer"; import type { JSCollectionData, @@ -76,6 +73,9 @@ import { getIsSavingForApiName, getIsSavingForJSObjectName, } from "selectors/ui"; +import WidgetFactory from "../../WidgetProvider/factory"; + +const WidgetTypes = WidgetFactory.widgetTypes; export enum GROUP_TYPES { API = "APIs", @@ -990,7 +990,8 @@ export const getAllPageWidgets = createSelector( export const getUISegmentItems = createSelector(getCanvasWidgets, (widgets) => { const items: GenericEntityItem[] = Object.values(widgets) - .filter((widget) => widget.widgetName !== MAIN_CONTAINER_WIDGET_NAME) + // We remove canvas widget because they are functional widgets and not UI widgets + .filter((widget) => widget.type !== WidgetTypes.CANVAS_WIDGET) .map((widget) => ({ icon: WidgetIconByType(widget.type), title: widget.widgetName, diff --git a/app/client/src/sagas/ErrorSagas.tsx b/app/client/src/sagas/ErrorSagas.tsx index 3e9426fe7daa..381668da3e01 100644 --- a/app/client/src/sagas/ErrorSagas.tsx +++ b/app/client/src/sagas/ErrorSagas.tsx @@ -1,33 +1,40 @@ import { get } from "lodash"; import { type ReduxAction } from "actions/ReduxActionTypes"; import { - toastMessageErrorTypes, - ReduxActionTypes, ReduxActionErrorTypes, + ReduxActionTypes, + toastMessageErrorTypes, } from "ee/constants/ReduxActionConstants"; import log from "loglevel"; import history from "utils/history"; import type { ApiResponse } from "api/ApiResponses"; -import { flushErrors, safeCrashApp } from "actions/errorActions"; +import { + type ErrorPayloadType, + flushErrors, + safeCrashApp, +} from "actions/errorActions"; import { AUTH_LOGIN_URL } from "constants/routes"; import type { User } from "constants/userConstants"; -import { ERROR_CODES, SERVER_ERROR_CODES } from "ee/constants/ApiConstants"; +import { ANONYMOUS_USERNAME } from "constants/userConstants"; +import { + AXIOS_CONNECTION_ABORTED_CODE, + ERROR_CODES, + SERVER_ERROR_CODES, +} from "ee/constants/ApiConstants"; import { getSafeCrash } from "selectors/errorSelectors"; import { getCurrentUser } from "selectors/usersSelectors"; -import { ANONYMOUS_USERNAME } from "constants/userConstants"; -import { put, takeLatest, call, select } from "redux-saga/effects"; +import { call, put, select, takeLatest } from "redux-saga/effects"; import { + createMessage, + DEFAULT_ERROR_MESSAGE, + ERROR_0, ERROR_401, ERROR_403, ERROR_500, - ERROR_0, - DEFAULT_ERROR_MESSAGE, - createMessage, } from "ee/constants/messages"; import store from "store"; import * as Sentry from "@sentry/react"; -import { AXIOS_CONNECTION_ABORTED_CODE } from "ee/constants/ApiConstants"; import { getLoginUrl } from "ee/utils/adminSettingsHelpers"; import type { PluginErrorDetails } from "api/ActionAPI"; import showToast from "sagas/ToastSagas"; @@ -176,12 +183,6 @@ export function extractClientDefinedErrorMetadata( } } -export interface ErrorPayloadType { - code?: number | string; - message?: string; - crash?: boolean; -} - const ActionErrorDisplayMap: { [key: string]: (error: ErrorPayloadType) => string; } = {
36d39eb0806dceebc994018dbac7e5ffd4730a01
2023-11-29 12:43:28
sneha122
fix: start with data onboarding issue fixes (#29168)
false
start with data onboarding issue fixes (#29168)
fix
diff --git a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx index 63cd5a0475ec..62cf98c7b645 100644 --- a/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx +++ b/app/client/src/ce/pages/Applications/CreateNewAppsOption.tsx @@ -130,6 +130,8 @@ const CardContainer = styled.div` const WithDataWrapper = styled.div` background: var(--ads-v2-color-bg); padding: var(--ads-v2-spaces-13); + border: 1px solid var(--ads-v2-color-gray-300); + border-radius: 5px; `; const Header = ({ subtitle, title }: { subtitle: string; title: string }) => { diff --git a/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx index ee602d78b388..8c7b30d9d030 100644 --- a/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx +++ b/app/client/src/pages/Editor/IntegrationEditor/CreateNewDatasourceTab.tsx @@ -180,7 +180,7 @@ function CreateNewSaasIntegration({ }, [active]); return !isAirgappedInstance ? ( <div id="new-saas-api" ref={newSaasAPIRef}> - <Text type={TextType.H2}>Saas Integrations</Text> + <Text type={TextType.H2}>SaaS Integrations</Text> <NewApiScreen history={history} isCreating={isCreating} diff --git a/app/client/src/sagas/ApiPaneSagas.ts b/app/client/src/sagas/ApiPaneSagas.ts index 9da79d9e7373..f53df2350fa1 100644 --- a/app/client/src/sagas/ApiPaneSagas.ts +++ b/app/client/src/sagas/ApiPaneSagas.ts @@ -657,7 +657,11 @@ function* handleDatasourceCreatedSaga( apiId: actionRouteInfo.apiId ?? "", }), ); - } else if (!currentApplicationIdForCreateNewApp) { + } else if ( + !currentApplicationIdForCreateNewApp || + (!!currentApplicationIdForCreateNewApp && + actionPayload.payload.id !== TEMP_DATASOURCE_ID) + ) { history.push( datasourcesEditorIdURL({ pageId,
08f625e754abfc0b44fb225a14753ce514633e6c
2023-12-01 23:13:15
Arpit Mohan
ci: Modifying the CI workflows for ok-to-test to leverage Cypress tags (#28944)
false
Modifying the CI workflows for ok-to-test to leverage Cypress tags (#28944)
ci
diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml index b892d40f206b..18eb6ec488c8 100644 --- a/.github/workflows/ci-test-custom-script.yml +++ b/.github/workflows/ci-test-custom-script.yml @@ -9,6 +9,10 @@ on: description: "This is the PR number in case the workflow is being called in a pull request" required: false type: number + tags: + description: "These are the optional tags a developer can specify in order to run a subset of all the tests" + required: false + type: string jobs: ci-test: @@ -383,6 +387,7 @@ jobs: CYPRESS_DB_PWD: ${{ secrets.CYPRESS_DB_PWD }} CYPRESS_S3_ACCESS: ${{ secrets.CYPRESS_S3_ACCESS }} CYPRESS_S3_SECRET: ${{ secrets.CYPRESS_S3_SECRET }} + CYPRESS_grepTags: ${{ inputs.tags }} # This is a comma separated list of tags to run a subset of the suite CYPRESS_SKIP_FLAKY: true with: browser: ${{ env.BROWSER_PATH }} diff --git a/.github/workflows/integration-tests-command.yml b/.github/workflows/integration-tests-command.yml index 0309f5878273..8c653a611a48 100644 --- a/.github/workflows/integration-tests-command.yml +++ b/.github/workflows/integration-tests-command.yml @@ -19,6 +19,7 @@ jobs: Workflow: `${{ github.workflow }}`. Commit: `${{ github.event.client_payload.slash_command.args.named.sha }}`. PR: ${{ github.event.client_payload.pull_request.number }}. + Tags: `${{ github.event.client_payload.slash_command.args.named.tags }}`. server-build: name: server-build @@ -69,6 +70,7 @@ jobs: secrets: inherit with: pr: ${{ github.event.client_payload.pull_request.number }} + tags: ${{ github.event.client_payload.slash_command.args.named.tags }} ci-test-result: needs: [ci-test]
9b2f186e141b6633dcdab6ff2de6e21dd8892f13
2024-04-15 12:17:41
Shrikant Sharat Kandula
chore: Revert all recent changes to SegmentConfig
false
Revert all recent changes to SegmentConfig
chore
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SegmentConfig.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SegmentConfig.java index 54199ed44bfd..d1663a30c098 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SegmentConfig.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SegmentConfig.java @@ -60,27 +60,11 @@ public Analytics analyticsRunner() { .build(); logProcessorWithErrorHandler.onError(logData -> { final Throwable error = logData.getError(); - - if (logData.getMessage() == null) { - log.error("Message is null for log data: {}", logData); - return; - } - - if (error == null) { - log.error("Error is null for log: {}", logData.getMessage()); - return; - } - - if (error.getMessage() == null) { - log.error("Error message is null for log: {}", logData.getMessage()); - return; - } - analyticsOnAnalytics.enqueue(TrackMessage.builder("segment_error") .userId("segmentError") .properties(Map.of( "message", logData.getMessage(), - "error", error.getMessage(), + "error", error == null ? "" : error.getMessage(), "args", ObjectUtils.defaultIfNull(logData.getArgs(), Collections.emptyList()), "stackTrace", ExceptionUtils.getStackTrace(error)))); });
59d2bc3b96cb27217613f6a60a9fa48d141430bc
2023-11-06 21:03:59
vadim
chore: WDS fluid tokens refinement (#28580)
false
WDS fluid tokens refinement (#28580)
chore
diff --git a/app/client/packages/design-system/theming/src/token/src/defaultTokens.json b/app/client/packages/design-system/theming/src/token/src/defaultTokens.json index 9ca2b9d3e3f6..3dd0888a4dd4 100644 --- a/app/client/packages/design-system/theming/src/token/src/defaultTokens.json +++ b/app/client/packages/design-system/theming/src/token/src/defaultTokens.json @@ -20,24 +20,24 @@ "maxV": 4, "minR": 2, "maxR": 3, - "minN": 3, + "minN": 2, "maxN": 3, "stepsUp": 8, "stepsDown": 0, - "userSizingRatio": 0.2, - "userDensityRatio": 1.4 + "userSizingRatio": 0.8, + "userDensityRatio": 1.5 }, "innerSpacing": { - "minV": 3, - "maxV": 4, + "minV": 2.25, + "maxV": 3, "minR": 2, "maxR": 3, - "minN": 3, + "minN": 2, "maxN": 3, "stepsUp": 8, "stepsDown": 0, - "userSizingRatio": 0.2, - "userDensityRatio": 1.4 + "userSizingRatio": 0.25, + "userDensityRatio": 2.5 }, "typography": { "minV": 6, @@ -48,8 +48,8 @@ "maxN": 5, "stepsUp": 5, "stepsDown": 1, - "userSizingRatio": 1.4, - "userDensityRatio": 0.2 + "userSizingRatio": 1.6, + "userDensityRatio": 0 } }, "colorMode": "light", diff --git a/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css b/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css index 5d796a4ea18d..eb9af3f32a58 100644 --- a/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css +++ b/app/client/packages/design-system/widgets/src/components/Button/src/styles.module.css @@ -11,8 +11,8 @@ font-family: inherit; border-style: solid; border-width: var(--border-width-1); - padding-inline: var(--inner-spacing-4); - block-size: var(--sizing-8); + padding-inline: var(--inner-spacing-3); + padding-block: var(--inner-spacing-2); min-inline-size: var(--sizing-8); border-radius: var(--border-radius-1); diff --git a/app/client/packages/design-system/widgets/src/styles/src/field.module.css b/app/client/packages/design-system/widgets/src/styles/src/field.module.css index 2cf140dee701..2c19a185751d 100644 --- a/app/client/packages/design-system/widgets/src/styles/src/field.module.css +++ b/app/client/packages/design-system/widgets/src/styles/src/field.module.css @@ -3,7 +3,7 @@ .field { display: flex; flex-direction: column; - gap: var(--inner-spacing-3); + gap: var(--inner-spacing-2); /** * ---------------------------------------------------------------------------- diff --git a/app/client/packages/design-system/widgets/src/styles/src/inline-label.module.css b/app/client/packages/design-system/widgets/src/styles/src/inline-label.module.css index d3c950f6db9f..e7fc4d96a918 100644 --- a/app/client/packages/design-system/widgets/src/styles/src/inline-label.module.css +++ b/app/client/packages/design-system/widgets/src/styles/src/inline-label.module.css @@ -2,7 +2,7 @@ .inline-label { display: flex; align-items: center; - gap: var(--inner-spacing-2); + gap: var(--inner-spacing-1); min-height: var(--sizing-4); position: relative; cursor: pointer; diff --git a/app/client/packages/design-system/widgets/src/styles/src/text-input.module.css b/app/client/packages/design-system/widgets/src/styles/src/text-input.module.css index 1a282cac36ec..34a73f2b0426 100644 --- a/app/client/packages/design-system/widgets/src/styles/src/text-input.module.css +++ b/app/client/packages/design-system/widgets/src/styles/src/text-input.module.css @@ -6,8 +6,8 @@ gap: var(--inner-spacing-1); border-radius: var(--border-radius-1); box-shadow: 0 0 0 1px var(--color-bd-neutral); - padding-inline: var(--inner-spacing-2); - block-size: var(--sizing-8); + padding-inline: var(--inner-spacing-1); + padding-block: var(--inner-spacing-1); } & [data-field-input] :is(input, textarea) { diff --git a/app/client/packages/design-system/widgets/src/testing/ComplexForm.tsx b/app/client/packages/design-system/widgets/src/testing/ComplexForm.tsx index 00857d373b8d..030c103982a8 100644 --- a/app/client/packages/design-system/widgets/src/testing/ComplexForm.tsx +++ b/app/client/packages/design-system/widgets/src/testing/ComplexForm.tsx @@ -25,9 +25,10 @@ import EmotionUnhappyLineIcon from "remixicon-react/EmotionUnhappyLineIcon"; export const ComplexForm = () => { return ( <Flex direction="column" gap="spacing-6"> - <Text variant="heading">Your order</Text> - - <Text>Choose your favorite dishes and place an order.</Text> + <Flex direction="column" gap="spacing-3"> + <Text variant="heading">Your order</Text> + <Text>Choose your favorite dishes and place an order.</Text> + </Flex> <Flex direction="column" gap="spacing-5"> <ButtonGroup> @@ -57,11 +58,13 @@ export const ComplexForm = () => { <Radio value="XL">XL</Radio> </RadioGroup> - <Flex direction="column" gap="spacing-2"> - <Text isBold>Feedback is important to us</Text> - <Flex gap="spacing-1"> - <IconButton icon={EmotionHappyLineIcon} variant="ghost" /> - <IconButton icon={EmotionUnhappyLineIcon} variant="ghost" /> + <Flex direction="column" gap="spacing-3"> + <Flex direction="column" gap="spacing-2"> + <Text isBold>Feedback is important to us</Text> + <Flex> + <IconButton icon={EmotionHappyLineIcon} variant="ghost" /> + <IconButton icon={EmotionUnhappyLineIcon} variant="ghost" /> + </Flex> </Flex> <TextArea label="Your comment" /> </Flex>
81bebcd914f6dd5b78bac51dbd97137e5d86a181
2023-12-05 19:05:22
Rajat Agrawal
chore: Improve logging format for debugging OOM issues (#29330)
false
Improve logging format for debugging OOM issues (#29330)
chore
diff --git a/app/server/appsmith-server/pom.xml b/app/server/appsmith-server/pom.xml index 5aa1316f38ef..925cbae4b491 100644 --- a/app/server/appsmith-server/pom.xml +++ b/app/server/appsmith-server/pom.xml @@ -41,6 +41,12 @@ </dependencyManagement> <dependencies> + <dependency> + <groupId>io.projectreactor</groupId> + <artifactId>reactor-tools</artifactId> + <version>3.6.0</version> + <classifier>original</classifier> + </dependency> <dependency> <groupId>io.opentelemetry</groupId> <artifactId>opentelemetry-api</artifactId> diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/ServerApplication.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/ServerApplication.java index 43195d4702b8..af8cd30311ab 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/ServerApplication.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/ServerApplication.java @@ -4,6 +4,7 @@ import io.micrometer.observation.aop.ObservedAspect; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.boot.Banner; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -11,14 +12,26 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableScheduling; +import reactor.tools.agent.ReactorDebugAgent; import static com.appsmith.server.constants.EnvVariables.APPSMITH_NEW_RELIC_ACCOUNT_ENABLE; +import static com.appsmith.server.constants.EnvVariables.APPSMITH_VERBOSE_LOGGING_ENABLED; @SpringBootApplication @EnableScheduling +@Slf4j public class ServerApplication { public static void main(String[] args) { + String loggingEnabled = System.getenv(String.valueOf(APPSMITH_VERBOSE_LOGGING_ENABLED)); + + if ("true".equalsIgnoreCase(loggingEnabled)) { + log.info("Enabling Reactor Debug Agent enabled"); + ReactorDebugAgent.init(); + } else { + log.info("Reactor Debug Agent not enabled"); + } + new SpringApplicationBuilder(ServerApplication.class) .bannerMode(Banner.Mode.OFF) .run(args); diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/performancelogging/PerformanceLoggingHandler.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/performancelogging/PerformanceLoggingHandler.java index b9be134421d9..024f2c772340 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/performancelogging/PerformanceLoggingHandler.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/performancelogging/PerformanceLoggingHandler.java @@ -1,5 +1,6 @@ package com.appsmith.server.performancelogging; +import io.micrometer.common.KeyValue; import io.micrometer.observation.Observation; import io.micrometer.observation.Observation.Context; import io.micrometer.observation.ObservationHandler; @@ -7,13 +8,44 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.stereotype.Component; +import java.lang.management.ManagementFactory; +import java.lang.management.MemoryMXBean; + @Component @Slf4j @ConditionalOnExpression("${logging.verbose.enabled}") class PerformanceLoggingHandler implements ObservationHandler<Observation.Context> { @Override public void onStart(Context context) { - context.put("executionTime", System.currentTimeMillis()); + if (needsLogStatement(context)) { + context.put("executionTime", System.currentTimeMillis()); + + KeyValue url = context.getHighCardinalityKeyValue("http.url"); + String urlName = url == null ? "null" : url.getValue(); + log.info("Execution Started : {}, Context : {}, {}", context.getName(), urlName, memoryFootprint()); + } + } + + private String memoryFootprint() { + MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean(); + + return String.format( + "Initial memory: %.2f GB, Used heap memory: %.2f GB, Max heap memory: %.2f GB, Committed memory: %.2f GB", + (double) memoryMXBean.getHeapMemoryUsage().getInit() / 1073741824, + (double) memoryMXBean.getHeapMemoryUsage().getUsed() / 1073741824, + (double) memoryMXBean.getHeapMemoryUsage().getMax() / 1073741824, + (double) memoryMXBean.getHeapMemoryUsage().getCommitted() / 1073741824); + } + + private Boolean needsLogStatement(Context context) { + String name = context.getName(); + if (name.equals("spring.security.authorizations") + || name.equals("spring.security.filterchains") + || name.equals("spring.security.http.secured.requests")) { + return false; + } else { + return true; + } } @Override @@ -23,13 +55,20 @@ public boolean supportsContext(Context context) { @Override public void onStop(Context context) { - long startTime = context.getOrDefault("executionTime", 0L); - long executionTime = System.currentTimeMillis() - startTime; - log.info( - "Execution Complete: {} | Total Time Taken: {} ms | Context: {}", - context.getName(), - executionTime, - context.toString()); + if (needsLogStatement(context)) { + long startTime = context.getOrDefault("executionTime", 0L); + long executionTime = System.currentTimeMillis() - startTime; + + KeyValue url = context.getHighCardinalityKeyValue("http.url"); + String urlName = url == null ? "null" : url.getValue(); + + log.info( + "Execution Complete: {} | Total Time Taken: {} ms | Context: {}, {}", + context.getName(), + executionTime, + urlName, + memoryFootprint()); + } } @Override diff --git a/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf b/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf index 95eeea10ded5..ecd505683bf0 100644 --- a/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf +++ b/deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf @@ -10,7 +10,7 @@ stdout_logfile=/appsmith-stacks/logs/%(program_name)s/%(program_name)s-%(ENV_HOS redirect_stderr=true stdout_logfile_maxbytes=10MB stderr_logfile_maxbytes=10MB -stdout_logfile_backups=2 -stderr_logfile_backups=2 +stdout_logfile_backups=10 +stderr_logfile_backups=10 stdout_events_enabled=true stderr_events_enabled=true
f6e46ee2c5e558cbcfd6cc12cc60aa56f54151b0
2023-05-22 13:29:29
Abhinav Jha
fix: resizable max height (#23143)
false
resizable max height (#23143)
fix
diff --git a/app/client/src/components/editorComponents/ResizableComponent.tsx b/app/client/src/components/editorComponents/ResizableComponent.tsx index bd5fba05caf2..59168e7af913 100644 --- a/app/client/src/components/editorComponents/ResizableComponent.tsx +++ b/app/client/src/components/editorComponents/ResizableComponent.tsx @@ -3,7 +3,11 @@ import { batchUpdateMultipleWidgetProperties } from "actions/controlActions"; import { focusWidget } from "actions/widgetActions"; import { EditorContext } from "components/editorComponents/EditorContextProvider"; import type { OccupiedSpace } from "constants/CanvasEditorConstants"; -import { DefaultDimensionMap, GridDefaults } from "constants/WidgetConstants"; +import { + DefaultDimensionMap, + GridDefaults, + WidgetHeightLimits, +} from "constants/WidgetConstants"; import { get, omit } from "lodash"; import type { XYCord } from "pages/common/CanvasArenas/hooks/useRenderBlocksOnCanvas"; import React, { memo, useContext, useMemo } from "react"; @@ -71,7 +75,6 @@ export const ResizableComponent = memo(function ResizableComponent( const { updateWidget } = useContext(EditorContext); const dispatch = useDispatch(); const isAutoLayout = useSelector(getIsAutoLayout); - const Resizable = isAutoLayout ? AutoLayoutResizable : FixedLayoutResizable; const isSnipingMode = useSelector(snipingModeSelector); const isPreviewMode = useSelector(previewModeSelector); @@ -355,10 +358,21 @@ export const ResizableComponent = memo(function ResizableComponent( return !isAutoHeightEnabledForWidget(props) && isEnabled; }, [props, isAutoHeightEnabledForWidget, isEnabled]); - const fixedHeight = - isAutoHeightEnabledForWidgetWithLimits(props) || - !isAutoHeightEnabledForWidget(props) || - !props.isCanvas; + // What is the max resizable height for this widget, in pixels? + let maxHeightInPx = + WidgetHeightLimits.MAX_HEIGHT_IN_ROWS * + GridDefaults.DEFAULT_GRID_ROW_HEIGHT; // Maximum possible height + // If the widget has auto height with limits, we need to respect the set limits. + if (isAutoHeightEnabledForWidgetWithLimits(props)) { + maxHeightInPx = + (props.maxDynamicHeight || WidgetHeightLimits.MAX_HEIGHT_IN_ROWS) * + GridDefaults.DEFAULT_GRID_ROW_HEIGHT; + } + + // Is auto height enabled for widget (without limits) + const autoHeight = + isAutoHeightEnabledForWidget(props) && + !isAutoHeightEnabledForWidgetWithLimits(props); const allowResize: boolean = !isMultiSelected || (isAutoLayout && !props.isFlexChild); @@ -370,22 +384,23 @@ export const ResizableComponent = memo(function ResizableComponent( !isAppSettingsPaneWithNavigationTabOpen && !isDragging && (isHovered || isSelected); + return ( <Resizable allowResize={allowResize} + autoHeight={autoHeight} componentHeight={dimensions.height} componentWidth={dimensions.width} direction={props.direction} enableHorizontalResize={isEnabled} enableVerticalResize={isVerticalResizeEnabled} - fixedHeight={fixedHeight} getResizedPositions={getResizedPositions} gridProps={gridProps} handles={handles} isFlexChild={props.isFlexChild} isHovered={isHovered} isMobile={props.isMobile || false} - maxDynamicHeight={props.maxDynamicHeight} + maxHeightInPx={maxHeightInPx} onStart={handleResizeStart} onStop={updateSize} originalPositions={originalPositions} diff --git a/app/client/src/resizable/autolayoutresize/index.tsx b/app/client/src/resizable/autolayoutresize/index.tsx index 6c26d4db3d0c..f28e52b3a5b4 100644 --- a/app/client/src/resizable/autolayoutresize/index.tsx +++ b/app/client/src/resizable/autolayoutresize/index.tsx @@ -4,11 +4,7 @@ import { isResizingDisabled, } from "components/editorComponents/ResizableUtils"; import type { OccupiedSpace } from "constants/CanvasEditorConstants"; -import { - GridDefaults, - WIDGET_PADDING, - WidgetHeightLimits, -} from "constants/WidgetConstants"; +import { GridDefaults, WIDGET_PADDING } from "constants/WidgetConstants"; import React, { useEffect, useMemo, useRef, useState } from "react"; import type { CSSProperties } from "react"; import { useDispatch, useSelector } from "react-redux"; @@ -685,33 +681,22 @@ function AutoLayoutResizable(props: ResizableProps) { }} from={{ width: props.componentWidth, - height: props.fixedHeight - ? Math.min( - (props.maxDynamicHeight || - WidgetHeightLimits.MAX_HEIGHT_IN_ROWS) * - GridDefaults.DEFAULT_GRID_ROW_HEIGHT, - props.componentHeight, - ) - : "auto", - maxHeight: - (props.maxDynamicHeight || WidgetHeightLimits.MAX_HEIGHT_IN_ROWS) * - GridDefaults.DEFAULT_GRID_ROW_HEIGHT, + height: props.autoHeight + ? "auto" + : Math.min(props.maxHeightInPx, props.componentHeight), + maxHeight: props.maxHeightInPx, }} immediate={newDimensions.reset ? true : false} to={{ width: widgetWidth, - height: props.fixedHeight - ? Math.min( - (props.maxDynamicHeight || - WidgetHeightLimits.MAX_HEIGHT_IN_ROWS) * - GridDefaults.DEFAULT_GRID_ROW_HEIGHT, - widgetHeight, - ) - : "auto", - - maxHeight: - (props.maxDynamicHeight || WidgetHeightLimits.MAX_HEIGHT_IN_ROWS) * - GridDefaults.DEFAULT_GRID_ROW_HEIGHT, + // If height is automatically set, use `auto`, widgetHeight is not considered + // other wise, limit the height based on the max. + // We could also use the isVerticalDisabled flag here, but that would mean that + // the auto height with limits will stop working correctly + height: props.autoHeight + ? "auto" + : Math.min(props.maxHeightInPx, widgetHeight), + maxHeight: props.maxHeightInPx, transform: `translate3d(${ newDimensions.reflectPosition ? newDimensions.x : 0 }px,${newDimensions.reflectPosition ? newDimensions.y : 0}px,0)`, diff --git a/app/client/src/resizable/common.tsx b/app/client/src/resizable/common.tsx index 607b3d237687..cf8b42d0f4d1 100644 --- a/app/client/src/resizable/common.tsx +++ b/app/client/src/resizable/common.tsx @@ -239,8 +239,8 @@ export type ResizableProps = { canResizeHorizontally: boolean; canResizeVertically: boolean; }; - fixedHeight: boolean; - maxDynamicHeight?: number; + maxHeightInPx: number; // Maximum height in pixels, the child can have. + autoHeight: boolean; // true if we don't want a pixel height specified for the child originalPositions: OccupiedSpace; onStart: (affectsWidth?: boolean) => void; onStop: ( diff --git a/app/client/src/resizable/resizenreflow/index.tsx b/app/client/src/resizable/resizenreflow/index.tsx index 642dc9fdac7b..ae68c1db7c8f 100644 --- a/app/client/src/resizable/resizenreflow/index.tsx +++ b/app/client/src/resizable/resizenreflow/index.tsx @@ -1,10 +1,6 @@ import { computeRowCols } from "components/editorComponents/ResizableUtils"; import { isHandleResizeAllowed } from "components/editorComponents/ResizableUtils"; -import { - GridDefaults, - WIDGET_PADDING, - WidgetHeightLimits, -} from "constants/WidgetConstants"; +import { WIDGET_PADDING } from "constants/WidgetConstants"; import { Spring } from "react-spring"; import React, { useEffect, useMemo, useRef, useState } from "react"; import type { CSSProperties } from "react"; @@ -400,6 +396,7 @@ export function ReflowResizable(props: ResizableProps) { props.showResizeBoundary ? "show-boundary" : "" } ${pointerEvents ? "" : "pointer-event-none"}`; }, [props.className, pointerEvents, props.showResizeBoundary]); + return ( <Spring config={{ @@ -409,33 +406,23 @@ export function ReflowResizable(props: ResizableProps) { }} from={{ width: props.componentWidth, - height: props.fixedHeight - ? Math.min( - (props.maxDynamicHeight || - WidgetHeightLimits.MAX_HEIGHT_IN_ROWS) * - GridDefaults.DEFAULT_GRID_ROW_HEIGHT, - props.componentHeight, - ) - : "auto", - maxHeight: - (props.maxDynamicHeight || WidgetHeightLimits.MAX_HEIGHT_IN_ROWS) * - GridDefaults.DEFAULT_GRID_ROW_HEIGHT, + height: props.autoHeight + ? "auto" + : Math.min(props.maxHeightInPx, props.componentHeight), + maxHeight: props.maxHeightInPx, }} immediate={newDimensions.reset ? true : false} to={{ width: widgetWidth, - height: props.fixedHeight - ? Math.min( - (props.maxDynamicHeight || - WidgetHeightLimits.MAX_HEIGHT_IN_ROWS) * - GridDefaults.DEFAULT_GRID_ROW_HEIGHT, - widgetHeight, - ) - : "auto", + // If height is automatically set, use `auto`, widgetHeight is not considered + // other wise, limit the height based on the max. + // We could also use the isVerticalDisabled flag here, but that would mean that + // the auto height with limits will stop working correctly + height: props.autoHeight + ? "auto" + : Math.min(props.maxHeightInPx, widgetHeight), - maxHeight: - (props.maxDynamicHeight || WidgetHeightLimits.MAX_HEIGHT_IN_ROWS) * - GridDefaults.DEFAULT_GRID_ROW_HEIGHT, + maxHeight: props.maxHeightInPx, transform: `translate3d(${ (newDimensions.reflectPosition ? newDimensions.x : 0) - RESIZE_BORDER_BUFFER / 2
fce7a4d345b38c8218d8339625255e950b033603
2023-12-22 10:52:17
Nidhi
chore: Split changes for refactor based on view mode (#29802)
false
Split changes for refactor based on view mode (#29802)
chore
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/refactors/ActionCollectionRefactoringServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/refactors/ActionCollectionRefactoringServiceCEImpl.java index a1461caa417b..b474031b10d6 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/refactors/ActionCollectionRefactoringServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/actioncollections/refactors/ActionCollectionRefactoringServiceCEImpl.java @@ -86,7 +86,7 @@ protected Mono<Boolean> refactorNameInActionCollection( return astService .replaceValueInMustacheKeys( new HashSet<>(Collections.singletonList( - new MustacheBindingToken(unpublishedCollection.getBody(), 0, true))), + new MustacheBindingToken(unpublishedCollection.getBody(), 0, false))), oldName, newName, evalVersion, @@ -156,15 +156,15 @@ public Mono<Void> updateRefactoredEntity(RefactorEntityNameDTO refactorEntityNam @Override public Flux<String> getExistingEntityNames( String contextId, CreatorContextType contextType, String layoutId, boolean viewMode) { - return getExistingEntities(contextId, contextType, layoutId).map(ActionCollectionDTO::getName); + return getExistingEntities(contextId, contextType, layoutId, viewMode).map(ActionCollectionDTO::getName); } protected Flux<ActionCollectionDTO> getExistingEntities( - String contextId, CreatorContextType contextType, String layoutId) { + String contextId, CreatorContextType contextType, String layoutId, boolean viewMode) { MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); if (StringUtils.hasText(contextId)) { params.add(FieldName.PAGE_ID, contextId); } - return actionCollectionService.getActionCollectionsByViewMode(params, false); + return actionCollectionService.getActionCollectionsByViewMode(params, viewMode); } } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/widgets/refactors/WidgetRefactoringServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/widgets/refactors/WidgetRefactoringServiceCEImpl.java index 7b90c5915a45..2ce5136fda49 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/widgets/refactors/WidgetRefactoringServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/widgets/refactors/WidgetRefactoringServiceCEImpl.java @@ -113,7 +113,7 @@ public Flux<String> getExistingEntityNames( String contextId, CreatorContextType contextType, String layoutId, boolean viewMode) { return newPageService // fetch the unpublished page - .findPageById(contextId, pagePermission.getReadPermission(), false) + .findPageById(contextId, pagePermission.getReadPermission(), viewMode) .flatMapMany(page -> { List<Layout> layouts = page.getLayouts(); for (Layout layout : layouts) {
b3d9e56664b241daf2f055acaa1ae784af1b09fa
2023-04-26 17:46:03
Favour Ohanekwu
fix: Add null check to entityConfig (#22735)
false
Add null check to entityConfig (#22735)
fix
diff --git a/app/client/src/workers/common/DataTreeEvaluator/test.ts b/app/client/src/workers/common/DataTreeEvaluator/test.ts index 57b4fe2dc63e..ad57398d9f69 100644 --- a/app/client/src/workers/common/DataTreeEvaluator/test.ts +++ b/app/client/src/workers/common/DataTreeEvaluator/test.ts @@ -21,6 +21,7 @@ import { parseJSActions } from "workers/Evaluation/JSObject"; import type { ActionEntityConfig } from "entities/DataTree/types"; import type { WidgetConfiguration } from "widgets/constants"; import { setEvalContext } from "workers/Evaluation/evaluate"; +import { isDataField } from "./utils"; const widgetConfigMap: Record< string, @@ -630,3 +631,532 @@ describe("DataTreeEvaluator", () => { }); }); }); + +describe("isDataField", () => { + const configTree = { + JSObject1: { + actionId: "642d384a630f4634e27a67ff", + meta: { + myFun2: { + arguments: [], + isAsync: true, + confirmBeforeExecute: false, + }, + myFun1: { + arguments: [], + isAsync: true, + confirmBeforeExecute: false, + }, + }, + name: "JSObject1", + pluginType: "JS", + ENTITY_TYPE: "JSACTION", + bindingPaths: { + body: "SMART_SUBSTITUTE", + superbaseClient: "SMART_SUBSTITUTE", + myVar2: "SMART_SUBSTITUTE", + myFun2: "SMART_SUBSTITUTE", + myFun1: "SMART_SUBSTITUTE", + }, + reactivePaths: { + body: "SMART_SUBSTITUTE", + superbaseClient: "SMART_SUBSTITUTE", + myVar2: "SMART_SUBSTITUTE", + myFun2: "SMART_SUBSTITUTE", + myFun1: "SMART_SUBSTITUTE", + }, + dynamicBindingPathList: [ + { + key: "body", + }, + { + key: "superbaseClient", + }, + { + key: "myVar2", + }, + { + key: "myFun2", + }, + { + key: "myFun1", + }, + ], + variables: ["superbaseClient", "myVar2"], + dependencyMap: { + body: ["myFun2", "myFun1"], + }, + }, + JSObject2: { + actionId: "644242aeadc0936a9b0e71cc", + meta: { + myFun2: { + arguments: [], + isAsync: true, + confirmBeforeExecute: false, + }, + myFun1: { + arguments: [], + isAsync: true, + confirmBeforeExecute: false, + }, + }, + name: "JSObject2", + pluginType: "JS", + ENTITY_TYPE: "JSACTION", + bindingPaths: { + body: "SMART_SUBSTITUTE", + supabaseClient: "SMART_SUBSTITUTE", + myVar2: "SMART_SUBSTITUTE", + myFun2: "SMART_SUBSTITUTE", + myFun1: "SMART_SUBSTITUTE", + }, + reactivePaths: { + body: "SMART_SUBSTITUTE", + supabaseClient: "SMART_SUBSTITUTE", + myVar2: "SMART_SUBSTITUTE", + myFun2: "SMART_SUBSTITUTE", + myFun1: "SMART_SUBSTITUTE", + }, + dynamicBindingPathList: [ + { + key: "body", + }, + { + key: "supabaseClient", + }, + { + key: "myVar2", + }, + { + key: "myFun2", + }, + { + key: "myFun1", + }, + ], + variables: ["supabaseClient", "myVar2"], + dependencyMap: { + body: ["myFun2", "myFun1"], + }, + }, + MainContainer: { + defaultProps: {}, + defaultMetaProps: [], + dynamicBindingPathList: [], + logBlackList: {}, + bindingPaths: {}, + reactivePaths: {}, + triggerPaths: {}, + validationPaths: {}, + ENTITY_TYPE: "WIDGET", + privateWidgets: {}, + propertyOverrideDependency: {}, + overridingPropertyPaths: {}, + type: "CANVAS_WIDGET", + dynamicTriggerPathList: [], + isMetaPropDirty: false, + widgetId: "0", + }, + Button1: { + defaultProps: {}, + defaultMetaProps: ["recaptchaToken"], + dynamicBindingPathList: [ + { + key: "buttonColor", + }, + { + key: "borderRadius", + }, + { + key: "text", + }, + ], + logBlackList: {}, + bindingPaths: { + text: "TEMPLATE", + tooltip: "TEMPLATE", + isVisible: "TEMPLATE", + isDisabled: "TEMPLATE", + animateLoading: "TEMPLATE", + googleRecaptchaKey: "TEMPLATE", + recaptchaType: "TEMPLATE", + disabledWhenInvalid: "TEMPLATE", + resetFormOnClick: "TEMPLATE", + buttonVariant: "TEMPLATE", + iconName: "TEMPLATE", + placement: "TEMPLATE", + buttonColor: "TEMPLATE", + borderRadius: "TEMPLATE", + boxShadow: "TEMPLATE", + }, + reactivePaths: { + recaptchaToken: "TEMPLATE", + buttonColor: "TEMPLATE", + borderRadius: "TEMPLATE", + text: "TEMPLATE", + tooltip: "TEMPLATE", + isVisible: "TEMPLATE", + isDisabled: "TEMPLATE", + animateLoading: "TEMPLATE", + googleRecaptchaKey: "TEMPLATE", + recaptchaType: "TEMPLATE", + disabledWhenInvalid: "TEMPLATE", + resetFormOnClick: "TEMPLATE", + buttonVariant: "TEMPLATE", + iconName: "TEMPLATE", + placement: "TEMPLATE", + boxShadow: "TEMPLATE", + }, + triggerPaths: { + onClick: true, + }, + validationPaths: { + text: { + type: "TEXT", + }, + tooltip: { + type: "TEXT", + }, + isVisible: { + type: "BOOLEAN", + }, + isDisabled: { + type: "BOOLEAN", + }, + animateLoading: { + type: "BOOLEAN", + }, + googleRecaptchaKey: { + type: "TEXT", + }, + recaptchaType: { + type: "TEXT", + params: { + allowedValues: ["V3", "V2"], + default: "V3", + }, + }, + disabledWhenInvalid: { + type: "BOOLEAN", + }, + resetFormOnClick: { + type: "BOOLEAN", + }, + buttonVariant: { + type: "TEXT", + params: { + allowedValues: ["PRIMARY", "SECONDARY", "TERTIARY"], + default: "PRIMARY", + }, + }, + iconName: { + type: "TEXT", + }, + placement: { + type: "TEXT", + params: { + allowedValues: ["START", "BETWEEN", "CENTER"], + default: "CENTER", + }, + }, + buttonColor: { + type: "TEXT", + }, + borderRadius: { + type: "TEXT", + }, + boxShadow: { + type: "TEXT", + }, + }, + ENTITY_TYPE: "WIDGET", + privateWidgets: {}, + propertyOverrideDependency: {}, + overridingPropertyPaths: {}, + type: "BUTTON_WIDGET", + dynamicTriggerPathList: [], + isMetaPropDirty: false, + widgetId: "19ih8rt2eo", + }, + Button2: { + defaultProps: {}, + defaultMetaProps: ["recaptchaToken"], + dynamicBindingPathList: [ + { + key: "buttonColor", + }, + { + key: "borderRadius", + }, + ], + logBlackList: {}, + bindingPaths: { + text: "TEMPLATE", + tooltip: "TEMPLATE", + isVisible: "TEMPLATE", + isDisabled: "TEMPLATE", + animateLoading: "TEMPLATE", + googleRecaptchaKey: "TEMPLATE", + recaptchaType: "TEMPLATE", + disabledWhenInvalid: "TEMPLATE", + resetFormOnClick: "TEMPLATE", + buttonVariant: "TEMPLATE", + iconName: "TEMPLATE", + placement: "TEMPLATE", + buttonColor: "TEMPLATE", + borderRadius: "TEMPLATE", + boxShadow: "TEMPLATE", + }, + reactivePaths: { + recaptchaToken: "TEMPLATE", + buttonColor: "TEMPLATE", + borderRadius: "TEMPLATE", + text: "TEMPLATE", + tooltip: "TEMPLATE", + isVisible: "TEMPLATE", + isDisabled: "TEMPLATE", + animateLoading: "TEMPLATE", + googleRecaptchaKey: "TEMPLATE", + recaptchaType: "TEMPLATE", + disabledWhenInvalid: "TEMPLATE", + resetFormOnClick: "TEMPLATE", + buttonVariant: "TEMPLATE", + iconName: "TEMPLATE", + placement: "TEMPLATE", + boxShadow: "TEMPLATE", + }, + triggerPaths: { + onClick: true, + }, + validationPaths: { + text: { + type: "TEXT", + }, + tooltip: { + type: "TEXT", + }, + isVisible: { + type: "BOOLEAN", + }, + isDisabled: { + type: "BOOLEAN", + }, + animateLoading: { + type: "BOOLEAN", + }, + googleRecaptchaKey: { + type: "TEXT", + }, + recaptchaType: { + type: "TEXT", + params: { + allowedValues: ["V3", "V2"], + default: "V3", + }, + }, + disabledWhenInvalid: { + type: "BOOLEAN", + }, + resetFormOnClick: { + type: "BOOLEAN", + }, + buttonVariant: { + type: "TEXT", + params: { + allowedValues: ["PRIMARY", "SECONDARY", "TERTIARY"], + default: "PRIMARY", + }, + }, + iconName: { + type: "TEXT", + }, + placement: { + type: "TEXT", + params: { + allowedValues: ["START", "BETWEEN", "CENTER"], + default: "CENTER", + }, + }, + buttonColor: { + type: "TEXT", + }, + borderRadius: { + type: "TEXT", + }, + boxShadow: { + type: "TEXT", + }, + }, + ENTITY_TYPE: "WIDGET", + privateWidgets: {}, + propertyOverrideDependency: {}, + overridingPropertyPaths: {}, + type: "BUTTON_WIDGET", + dynamicPropertyPathList: [ + { + key: "onClick", + }, + ], + dynamicTriggerPathList: [ + { + key: "onClick", + }, + ], + isMetaPropDirty: false, + widgetId: "vss3w1eecd", + }, + Button3: { + defaultProps: {}, + defaultMetaProps: ["recaptchaToken"], + dynamicBindingPathList: [ + { + key: "buttonColor", + }, + { + key: "borderRadius", + }, + ], + logBlackList: {}, + bindingPaths: { + text: "TEMPLATE", + tooltip: "TEMPLATE", + isVisible: "TEMPLATE", + isDisabled: "TEMPLATE", + animateLoading: "TEMPLATE", + googleRecaptchaKey: "TEMPLATE", + recaptchaType: "TEMPLATE", + disabledWhenInvalid: "TEMPLATE", + resetFormOnClick: "TEMPLATE", + buttonVariant: "TEMPLATE", + iconName: "TEMPLATE", + placement: "TEMPLATE", + buttonColor: "TEMPLATE", + borderRadius: "TEMPLATE", + boxShadow: "TEMPLATE", + }, + reactivePaths: { + recaptchaToken: "TEMPLATE", + buttonColor: "TEMPLATE", + borderRadius: "TEMPLATE", + text: "TEMPLATE", + tooltip: "TEMPLATE", + isVisible: "TEMPLATE", + isDisabled: "TEMPLATE", + animateLoading: "TEMPLATE", + googleRecaptchaKey: "TEMPLATE", + recaptchaType: "TEMPLATE", + disabledWhenInvalid: "TEMPLATE", + resetFormOnClick: "TEMPLATE", + buttonVariant: "TEMPLATE", + iconName: "TEMPLATE", + placement: "TEMPLATE", + boxShadow: "TEMPLATE", + }, + triggerPaths: { + onClick: true, + }, + validationPaths: { + text: { + type: "TEXT", + }, + tooltip: { + type: "TEXT", + }, + isVisible: { + type: "BOOLEAN", + }, + isDisabled: { + type: "BOOLEAN", + }, + animateLoading: { + type: "BOOLEAN", + }, + googleRecaptchaKey: { + type: "TEXT", + }, + recaptchaType: { + type: "TEXT", + params: { + allowedValues: ["V3", "V2"], + default: "V3", + }, + }, + disabledWhenInvalid: { + type: "BOOLEAN", + }, + resetFormOnClick: { + type: "BOOLEAN", + }, + buttonVariant: { + type: "TEXT", + params: { + allowedValues: ["PRIMARY", "SECONDARY", "TERTIARY"], + default: "PRIMARY", + }, + }, + iconName: { + type: "TEXT", + }, + placement: { + type: "TEXT", + params: { + allowedValues: ["START", "BETWEEN", "CENTER"], + default: "CENTER", + }, + }, + buttonColor: { + type: "TEXT", + }, + borderRadius: { + type: "TEXT", + }, + boxShadow: { + type: "TEXT", + }, + }, + ENTITY_TYPE: "WIDGET", + privateWidgets: {}, + propertyOverrideDependency: {}, + overridingPropertyPaths: {}, + type: "BUTTON_WIDGET", + dynamicPropertyPathList: [ + { + key: "onClick", + }, + ], + dynamicTriggerPathList: [ + { + key: "onClick", + }, + ], + isMetaPropDirty: false, + widgetId: "pzom2ufg3b", + }, + } as ConfigTree; + it("doesn't crash when config tree is empty", () => { + const isADataField = isDataField("appsmith.store", {}); + expect(isADataField).toBe(false); + }); + it("works correctly", function () { + const testCases = [ + { + fullPath: "Button1.text", + isDataField: true, + }, + { + fullPath: "appsmith.store", + isDataField: false, + }, + { + fullPath: "JSObject2.body", + isDataField: false, + }, + ]; + + for (const testCase of testCases) { + const isADataField = isDataField(testCase.fullPath, configTree); + expect(isADataField).toBe(testCase.isDataField); + } + }); +}); diff --git a/app/client/src/workers/common/DataTreeEvaluator/utils.ts b/app/client/src/workers/common/DataTreeEvaluator/utils.ts index 2aa540eb047a..0a663605b686 100644 --- a/app/client/src/workers/common/DataTreeEvaluator/utils.ts +++ b/app/client/src/workers/common/DataTreeEvaluator/utils.ts @@ -20,7 +20,7 @@ export function getFixedTimeDifference(endTime: number, startTime: number) { export function isDataField(fullPath: string, configTree: ConfigTree) { const { entityName, propertyPath } = getEntityNameAndPropertyPath(fullPath); const entityConfig = configTree[entityName]; - if ("triggerPaths" in entityConfig) { + if (entityConfig && "triggerPaths" in entityConfig) { return !(propertyPath in entityConfig.triggerPaths); } return false;