update early access guards

softmarshmallow · softmarshmallow · commit 9a73f26c9fa5 · 2023-03-02T20:46:05.000+09:00
diff --git a/packages/_firstparty-early-access/guards/index.ts b/packages/_firstparty-early-access/guards/index.ts
@@ -0,0 +1,17 @@
+import { useEarlyAccess } from "@assistant-fp/early-access";
+import { useHistory } from "react-router-dom";
+import { early_access_required_message } from "../k";
+
+export function requiresEarlyAccess<T extends Function>(f: T): T {
+  const history = useHistory();
+  const ea = useEarlyAccess();
+
+  if (!ea) {
+    return ((...args) => {
+      alert(early_access_required_message);
+      history.push("/upgrade");
+    }) as any as T;
+  } else {
+    return f;
+  }
+}
diff --git a/packages/_firstparty-early-access/index.ts b/packages/_firstparty-early-access/index.ts
@@ -1,3 +1,4 @@
 export { UpgradePage } from "./register";
+export * from "./guards";
 export * from "./hooks";
 export { default as store } from "./store";
diff --git a/packages/_firstparty-early-access/k.ts b/packages/_firstparty-early-access/k.ts
@@ -1 +1,3 @@
 export const __key = "assistant-early-access-activation";
+export const early_access_required_message =
+  "This is a pro feature, please activate";
diff --git a/packages/app-design-lint/fix-your-self.tsx b/packages/app-design-lint/fix-your-self.tsx
@@ -7,6 +7,7 @@ import { LintItemRow } from "@app/design-lint";
 import { LintProcessPaginator } from "@app/design-lint/lint-process-paginator";
 import { _APP_EVENT_LINT_RESULT_EK } from "@app/design-lint/__plugin/events";
 import BackArrowIcon from "@assistant/icons/back-arrow";
+import { requiresEarlyAccess } from "@assistant-fp/early-access";
 
 /** Fix your self as page with router props ver. (not used. planned.) */
 export function FixYourSelfPage(props: {
@@ -43,12 +44,12 @@ export function FixYourSelf(props: {
     chaange_layer_index(0);
   }, []);
 
-  const chaange_layer_index = (i) => {
+  const chaange_layer_index = requiresEarlyAccess((i) => {
     setLayerIndex(i);
     const _target = layerlintMap.get(_key_at_index(i));
     setLayerLint(_target);
     PluginSdk.focus(_target.node.id);
-  };
+  });
 
   const _page_size = layerlintMap.size;
 
diff --git a/packages/app-design-lint/lint-screen.tsx b/packages/app-design-lint/lint-screen.tsx
@@ -19,6 +19,7 @@ import { makeSummary, requestLintOnCurrentSelection } from "./actions";
 import { FixYourSelf } from "./fix-your-self";
 import { mapGrandchildren } from "@design-sdk/core/utils";
 import Dialog from "@material-ui/core/Dialog";
+import { requiresEarlyAccess } from "@assistant-fp/early-access";
 
 export const LintScreen = () => {
   const [feedbacks, setFeedbacks] = useState<ReflectLintFeedback[]>([]);
@@ -50,10 +51,10 @@ export const LintScreen = () => {
     }).length;
   }
 
-  function onFeedbackTap(feedback: ReflectLintFeedback) {
+  const onFeedbackTap = requiresEarlyAccess((feedback: ReflectLintFeedback) => {
     const targetNodeId = feedback.node.id;
     PluginSdk.focus(targetNodeId);
-  }
+  });
 
   function handleSelectionLayer() {
     const summary = makeSummary(feedbacks);
diff --git a/packages/app-photo-loader/photo-loader.tsx b/packages/app-photo-loader/photo-loader.tsx
@@ -13,12 +13,16 @@ import InfiniteScroll from "react-infinite-scroller";
 import { useHistory } from "react-router-dom";
 import { radmon_query_placeholder } from "./k";
 import { ImagePromptBox } from "./image-prompt-box";
-import { useEarlyAccess } from "@assistant-fp/early-access";
+import {
+  requiresEarlyAccess,
+  useEarlyAccess,
+} from "@assistant-fp/early-access";
+import { early_access_required_message } from "@assistant-fp/early-access/k";
 
 ///
 ///  TODO:
 ///  2. Support for DND
-///  3. Support for replace fill(s)
+///  3. Support random images (on multiple selection)
 ///  4. Add optimized image loading witn max 4096 in width and height (either)
 ///
 
@@ -94,41 +98,43 @@ export function PhotoLoader() {
     }
   }, [data.from_resources, hidenav, shownav, query]);
 
-  const promptGeneration = async (
-    q: string,
-    c: {
-      style?: string;
-    }
-  ) => {
-    setLocked(true);
-    try {
-      const { images: gens, n } = await api
-        .fromGenerative(
-          {
-            q: q,
-            style: c.style,
-          },
-          accesskey
-        )
-        .finally(() => setLocked(false));
+  const promptGeneration = requiresEarlyAccess(
+    async (
+      q: string,
+      c: {
+        style?: string;
+      }
+    ) => {
+      setLocked(true);
+      try {
+        const { images: gens, n } = await api
+          .fromGenerative(
+            {
+              q: q,
+              style: c.style,
+            },
+            accesskey
+          )
+          .finally(() => setLocked(false));
 
-      setData({
-        from_resources: data.from_resources,
-        from_ai: gens.map((g) => ({
-          src: g,
-          thumbnail: g,
-          name: `${n} ${query}`,
-        })),
-      });
-    } catch (e) {
-      // if e.message == 'Unauthorized'
-      // then show the activation screen
-      if (e.message === "Unauthorized") {
-        alert("This is a pro feature, please activate");
-        history.push("/upgrade");
+        setData({
+          from_resources: data.from_resources,
+          from_ai: gens.map((g) => ({
+            src: g,
+            thumbnail: g,
+            name: `${n} ${query}`,
+          })),
+        });
+      } catch (e) {
+        // if e.message == 'Unauthorized'
+        // then show the activation screen
+        if (e.message === "Unauthorized") {
+          alert(early_access_required_message);
+          history.push("/upgrade");
+        }
       }
     }
-  };
+  );
 
   const searchResources = useCallback(
     async (q: string, page = 1, extend = false) => {

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`export const __key = "assistant-early-access-activation";`
	`2`	`+export const early_access_required_message =`
	`3`	`+ "This is a pro feature, please activate";`