Merge pull request #4336 from makre10/SHARE-433

SHARE-433 Add Studios to sidebar
Catrobat · Sep 28, 2023 · faee9e6 · faee9e6
2 parents 4047d6d + ba24714
commit faee9e6
Show file tree

Hide file tree

Showing 78 changed files with 106 additions and 3 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -89,7 +89,6 @@ jobs:
         with:
           name: PhpUnitTestReport
           path: tests/TestReports/CoverageReports/PhpUnit
-
       - uses: codecov/codecov-action@v3
         with:
           # token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
@@ -235,7 +234,6 @@ jobs:
             cat tests/TestReports/Behat/${{ matrix.testSuite }}.log;
             docker exec app.catroweb bin/behat -s ${{ matrix.testSuite }} -f pretty;
           fi
-
       - uses: codecov/codecov-action@v3
         with:
           # token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos

diff --git a/config/features.php b/config/features.php
@@ -4,4 +4,5 @@
   'Test-Flag' => false,
   'New-Feature' => false,
   'Experimental-Feature' => true,
+  'Sidebar-Studio-Link-Feature' => false,
 ];
diff --git a/src/Application/Controller/Test/TestFeatureFlagController.php b/src/Application/Controller/Test/TestFeatureFlagController.php
@@ -16,4 +16,9 @@ public function testFlagAction(): Response
   {
     return $this->render('Admin/Tools/test_feature_flag.html.twig', ['enabled' => $this->manager->isEnabled('Test-Flag')]);
   }
+
+  public function testFlagSidebarStudioLink(): Response
+  {
+    return $this->render('Admin/Tools/feature_flag_sidebar_studio_link.html.twig', ['enabled' => $this->manager->isEnabled('Sidebar-Studio-Link-Feature')]);
+  }
 }
diff --git a/templates/Admin/Tools/feature_flag_sidebar_studio_link.html.twig b/templates/Admin/Tools/feature_flag_sidebar_studio_link.html.twig
@@ -0,0 +1,8 @@
+{% if enabled %}
+<li class="nav-item" >
+    <a class="nav-link" href="{{ url('studios_overview') }} id="btn-studio"">
+        <span class="sidebar-link-icon material-icons">group_work</span>
+        <span class="sidebar-link-text">{{ 'menu.studio'|trans({}, "catroweb") }}</span>
+    </a>
+</li>
+{% endif %}
diff --git a/templates/Default/sidebar.html.twig b/templates/Default/sidebar.html.twig
@@ -113,13 +113,20 @@
 
     {# Always visible #}
 
+
     <li class="nav-item">
       <a class="nav-link" href="{{ url('media_library_overview') }}">
         <span class="sidebar-link-icon material-icons">collections</span>
         <span class="sidebar-link-text">{{ 'menu.mediaLibrary'|trans({}, "catroweb") }}</span>
       </a>
     </li>
 
+    {{ render(controller(
+      'App\\Application\\Controller\\Test\\TestFeatureFlagController::testFlagSidebarStudioLink'
+    )) }}
+
+
+
     <li class="nav-item">
       <a class="nav-link" href="{{url('help')}}" id="btn-tutorials">
         <span class="sidebar-link-icon material-icons">help_outline</span>

diff --git a/tests/BehatFeatures/web/admin/feature_flag.feature b/tests/BehatFeatures/web/admin/feature_flag.feature
@@ -25,4 +25,16 @@ Scenario: Overriding test feature with header true:
 Scenario: Overriding test feature with header false:
     Given I am on the page "/app/featureflag/test" with header "X-Feature-Flag-Test-Flag" equal to "0"
     And I wait for the page to be loaded
-    Then I should see "Test feature is disabled!"
+    Then I should see "Test feature is disabled!"
+
+Scenario: List Studio Link Feature Flags:
+   Given I log in as "Admin" with the password "123456"
+   And I am on "/admin/featureflag/list"
+   Then I should see "Sidebar-Studio-Link-Feature"
+
+
+
+
+
+
+
diff --git a/translations/catroweb.af_ZA.yaml b/translations/catroweb.af_ZA.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.ar_SA.yaml b/translations/catroweb.ar_SA.yaml
@@ -395,6 +395,7 @@ menu:
   helpAndTutorials: تعليمات ودروس
   followersAndFollowing: متابع
   mediaLibrary: مكتبة الوسائط
+  studio: استوديوهات
 login:
   login: تسجيل الدخول
   button:

diff --git a/translations/catroweb.az_AZ.yaml b/translations/catroweb.az_AZ.yaml
@@ -395,6 +395,7 @@ menu:
   helpAndTutorials: Kömək və təlimatlar
   followersAndFollowing: İzləyici
   mediaLibrary: Media library
+  studio: Studiyalar
 login:
   login: Giriş
   button:

diff --git a/translations/catroweb.bg_BG.yaml b/translations/catroweb.bg_BG.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.bn_BD.yaml b/translations/catroweb.bn_BD.yaml
@@ -401,6 +401,7 @@ menu:
   helpAndTutorials: সহায়তা ও টিউটোরিয়াল
   followersAndFollowing: অনুসরণকারী
   mediaLibrary: মিডিয়া লাইব্রেরি
+  studio: স্টুডিও
 login:
   login: প্রবেশ করুন
   button:

diff --git a/translations/catroweb.bs_BA.yaml b/translations/catroweb.bs_BA.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Pomoć i tutorijali
   followersAndFollowing: Follower
   mediaLibrary: Biblioteka medija
+  studio: Studios
 login:
   login: Prijava
   button:

diff --git a/translations/catroweb.ca_ES.yaml b/translations/catroweb.ca_ES.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.chr_US.yaml b/translations/catroweb.chr_US.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.cs_CZ.yaml b/translations/catroweb.cs_CZ.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Knihovna médií
+  studio: Studia
 login:
   login: Přihlásit se
   button:

diff --git a/translations/catroweb.da_DK.yaml b/translations/catroweb.da_DK.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Log på
   button:

diff --git a/translations/catroweb.de_DE.yaml b/translations/catroweb.de_DE.yaml
@@ -399,6 +399,7 @@ menu:
   helpAndTutorials: Hilfe & Tutorials
   followersAndFollowing: Abonnenten
   mediaLibrary: Medienbibliothek
+  studio: Studios
 login:
   login: Einloggen
   button:

diff --git a/translations/catroweb.el_GR.yaml b/translations/catroweb.el_GR.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Βιβλιοθήκη πολυμέσων
+  studio: Στούντιο
 login:
   login: Σύνδεση
   button:

diff --git a/translations/catroweb.en.yaml b/translations/catroweb.en.yaml
@@ -409,6 +409,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 
 login:
   login: Login

diff --git a/translations/catroweb.en_AU.yaml b/translations/catroweb.en_AU.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.en_CA.yaml b/translations/catroweb.en_CA.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.en_GB.yaml b/translations/catroweb.en_GB.yaml
@@ -395,6 +395,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.es_ES.yaml b/translations/catroweb.es_ES.yaml
@@ -395,6 +395,7 @@ menu:
   helpAndTutorials: Ayuda y tutoriales
   followersAndFollowing: Seguidor
   mediaLibrary: Libreria de medios
+  studio: Estudios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.eu_ES.yaml b/translations/catroweb.eu_ES.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.fa_AF.yaml b/translations/catroweb.fa_AF.yaml
@@ -395,6 +395,7 @@ menu:
   helpAndTutorials: کمک و آموزش
   followersAndFollowing: دنبال کننده
   mediaLibrary: کتابخانه ی رسانه
+  studio: استودیوها
 login:
   login: وارد شدن
   button:

diff --git a/translations/catroweb.fa_IR.yaml b/translations/catroweb.fa_IR.yaml
@@ -399,6 +399,7 @@ menu:
   helpAndTutorials: کمک و آموزش
   followersAndFollowing: پی‌گیر
   mediaLibrary: کتابخانه ی رسانه
+  studio: استودیوها
 login:
   login: ورود به سیستم
   button:

diff --git a/translations/catroweb.fi_FI.yaml b/translations/catroweb.fi_FI.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.fr_FR.yaml b/translations/catroweb.fr_FR.yaml
@@ -395,6 +395,7 @@ menu:
   helpAndTutorials: Aide et tutoriels
   followersAndFollowing: Suiveurs
   mediaLibrary: Bibliothèque multimédia
+  studio: Ateliers
 login:
   login: Se connecter
   button:

diff --git a/translations/catroweb.gl_ES.yaml b/translations/catroweb.gl_ES.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Iniciar sesión
   button:

diff --git a/translations/catroweb.gu_IN.yaml b/translations/catroweb.gu_IN.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: સ્ટુડિયો
 login:
   login: લોગીન
   button:

diff --git a/translations/catroweb.ha_HG.yaml b/translations/catroweb.ha_HG.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.he_IL.yaml b/translations/catroweb.he_IL.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: התחברות
   button:

diff --git a/translations/catroweb.hi_IN.yaml b/translations/catroweb.hi_IN.yaml
@@ -395,6 +395,7 @@ menu:
   helpAndTutorials: सहायता और ट्यूटोरियल
   followersAndFollowing: अनुगामी
   mediaLibrary: मीडिया लाइब्रेरी
+  studio: स्टूडियो
 login:
   login: प्रवेश करे
   button:

diff --git a/translations/catroweb.hr_HR.yaml b/translations/catroweb.hr_HR.yaml
@@ -400,6 +400,7 @@ menu:
   helpAndTutorials: Pomoc i Tutorijali
   followersAndFollowing: Sljedbenik
   mediaLibrary: Biblioteka medijskih sadržaja
+  studio: Studiji
 login:
   login: prijava
   button:

diff --git a/translations/catroweb.hu_HU.yaml b/translations/catroweb.hu_HU.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Bejelentkezés
   button:

diff --git a/translations/catroweb.id_ID.yaml b/translations/catroweb.id_ID.yaml
@@ -395,6 +395,7 @@ menu:
   helpAndTutorials: Bantuan & tutorial
   followersAndFollowing: Pengikut
   mediaLibrary: Perpustakaan media
+  studio: Studio
 login:
   login: Gabung
   button:

diff --git a/translations/catroweb.ig_NG.yaml b/translations/catroweb.ig_NG.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.it_IT.yaml b/translations/catroweb.it_IT.yaml
@@ -399,6 +399,7 @@ menu:
   helpAndTutorials: Tutorial e aiuto
   followersAndFollowing: Seguace
   mediaLibrary: Libreria multimediale
+  studio: Studi
 login:
   login: Login
   button:

diff --git a/translations/catroweb.ja_JP.yaml b/translations/catroweb.ja_JP.yaml
@@ -395,6 +395,7 @@ menu:
   helpAndTutorials: ヘルプとチュートリアル
   followersAndFollowing: フォロワー
   mediaLibrary: メディア ライブラリー
+  studio: スタジオ
 login:
   login: ログイン
   button:

diff --git a/translations/catroweb.ka_GE.yaml b/translations/catroweb.ka_GE.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.kab_KAB.yaml b/translations/catroweb.kab_KAB.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.kk_KZ.yaml b/translations/catroweb.kk_KZ.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Анықтама және туториалдар
   followersAndFollowing: Бақылау
   mediaLibrary: Медиатека
+  studio: Студия
 login:
   login: Кіру
   button:

diff --git a/translations/catroweb.kn_IN.yaml b/translations/catroweb.kn_IN.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button:

diff --git a/translations/catroweb.ko_KR.yaml b/translations/catroweb.ko_KR.yaml
@@ -392,6 +392,7 @@ menu:
   helpAndTutorials: 도움말 & 튜터리얼
   followersAndFollowing: 팔로워
   mediaLibrary: 미디어 라이브러리
+  studio: 스튜디오
 login:
   login: 로그인
   button:

diff --git a/translations/catroweb.lt_LT.yaml b/translations/catroweb.lt_LT.yaml
@@ -394,6 +394,7 @@ menu:
   helpAndTutorials: Help & tutorials
   followersAndFollowing: Follower
   mediaLibrary: Media library
+  studio: Studios
 login:
   login: Login
   button: