Syncing files from cloud/release/2024.001 to release/2024.001

vanilla · Feb 5, 2024 · 6b433d1 · 6b433d1
1 parent 72fd382
commit 6b433d1
Show file tree

Hide file tree

Showing 36 changed files with 437 additions and 184 deletions.
diff --git a/applications/dashboard/models/DeveloperProfileModel.php b/applications/dashboard/models/DeveloperProfileModel.php
@@ -30,7 +30,7 @@ public function __construct(ConfigurationInterface $config)
         $this->config = $config;
         parent::__construct(self::TABLE_NAME);
         $this->addPipelineProcessor(
-            new PruneProcessor("dateRecorded", "7 days", 100, [
+            new PruneProcessor("dateRecorded", "1 days", 100, [
                 "isTracked" => false,
             ])
         );

diff --git a/applications/dashboard/models/QueuedJobModel.php b/applications/dashboard/models/QueuedJobModel.php
@@ -119,12 +119,13 @@ public function __construct(
     ) {
         parent::__construct(self::TABLE_NAME);
         $this->addPipelineProcessor(new JsonFieldProcessor(["message", "metrics"]));
+        $successPruneDuration = $config->get("JobQueue.SuccessPruneDuration", "3 days");
         $this->addPipelineProcessor(
             new PruneProcessor("dateUpdated", "3 days", 100, [
                 "status" => [self::STATUS_SUCCESS],
             ])
         );
-        $this->addPipelineProcessor(new PruneProcessor("dateUpdated", "1 month", 100));
+        $this->addPipelineProcessor(new PruneProcessor("dateUpdated", "2 weeks", 100));
         $this->lockService = $lockService;
         $this->config = $config;
         $this->scheduler = $scheduler;
@@ -241,12 +242,11 @@ public function insert(array $set, array $options = [])
     }
 
     /**
-     * Check to schedule Job
-     * @param string $jobDescriptor Class name of the job to schedule
+     * Check if we should flush any pending jobs.
      *
-     * @throws \Exception
+     * @return bool
      */
-    public function checkToScheduleJob(string $jobDescriptor)
+    public function shouldFlushPendingJobs(): bool
     {
         $subquery = $this->createSql();
         $subquery
@@ -275,10 +275,7 @@ public function checkToScheduleJob(string $jobDescriptor)
         }
 
         // Trigger job when we have jobThreshold(default 50) number of jobs queued, or latest queued job was queued 1 minute ago.
-        if ($pendingCount >= $this->getJobThreshold() || $hasEarlyJob) {
-            $jobDescriptor = new NormalJobDescriptor($jobDescriptor);
-            $this->scheduler->addJobDescriptor($jobDescriptor);
-        }
+        return $pendingCount >= $this->getJobThreshold() || $hasEarlyJob;
     }
 
     /**

diff --git a/applications/dashboard/models/class.usermodel.php b/applications/dashboard/models/class.usermodel.php
@@ -5823,7 +5823,10 @@ public function getAttribute($userID, $attribute, $defaultValue = false)
     {
         $user = $this->getID($userID, DATASET_TYPE_ARRAY);
         $result = val($attribute, $user["Attributes"], $defaultValue);
-
+        // return same default value type
+        if (is_array($defaultValue) && $result === false) {
+            $result = $defaultValue;
+        }
         return $result;
     }
 

diff --git a/applications/vanilla/controllers/class.moderationcontroller.php b/applications/vanilla/controllers/class.moderationcontroller.php
@@ -270,7 +270,7 @@ public function clearDiscussionSelections($transientKey = "")
     {
         $session = Gdn::session();
         if ($session->validateTransientKey($transientKey)) {
-            Gdn::userModel()->saveAttribute($session->UserID, "CheckedDiscussions", false);
+            Gdn::userModel()->saveAttribute($session->UserID, "CheckedDiscussions", []);
         }
 
         redirectTo(getIncomingValue("Target", "/discussions"));

diff --git a/build/scripts/configs/makeBaseConfig.ts b/build/scripts/configs/makeBaseConfig.ts
@@ -133,8 +133,12 @@ export async function makeBaseConfig(entryModel: EntryModel, section: string) {
                                               'link[rel="stylesheet"][static="1"]',
                                           );
                                           const lastStaticStylesheet = staticStylesheets[staticStylesheets.length - 1];
+
+                                          const firstStyleTag = document.head.querySelector("style");
                                           if (lastStaticStylesheet) {
                                               document.head.insertBefore(element, lastStaticStylesheet.nextSibling);
+                                          } else if (firstStyleTag) {
+                                              document.head.insertBefore(element, firstStyleTag);
                                           } else {
                                               document.head.appendChild(element);
                                           }
@@ -192,6 +196,10 @@ export async function makeBaseConfig(entryModel: EntryModel, section: string) {
                     VANILLA_ROOT,
                     "library/src/scripts/leaderboardWidget/LeaderboardWidget.styles.ts",
                 ),
+                "@library/embeddedContent/embedService": path.resolve(
+                    VANILLA_ROOT,
+                    "library/src/scripts/embeddedContent/embedService.register.tsx",
+                ),
                 ...entryModel.aliases,
                 "library-scss": path.resolve(VANILLA_ROOT, "library/src/scss"),
                 "react-select": require.resolve("react-select/dist/react-select.esm.js"),

diff --git a/library/Garden/Web/Dispatcher.php b/library/Garden/Web/Dispatcher.php
@@ -79,7 +79,7 @@ public function __construct(
         $this->locale = $locale;
         $this->container = $container;
         $this->eventManager = $eventManager ?? new EventManager();
-        $this->timers = $timers ?? new Timers();
+        // $this->timers = $timers ?? new Timers();
     }
 
     /**
@@ -136,13 +136,13 @@ public function getRoute($key)
      */
     public function dispatch(RequestInterface $request)
     {
-        $span = $this->timers->startRequest($request);
+        // $span = $this->timers->startRequest($request);
         try {
             $result = $this->callMiddleware($request);
         } catch (\Throwable $ex) {
             $result = $this->makeResponse($ex);
         } finally {
-            $span->finish($result ? $result->asHttpResponse() : null);
+            // $span->finish($result ? $result->asHttpResponse() : null);
         }
         return $result;
     }
@@ -162,9 +162,9 @@ protected function dispatchInternal(RequestInterface $request)
 
         foreach ($this->routes as $route) {
             try {
-                $routeMatchSpan = $this->timers->startGeneric("route-match");
+                // $routeMatchSpan = $this->timers->startGeneric("route-match");
                 $action = $route->match($request);
-                $routeMatchSpan->finish();
+                // $routeMatchSpan->finish();
                 if ($action instanceof \Exception) {
                     // Hold the action in case another route succeeds.
                     $ex = $action;

diff --git a/library/Vanilla/Scheduler/DeferredScheduler.php b/library/Vanilla/Scheduler/DeferredScheduler.php
@@ -341,9 +341,8 @@ protected function dispatchAll(): array
         /** @var TrackingSlip $trackingSlip */
         foreach ($this->generateTrackingSlips() as $trackingSlip) {
             $trackingSlip->start();
-            $jobClass = $trackingSlip->getJobInterface();
             $span = $this->timers->startGeneric("dispatchJob", [
-                "name" => "Job: $jobClass",
+                "name" => "Job: {$trackingSlip->getType()}",
                 "trackingID" => $trackingSlip->getTrackingID(),
             ]);
             try {
@@ -387,6 +386,10 @@ protected function dispatchAll(): array
                 $trackingSlip->log();
             }
         }
+
+        foreach ($this->drivers as $driver) {
+            $driver->cleanupAfterDispatch();
+        }
         return $this->trackingSlips;
     }
 

diff --git a/library/Vanilla/Scheduler/Driver/DriverInterface.php b/library/Vanilla/Scheduler/Driver/DriverInterface.php
@@ -38,4 +38,11 @@ public function execute(DriverSlipInterface $driverSlip): JobExecutionStatus;
      * @return array
      */
     public function getSupportedInterfaces(): array;
+
+    /**
+     * Use this method to have your driver perform any necessary cleanup after all jobs have been executed.
+     *
+     * @return void
+     */
+    public function cleanupAfterDispatch(): void;
 }
diff --git a/library/Vanilla/Scheduler/Driver/LocalDriver.php b/library/Vanilla/Scheduler/Driver/LocalDriver.php
@@ -94,4 +94,12 @@ public function getSupportedInterfaces(): array
     {
         return [LocalJobInterface::class];
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function cleanupAfterDispatch(): void
+    {
+        // Nothing to do here.
+    }
 }
diff --git a/library/Vanilla/Utility/StringUtils.php b/library/Vanilla/Utility/StringUtils.php
@@ -7,6 +7,7 @@
 namespace Vanilla\Utility;
 
 use Firebase\JWT\JWT;
+use function Sodium\add;
 
 /**
  * A collection of string utilities.
@@ -237,6 +238,13 @@ public static function flattenArray($rows, $prefix = "")
             } elseif (is_array($value)) {
                 $result = $result + self::flattenArray($value, $prefix . $key . ".");
             } else {
+                if (is_string($value)) {
+                    // Remove escaped quotes since those are not processed by the CSV generator.
+                    $value = str_replace("\\\"", "\"", $value);
+
+                    // Escape next line to prevent text from breaking.
+                    $value = str_replace("\n", "\\n", $value);
+                }
                 $result[$prefix . $key] = $value;
             }
         }

diff --git a/library/Vanilla/Utility/Timers.php b/library/Vanilla/Utility/Timers.php
@@ -261,8 +261,8 @@ private function shouldRecordProfile(): bool
         $session = \Gdn::session();
         $config = \Gdn::config();
 
-        if (!$config->get("trace.profiler", true)) {
-            // Never record traces if the feature is disabled. On by default.
+        if (!$config->get("trace.profiler", false)) {
+            // Never record traces if the feature is disabled. Off by default.
             return false;
         }
 

diff --git a/library/Vanilla/Web/MasterViewRenderer.php b/library/Vanilla/Web/MasterViewRenderer.php
@@ -115,6 +115,16 @@ public function renderGdnController(\Gdn_Controller $controller): string
 
         $bodyHtmlKey = $controller->getIsReactView() ? "seoContent" : "bodyContent";
 
+        foreach ($this->getFontCssUrls() as $fontCssUrl) {
+            $modernPageHead = \Gdn::getContainer()->get(PageHead::class);
+            $inlineContent = $modernPageHead->getInlineStyleFromUrl($fontCssUrl);
+            if ($inlineContent !== null) {
+                $controller->Head->addString("<style>{$inlineContent}</style>");
+            } else {
+                $controller->Head->addCss($fontCssUrl);
+            }
+        }
+
         $extraData = [
             $bodyHtmlKey => $this->renderThemeContentView($data) ?? $controller->renderAssetForTwig("Content"),
             "cssClasses" =>
@@ -191,7 +201,7 @@ private function getFontCssUrls(): array
         $fontsAssetUrls = array_column($fontsAssets, "url");
 
         $variables = $this->themePreloader->getVariables();
-        $fontVars = $variables["font"] ?? [];
+        $fontVars = $variables["global"]["fonts"] ?? [];
 
         $customFontUrl = $fontVars["customFont"]["url"] ?? ($fontVars["customFontUrl"] ?? null);
         $forceGoogleFont = $fontVars["forceGoogleFont"] ?? false;

diff --git a/library/core/class.email.php b/library/core/class.email.php
@@ -532,7 +532,7 @@ public function send($eventName = "")
         try {
             $this->mailer->send();
         } finally {
-            $span->stopTimer();
+            $span->finish();
         }
 
         if ($this->isDebug() && $this->logger instanceof Psr\Log\LoggerInterface) {

diff --git a/library/core/class.proxyrequest.php b/library/core/class.proxyrequest.php
@@ -434,6 +434,7 @@ public function request($options = null, $queryParams = null, $files = null, $ex
         curl_setopt($handler, CURLOPT_CONNECTTIMEOUT, $connectTimeout);
         curl_setopt($handler, CURLOPT_HEADERFUNCTION, [$this, "CurlHeader"]);
         curl_setopt($handler, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+        curl_setopt($handler, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
 
         if ($transferMode == "binary") {
             curl_setopt($handler, CURLOPT_BINARYTRANSFER, true);

diff --git a/library/core/class.session.php b/library/core/class.session.php
@@ -419,7 +419,12 @@ public function getPreference($preferenceName, $defaultValue = false)
     public function getAttribute($attributeName, $defaultValue = false)
     {
         if (is_array($this->_Attributes)) {
-            return val($attributeName, $this->_Attributes, $defaultValue);
+            $value = val($attributeName, $this->_Attributes, $defaultValue);
+            // return same default value type
+            if (is_array($defaultValue) && $value === false) {
+                $value = $defaultValue;
+            }
+            return $value;
         }
         return $defaultValue;
     }

diff --git a/library/src/scripts/categoriesWidget/CategoryList.tsx b/library/src/scripts/categoriesWidget/CategoryList.tsx
@@ -16,6 +16,7 @@ import { HomeWidgetContainer } from "@library/homeWidget/HomeWidgetContainer";
 import { WidgetContainerDisplayType } from "@library/homeWidget/HomeWidgetContainer.styles";
 import { updateCategoryFollowCount } from "@library/categoriesWidget/CategoriesWidget.utils";
 import cloneDeep from "lodash/cloneDeep";
+import isEqual from "lodash/isEqual";
 
 export function CategoryList(props: ICategoriesWidgetProps) {
     const classes = categoryListClasses();
@@ -25,13 +26,20 @@ export function CategoryList(props: ICategoriesWidgetProps) {
         contentType: props.itemOptions?.contentType,
     };
 
-    const [categories, setCategories] = useState<ICategoryItem[]>(cloneDeep(props.itemData));
+    const itemData = cloneDeep(props.itemData);
+
+    const [categories, setCategories] = useState<ICategoryItem[]>(itemData);
     const [categoryWithFollowCountChange, setCategoryWithFollowCountChange] = useState<{
         categoryID: ICategoryItem["categoryID"];
         preferences: ICategoryItem["preferences"];
     } | null>(null);
 
     useEffect(() => {
+        // reset the state if itemData from props is changed
+        if (!isEqual(categories, itemData)) {
+            setCategories(itemData);
+        }
+
         if (categoryWithFollowCountChange) {
             const updatedCategories = updateCategoryFollowCount(
                 categories,
@@ -44,7 +52,7 @@ export function CategoryList(props: ICategoriesWidgetProps) {
             }
             setCategoryWithFollowCountChange(null);
         }
-    }, [categoryWithFollowCountChange]);
+    }, [categoryWithFollowCountChange, itemData]);
 
     const onCategoryFollowChange = (categoryWithNewPreferences: {
         categoryID: ICategoryItem["categoryID"];

diff --git a/library/src/scripts/features/discussions/DiscussionList.classes.ts b/library/src/scripts/features/discussions/DiscussionList.classes.ts
@@ -202,6 +202,10 @@ export const discussionListClasses = useThemeCache(
             },
         });
 
+        const disablePointerEvents = css({
+            pointerEvents: "none",
+        });
+
         return {
             title,
             iconAndVoteCounterWrapper,
@@ -223,6 +227,7 @@ export const discussionListClasses = useThemeCache(
             filterAndSortingLabel,
             filterAndSortingDropdown,
             filterAndSortingButton,
+            disablePointerEvents,
         };
     },
 );
diff --git a/library/src/scripts/features/discussions/DiscussionListAsset.tsx b/library/src/scripts/features/discussions/DiscussionListAsset.tsx
@@ -69,6 +69,11 @@ export function DiscussionListAsset(props: IProps) {
             pinOrder: getPinOrder(sort),
         };
 
+        // we always receive this from props, so reset it here to avoid categoryID from previous page/state if navigating between react pages
+        if (props.apiParams?.categoryID) {
+            finalParams.categoryID = props.apiParams?.categoryID;
+        }
+
         // In case a community manager shared a link that had one of these set.
         // Display a permission error and exclude the parameter.
         if (finalParams.internalStatusID?.length && !isCommunityManager) {
@@ -125,6 +130,7 @@ export function DiscussionListAsset(props: IProps) {
             paginationProps={paginationProps}
             apiParams={actualApiParams}
             updateApiParams={updateApiParams}
+            isPreview={props.isPreview}
         />
     );
 

diff --git a/library/src/scripts/features/discussions/DiscussionListAssetHeader.tsx b/library/src/scripts/features/discussions/DiscussionListAssetHeader.tsx
@@ -23,13 +23,14 @@ interface IProps {
     paginationProps?: INumberedPagerProps;
     apiParams: IGetDiscussionListParams;
     updateApiParams: (newParams: Partial<IGetDiscussionListParams>) => void;
+    isPreview?: boolean;
 }
 
 /**
  * Header component for discussion list asset.
  */
 export function DiscussionListAssetHeader(props: IProps) {
-    const { updateApiParams, apiParams } = props;
+    const { updateApiParams, apiParams, isPreview } = props;
     const classes = discussionListClasses();
     const { hasPermission } = usePermissionsContext();
     const canUseCheckboxes =
@@ -39,7 +40,7 @@ export function DiscussionListAssetHeader(props: IProps) {
     const isMobile = measure.width < 600;
 
     return (
-        <div className={cx(classes.assetHeader)} ref={selfRef}>
+        <div className={cx(classes.assetHeader, { [classes.disablePointerEvents]: isPreview })} ref={selfRef}>
             <div>
                 {canUseCheckboxes && (
                     <DiscussionListSelectAll