Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Show warning when mail client is not enabled on an instance (#333)

Browse Source 
* Adds the `APPSMITH_MAIL_ENABLED` flag on client
* Shows warning if email service not configured for inviting users in an org
* Shows warning if email service not configured for password reset
This commit is contained in:
Hetu Nandu 2020-08-20 10:43:20 +05:30 committed by GitHub
parent 85974daa9b
commit f70c55c681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 157 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/docker/templates/nginx-linux.conf.template
View File

@ -36,6 +36,7 @@ server {
sub_filter __APPSMITH_VERSION_ID__ '${APPSMITH_VERSION_ID}';
sub_filter __APPSMITH_VERSION_RELEASE_DATE__ '${APPSMITH_VERSION_RELEASE_DATE}';
sub_filter __APPSMITH_INTERCOM_APP_ID__ '${APPSMITH_INTERCOM_APP_ID}';
sub_filter __APPSMITH_MAIL_ENABLED__ '${APPSMITH_MAIL_ENABLED}';
}
location /f {
@ -103,6 +104,7 @@ server {
sub_filter __APPSMITH_VERSION_ID__ '${APPSMITH_VERSION_ID}';
sub_filter __APPSMITH_VERSION_RELEASE_DATE__ '${APPSMITH_VERSION_RELEASE_DATE}';
sub_filter __APPSMITH_INTERCOM_APP_ID__ '${APPSMITH_INTERCOM_APP_ID}';
sub_filter __APPSMITH_MAIL_ENABLED__ '${APPSMITH_MAIL_ENABLED}';
}
location /f {

2
app/client/docker/templates/nginx-mac.conf.template
View File

@ -36,6 +36,7 @@ server {
sub_filter __APPSMITH_VERSION_ID__ '${APPSMITH_VERSION_ID}';
sub_filter __APPSMITH_VERSION_RELEASE_DATE__ '${APPSMITH_VERSION_RELEASE_DATE}';
sub_filter __APPSMITH_INTERCOM_APP_ID__ '${APPSMITH_INTERCOM_APP_ID}';
sub_filter __APPSMITH_MAIL_ENABLED__ '${APPSMITH_MAIL_ENABLED}';
}
location /f {
@ -104,6 +105,7 @@ server {
sub_filter __APPSMITH_VERSION_ID__ '${APPSMITH_VERSION_ID}';
sub_filter __APPSMITH_VERSION_RELEASE_DATE__ '${APPSMITH_VERSION_RELEASE_DATE}';
sub_filter __APPSMITH_INTERCOM_APP_ID__ '${APPSMITH_INTERCOM_APP_ID}';
sub_filter __APPSMITH_MAIL_ENABLED__ '${APPSMITH_MAIL_ENABLED}';
}

5
app/client/public/index.html
View File

@ -97,11 +97,12 @@
id: parseConfig("__APPSMITH_VERSION_ID__"),
releaseDate: parseConfig("__APPSMITH_VERSION_RELEASE_DATE__")
},
intercomAppID: parseConfig("__APPSMITH_INTERCOM_APP_ID__"),
intercomAppID: parseConfig("__APPSMITH_INTERCOM_APP_ID__"),
mailEnabled: parseConfig("__APPSMITH_MAIL_ENABLED__").length > 0,
};
</script>
<script rel="prefetch" type="text/javascript" src="/shims/realms-shim.umd.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/5.4.0/tinymce.min.js" referrerpolicy="origin"></script>
</body>
</html>
</html>

78
app/client/src/assets/images/email-not-configured.svg Normal file
View File

@ -0,0 +1,78 @@
<svg width="169" height="148" viewBox="0 0 169 148" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M80.364 17.1609C101.239 19.4959 110.401 1.39805 131.09 3.76769C149.552 5.88127 162.286 19.0358 157.976 36.7517C154.148 52.4799 135.925 57.4144 129.445 72.1487C122.575 87.7727 117.25 104.608 96.5044 110.046C55.7735 120.722 35.9875 70.6037 33.2142 41.8165C32.1509 30.7668 30.2934 4.34925 44.7196 0.929332C59.2369 -2.51663 67.574 15.7287 80.364 17.1609Z" fill="#2E3D49"/>
<path opacity="0.9" d="M80.364 17.1609C101.239 19.4959 110.401 1.39805 131.09 3.76769C149.552 5.88127 162.286 19.0358 157.976 36.7517C154.148 52.4799 135.925 57.4144 129.445 72.1487C122.575 87.7727 117.25 104.608 96.5044 110.046C55.7735 120.722 35.9875 70.6037 33.2142 41.8165C32.1509 30.7668 30.2934 4.34925 44.7196 0.929332C59.2369 -2.51663 67.574 15.7287 80.364 17.1609Z" fill="white"/>
<path d="M84.4998 147.561C130.974 147.561 168.648 145.362 168.648 142.648C168.648 139.935 130.974 137.735 84.4998 137.735C38.026 137.735 0.351562 139.935 0.351562 142.648C0.351562 145.362 38.026 147.561 84.4998 147.561Z" fill="#F5F5F5"/>
<path d="M21.1878 49.8233L20.7549 49.8545L21.3314 57.8584L21.7643 57.8272L21.1878 49.8233Z" fill="#2E3D49"/>
<path d="M22.0589 61.9591L21.626 61.9902L21.843 65.0031L22.2759 64.9719L22.0589 61.9591Z" fill="#2E3D49"/>
<path d="M122.567 98.7793H29.6211C28.5865 98.7606 27.5954 98.3597 26.8389 97.6537C26.0824 96.9477 25.6141 95.9866 25.5242 94.9557L20.9585 31.5353C20.916 31.0462 20.9765 30.5536 21.136 30.0893C21.2954 29.625 21.5504 29.1992 21.8844 28.8394C22.2185 28.4796 22.6242 28.1938 23.0754 28.0003C23.5266 27.8068 24.0134 27.71 24.5043 27.7161H117.45C118.484 27.7346 119.474 28.1349 120.231 28.8401C120.987 29.5452 121.456 30.5052 121.547 31.5353L126.112 94.9557C126.155 95.445 126.094 95.9378 125.935 96.4023C125.775 96.8669 125.521 97.2929 125.187 97.653C124.853 98.0132 124.447 98.2994 123.996 98.4934C123.545 98.6873 123.058 98.7847 122.567 98.7793Z" fill="#2E3D49"/>
<path d="M122.922 98.7793H29.9766C28.942 98.7607 27.9509 98.3597 27.1944 97.6537C26.4379 96.9477 25.9695 95.9866 25.8796 94.9557L21.314 31.5353C21.2715 31.0462 21.3319 30.5536 21.4914 30.0893C21.6509 29.625 21.9059 29.1992 22.2399 28.8394C22.5739 28.4796 22.9796 28.1938 23.4309 28.0003C23.8821 27.8068 24.3688 27.71 24.8597 27.7161H117.805C118.839 27.7346 119.83 28.1349 120.586 28.8401C121.342 29.5452 121.811 30.5052 121.902 31.5353L126.468 94.9557C126.511 95.4452 126.451 95.9382 126.292 96.4031C126.133 96.8679 125.878 97.2942 125.544 97.6545C125.21 98.0148 124.804 98.301 124.352 98.4948C123.9 98.6885 123.413 98.7854 122.922 98.7793Z" fill="#2E3D49"/>
<path opacity="0.5" d="M122.922 98.7793H29.9766C28.942 98.7607 27.9509 98.3597 27.1944 97.6537C26.4379 96.9477 25.9695 95.9866 25.8796 94.9557L21.314 31.5353C21.2715 31.0462 21.3319 30.5536 21.4914 30.0893C21.6509 29.625 21.9059 29.1992 22.2399 28.8394C22.5739 28.4796 22.9796 28.1938 23.4309 28.0003C23.8821 27.8068 24.3688 27.71 24.8597 27.7161H117.805C118.839 27.7346 119.83 28.1349 120.586 28.8401C121.342 29.5452 121.811 30.5052 121.902 31.5353L126.468 94.9557C126.511 95.4452 126.451 95.9382 126.292 96.4031C126.133 96.8679 125.878 97.2942 125.544 97.6545C125.21 98.0148 124.804 98.301 124.352 98.4948C123.9 98.6885 123.413 98.7854 122.922 98.7793Z" fill="white"/>
<path d="M117.944 29.626H24.9983H24.6859C22.3119 29.8213 22.798 33.4365 25.1936 33.4365H118.295C120.695 33.4365 120.661 29.8213 118.256 29.626H117.944Z" fill="#2E3D49"/>
<path d="M27.421 31.5351C27.4302 31.647 27.4157 31.7595 27.3787 31.8655C27.3416 31.9714 27.2827 32.0684 27.2058 32.1502C27.1289 32.232 27.0357 32.2968 26.9323 32.3403C26.8288 32.3839 26.7174 32.4053 26.6051 32.4031C26.3692 32.3997 26.1429 32.3092 25.9698 32.149C25.7967 31.9887 25.6891 31.77 25.6677 31.5351C25.6586 31.4236 25.6729 31.3114 25.7097 31.2057C25.7466 31.1001 25.805 31.0033 25.8815 30.9215C25.9579 30.8398 26.0505 30.775 26.1535 30.7311C26.2564 30.6873 26.3674 30.6655 26.4793 30.6671C26.7159 30.6693 26.9433 30.7594 27.1173 30.9197C27.2913 31.0801 27.3995 31.2994 27.421 31.5351Z" fill="#FAFAFA"/>
<path d="M30.4025 31.5351C30.4116 31.647 30.3972 31.7595 30.3601 31.8655C30.323 31.9714 30.2642 32.0684 30.1873 32.1502C30.1104 32.232 30.0172 32.2968 29.9137 32.3403C29.8103 32.3839 29.6988 32.4053 29.5866 32.4031C29.3507 32.3997 29.1244 32.3092 28.9513 32.149C28.7782 31.9887 28.6706 31.77 28.6491 31.5351C28.6401 31.4236 28.6544 31.3114 28.6912 31.2057C28.728 31.1001 28.7865 31.0033 28.8629 30.9215C28.9393 30.8398 29.032 30.775 29.1349 30.7311C29.2379 30.6873 29.3488 30.6655 29.4607 30.6671C29.6974 30.6693 29.9247 30.7594 30.0987 30.9197C30.2727 31.0801 30.381 31.2994 30.4025 31.5351Z" fill="#FAFAFA"/>
<path d="M33.38 31.5352C33.3891 31.6467 33.3748 31.7589 33.3379 31.8645C33.3011 31.9702 33.2426 32.067 33.1662 32.1487C33.0898 32.2304 32.9972 32.2953 32.8942 32.3391C32.7913 32.3829 32.6803 32.4047 32.5684 32.4032C32.3322 32.4008 32.1054 32.3106 31.9321 32.1502C31.7588 31.9897 31.6514 31.7704 31.631 31.5352C31.6212 31.4235 31.635 31.311 31.6716 31.2051C31.7082 31.0991 31.7666 31.002 31.8432 30.9202C31.9197 30.8383 32.0127 30.7734 32.1159 30.7299C32.2192 30.6863 32.3305 30.6649 32.4426 30.6672C32.6784 30.6705 32.9047 30.761 33.0778 30.9213C33.2509 31.0815 33.3586 31.3002 33.38 31.5352Z" fill="#FAFAFA"/>
<path d="M120.457 92.4511H31.5525C31.1769 92.4448 30.817 92.2993 30.5428 92.0427C30.2685 91.786 30.0993 91.4366 30.0682 91.0623L26.3141 38.9085C26.2974 38.7296 26.3189 38.5491 26.3773 38.3791C26.4357 38.2091 26.5296 38.0535 26.6527 37.9225C26.7758 37.7916 26.9254 37.6883 27.0915 37.6196C27.2576 37.551 27.4364 37.5184 27.6161 37.5241H116.543C116.918 37.5292 117.278 37.6739 117.552 37.9298C117.826 38.1857 117.996 38.5346 118.027 38.9085L121.785 91.0623C121.802 91.2436 121.779 91.4262 121.719 91.598C121.659 91.7698 121.563 91.9267 121.437 92.0583C121.311 92.1898 121.158 92.2929 120.99 92.3607C120.821 92.4284 120.639 92.4592 120.457 92.4511Z" fill="white"/>
<path d="M82.9943 72.5834L81.5447 52.4805L77.1613 49.8418H65.0918L66.7323 72.5834H82.9943Z" fill="white"/>
<path d="M82.9942 72.7915H66.7322C66.6784 72.7927 66.6262 72.773 66.5865 72.7366C66.5469 72.7002 66.5229 72.6499 66.5195 72.5962L64.8834 49.8546C64.8813 49.826 64.8852 49.7974 64.8949 49.7705C64.9047 49.7435 64.9199 49.719 64.9398 49.6983C64.9589 49.6769 64.9823 49.6597 65.0085 49.6477C65.0346 49.6358 65.0629 49.6294 65.0917 49.6289H77.1612C77.1993 49.6302 77.2365 49.6406 77.2697 49.6593L81.6531 52.298C81.6826 52.3149 81.7075 52.3388 81.7257 52.3675C81.7438 52.3963 81.7547 52.429 81.7573 52.4629L83.1981 72.5658C83.2012 72.5951 83.1977 72.6246 83.1879 72.6524C83.1781 72.6802 83.1624 72.7054 83.1417 72.7264C83.1228 72.7467 83.1 72.7629 83.0746 72.7741C83.0493 72.7853 83.0219 72.7912 82.9942 72.7915ZM66.9362 72.3575H82.7641L81.3406 52.5888L77.1221 50.0499H65.3174L66.9362 72.3575Z" fill="#2E3D49"/>
<path d="M81.5445 52.4805L77.1611 49.8418L78.7713 53.3398L81.5445 52.4805Z" fill="#EBEBEB"/>
<path d="M78.7719 53.5479C78.7319 53.5477 78.6927 53.5362 78.6589 53.5147C78.6251 53.4932 78.5981 53.4626 78.581 53.4264L76.9708 49.9284C76.952 49.8873 76.9465 49.8414 76.9551 49.797C76.9637 49.7527 76.9858 49.7121 77.0186 49.681C77.053 49.6515 77.0958 49.6336 77.1409 49.6297C77.1861 49.6258 77.2313 49.6362 77.2703 49.6593L81.6537 52.298C81.689 52.3192 81.7176 52.3501 81.7361 52.387C81.7545 52.4239 81.7621 52.4653 81.7578 52.5063C81.7522 52.5463 81.7354 52.5838 81.7093 52.6145C81.6831 52.6453 81.6488 52.668 81.6103 52.6799L78.8327 53.5479H78.7719ZM77.6392 50.371L78.8848 53.0835L81.0548 52.4195L77.6392 50.371Z" fill="#2E3D49"/>
<path d="M71.9141 60.0837C71.9205 60.2016 71.9029 60.3197 71.8622 60.4305C71.8215 60.5414 71.7586 60.6428 71.6773 60.7286C71.5961 60.8143 71.4982 60.8825 71.3896 60.9291C71.2811 60.9757 71.1642 60.9996 71.046 60.9994C70.7983 60.995 70.561 60.899 70.3798 60.7299C70.1987 60.5608 70.0866 60.3306 70.0652 60.0837C70.054 59.9645 70.0684 59.8443 70.1073 59.7311C70.1463 59.6179 70.2089 59.5143 70.291 59.4273C70.3732 59.3402 70.473 59.2716 70.5837 59.2262C70.6944 59.1807 70.8136 59.1594 70.9332 59.1636C71.1814 59.1691 71.4187 59.2661 71.5998 59.4359C71.7808 59.6057 71.8927 59.8364 71.9141 60.0837Z" fill="#2E3D49"/>
<path d="M77.8596 60.0841C77.8702 60.203 77.8553 60.3227 77.8161 60.4354C77.7768 60.548 77.7141 60.6511 77.632 60.7377C77.55 60.8242 77.4504 60.8924 77.34 60.9376C77.2296 60.9828 77.1109 61.004 76.9916 60.9999C76.7434 60.9956 76.5055 60.8997 76.3237 60.7307C76.1419 60.5616 76.0289 60.3314 76.0064 60.0841C75.9993 59.9659 76.0165 59.8474 76.057 59.736C76.0974 59.6246 76.1602 59.5226 76.2415 59.4364C76.3228 59.3502 76.4209 59.2816 76.5298 59.2347C76.6386 59.1879 76.7559 59.1639 76.8744 59.1641C77.1236 59.1675 77.3626 59.2637 77.5448 59.4338C77.7269 59.6039 77.8391 59.8358 77.8596 60.0841Z" fill="#2E3D49"/>
<path d="M79.5437 66.0474C79.491 66.0465 79.4404 66.026 79.4019 65.9899C79.3634 65.9538 79.3397 65.9047 79.3354 65.8521C79.2269 64.3722 76.9093 63.17 74.1708 63.17C72.3523 63.17 70.7205 63.7125 69.9133 64.5805C69.7474 64.7404 69.6175 64.9338 69.5322 65.1478C69.4469 65.3619 69.4082 65.5916 69.4185 65.8217C69.4205 65.8502 69.4169 65.8788 69.4078 65.9059C69.3987 65.933 69.3844 65.9581 69.3657 65.9796C69.3278 66.0232 69.2742 66.0499 69.2167 66.0539C69.1591 66.058 69.1023 66.039 69.0588 66.0011C69.0153 65.9633 68.9885 65.9097 68.9845 65.8521C68.9716 65.5644 69.019 65.2772 69.1236 65.0089C69.2282 64.7405 69.3878 64.4971 69.5921 64.2941C70.4601 63.3436 72.2265 62.749 74.1578 62.749C77.1654 62.749 79.6175 64.0988 79.739 65.8217C79.7408 65.8491 79.7371 65.8765 79.7283 65.9025C79.7194 65.9285 79.7055 65.9524 79.6874 65.973C79.6692 65.9935 79.6472 66.0103 79.6225 66.0223C79.5979 66.0344 79.5711 66.0414 79.5437 66.0431V66.0474Z" fill="#2E3D49"/>
<path d="M68.5154 58.2257C68.4625 58.2246 68.4116 58.2046 68.3722 58.1692C68.3327 58.1294 68.3105 58.0756 68.3105 58.0195C68.3105 57.9634 68.3327 57.9096 68.3722 57.8698L69.2966 56.8759C69.3363 56.8377 69.3891 56.8164 69.4442 56.8164C69.4992 56.8164 69.5521 56.8377 69.5917 56.8759C69.6112 56.8953 69.6266 56.9183 69.6371 56.9436C69.6476 56.9689 69.653 56.9961 69.653 57.0235C69.653 57.0509 69.6476 57.0781 69.6371 57.1034C69.6266 57.1287 69.6112 57.1517 69.5917 57.171L68.6673 58.1649C68.6474 58.1848 68.6237 58.2004 68.5976 58.2108C68.5715 58.2213 68.5435 58.2263 68.5154 58.2257Z" fill="#2E3D49"/>
<path d="M79.1098 58.2257C79.0572 58.2232 79.0068 58.2033 78.9666 58.1692L77.9033 57.1754C77.8832 57.156 77.8673 57.1327 77.8564 57.107C77.8455 57.0813 77.8398 57.0536 77.8398 57.0257C77.8398 56.9977 77.8455 56.9701 77.8564 56.9443C77.8673 56.9186 77.8832 56.8954 77.9033 56.8759C77.943 56.8377 77.9958 56.8164 78.0509 56.8164C78.1059 56.8164 78.1588 56.8377 78.1984 56.8759L79.2617 57.8698C79.2812 57.8891 79.2966 57.9121 79.3071 57.9375C79.3176 57.9628 79.323 57.9899 79.323 58.0173C79.323 58.0448 79.3176 58.0719 79.3071 58.0972C79.2966 58.1226 79.2812 58.1455 79.2617 58.1649C79.2205 58.2034 79.1663 58.2251 79.1098 58.2257Z" fill="#2E3D49"/>
<path d="M63.7812 77.0752H64.7621L66.1769 78.9588L66.0424 77.0752H67.0319L67.2749 80.4778H66.2724L64.8662 78.6072L65.0008 80.4778H64.0113L63.7812 77.0752Z" fill="#2E3D49"/>
<path d="M67.7173 78.7763C67.6838 78.5452 67.6997 78.3096 67.7641 78.0852C67.8284 77.8607 67.9397 77.6525 68.0905 77.4743C68.2554 77.3121 68.4529 77.1868 68.6699 77.1067C68.8869 77.0267 69.1184 76.9937 69.3491 77.0099C69.8381 76.9833 70.3185 77.1466 70.6902 77.4656C71.0306 77.8046 71.2279 78.2613 71.2413 78.7415C71.2772 79.0728 71.2325 79.4078 71.1111 79.718C70.9988 79.9679 70.8105 80.176 70.573 80.3126C70.288 80.4654 69.9673 80.5388 69.6442 80.5253C69.3122 80.5358 68.9819 80.4736 68.6764 80.343C68.4088 80.2145 68.1831 80.0129 68.0254 79.7614C67.8392 79.4652 67.733 79.1258 67.7173 78.7763ZM68.7719 78.7763C68.7677 79.0425 68.8533 79.3024 69.0149 79.5141C69.0827 79.5887 69.166 79.6476 69.259 79.6866C69.3519 79.7256 69.4523 79.7437 69.5531 79.7397C69.6493 79.7465 69.7457 79.7298 69.8341 79.6913C69.9225 79.6528 70.0003 79.5935 70.0609 79.5184C70.1855 79.2813 70.2268 79.0092 70.178 78.7459C70.1799 78.4906 70.0941 78.2424 69.935 78.0428C69.8655 77.9695 69.7811 77.9119 69.6876 77.8737C69.594 77.8356 69.4935 77.8177 69.3925 77.8215C69.2981 77.8174 69.204 77.8357 69.118 77.8749C69.032 77.9141 68.9566 77.9732 68.8977 78.0471C68.7707 78.2707 68.7261 78.5319 68.7719 78.7849V78.7763Z" fill="#2E3D49"/>
<path d="M73.2812 77.0752H74.8437C75.1012 77.067 75.3578 77.1098 75.5988 77.2011C75.7895 77.281 75.9589 77.4043 76.0936 77.5613C76.2302 77.7206 76.3348 77.9048 76.4017 78.1038C76.4721 78.3175 76.5158 78.5391 76.5319 78.7635C76.5652 79.0471 76.5431 79.3345 76.4668 79.6098C76.407 79.8004 76.3012 79.9733 76.1587 80.1132C76.0398 80.239 75.8902 80.3317 75.7247 80.3823C75.5228 80.4408 75.3142 80.4729 75.1041 80.4778H73.546L73.2812 77.0752ZM74.388 77.8477L74.5225 79.7052H74.7786C74.9369 79.7156 75.0956 79.6904 75.2429 79.6315C75.3401 79.5752 75.4117 79.4834 75.4426 79.3754C75.4923 79.1828 75.504 78.9823 75.4773 78.7852C75.4856 78.5204 75.4046 78.2605 75.2473 78.0474C75.1667 77.9745 75.0718 77.9191 74.9687 77.8847C74.8657 77.8504 74.7566 77.8378 74.6484 77.8477H74.388Z" fill="#2E3D49"/>
<path d="M79.0534 79.9136H77.8599L77.7341 80.4778H76.6621L77.695 77.0752H78.8581L80.3815 80.4778H79.2791L79.0534 79.9136ZM78.78 79.1801L78.32 77.9562L78.0335 79.1801H78.78Z" fill="#2E3D49"/>
<path d="M79.8867 77.0752H83.081L83.1417 77.9172H82.0697L82.252 80.4778H81.2017L81.0195 77.9172H79.9475L79.8867 77.0752Z" fill="#2E3D49"/>
<path d="M85.529 79.9136H84.3355L84.2097 80.4778H83.1377L84.1706 77.0752H85.3164L86.8354 80.4778H85.7373L85.529 79.9136ZM85.2556 79.1801L84.7912 77.9562L84.5005 79.1801H85.2556Z" fill="#2E3D49"/>
<path d="M129.502 37.1162C129.888 36.9209 130.37 36.6822 130.778 36.4348C131.186 36.1874 131.646 35.9487 132.08 35.6883C132.926 35.1632 133.786 34.6467 134.597 34.0738C136.227 32.9585 137.755 31.7008 139.163 30.3154C139.341 30.1505 139.497 29.9682 139.666 29.7902L139.914 29.5255L140.035 29.3953L140.096 29.3259C140.035 29.443 140.096 29.4083 140.096 29.2955C140.134 29.1405 140.156 28.9819 140.161 28.8224C140.151 27.8996 140.045 26.9803 139.844 26.0795C139.458 24.1352 138.872 22.1301 138.295 20.1685L139.979 19.4307C141.042 21.3128 141.929 23.2885 142.63 25.3331C143.024 26.438 143.275 27.5887 143.377 28.7573C143.403 29.1207 143.392 29.4858 143.342 29.8467C143.278 30.357 143.097 30.8456 142.813 31.2745L142.739 31.3743L142.683 31.4438L142.617 31.5262L142.483 31.6912L142.214 32.0167C142.036 32.2293 141.862 32.4507 141.671 32.6546C140.187 34.3016 138.531 35.7856 136.732 37.0814C135.864 37.7238 134.944 38.34 134.003 38.8999C133.538 39.182 133.065 39.4511 132.583 39.7158C132.102 39.9806 131.633 40.2236 131.077 40.484L129.502 37.1162Z" fill="#FFB573"/>
<path d="M125.639 139.15C125.964 139.141 126.287 139.098 126.603 139.019C126.619 139.015 126.633 139.006 126.645 138.993C126.656 138.981 126.664 138.966 126.668 138.95C126.67 138.933 126.668 138.916 126.661 138.901C126.654 138.886 126.643 138.873 126.629 138.863C126.503 138.781 125.401 138.069 124.975 138.26C124.928 138.282 124.888 138.316 124.858 138.359C124.828 138.401 124.81 138.451 124.806 138.503C124.789 138.585 124.793 138.67 124.818 138.749C124.844 138.829 124.889 138.901 124.949 138.959C125.149 139.104 125.394 139.171 125.639 139.15ZM126.355 138.898C125.726 139.024 125.249 139.002 125.053 138.833C125.014 138.793 124.986 138.744 124.971 138.69C124.956 138.636 124.954 138.579 124.967 138.525C124.968 138.502 124.976 138.48 124.989 138.46C125.002 138.441 125.02 138.426 125.04 138.416C125.27 138.316 125.908 138.638 126.355 138.898Z" fill="#2E3D49"/>
<path d="M126.598 139.019H126.641C126.654 139.011 126.665 139.001 126.672 138.988C126.68 138.975 126.684 138.96 126.685 138.945C126.685 138.898 126.685 137.852 126.285 137.505C126.238 137.458 126.18 137.424 126.117 137.404C126.054 137.383 125.987 137.378 125.921 137.387C125.852 137.388 125.786 137.412 125.733 137.455C125.68 137.499 125.644 137.559 125.63 137.626C125.548 138.06 126.207 138.82 126.555 139.019C126.569 139.023 126.584 139.023 126.598 139.019ZM125.977 137.548C126.048 137.548 126.116 137.575 126.168 137.622C126.397 137.959 126.516 138.36 126.507 138.768C126.16 138.49 125.747 137.9 125.799 137.652C125.799 137.613 125.83 137.561 125.938 137.548H125.977Z" fill="#2E3D49"/>
<path d="M126.26 26.2617C125.826 28.4317 124.958 32.7717 126.455 34.2256C126.455 34.2256 125.865 36.3956 121.859 36.3956C117.45 36.3956 119.754 34.2256 119.754 34.2256C122.159 33.6527 122.094 31.869 121.677 30.1894L126.26 26.2617Z" fill="#FFB573"/>
<path d="M118.907 35.0935C118.217 35.189 118.808 33.3966 119.085 33.21C119.736 32.776 128.139 32.1727 128.082 33.21C128.047 33.644 127.839 34.512 127.475 34.7984C127.11 35.0849 124.949 34.1908 118.907 35.0935Z" fill="#263238"/>
<path d="M120.279 34.4771C119.728 34.6638 119.78 32.8583 119.966 32.6413C120.4 32.1379 127.201 30.3932 127.401 31.3784C127.479 31.8124 127.518 32.6804 127.284 32.9885C127.049 33.2967 125.053 32.7889 120.279 34.4771Z" fill="#263238"/>
<path d="M117.749 22.3732C117.722 22.3744 117.694 22.3692 117.669 22.3578C117.645 22.3465 117.623 22.3295 117.606 22.3081C117.473 22.1374 117.302 22.0001 117.107 21.9074C116.912 21.8146 116.698 21.7691 116.482 21.7743C116.459 21.7773 116.436 21.7758 116.414 21.7697C116.392 21.7636 116.372 21.7532 116.354 21.739C116.336 21.7248 116.321 21.7072 116.31 21.6872C116.299 21.6671 116.293 21.6451 116.291 21.6224C116.287 21.5777 116.301 21.5333 116.329 21.4985C116.357 21.4637 116.398 21.4413 116.443 21.4358C116.716 21.4219 116.988 21.4742 117.237 21.5883C117.485 21.7024 117.703 21.8749 117.87 22.0911C117.899 22.1264 117.913 22.1716 117.909 22.2171C117.905 22.2626 117.884 22.3047 117.849 22.3342C117.819 22.3553 117.785 22.3688 117.749 22.3732Z" fill="#263238"/>
<path d="M116.907 24.4951C116.71 25.1875 116.418 25.8491 116.039 26.4611C116.198 26.5526 116.376 26.6082 116.558 26.624C116.741 26.6397 116.926 26.6152 117.098 26.5523L116.907 24.4951Z" fill="#FF5652"/>
<path d="M117.119 23.9703C117.15 24.2611 117.015 24.5128 116.824 24.5302C116.633 24.5476 116.455 24.3306 116.429 24.0354C116.403 23.7403 116.533 23.4929 116.72 23.4756C116.906 23.4582 117.089 23.6752 117.119 23.9703Z" fill="#263238"/>
<path d="M116.807 23.4841L116.087 23.3496C116.087 23.3496 116.499 23.8617 116.807 23.4841Z" fill="#263238"/>
<path d="M130.808 138.937H127.171L127.457 130.518H131.094L130.808 138.937Z" fill="#FFB573"/>
<path d="M126.885 138.516H130.969C131.039 138.514 131.108 138.538 131.162 138.584C131.215 138.63 131.25 138.693 131.26 138.763L131.724 141.992C131.733 142.074 131.725 142.156 131.7 142.235C131.675 142.313 131.634 142.385 131.579 142.446C131.524 142.507 131.456 142.556 131.381 142.589C131.306 142.622 131.225 142.639 131.143 142.639C129.719 142.617 129.033 142.53 127.237 142.53C126.13 142.53 124.515 142.647 122.992 142.647C121.469 142.647 121.382 141.137 122.02 141.003C124.867 140.386 125.318 139.544 126.277 138.737C126.448 138.595 126.663 138.517 126.885 138.516Z" fill="#263238"/>
<g opacity="0.2">
<path opacity="0.2" d="M131.095 130.518H127.458L127.311 134.858H130.947L131.095 130.518Z" fill="black"/>
</g>
<path d="M116.343 39.2509C114.117 38.3856 111.937 37.4079 109.811 36.3214C107.615 35.2483 105.523 33.9741 103.562 32.5152C103.038 32.1048 102.542 31.6596 102.077 31.1828C101.956 31.0526 101.834 30.9311 101.717 30.7792C101.579 30.624 101.452 30.4602 101.335 30.2888C101.015 29.8225 100.815 29.2843 100.754 28.7221C100.706 28.189 100.778 27.6521 100.966 27.151C101.117 26.7482 101.323 26.3684 101.578 26.0226C101.997 25.4493 102.492 24.9354 103.049 24.4949C104.033 23.7119 105.094 23.0327 106.218 22.4681C106.756 22.1817 107.303 21.9256 107.858 21.6869C108.414 21.4482 108.96 21.2225 109.555 21.0186L110.323 22.6895C108.431 23.883 106.469 25.198 105.028 26.6649C104.706 26.9916 104.422 27.3542 104.182 27.7456C103.974 28.0884 103.978 28.3445 104.013 28.3228C104.048 28.3011 104.013 28.3228 104.074 28.3662L104.247 28.5528C104.312 28.6309 104.403 28.709 104.486 28.7915C104.854 29.1298 105.244 29.443 105.653 29.7289C106.549 30.3633 107.483 30.943 108.448 31.4649C109.425 32.0118 110.432 32.5282 111.456 33.023C113.504 34.0038 115.622 34.9456 117.701 35.8049L116.343 39.2509Z" fill="#FFB573"/>
<path d="M111.408 21.5222L112.007 20.2202L109.264 19.2871C109.264 19.2871 108.396 21.8521 109.425 23.0325C109.855 22.9649 110.261 22.7914 110.607 22.5278C110.953 22.2641 111.229 21.9186 111.408 21.5222Z" fill="#FFB573"/>
<path d="M111.995 17.4042L109.811 16.7705L109.265 19.2704L111.995 20.2208V17.4042Z" fill="#FFB573"/>
<path d="M140.205 20.3466L140.521 17.3086L137.709 17.9856C137.709 17.9856 137.666 20.8413 139.154 21.2927L140.205 20.3466Z" fill="#FFB573"/>
<path d="M139.167 15.1689L137.331 16.0239L137.709 17.9639L140.521 17.2999L139.167 15.1689Z" fill="#FFB573"/>
<path d="M126.833 21.9996C126.967 25.6062 127.097 27.1295 125.47 29.1476C123.018 32.1856 118.561 31.5563 117.354 28.0626C116.269 24.9204 116.234 19.5519 119.602 17.7812C120.343 17.3875 121.171 17.1895 122.01 17.206C122.848 17.2226 123.669 17.4531 124.393 17.8757C125.117 18.2983 125.722 18.8989 126.149 19.6207C126.576 20.3424 126.811 21.1613 126.833 21.9996Z" fill="#FFB573"/>
<path d="M125.262 29.1433C128.803 27.6113 131.129 24.3693 130.149 19.3436C129.207 14.5219 125.952 14.0445 124.606 15.0427C123.261 16.0409 119.906 14.5522 117.892 16.2448C114.42 19.183 117.701 22.3208 119.42 24.2174C120.444 26.3267 121.79 30.6406 125.262 29.1433Z" fill="#263238"/>
<path d="M123.79 18.4798C124.222 19.034 124.807 19.4495 125.472 19.6751C126.138 19.9008 126.855 19.9266 127.535 19.7494C128.215 19.5722 128.828 19.1998 129.299 18.6781C129.769 18.1564 130.077 17.5083 130.184 16.8137C130.29 16.1192 130.191 15.4086 129.899 14.7698C129.606 14.1309 129.133 13.5917 128.537 13.2187C127.942 12.8457 127.25 12.6552 126.548 12.6708C125.845 12.6864 125.163 12.9074 124.584 13.3065C123.793 13.8874 123.265 14.7586 123.116 15.7287C122.967 16.6988 123.21 17.6883 123.79 18.4798Z" fill="#2E3D49"/>
<path d="M124.71 15.3812C124.202 12.4734 126.949 10.2339 130.63 11.3146C134.31 12.3953 132.366 15.6546 131.606 18.2586C130.847 20.8626 132.834 23.3451 133.659 21.3617C134.484 19.3783 133.095 18.7577 133.095 18.7577C133.095 18.7577 137.001 19.7689 133.373 24.174C129.744 28.5791 126.459 23.714 127.349 20.8453C128.069 18.5407 125.192 18.1284 124.71 15.3812Z" fill="#263238"/>
<path d="M121.034 16.4789C119.354 15.6109 116.512 14.8948 114.893 17.6204C114.129 18.9224 114.424 20.6584 114.424 20.6584L119.367 20.9839L121.034 16.4789Z" fill="#263238"/>
<path d="M113.843 19.7994C113.813 19.7972 113.786 19.7837 113.767 19.7619C113.747 19.74 113.737 19.7115 113.738 19.6822C113.738 19.6084 113.864 17.8638 114.919 16.7701C117.466 14.1227 120.452 16.3361 121.303 17.0522C121.321 17.0716 121.332 17.097 121.333 17.1236C121.333 17.1503 121.324 17.1762 121.307 17.1966C121.29 17.217 121.266 17.2304 121.24 17.2342C121.213 17.2379 121.186 17.2319 121.164 17.2171C120.344 16.514 117.488 14.4091 115.088 16.9177C114.09 17.9549 113.968 19.6779 113.968 19.6952C113.968 19.7107 113.964 19.7259 113.957 19.7398C113.951 19.7537 113.941 19.766 113.929 19.7759C113.917 19.7858 113.903 19.793 113.888 19.797C113.873 19.8011 113.858 19.8019 113.843 19.7994Z" fill="#263238"/>
<path d="M120.023 24.061C120.004 24.7438 119.751 25.3994 119.307 25.9186C118.708 26.6216 118.005 26.2744 117.862 25.4846C117.719 24.7858 117.862 23.575 118.617 23.154C119.372 22.733 120.032 23.2712 120.023 24.061Z" fill="#FFB573"/>
<path d="M119.242 57.0977C119.242 57.0977 119.477 82.3348 121.664 96.3964C123.435 107.754 126.703 134.02 126.703 134.02H131.663C131.663 134.02 132.145 108.661 131.229 97.4293C128.959 69.0023 134.823 63.6858 130.092 57.0977H119.242Z" fill="#263238"/>
<path opacity="0.1" d="M119.242 57.0977C119.242 57.0977 119.477 82.3348 121.664 96.3964C123.435 107.754 126.703 134.02 126.703 134.02H131.663C131.663 134.02 132.145 108.661 131.229 97.4293C128.959 69.0023 134.823 63.6858 130.092 57.0977H119.242Z" fill="white"/>
<path opacity="0.3" d="M121.851 68.5464C123.587 76.1631 122.202 88.1588 121.252 93.4406C120.245 85.4203 119.737 75.026 119.485 67.4006C120.384 65.9511 121.234 65.8556 121.851 68.5464Z" fill="black"/>
<path d="M126.026 134.115H132.341L132.67 131.901L125.991 131.676L126.026 134.115Z" fill="#2E3D49"/>
<path d="M127.827 35.7796C128.422 34.5991 131.616 33.857 133.36 33.8613L134.662 39.6596C134.662 39.6596 131.19 44.8199 129.741 44.273C128.035 43.6437 126.555 38.3272 127.827 35.7796Z" fill="#2E3D49"/>
<path opacity="0.4" d="M127.827 35.7796C128.422 34.5991 131.616 33.857 133.36 33.8613L134.662 39.6596C134.662 39.6596 131.19 44.8199 129.741 44.273C128.035 43.6437 126.555 38.3272 127.827 35.7796Z" fill="black"/>
<path d="M124.146 132.696C124.153 132.683 124.157 132.669 124.157 132.654C124.157 132.64 124.153 132.626 124.146 132.613C124.138 132.597 124.125 132.583 124.108 132.574C124.092 132.566 124.073 132.563 124.055 132.565C123.873 132.596 122.267 132.848 122.05 133.308C122.027 133.349 122.015 133.396 122.015 133.444C122.015 133.492 122.027 133.539 122.05 133.581C122.087 133.65 122.141 133.708 122.206 133.751C122.271 133.794 122.346 133.821 122.423 133.828C122.948 133.88 123.725 133.151 124.116 132.709L124.146 132.696ZM122.219 133.364C122.367 133.121 123.2 132.895 123.834 132.778C123.261 133.36 122.757 133.685 122.462 133.646C122.411 133.641 122.362 133.623 122.32 133.594C122.277 133.566 122.243 133.527 122.219 133.481C122.21 133.465 122.205 133.446 122.205 133.427C122.205 133.408 122.21 133.389 122.219 133.373C122.219 133.373 122.215 133.368 122.219 133.364Z" fill="#2E3D49"/>
<path d="M127.935 131.155L124.61 132.635L123.131 129.549L121.195 125.513L120.965 125.044L124.289 123.564L124.545 124.094L126.42 128.004L127.935 131.155Z" fill="#FFB573"/>
<path opacity="0.2" d="M126.421 128.004L123.131 129.549L121.195 125.513L124.546 124.094L126.421 128.004Z" fill="black"/>
<path d="M115.344 57.0977C115.344 57.0977 104.724 83.5196 107.602 95.932C110.206 107.168 121.707 128.447 121.707 128.447L126.164 126.216C126.164 126.216 119.051 100.528 118.283 94.9468C116.781 84.0968 126.429 68.7636 126.429 57.0977H115.344Z" fill="#263238"/>
<path opacity="0.1" d="M115.344 57.0977C115.344 57.0977 104.724 83.5196 107.602 95.932C110.206 107.168 121.707 128.447 121.707 128.447L126.164 126.216C126.164 126.216 119.051 100.528 118.283 94.9468C116.781 84.0968 126.429 68.7636 126.429 57.0977H115.344Z" fill="white"/>
<path d="M124.02 132.171L127.319 129.771C127.374 129.727 127.444 129.706 127.515 129.711C127.585 129.715 127.651 129.746 127.701 129.797L129.979 132.136C130.034 132.197 130.076 132.269 130.102 132.347C130.127 132.426 130.136 132.509 130.127 132.59C130.119 132.672 130.093 132.752 130.052 132.823C130.011 132.894 129.955 132.956 129.888 133.004C128.721 133.82 128.117 134.159 126.668 135.213C125.774 135.864 123.994 137.301 122.762 138.199C121.529 139.097 120.592 137.926 121.026 137.444C122.97 135.274 123.378 133.928 123.682 132.709C123.729 132.496 123.848 132.306 124.02 132.171Z" fill="#263238"/>
<path d="M121.421 129.389L127.163 126.763L126.429 124.424L120.279 127.227L121.421 129.389Z" fill="#2E3D49"/>
<path d="M118.161 35.5009C117.688 34.2683 113.539 32.8969 111.456 32.4629L110.54 39.2854C110.54 39.2854 113.943 44.1722 115.431 43.7686C117.193 43.2912 119.185 38.1439 118.161 35.5009Z" fill="#2E3D49"/>
<path opacity="0.4" d="M118.161 35.5009C117.688 34.2683 113.539 32.8969 111.456 32.4629L110.54 39.2854C110.54 39.2854 113.943 44.1722 115.431 43.7686C117.193 43.2912 119.185 38.1439 118.161 35.5009Z" fill="black"/>
<path d="M113.609 35.1582C113.609 35.1582 111.873 35.7658 115.345 57.0969H130.101C129.853 51.0903 129.845 47.384 132.705 35.0497C130.637 34.6231 128.541 34.3475 126.433 34.2251C124.203 34.0643 121.963 34.0643 119.733 34.2251C116.872 34.4768 113.609 35.1582 113.609 35.1582Z" fill="#2E3D49"/>
<path opacity="0.4" d="M113.609 35.1582C113.609 35.1582 111.873 35.7658 115.345 57.0969H130.101C129.853 51.0903 129.845 47.384 132.705 35.0497C130.637 34.6231 128.541 34.3475 126.433 34.2251C124.203 34.0643 121.963 34.0643 119.733 34.2251C116.872 34.4768 113.609 35.1582 113.609 35.1582Z" fill="black"/>
<path d="M130.331 56.2333L130.995 57.5353C131.047 57.6394 130.925 57.7436 130.756 57.7436H115.271C115.136 57.7436 115.028 57.6785 115.019 57.5917L114.885 56.2897C114.885 56.1986 114.993 56.1204 115.136 56.1204H130.07C130.12 56.1126 130.171 56.119 130.217 56.139C130.263 56.159 130.303 56.1917 130.331 56.2333Z" fill="#2E3D49"/>
<path opacity="0.3" d="M130.331 56.2333L130.995 57.5353C131.047 57.6394 130.925 57.7436 130.756 57.7436H115.271C115.136 57.7436 115.028 57.6785 115.019 57.5917L114.885 56.2897C114.885 56.1986 114.993 56.1204 115.136 56.1204H130.07C130.12 56.1126 130.171 56.119 130.217 56.139C130.263 56.159 130.303 56.1917 130.331 56.2333Z" fill="white"/>
<path d="M128.334 57.9134H128.734C128.816 57.9134 128.877 57.87 128.868 57.8222L128.681 56.0863C128.681 56.0342 128.608 55.9951 128.53 55.9951H128.126C128.048 55.9951 127.987 56.0342 127.991 56.0863L128.178 57.8222C128.174 57.8613 128.243 57.9134 128.334 57.9134Z" fill="#263238"/>
<path d="M118.617 57.9134H119.017C119.095 57.9134 119.156 57.87 119.151 57.8222L118.965 56.0863C118.965 56.0342 118.891 55.9951 118.808 55.9951H118.409C118.327 55.9951 118.27 56.0342 118.275 56.0863L118.461 57.8222C118.466 57.8613 118.535 57.9134 118.617 57.9134Z" fill="#263238"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

5
app/client/src/configs/index.ts
View File

@ -29,6 +29,7 @@ type INJECTED_CONFIGS = {
releaseDate: string;
};
intercomAppID: string;
mailEnabled: boolean;
};
declare global {
interface Window {
@ -90,6 +91,9 @@ const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
releaseDate: process.env.REACT_APP_VERSION_RELEASE_DATE || "",
},
intercomAppID: process.env.REACT_APP_INTERCOM_APP_ID || "",
mailEnabled: process.env.REACT_APP_MAIL_ENABLED
? process.env.REACT_APP_MAIL_ENABLED.length > 0
: false,
};
};
@ -206,5 +210,6 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
appVersion: ENV_CONFIG.appVersion || APPSMITH_FEATURE_CONFIGS.appVersion,
intercomAppID:
ENV_CONFIG.intercomAppID || APPSMITH_FEATURE_CONFIGS.intercomAppID,
mailEnabled: ENV_CONFIG.mailEnabled || APPSMITH_FEATURE_CONFIGS.mailEnabled,
};
};

1
app/client/src/configs/types.ts
View File

@ -66,4 +66,5 @@ export type AppsmithUIConfigs = {
releaseDate: string;
};
intercomAppID: string;
mailEnabled: boolean;
};

19
app/client/src/pages/UserAuth/ForgotPassword.tsx
View File

@ -23,7 +23,6 @@ import {
} from "constants/messages";
import { AUTH_LOGIN_URL } from "constants/routes";
import FormMessage from "components/editorComponents/form/FormMessage";
import { FORGOT_PASSWORD_FORM_NAME } from "constants/forms";
import FormGroup from "components/editorComponents/form/FormGroup";
import Button from "components/editorComponents/Button";
@ -33,6 +32,9 @@ import {
ForgotPasswordFormValues,
forgotPasswordSubmitHandler,
} from "./helpers";
import { getAppsmithConfigs } from "configs";
const { mailEnabled } = getAppsmithConfigs();
const validate = (values: ForgotPasswordFormValues) => {
const errors: ForgotPasswordFormValues = {};
@ -69,6 +71,21 @@ export const ForgotPassword = (props: ForgotPasswordProps) => {
message={`${FORGOT_PASSWORD_SUCCESS_TEXT} ${props.emailValue}`}
/>
)}
{!mailEnabled && (
<FormMessage
intent="warning"
message={
"You haven’t setup any email service yet. Please configure your email service to receive a reset link"
}
actions={[
{
url: "https://docs.appsmith.com/third-party-services/email",
text: "Configure Email service",
intent: "primary",
},
]}
/>
)}
{submitFailed && error && <FormMessage intent="danger" message={error} />}
<AuthCardHeader>
<h1>{FORGOT_PASSWORD_PAGE_TITLE}</h1>

56
app/client/src/pages/organization/OrgInviteUsersForm.tsx
View File

@ -32,6 +32,8 @@ import {
isPermitted,
PERMISSION_TYPE,
} from "../Applications/permissionHelpers";
import { getAppsmithConfigs } from "configs";
import { ReactComponent as NoEmailConfigImage } from "assets/images/email-not-configured.svg";
const OrgInviteTitle = styled.div`
font-weight: bold;
@ -117,6 +119,23 @@ const Loading = styled(Spinner)`
width: 100%;
`;
const MailConfigContainer = styled.div`
display: flex;
flex-direction: column;
padding: 5px;
align-items: center;
&& > span {
color: #2e3d49;
font-weight: 500;
font-size: 14px;
}
&& > a {
color: rgba(46, 61, 73, 0.5);
font-size: 12px;
text-decoration: underline;
}
`;
const validateFormValues = (values: { users: string; role: string }) => {
if (values.users && values.users.length > 0) {
const _users = values.users.split(",").filter(Boolean);
@ -150,6 +169,8 @@ const validate = (values: any) => {
return errors;
};
const { mailEnabled } = getAppsmithConfigs();
const OrgInviteUsersForm = (props: any) => {
const {
handleSubmit,
@ -248,16 +269,31 @@ const OrgInviteUsersForm = (props: any) => {
{isLoading ? (
<Loading size={30} />
) : (
<UserList style={{ justifyContent: "space-between" }}>
{allUsers.map((user: { username: string; roleName: string }) => {
return (
<div className="user" key={user.username}>
<div>{user.username}</div>
<div>{user.roleName}</div>
</div>
);
})}
</UserList>
<React.Fragment>
{!mailEnabled && (
<MailConfigContainer>
{allUsers.length === 0 && <NoEmailConfigImage />}
<span>You haven’t setup any email service yet</span>
<a
href="https://docs.appsmith.com/third-party-services/email"
target="_blank"
rel="noopener noreferrer"
>
Please configure your email service to invite people
</a>
</MailConfigContainer>
)}
<UserList style={{ justifyContent: "space-between" }}>
{allUsers.map((user: { username: string; roleName: string }) => {
return (
<div className="user" key={user.username}>
<div>{user.username}</div>
<div>{user.roleName}</div>
</div>
);
})}
</UserList>
</React.Fragment>
)}
{!pathRegex.test(currentPath) && canManage && (
<Button

2
deploy/template/nginx_app.conf.sh
View File

@ -47,6 +47,7 @@ $NGINX_SSL_CMNT server_name $custom_domain ;
sub_filter __APPSMITH_VERSION_ID__ '\''${APPSMITH_VERSION_ID}'\'';
sub_filter __APPSMITH_VERSION_RELEASE_DATE__ '\''${APPSMITH_VERSION_RELEASE_DATE}'\'';
sub_filter __APPSMITH_INTERCOM_APP_ID__ '\''${APPSMITH_INTERCOM_APP_ID}'\'';
sub_filter __APPSMITH_MAIL_ENABLED__ '\''${APPSMITH_MAIL_ENABLED}'\'';
}
location /f {
@ -102,6 +103,7 @@ $NGINX_SSL_CMNT sub_filter __APPSMITH_TNC_PP__ '\''${APPSMITH_TNC_PP}'\''
$NGINX_SSL_CMNT sub_filter __APPSMITH_VERSION_ID__ '\''${APPSMITH_VERSION_ID}'\'';
$NGINX_SSL_CMNT sub_filter __APPSMITH_VERSION_RELEASE_DATE__ '\''${APPSMITH_VERSION_RELEASE_DATE}'\'';
$NGINX_SSL_CMNT sub_filter __APPSMITH_INTERCOM_APP_ID__ '\''${APPSMITH_INTERCOM_APP_ID}'\'';
$NGINX_SSL_CMNT sub_filter __APPSMITH_MAIL_ENABLED__ '\''${APPSMITH_MAIL_ENABLED}'\'';
$NGINX_SSL_CMNT }
$NGINX_SSL_CMNT
$NGINX_SSL_CMNT location /f {