feat(ministry brands): handler in editor-client

admin/blocks/main.php

@@ -222,7 +222,7 @@ public function getMatchingBrizyBlocks($wpPost = null)
         } else {
             $template = Brizy_Admin_Templates::instance()->getTemplateForCurrentPage();
 
-            if ($template) {
+           if ($template) {
                 $ruleMatches = $this->getTemplateRuleMatches($template->getWpPost());
             } else {
                 $ruleMatches[] = [

config.dev.php

@@ -25,7 +25,6 @@ class Brizy_Config
     const PLATFORM_EMAIL = "[email protected]";
 
     const UPGRADE_TO_PRO_URL = "https://www.brizy.io/pricing/?utm_source=wp-menu&utm_campaign=gopro&utm_medium=wp-dash/";
-    const EDITOR_TEMPLEATES_URL = "https://e-t-cloud.b-cdn.net/1.3.3-beta2/";
     const EDITOR_NEW_TEMPLEATES_URL = "https://phplaravel-1109775-4184176.cloudwaysapps.com/";
     const SUPPORT_URL = "https://support.brizy.io";
     const ABOUT_URL = "https://brizy.io";
@@ -73,8 +72,6 @@ class Brizy_Config
     // this file will be stored in uploads/brizy/
     const PROJECT_STLYES_FILE_PATH = DIRECTORY_SEPARATOR.'project'.DIRECTORY_SEPARATOR.'styles.css';
 
-    const TEMPLATES_URL = 'https://template-mk.b-cdn.net';
-
     static public function getCompilerUrls()
     {
         $host = self::getEnvValue('COMPILER_HOST');
@@ -139,11 +136,6 @@ static public function getUpgradeUrl()
         return apply_filters('brizy_upgrade_to_pro_url', self::UPGRADE_TO_PRO_URL);
     }
 
-    static public function getEditorTemplatesUrl($directories)
-    {
-        return apply_filters('brizy_editor_config_templates_url', self::EDITOR_TEMPLEATES_URL.$directories);
-    }
-
     static public function getEditorNewTemplatesUrl($directories)
     {
         return apply_filters('brizy_editor_config_templates_url', self::EDITOR_NEW_TEMPLEATES_URL.$directories);

config.php

@@ -26,7 +26,6 @@ class Brizy_Config
     const PLATFORM_EMAIL = "[email protected]";
 
     const UPGRADE_TO_PRO_URL = "https://www.brizy.io/pricing/?utm_source=wp-menu&utm_campaign=gopro&utm_medium=wp-dash/";
-    const EDITOR_TEMPLEATES_URL = "https://e-t-cloud.b-cdn.net/1.3.3-beta2/";
     const SUPPORT_URL = "https://support.brizy.io";
     const ABOUT_URL = "https://www.brizy.io";
     const TERMS_OF_SERVICE_URL = "https://www.brizy.io/terms-and-conditions";
@@ -73,8 +72,6 @@ class Brizy_Config
     // this file will be stored in uploads/brizy/
     const PROJECT_STLYES_FILE_PATH = '/project/styles.css';
 
-    const TEMPLATES_URL = 'https://template-mk.b-cdn.net';
-
     static public function getCompilerUrls()
     {
         return new Brizy_Admin_UrlIterator(
@@ -128,11 +125,6 @@ static public function getUpgradeUrl()
         return apply_filters('brizy_upgrade_to_pro_url', self::UPGRADE_TO_PRO_URL);
     }
 
-    static public function getEditorTemplatesUrl($directories)
-    {
-        return apply_filters('brizy_editor_config_templates_url', self::EDITOR_TEMPLEATES_URL.$directories);
-    }
-
     static public function getTermsOfServiceUrl()
     {
         return apply_filters('brizy_config_terms_of_service_url', self::TERMS_OF_SERVICE_URL);

editor/editor/editor.php

@@ -411,10 +411,6 @@ private function getApiConfigFields($config, $context)
                     'fileUrl' => home_url('?'.Brizy_Editor::prefix('_attachment').'='),
                 ],
                 'templates' => [
-                    'kitsUrl' => Brizy_Config::getEditorTemplatesUrl('kits'),
-                    'layoutsUrl' => Brizy_Config::getEditorTemplatesUrl('layouts'),
-                    'popupsUrl' => Brizy_Config::getEditorTemplatesUrl('popups'),
-                    'storiesUrl' => Brizy_Config::getEditorTemplatesUrl('stories'),
                     'layoutsChunkUrl' => Brizy_Config::LAYOUTS_CHUNK_URL,
                     'layoutsPagesUrl' => Brizy_Config::LAYOUTS_PAGES_URL,
                     'layoutDataUrl' => Brizy_Config::LAYOUTS_PAGE_DATA_URL,
@@ -426,7 +422,6 @@ private function getApiConfigFields($config, $context)
                     'storiesChunkUrl' => Brizy_Config::STORIES_CHUNK_URL,
                     'storiesPagesUrl' => Brizy_Config::STORIES_PAGES_URL,
                     'storiesDataUrl' => Brizy_Config::STORIES_DATA_URL,
-                    'templatesUrl' => Brizy_Config::TEMPLATES_URL,
                 ],
                 'templatesImageUrl' => Brizy_Config::TEMPLATES_IMAGE_URL,
             ],

public/editor-client/src/config.ts

@@ -9,10 +9,6 @@ import { throwOnNullish } from "./utils/throwOnNullish";
 import { MValue } from "./utils/types";
 
 interface DefaultTemplates {
-  kitsUrl: string;
-  popupsUrl: string;
-  storiesUrl: string;
-  layoutsUrl: string;
   layoutDataUrl: string;
   layoutsChunkUrl: string;
   layoutsPagesUrl: string;
@@ -24,7 +20,6 @@ interface DefaultTemplates {
   storiesChunkUrl: string;
   storiesPagesUrl: string;
   storiesDataUrl: string;
-  templatesUrl: string;
 }
 
 interface Actions {
@@ -83,6 +78,7 @@ interface API {
   fileUrl: string;
   templates: DefaultTemplates;
   openAIUrl?: string;
+  ekklesiaApiUrl?: string;
   iconsUrl?: string;
   iconUrl?: string;
   deleteIconUrl?: string;
@@ -105,22 +101,6 @@ export interface Config {
 }
 
 const templatesReader = parseStrict<Record<string, unknown>, DefaultTemplates>({
-  kitsUrl: pipe(
-    mPipe(Obj.readKey("kitsUrl"), Str.read),
-    throwOnNullish("Invalid API Config: kits")
-  ),
-  layoutsUrl: pipe(
-    mPipe(Obj.readKey("layoutsUrl"), Str.read),
-    throwOnNullish("Invalid API Config: layouts")
-  ),
-  popupsUrl: pipe(
-    mPipe(Obj.readKey("popupsUrl"), Str.read),
-    throwOnNullish("Invalid API Config: popups")
-  ),
-  storiesUrl: pipe(
-    mPipe(Obj.readKey("storiesUrl"), Str.read),
-    throwOnNullish("Invalid API Config: stories")
-  ),
   layoutDataUrl: pipe(
     mPipe(Obj.readKey("layoutDataUrl"), Str.read),
     throwOnNullish("Invalid API Config: layouts")
@@ -164,10 +144,6 @@ const templatesReader = parseStrict<Record<string, unknown>, DefaultTemplates>({
   storiesDataUrl: pipe(
     mPipe(Obj.readKey("storiesDataUrl"), Str.read),
     throwOnNullish("Invalid API Config: stories")
-  ),
-  templatesUrl: pipe(
-    mPipe(Obj.readKey("templatesUrl"), Str.read),
-    throwOnNullish("Invalid API Config: templates")
   )
 });
 
@@ -236,7 +212,8 @@ const apiReader = parseStrict<PLUGIN_ENV["api"], API>({
   iconUrl: readIconUrl("iconUrl"),
   iconsUrl: readIconUrl("getIconsUrl"),
   uploadIconUrl: readIconUrl("uploadIconUrl"),
-  deleteIconUrl: readIconUrl("deleteIconUrl")
+  deleteIconUrl: readIconUrl("deleteIconUrl"),
+  ekklesiaApiUrl: optional(mPipe(Obj.readKey("ekklesiaApiUrl"), Str.read))
 });
 
 const actionsReader = parseStrict<PLUGIN_ENV["actions"], Actions>({

public/editor-client/src/customFile/addFile.ts

@@ -47,7 +47,7 @@ export const addFile: AddFileData = {
           .then((res) => res.blob())
           .then((blob) => {
             const file = new File([blob], filename, { type: mimeType });
-            validateByComponent(file, componentId)
+            validateByComponent(file, componentId, url)
               .then(() => handleGetAttachmentById(res, attachment))
               .catch((e) => rej(e.message));
           });

public/editor-client/src/customFile/lottieFile.ts

@@ -55,3 +55,5 @@ export const validateLottie = (file: File): Promise<LottieData> =>
 
     fileReader.readAsText(file);
   });
+
+export const isLottieFile = (file: string): boolean => /\.lottie$/i.test(file);

public/editor-client/src/customFile/utils.ts

@@ -2,15 +2,21 @@ import { Model } from "backbone";
 import { getAttachmentById } from "../api";
 import { UploadData } from "../types/File";
 import { Response } from "../types/Response";
-import { validateLottie } from "./lottieFile";
+import { isLottieFile, validateLottie } from "./lottieFile";
 
 export const validateByComponent = (
   file: File,
-  componentId: string
+  componentId: string,
+  url: string
 ): Promise<unknown> => {
   switch (componentId) {
-    case "Lottie":
-      return validateLottie(file);
+    case "Lottie": {
+      // we should validate only json lottie files
+      if (!isLottieFile(url)) {
+        return validateLottie(file);
+      }
+      return Promise.resolve();
+    }
     default:
       return Promise.resolve();
   }