Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NEW] Warning Popup reinforcing Zapier deprecation on Integrations Admin settings #27744

Merged
merged 24 commits into from
Feb 3, 2023
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
99c211f
New Popup prototype
Educg550 Jan 11, 2023
7b82cf7
Zapier deprecation popup prototype
Educg550 Jan 11, 2023
2a17353
Zapier warning deprecation popup prototype
Educg550 Jan 11, 2023
59d782b
Zapier warning deprecation popup prototype
Educg550 Jan 11, 2023
eaeb46d
Fix on merge issue
Educg550 Jan 12, 2023
c4f3c6d
Added Zapier message to translation JSON
Educg550 Jan 12, 2023
ac2dc52
Fixed translation
Educg550 Jan 12, 2023
6f3b395
New Popup prototype
Educg550 Jan 11, 2023
c41cf6a
Rebased Zapier branch
Educg550 Jan 11, 2023
d308a29
Zapier warning deprecation popup prototype
Educg550 Jan 11, 2023
cd3ef50
Zapier warning deprecation popup prototype
Educg550 Jan 11, 2023
79ecdca
Added Zapier message to translation JSON
Educg550 Jan 12, 2023
c4377a8
Merge remote-tracking branch 'origin/tc-363' into tc-363
Educg550 Jan 12, 2023
5e030fc
Fix on JSON unintended lint
Educg550 Jan 12, 2023
1100069
Fix on JSON indentation
Educg550 Jan 13, 2023
42b7727
Standalone component deleted
Educg550 Jan 13, 2023
009d3c8
fix review: weird looking margins
yash-rajpal Jan 13, 2023
33436a7
Updated warning popup base component
Educg550 Jan 17, 2023
bacdc3f
use margin prop inplace of styles
yash-rajpal Jan 18, 2023
e02aea2
remove unused translation
yash-rajpal Jan 18, 2023
d381b76
fix lint
yash-rajpal Jan 18, 2023
c10e395
Vertical margin applied to warning callout
Educg550 Jan 20, 2023
56c1990
Merge branch 'develop' into tc-363
kodiakhq[bot] Jan 23, 2023
dfdc190
Merge branch 'develop' into tc-363
Educg550 Feb 3, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions apps/meteor/client/views/admin/integrations/new/NewZapier.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Box, Skeleton, Margins } from '@rocket.chat/fuselage';
import { Box, Skeleton, Margins, Banner, Icon } from '@rocket.chat/fuselage';
import { useTranslation } from '@rocket.chat/ui-contexts';
import React, { useEffect, useState } from 'react';

Expand All @@ -16,8 +16,8 @@ const blogSpotStyleScriptImport = (src) =>
});

export default function NewZapier({ ...props }) {
const t = useTranslation();
const [script, setScript] = useState();
const t = useTranslation();
useEffect(() => {
const importZapier = async () => {
const scriptEl = await blogSpotStyleScriptImport(
Expand All @@ -33,7 +33,14 @@ export default function NewZapier({ ...props }) {

return (
<>
<Box pb='x20' fontScale='h4' dangerouslySetInnerHTML={{ __html: t('additional_integrations_Zapier') }} />
<Banner
icon={<Icon name='warning' />}
title={t('This_is_a_deprecated_feature_alert')}
variant='warning'
style={{ marginInline: '-1.5rem' }}
>
{t('Install_Zapier_from_marketplace')}
</Banner>
{!script && (
<Box display='flex' flexDirection='column' alignItems='stretch' mbs={10}>
<Margins blockEnd={14}>
Expand Down
1 change: 1 addition & 0 deletions apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -4763,6 +4763,7 @@
"This_feature_is_currently_in_alpha": "This feature is currently in alpha!",
"This_is_a_desktop_notification": "This is a desktop notification",
"This_is_a_deprecated_feature_alert": "This is a deprecated feature. It may not work as expected and will not get new updates.",
"Install_Zapier_from_marketplace": "Install the Zapier app from Marketplace to avoid disruptions.",
"This_is_a_push_test_messsage": "This is a push test message",
"This_message_was_rejected_by__peer__peer": "This message was rejected by <em>__peer__</em> peer.",
"This_monitor_was_already_selected": "This monitor was already selected",
Expand Down