License server (#2379)

* WIP License server * WIP * Moves locations to App Store and Core * LocationType fixes * Runs db migrations post-deploy * WIP * WIP * Cleanup * WIP * WIP * Decouples translations from NavTabs * Adds admin submodule * Adds admin submodule * Sync dependencies * WIP * WIP * Updates submodules * Renames package * Updates submodules * Adds scripts for console * Updates license checker URL * Updates admin * Adds staging/prod admin console links * Update yarn.lock * Update NavTabs.tsx * WIP * Update admin * WIP * Adds hint to InputField * Update admin * Adds turbo admin dependecies * Update admin * Prevents redirection on form submit * Form warning fixes * Update admin * Form fixes * Update yarn.lock * Update admin * Update admin * Update admin * Adds withLicenseRequired HOC * Adds LicenseRequired to EE components * Admin deploy fix? * Updates submodules * Use relative inside lib * type fixes * Fixes turbo race condition * Relocates admin to console * Relocates admin to console * Update console * Update api * Update turbo.json * Update ErrorBoundary.tsx * Update defaultEvents.ts * Update checkLicense.ts * Update yarn.lock * Skip on E2E Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-26 11:07:14 -06:00
parent 6940c8d6cc
commit 9df4867fca
37 changed files with 502 additions and 285 deletions
@@ -15,11 +15,12 @@ import { trpc } from "@lib/trpc";

 import { DatePicker } from "@components/ui/form/DatePicker";

-import { TApiKeys } from "./ApiKeyListItem";
+import LicenseRequired from "../LicenseRequired";
+import type { TApiKeys } from "./ApiKeyListItem";

 export default function ApiKeyDialogForm(props: {
  title: string;
-  defaultValues?: Omit<TApiKeys, "userId" | "createdAt" | "lastUsedAt"> & { neverExpires: boolean };
+  defaultValues?: Omit<TApiKeys, "userId" | "createdAt" | "lastUsedAt"> & { neverExpires?: boolean };
  handleClose: () => void;
 }) {
  const { t } = useLocale();
@@ -49,7 +50,7 @@ export default function ApiKeyDialogForm(props: {
  const watchNeverExpires = form.watch("neverExpires");

  return (
-    <>
+    <LicenseRequired>
      {successfulNewApiKeyModal ? (
        <>
          <div className="mb-10">
@@ -92,12 +93,12 @@ export default function ApiKeyDialogForm(props: {
          </DialogFooter>
        </>
      ) : (
-        <Form<Omit<TApiKeys, "userId" | "createdAt" | "lastUsedAt"> & { neverExpires: boolean }>
+        <Form<Omit<TApiKeys, "userId" | "createdAt" | "lastUsedAt"> & { neverExpires?: boolean }>
          form={form}
          handleSubmit={async (event) => {
            const apiKey = await utils.client.mutation("viewer.apiKeys.create", event);
            setApiKey(apiKey);
-            setApiKeyDetails({ ...event });
+            setApiKeyDetails({ ...event, neverExpires: !!event.neverExpires });
            await utils.invalidateQueries(["viewer.apiKeys.list"]);
            setSuccessfulNewApiKeyModal(true);
          }}
@@ -146,6 +147,6 @@ export default function ApiKeyDialogForm(props: {
          </DialogFooter>
        </Form>
      )}
-    </>
+    </LicenseRequired>
  );
 }
@@ -12,66 +12,76 @@ import { trpc } from "@lib/trpc";

 import { List } from "@components/List";

-export default function ApiKeyListContainer() {
+import LicenseRequired from "../LicenseRequired";
+
+function ApiKeyListContainer() {
  const { t } = useLocale();
  const query = trpc.useQuery(["viewer.apiKeys.list"]);

  const [newApiKeyModal, setNewApiKeyModal] = useState(false);
  const [editModalOpen, setEditModalOpen] = useState(false);
-  const [apiKeyToEdit, setApiKeyToEdit] = useState<(TApiKeys & { neverExpires: boolean }) | null>(null);
+  const [apiKeyToEdit, setApiKeyToEdit] = useState<(TApiKeys & { neverExpires?: boolean }) | null>(null);
  return (
-    <QueryCell
-      query={query}
-      success={({ data }) => (
-        <>
-          <div className="flex flex-col justify-between truncate pl-2 pr-1 sm:flex-row">
-            <div className="mt-9">
-              <h2 className="font-cal text-lg font-medium leading-6 text-gray-900">{t("api_keys")}</h2>
-              <p className="mt-1 mb-5 text-sm text-gray-500">{t("api_keys_subtitle")}</p>
-            </div>
-            <div className="mb-9 sm:self-center">
-              <Button StartIcon={PlusIcon} color="secondary" onClick={() => setNewApiKeyModal(true)}>
-                {t("generate_new_api_key")}
-              </Button>
-            </div>
-          </div>
-
-          {data.length > 0 && (
-            <List className="pb-6">
-              {data.map((item: any) => (
-                <ApiKeyListItem
-                  key={item.id}
-                  apiKey={item}
-                  onEditApiKey={() => {
-                    setApiKeyToEdit(item);
-                    setEditModalOpen(true);
-                  }}
-                />
-              ))}
-            </List>
-          )}
-
-          {/* New api key dialog */}
-          <Dialog open={newApiKeyModal} onOpenChange={(isOpen) => !isOpen && setNewApiKeyModal(false)}>
-            <DialogContent>
-              <ApiKeyDialogForm title={t("create_api_key")} handleClose={() => setNewApiKeyModal(false)} />
-            </DialogContent>
-          </Dialog>
-          {/* Edit api key dialog */}
-          <Dialog open={editModalOpen} onOpenChange={(isOpen) => !isOpen && setEditModalOpen(false)}>
-            <DialogContent>
-              {apiKeyToEdit && (
-                <ApiKeyDialogForm
-                  title={t("edit_api_key")}
-                  key={apiKeyToEdit.id}
-                  handleClose={() => setEditModalOpen(false)}
-                  defaultValues={apiKeyToEdit}
-                />
+    <>
+      <div className="flex flex-col justify-between truncate pl-2 pr-1 sm:flex-row">
+        <div className="mt-9">
+          <h2 className="font-cal text-lg font-medium leading-6 text-gray-900">{t("api_keys")}</h2>
+          <p className="mt-1 mb-5 text-sm text-gray-500">{t("api_keys_subtitle")}</p>
+        </div>
+        <div className="mb-9 sm:self-center">
+          <Button StartIcon={PlusIcon} color="secondary" onClick={() => setNewApiKeyModal(true)}>
+            {t("generate_new_api_key")}
+          </Button>
+        </div>
+      </div>
+      <LicenseRequired>
+        <QueryCell
+          query={query}
+          success={({ data }) => (
+            <>
+              {data.length > 0 && (
+                <List className="pb-6">
+                  {data.map((item) => (
+                    <ApiKeyListItem
+                      key={item.id}
+                      apiKey={item}
+                      onEditApiKey={() => {
+                        setApiKeyToEdit(item);
+                        setEditModalOpen(true);
+                      }}
+                    />
+                  ))}
+                </List>
              )}
-            </DialogContent>
-          </Dialog>
-        </>
-      )}
-    />
+
+              {/* New api key dialog */}
+              <Dialog open={newApiKeyModal} onOpenChange={(isOpen) => !isOpen && setNewApiKeyModal(false)}>
+                <DialogContent>
+                  <ApiKeyDialogForm
+                    title={t("create_api_key")}
+                    handleClose={() => setNewApiKeyModal(false)}
+                  />
+                </DialogContent>
+              </Dialog>
+              {/* Edit api key dialog */}
+              <Dialog open={editModalOpen} onOpenChange={(isOpen) => !isOpen && setEditModalOpen(false)}>
+                <DialogContent>
+                  {apiKeyToEdit && (
+                    <ApiKeyDialogForm
+                      title={t("edit_api_key")}
+                      key={apiKeyToEdit.id}
+                      handleClose={() => setEditModalOpen(false)}
+                      defaultValues={apiKeyToEdit}
+                    />
+                  )}
+                </DialogContent>
+              </Dialog>
+            </>
+          )}
+        />
+      </LicenseRequired>
+    </>
  );
 }
+
+export default ApiKeyListContainer;