cleanup: move pricing page url to env

Author: densumesh

.env.server

@@ -69,3 +69,4 @@ AWS_REGION_CSVJSONL=us-west-1
 BATCH_ETL_URL="http://localhost:8082"
 HIGHLIGHT_TIMEOUT_MS=500
 PREMIUM_ORGANIZATION_UUIDS=""
+SHOPIFY_SECRET_KEY=

clients/trieve-shopify-extension/.env.densumes-trieve-extension

@@ -0,0 +1,4 @@
+
+SHOPIFY_API_KEY=35eede841ebb457fb68f6eada8e1d780
+SHOPIFY_TRIEVE_PDP_QUESTIONS_ID=51815e62-ddad-408b-afb9-6f804648f89f
+SHOPIFY_GLOBAL_COMPONENT_ID=6c762bf0-fbc4-47bd-9370-514048760d5c

clients/trieve-shopify-extension/.env.dist

@@ -3,3 +3,5 @@ SHOPIFY_API_KEY=
 REMIX_SERVER_URL=http://localhost:49345
 TRIEVE_BASE_URL=http://localhost:8090
 SHOPIFY_THEME_APP_EXTENSION_UUID=f76c64354373934b7e5b794c7070f51a
+SHOPIFY_PRICING_URL="shopify://admin/charges/densumes-trieve-extension/pricing_plans?test=true"
+SHOPIFY_SECRET_KEY=

clients/trieve-shopify-extension/app/context/trieveContext.tsx

@@ -17,11 +17,13 @@ export const TrieveContext = createContext<{
   dataset: Dataset;
   trieveKey: StrongTrieveKey;
   organization: OrganizationWithSubAndPlan;
+  refetch: () => void;
 }>({
   trieve: null as any,
   dataset: null as any,
   trieveKey: null as any,
   organization: null as any,
+  refetch: null as any,
 });
 
 export const TrieveProvider = ({
@@ -67,7 +69,7 @@ export const TrieveProvider = ({
 
   return (
     <TrieveContext.Provider
-      value={{ trieve, dataset, trieveKey, organization }}
+      value={{ trieve, dataset, trieveKey, organization, refetch: queryClient.refetchQueries }}
     >
       {children}
     </TrieveContext.Provider>

clients/trieve-shopify-extension/app/routes/app._dashboard._index.tsx

@@ -54,7 +54,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
   const action = formData.get("action");
   if (action === "modify") {
     return redirect(
-      `shopify://admin/charges/densumes-trieve-extension/pricing_plans?test=true`,
+      process.env.SHOPIFY_PRICING_URL || "",
       {
         target: "_top",
       },
@@ -72,7 +72,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
 };
 
 export default function Dashboard() {
-  const { organization, trieve } = useTrieve();
+  const { organization, trieve, refetch: refetchTrieve } = useTrieve();
   const [filters, setFilters] = useState(defaultSearchAnalyticsFilter);
   const [granularity, setGranularity] = useState<Granularity>("day");
   const [showCancelModal, setShowCancelModal] = useState(false);
@@ -157,6 +157,9 @@ export default function Dashboard() {
               method: "post",
             });
             setShowCancelModal(false);
+            setTimeout(() => {
+              refetchTrieve();
+            }, 5000);
           }}>Cancel Subscription</Button>
         </div>
       </Modal>

server/src/lib.rs

@@ -964,6 +964,10 @@ pub fn main() -> std::io::Result<()> {
                                     web::resource("user_event")
                                     .route(web::post().to(handlers::shopify_handler::send_shopify_user_event))
                                 )
+                                .service(
+                                    web::resource("plan_change")
+                                    .route(web::post().to(handlers::payment_handler::handle_shopify_plan_change))
+                                )
                         )
                         .service(
                             web::scope("/dataset")
@@ -1378,13 +1382,6 @@ pub fn main() -> std::io::Result<()> {
                                         .route(web::get().to(handlers::invitation_handler::get_invitations)),
                                 ),
                             )
-                        .service(
-                            web::scope("/shopify")
-                                .service(
-                                    web::resource("/plan_change")
-                                        .route(web::post().to(handlers::payment_handler::handle_shopify_plan_change)),
-                                ),
-                        )
                         .service(
                             web::scope("/stripe")
                                 .service(

server/src/operators/dataset_operator.rs

@@ -337,7 +337,6 @@ pub async fn get_dataset_and_organization_from_dataset_id_query(
 
     if let Some(sub) = &subscription {
         let end_date = sub.current_period_end();
-        log::info!("Subscription end date: {}", end_date.unwrap_or_default());
         if end_date.is_some()
             && chrono::Utc::now().naive_utc() > end_date.expect("End date should be set")
         {

server/src/operators/organization_operator.rs

@@ -377,7 +377,6 @@ pub async fn get_org_from_id_query(
 
     if let Some(sub) = &subscription {
         let end_date = sub.current_period_end();
-        log::info!("Subscription end date: {}", end_date.unwrap_or_default());
         if end_date.is_some()
             && chrono::Utc::now().naive_utc() > end_date.expect("End date should be set")
         {