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.

Sign up for GitHub

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

[FIX] Add Offline License Endpoint #26282

Merged
merged 14 commits into from
Aug 18, 2022
Merged

[FIX] Add Offline License Endpoint #26282

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8c369e3
update endpoint to add offline license
LucianoPierdona Jul 15, 2022
499f845
update `OfflineLicenseModal` to `ts`
LucianoPierdona Jul 15, 2022
38b1b16
Merge remote-tracking branch 'origin/develop' into fix/add-license-re…
LucianoPierdona Jul 15, 2022
d117451
updates to fix typecheck
LucianoPierdona Jul 15, 2022
d1a0664
Merge branch 'develop' into fix/add-license-request
tassoevan Jul 19, 2022
1d785a9
Merge remote-tracking branch 'origin/develop' into fix/add-license-re…
LucianoPierdona Jul 21, 2022
4eff90c
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
tassoevan Jul 28, 2022
c866b04
Use a different hook for `POST /v1/licenses.add`
tassoevan Jul 28, 2022
e0f9ce0
Fix error message
LucianoPierdona Aug 9, 2022
9dd3d94
Merge remote-tracking branch 'origin/develop' into fix/add-license-re…
LucianoPierdona Aug 17, 2022
f2ceccb
Merge branch 'develop' into fix/add-license-request
kodiakhq[bot] Aug 18, 2022
2029c85
Merge branch 'develop' into fix/add-license-request
hugocostadev Aug 18, 2022
fb53011
Merge branch 'develop' into fix/add-license-request
kodiakhq[bot] Aug 18, 2022
b898b0a
Merge branch 'develop' into fix/add-license-request
kodiakhq[bot] Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/meteor/client/views/admin/info/LicenseCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ const LicenseCard = (): ReactElement => {
const t = useTranslation();
const setModal = useSetModal();

const currentLicense = useSetting('Enterprise_License');
const licenseStatus = useSetting('Enterprise_License_Status');
const currentLicense = useSetting('Enterprise_License') as string;
const licenseStatus = useSetting('Enterprise_License_Status') as string;

const isAirGapped = true;

Expand Down
18 changes: 12 additions & 6 deletions ...t/views/admin/info/OfflineLicenseModal.js → .../views/admin/info/OfflineLicenseModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
import { Modal, Box, ButtonGroup, Button, Scrollable, Callout, Margins, Icon } from '@rocket.chat/fuselage';
import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
import React, { useState } from 'react';
import React, { ComponentProps, FormEvent, ReactElement, useState } from 'react';

import { useEndpointActionExperimental } from '../../../hooks/useEndpointActionExperimental';

const OfflineLicenseModal = ({ onClose, license, licenseStatus, ...props }) => {
type OfflineLicenseModalProps = {
onClose: () => void;
license: string;
licenseStatus: string;
} & ComponentProps<typeof Modal>;

const OfflineLicenseModal = ({ onClose, license, licenseStatus, ...props }: OfflineLicenseModalProps): ReactElement => {
const t = useTranslation();

const dispatchToastMessage = useToastMessageDispatch();
Expand All @@ -15,7 +21,7 @@ const OfflineLicenseModal = ({ onClose, license, licenseStatus, ...props }) => {
const [status, setStatus] = useState(licenseStatus);
const [lastSetLicense, setLastSetLicense] = useState(license);

const handleNewLicense = (e) => {
const handleNewLicense = (e: FormEvent<HTMLInputElement>): void => {
setNewLicense(e.currentTarget.value);
};

Expand All @@ -35,8 +41,8 @@ const OfflineLicenseModal = ({ onClose, license, licenseStatus, ...props }) => {
const handleApplyLicense = useMutableCallback(async () => {
setIsUpdating(true);
setLastSetLicense(newLicense);
const data = await addLicense({ license: newLicense });
if (data.success) {
const data = (await addLicense({ license: newLicense })) as unknown as { success: true };
hugocostadev marked this conversation as resolved.
Show resolved Hide resolved
if (data?.success) {
onClose();
return;
}
Expand All @@ -62,7 +68,7 @@ const OfflineLicenseModal = ({ onClose, license, licenseStatus, ...props }) => {
pb='x8'
flexGrow={1}
backgroundColor='neutral-800'
mb={status === 'invalid' && 'x8'}
mb={status === 'invalid' ? 'x8' : undefined}
>
<Margins block='x8'>
<Scrollable vertical>
Expand Down