feat: Instance activate page added

apiserver/plane/api/views/cycle.py

@@ -579,7 +579,6 @@ class CycleIssueViewSet(BaseViewSet):
             )
         )
 
-        total_issues = issues.count()
         issues_data = IssueStateSerializer(issues, many=True).data
 
         if sub_group_by and sub_group_by == group_by:
@@ -591,12 +590,12 @@ class CycleIssueViewSet(BaseViewSet):
         if group_by:
             grouped_results = group_results(issues_data, group_by, sub_group_by)
             return Response(
-                {"data": grouped_results, "total_issues": total_issues},
+                grouped_results,
                 status=status.HTTP_200_OK,
             )
 
         return Response(
-            {"data": issues_data, "total_issues": total_issues}, status=status.HTTP_200_OK
+            issues_data, status=status.HTTP_200_OK
         )
 
     def create(self, request, slug, project_id, cycle_id):

apiserver/plane/api/views/issue.py

@@ -217,7 +217,6 @@ class IssueViewSet(BaseViewSet):
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
 
-        total_issues = issue_queryset.count()
         issues = IssueLiteSerializer(issue_queryset, many=True).data
 
         ## Grouping the results
@@ -232,12 +231,12 @@ class IssueViewSet(BaseViewSet):
         if group_by:
             grouped_results = group_results(issues, group_by, sub_group_by)
             return Response(
-                {"data": grouped_results, "total_issues": total_issues},
+                grouped_results,
                 status=status.HTTP_200_OK,
             )
 
         return Response(
-            {"data": issues, "total_issues": total_issues}, status=status.HTTP_200_OK
+            issues, status=status.HTTP_200_OK
         )
 
 
@@ -426,7 +425,6 @@ class UserWorkSpaceIssues(BaseAPIView):
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
 
-        total_issues = issue_queryset.count()
         issues = IssueLiteSerializer(issue_queryset, many=True).data
 
         ## Grouping the results
@@ -441,12 +439,12 @@ class UserWorkSpaceIssues(BaseAPIView):
         if group_by:
             grouped_results = group_results(issues, group_by, sub_group_by)
             return Response(
-                {"data": grouped_results, "total_issues": total_issues},
+                grouped_results,
                 status=status.HTTP_200_OK,
             )
 
         return Response(
-            {"data": issues, "total_issues": total_issues}, status=status.HTTP_200_OK
+            issues, status=status.HTTP_200_OK
         )
 
 
@@ -2151,7 +2149,6 @@ class IssueDraftViewSet(BaseViewSet):
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
 
-        total_issues = issue_queryset.count()
         issues = IssueLiteSerializer(issue_queryset, many=True).data
 
         ## Grouping the results
@@ -2159,12 +2156,12 @@ class IssueDraftViewSet(BaseViewSet):
         if group_by:
             grouped_results = group_results(issues, group_by)
             return Response(
-                {"data": grouped_results, "total_issues": total_issues},
+                grouped_results,
                 status=status.HTTP_200_OK,
             )
 
         return Response(
-            {"data": issues, "total_issues": total_issues}, status=status.HTTP_200_OK
+            issues, status=status.HTTP_200_OK
         )
 
     def create(self, request, slug, project_id):

apiserver/plane/api/views/module.py

@@ -364,7 +364,6 @@ class ModuleIssueViewSet(BaseViewSet):
                 .values("count")
             )
         )
-        total_issues = issues.count()
         issues_data = IssueStateSerializer(issues, many=True).data
 
         if sub_group_by and sub_group_by == group_by:
@@ -376,12 +375,12 @@ class ModuleIssueViewSet(BaseViewSet):
         if group_by:
             grouped_results = group_results(issues_data, group_by, sub_group_by)
             return Response(
-                {"data": grouped_results, "total_issues": total_issues},
+                grouped_results,
                 status=status.HTTP_200_OK,
             )
 
         return Response(
-            {"data": issues_data, "total_issues": total_issues}, status=status.HTTP_200_OK
+            issues_data, status=status.HTTP_200_OK
         )
 
     def create(self, request, slug, project_id, module_id):

apiserver/plane/api/views/view.py

@@ -93,7 +93,6 @@ class GlobalViewIssuesViewSet(BaseViewSet):
             )
         )
 
-        
     @method_decorator(gzip_page)
     def list(self, request, slug):
         filters = issue_filters(request.query_params, "GET")
@@ -117,9 +116,7 @@ class GlobalViewIssuesViewSet(BaseViewSet):
                 .values("count")
             )
             .annotate(
-                attachment_count=IssueAttachment.objects.filter(
-                    issue=OuterRef("id")
-                )
+                attachment_count=IssueAttachment.objects.filter(issue=OuterRef("id"))
                 .order_by()
                 .annotate(count=Func(F("id"), function="Count"))
                 .values("count")
@@ -129,9 +126,7 @@ class GlobalViewIssuesViewSet(BaseViewSet):
         # Priority Ordering
         if order_by_param == "priority" or order_by_param == "-priority":
             priority_order = (
-                priority_order
-                if order_by_param == "priority"
-                else priority_order[::-1]
+                priority_order if order_by_param == "priority" else priority_order[::-1]
             )
             issue_queryset = issue_queryset.annotate(
                 priority_order=Case(
@@ -183,8 +178,6 @@ class GlobalViewIssuesViewSet(BaseViewSet):
             )
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
-
-        total_issues = issue_queryset.count()
         issues = IssueLiteSerializer(issue_queryset, many=True).data
 
         ## Grouping the results
@@ -195,17 +188,15 @@ class GlobalViewIssuesViewSet(BaseViewSet):
                 {"error": "Group by and sub group by cannot be same"},
                 status=status.HTTP_400_BAD_REQUEST,
             )
-        
+
         if group_by:
             grouped_results = group_results(issues, group_by, sub_group_by)
             return Response(
-                {"data": grouped_results, "total_issues": total_issues},
+                grouped_results,
                 status=status.HTTP_200_OK,
             )
 
-        return Response(
-            {"data": issues, "total_issues": total_issues}, status=status.HTTP_200_OK
-        )
+        return Response(issues, status=status.HTTP_200_OK)
 
 
 class IssueViewViewSet(BaseViewSet):

apiserver/plane/api/views/workspace.py

@@ -1223,7 +1223,6 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
         else:
             issue_queryset = issue_queryset.order_by(order_by_param)
 
-        total_issues = issue_queryset.count()
         issues = IssueLiteSerializer(issue_queryset, many=True).data
 
         ## Grouping the results
@@ -1231,12 +1230,12 @@ class WorkspaceUserProfileIssuesEndpoint(BaseAPIView):
         if group_by:
             grouped_results = group_results(issues, group_by)
             return Response(
-                {"data": grouped_results, "total_issues": total_issues},
+                grouped_results,
                 status=status.HTTP_200_OK,
             )
 
         return Response(
-            {"data": issues, "total_issues": total_issues}, status=status.HTTP_200_OK
+            issues, status=status.HTTP_200_OK
         )
 
 

web/components/account/email-password-form.tsx

@@ -12,10 +12,20 @@ export interface EmailPasswordFormValues {
 
 export interface IEmailPasswordForm {
   onSubmit: (formData: EmailPasswordFormValues) => Promise<void>;
+  buttonText?: string;
+  submittingButtonText?: string;
+  withForgetPassword?: boolean;
+  withSignUpLink?: boolean;
 }
 
 export const EmailPasswordForm: React.FC<IEmailPasswordForm> = (props) => {
-  const { onSubmit } = props;
+  const {
+    onSubmit,
+    buttonText = "Sign in",
+    submittingButtonText = "Signing in...",
+    withForgetPassword = false,
+    withSignUpLink = false,
+  } = props;
   // router
   const router = useRouter();
   // form info
@@ -82,15 +92,17 @@ export const EmailPasswordForm: React.FC<IEmailPasswordForm> = (props) => {
             )}
           />
         </div>
-        <div className="text-right text-xs">
-          <button
-            type="button"
-            onClick={() => router.push("/accounts/forgot-password")}
-            className="text-custom-text-200 hover:text-custom-primary-100"
-          >
-            Forgot your password?
-          </button>
-        </div>
+        {withForgetPassword && (
+          <div className="text-right text-xs">
+            <button
+              type="button"
+              onClick={() => router.push("/accounts/forgot-password")}
+              className="text-custom-text-200 hover:text-custom-primary-100"
+            >
+              Forgot your password?
+            </button>
+          </div>
+        )}
         <div>
           <Button
             variant="primary"
@@ -100,18 +112,20 @@ export const EmailPasswordForm: React.FC<IEmailPasswordForm> = (props) => {
             disabled={!isValid && isDirty}
             loading={isSubmitting}
           >
-            {isSubmitting ? "Signing in..." : "Sign in"}
+            {isSubmitting ? submittingButtonText : buttonText}
           </Button>
         </div>
-        <div className="text-xs">
-          <button
-            type="button"
-            onClick={() => router.push("/accounts/sign-up")}
-            className="text-custom-text-200 hover:text-custom-primary-100"
-          >
-            {"Don't have an account? Sign Up"}
-          </button>
-        </div>
+        {withSignUpLink && (
+          <div className="text-xs">
+            <button
+              type="button"
+              onClick={() => router.push("/accounts/sign-up")}
+              className="text-custom-text-200 hover:text-custom-primary-100"
+            >
+              {"Don't have an account? Sign Up"}
+            </button>
+          </div>
+        )}
       </form>
     </>
   );

web/components/account/email-signup-form.tsx

@@ -4,7 +4,7 @@ import { Controller, useForm } from "react-hook-form";
 // ui
 import { Button, Input } from "@plane/ui";
 // types
-type EmailPasswordFormValues = {
+export type EmailPasswordSignUpFormValues = {
   email: string;
   password?: string;
   confirm_password: string;
@@ -12,7 +12,7 @@ type EmailPasswordFormValues = {
 };
 
 type Props = {
-  onSubmit: (formData: EmailPasswordFormValues) => Promise<void>;
+  onSubmit: (formData: EmailPasswordSignUpFormValues) => Promise<void>;
 };
 
 export const EmailSignUpForm: React.FC<Props> = (props) => {
@@ -23,7 +23,7 @@ export const EmailSignUpForm: React.FC<Props> = (props) => {
     control,
     watch,
     formState: { errors, isSubmitting, isValid, isDirty },
-  } = useForm<EmailPasswordFormValues>({
+  } = useForm<EmailPasswordSignUpFormValues>({
     defaultValues: {
       email: "",
       password: "",

web/components/notifications/notification-card.tsx

@@ -11,7 +11,7 @@ import { ArchiveIcon, CustomMenu, Tooltip } from "@plane/ui";
 import { ArchiveRestore, Clock, MessageSquare, User2 } from "lucide-react";
 
 // helper
-import { stripHTML, replaceUnderscoreIfSnakeCase, truncateText } from "helpers/string.helper";
+import { replaceUnderscoreIfSnakeCase, truncateText, stripAndTruncateHTML } from "helpers/string.helper";
 import {
   formatDateDistance,
   render12HourFormatTime,
@@ -115,10 +115,10 @@ export const NotificationCard: React.FC<NotificationCardProps> = (props) => {
                   renderShortDateWithYearFormat(notification.data.issue_activity.new_value)
                 ) : notification.data.issue_activity.field === "attachment" ? (
                   "the issue"
-                ) : stripHTML(notification.data.issue_activity.new_value).length > 55 ? (
-                  stripHTML(notification.data.issue_activity.new_value).slice(0, 50) + "..."
+                ) : notification.data.issue_activity.field === "description" ? (
+                  stripAndTruncateHTML(notification.data.issue_activity.new_value, 55)
                 ) : (
-                  stripHTML(notification.data.issue_activity.new_value)
+                  notification.data.issue_activity.new_value
                 )
               ) : (
                 <span>

web/components/page-views/signin.tsx

@@ -210,7 +210,9 @@ export const SignInView = observer(() => {
               ) : (
                 <>
                   <>
-                    {enableEmailPassword && <EmailPasswordForm onSubmit={handlePasswordSignIn} />}
+                    {enableEmailPassword && (
+                      <EmailPasswordForm onSubmit={handlePasswordSignIn} withForgetPassword withSignUpLink />
+                    )}
                     {data?.magic_login && (
                       <div className="flex flex-col divide-y divide-custom-border-200">
                         <div className="pb-7">

web/components/views/signin.tsx

@@ -149,7 +149,9 @@ export const SignInView = observer(() => {
                 Sign in to Plane
               </h1>
               <>
-                {enableEmailPassword && <EmailPasswordForm onSubmit={handlePasswordSignIn} />}
+                {enableEmailPassword && (
+                  <EmailPasswordForm onSubmit={handlePasswordSignIn} withForgetPassword withSignUpLink />
+                )}
                 {data?.magic_login && (
                   <div className="flex flex-col divide-y divide-custom-border-200">
                     <div className="pb-7">

web/helpers/string.helper.ts

@@ -111,11 +111,20 @@ export const getFirstCharacters = (str: string) => {
  */
 
 export const stripHTML = (html: string) => {
-  const tmp = document.createElement("DIV");
-  tmp.innerHTML = html;
-  return tmp.textContent || tmp.innerText || "";
+  const strippedText = html.replace(/<script[^>]*>[\s\S]*?<\/script>/gi, ""); // Remove script tags
+  return strippedText.replace(/<[^>]*>/g, ""); // Remove all other HTML tags
 };
 
+/**
+ *
+ * @example:
+ * const html = "<p>Some text</p>";
+ * const text = stripAndTruncateHTML(html);
+ * console.log(text); // Some text
+ */
+
+export const stripAndTruncateHTML = (html: string, length: number = 55) => truncateText(stripHTML(html), length);
+
 /**
  * @description: This function return number count in string if number is more than 100 then it will return 99+
  * @param {number} number

web/pages/activate/index.tsx

@@ -0,0 +1,58 @@
+import Image from "next/image";
+// layouts
+import DefaultLayout from "layouts/default-layout";
+// components
+import { EmailPasswordForm, EmailPasswordFormValues } from "components/account";
+// images
+import BluePlaneLogoWithoutText from "public/plane-logos/blue-without-text.png";
+// services
+import { InstanceService } from "services/instance.service";
+import { useRouter } from "next/router";
+import { useEffect } from "react";
+
+const instanceService = new InstanceService();
+
+const ActivateInstancePage = () => {
+  const router = useRouter();
+
+  useEffect(() => {
+    instanceService.checkForInstanceStatus().then((response) => {
+      console.log(response);
+    });
+  }, []);
+
+  const handleSignUp = (values: EmailPasswordFormValues) =>
+    instanceService
+      .createInstance(values)
+      .then((response) => {
+        router.push("/");
+      })
+      .catch((error) => {});
+
+  return (
+    <DefaultLayout>
+      <>
+        <div className="hidden sm:block sm:fixed border-r-[0.5px] border-custom-border-200 h-screen w-[0.5px] top-0 left-20 lg:left-32" />
+        <div className="fixed grid place-items-center bg-custom-background-100 sm:py-5 top-11 sm:top-12 left-7 sm:left-16 lg:left-28">
+          <div className="grid place-items-center bg-custom-background-100">
+            <div className="h-[30px] w-[30px]">
+              <Image src={BluePlaneLogoWithoutText} alt="Plane Logo" />
+            </div>
+          </div>
+        </div>
+      </>
+      <div className="grid place-items-center h-full w-full overflow-y-auto py-5 px-7">
+        <div>
+          <h1 className="text-3xl text-center font-bold">Activate Your Instance</h1>
+          <EmailPasswordForm
+            onSubmit={handleSignUp}
+            buttonText="Activate Instance"
+            submittingButtonText="Activating Instance"
+          />
+        </div>
+      </div>
+    </DefaultLayout>
+  );
+};
+
+export default ActivateInstancePage;

web/services/instance.service.ts

@@ -0,0 +1,30 @@
+import { APIService } from "services/api.service";
+// helpers
+import { API_BASE_URL } from "helpers/common.helper";
+import Cookies from "js-cookie";
+
+export class InstanceService extends APIService {
+  constructor() {
+    super(API_BASE_URL);
+  }
+
+  async checkForInstanceStatus() {
+    return this.get("/api/licenses/instances/")
+      .then((response) => response?.data)
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+
+  async createInstance(values: any) {
+    return this.post("/api/licenses/instances/", values)
+      .then((response) => {
+        console.log(response);
+        Cookies.set("instance_id", response?.data?.instance_id);
+        return response?.data;
+      })
+      .catch((error) => {
+        throw error?.response?.data;
+      });
+  }
+}