Merge branch 'master' of github.com:cerpus/Edlib into unit-tests-and-…

…minor-fixes-202310
cerpus · Oct 16, 2023 · a0a6647 · a0a6647
2 parents 8badaf5 + 0bd2a53
commit a0a6647
Show file tree

Hide file tree

Showing 39 changed files with 3 additions and 650 deletions.
diff --git a/chart/templates/common.yaml b/chart/templates/common.yaml
@@ -39,8 +39,6 @@
 {{- $_ := set $commonEnvConfig "EDLIBCOMMON_RABBITMQ_PASSWORD" .Global.Values.services.rabbitmq.password -}}
 {{- $_ := set $commonEnvConfig "EDLIBCOMMON_RABBITMQ_SECURE" .Global.Values.services.rabbitmq.secure -}}
 
-{{- $_ := set $commonEnvConfig "EDLIBCOMMON_EMBEDLY_KEY" .Global.Values.services.embedly.key -}}
-
 {{- $_ := set $commonEnvConfig "EDLIBCOMMON_CONTENTAUTHOR_URL" .Global.Values.contentauthor.url -}}
 {{- $_ := set $commonEnvConfig "EDLIBCOMMON_CONTENTAUTHOR_CONSUMER_KEY" .Global.Values.contentauthor.h5pConsumerKey -}}
 {{- $_ := set $commonEnvConfig "EDLIBCOMMON_CONTENTAUTHOR_CONSUMER_SECRET" .Global.Values.contentauthor.h5pConsumerSecret -}}

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -59,5 +59,3 @@ services:
     user: "rabbitmq"
     password: "rabbitmq"
     secure: "true"
-  embedly:
-    key: "key"
diff --git a/localSetup/.env.example b/localSetup/.env.example
@@ -19,8 +19,6 @@ EDLIBCOMMON_DB_CHARSET=utf8mb4
 
 EDLIBCOMMON_RABBITMQ_HOST=rabbitmq
 
-EDLIB_COMMON_EMBEDLY_KEY=
-
 EDLIBCOMMON_LOCAL_DEVELOPMENT=true
 EDLIBCOMMON_FEATURE_AUTO_UPDATE_LTI_USAGE=false
 EDLIBCOMMON_DISPLAY_DETAILED_ERRORS=true

diff --git a/localSetup/projects/content-author/.env b/localSetup/projects/content-author/.env
@@ -32,8 +32,6 @@ QUESTIONBANK_SERVICE_URL=http://questionbankservice:8104
 IMAGESERVICE_URL=https://imagestorageservice-test.edlibservices.cerpus.net
 IMAGESERVICE_SYSTEM_NAME=DevEnvContainer
 
-EMBEDLY_KEY=
-
 REDIS_HOST=redis
 REDIS_PASSWORD=null
 REDIS_PORT=6379

diff --git a/sourcecode/apis/contentauthor/app/Http/Controllers/API/EmbedlyController.php b/sourcecode/apis/contentauthor/app/Http/Controllers/API/EmbedlyController.php
diff --git a/sourcecode/apis/contentauthor/app/Http/Controllers/ContentController.php b/sourcecode/apis/contentauthor/app/Http/Controllers/ContentController.php
@@ -5,7 +5,6 @@
 use App\Http\Libraries\ContentTypes\ArticleContentType;
 use App\Http\Libraries\ContentTypes\ContentType;
 use App\Http\Libraries\ContentTypes\ContentTypeInterface;
-use App\Http\Libraries\ContentTypes\EmbedContentType;
 use App\Http\Libraries\ContentTypes\InteractivityContentType;
 use App\Http\Libraries\ContentTypes\LinkContentType;
 use App\Http\Libraries\ContentTypes\H5PContentType;
@@ -83,10 +82,6 @@ private function getActiveContentTypes()
                     InteractivityContentType::class,
                     QuestionsContentType::class,
                 ]);
-
-                if (config('feature.use-add-link-resource') === true) {
-                    $activeContentTypes->push(EmbedContentType::class);
-                }
                 break;
             case "grid":
             default:

diff --git a/sourcecode/apis/contentauthor/app/Http/Controllers/EmbedController.php b/sourcecode/apis/contentauthor/app/Http/Controllers/EmbedController.php
diff --git a/sourcecode/apis/contentauthor/app/Http/Libraries/ContentTypes/EmbedContentType.php b/sourcecode/apis/contentauthor/app/Http/Libraries/ContentTypes/EmbedContentType.php
diff --git a/sourcecode/apis/contentauthor/app/Http/Libraries/EmbedlyService.php b/sourcecode/apis/contentauthor/app/Http/Libraries/EmbedlyService.php
diff --git a/sourcecode/apis/contentauthor/app/Http/Requests/EmbedRequest.php b/sourcecode/apis/contentauthor/app/Http/Requests/EmbedRequest.php
diff --git a/sourcecode/apis/contentauthor/app/Libraries/DataObjects/EmbedStateDataObject.php b/sourcecode/apis/contentauthor/app/Libraries/DataObjects/EmbedStateDataObject.php
diff --git a/sourcecode/apis/contentauthor/config/embedly.php b/sourcecode/apis/contentauthor/config/embedly.php
diff --git a/sourcecode/apis/contentauthor/config/feature.php b/sourcecode/apis/contentauthor/config/feature.php
@@ -9,7 +9,6 @@
     'no-rabbitmq' => false,
     'collaboration' => env('FEATURE_COLLABORATION', false),
     'allow-mode-switch' => env('FEATURE_MODE_SWITCH', false),
-    'use-add-link-resource' => env('FEATURE_USE_ADD_LINK_RESOURCE', true),
     'enableUserPublish' => env('FEATURE_ENABLE_USER_PUBLISH', env('FEATURE_ENABLE_DRAFT_LOGIC', true)),
     "export_h5p_on_save" => env("FEATURE_EXPORT_H5P_ON_SAVE", false),
     "export_h5p_with_local_files" => env("FEATURE_EXPORT_H5P_WITH_LOCAL_FILES", true),

diff --git a/sourcecode/apis/contentauthor/phpstan-baseline.neon b/sourcecode/apis/contentauthor/phpstan-baseline.neon
@@ -300,16 +300,6 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/ArticleCopyrightController.php
 
-		-
-			message: "#^Call to an undefined method App\\\\Http\\\\Controllers\\\\EmbedController\\:\\:doShow\\(\\)\\.$#"
-			count: 1
-			path: app/Http/Controllers/EmbedController.php
-
-		-
-			message: "#^Call to an undefined method App\\\\Http\\\\Controllers\\\\EmbedController\\:\\:edit\\(\\)\\.$#"
-			count: 1
-			path: app/Http/Controllers/EmbedController.php
-
 		-
 			message: "#^Call to an undefined method App\\\\Http\\\\Controllers\\\\GameController\\:\\:create\\(\\)\\.$#"
 			count: 1

diff --git a/sourcecode/apis/contentauthor/resources/assets/entrypoints/react-embed.js b/sourcecode/apis/contentauthor/resources/assets/entrypoints/react-embed.js