User testing changes

- Reworked the entire export status interface - Use `AMP` instead of `Amplify` for brand - Switch contributor role to simple select2 (fixed list) - select2entity now start displaying immediately (no 2 char min) - form collections now have more detailed add button labels - moved episode transcript form text area to bottom of form to appear with transcript pdf upload - added labels to differentiate them - Added context to actions buttons (ex: `Edit Podcast` instead of `Edit`) - moved table captions to the top of the table - fixed select2 (+ select2entity) required fields not displaying form required validation on submit correctly - Added save & Continue to podcast/season/episode forms - Added image alt text and tooltip using image description - simplify Institutions into text input with datalist of Canadian Universities - New publishers and contributor->people are now added in modals (not automatically selected in form though) - fixed required label showing for collections (collection needs required so that subfields follow required settings but the * looks weird when doing this) - Allow float values for episode numbers - person/publishers are now locked to a podcast - added season/episode heading on their show pages so it is clearer where the user is - fixed select not focusing properly when opened
sfu-dhil · Dec 22, 2023 · 99fbc87 · 99fbc87
1 parent f9e4a9c
commit 99fbc87
Show file tree

Hide file tree

Showing 128 changed files with 2,062 additions and 2,401 deletions.
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "phpdocumentor/reflection-docblock": "^5.3",
         "scienta/doctrine-json-functions": "^5.3",
         "sensio/framework-extra-bundle": "^6.2",
-        "sfu-dhil/nines": "6.3.11",
+        "sfu-dhil/nines": "6.3.13",
         "simplepie/simplepie": "^1.8",
         "symfony/asset": "6.3.*",
         "symfony/console": "6.3.*",

diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/tetranzselect2entity.yaml b/config/packages/tetranzselect2entity.yaml
@@ -1,3 +1,4 @@
 tetranz_select2_entity:
+    minimum_input_length: 0
     theme: 'bootstrap-5'
     width: 100%
diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
@@ -18,7 +18,6 @@ twig:
         matomo_url: '%dhil.matomo_url%'
         matomo_siteid: '%dhil.matomo_siteid%'
         matomo_domain: '%dhil.matomo_domain%'
-        linker: '@Nines\UtilBundle\Services\EntityLinker'
         git_repo: '%env(default::string:GIT_REPO)%'
         git_commit: '%env(default::string:GIT_COMMIT)%'
         git_commit_short: '%env(default::string:GIT_COMMIT_SHORT)%'

diff --git a/migrations/2023/12/Version20231213005011.php b/migrations/2023/12/Version20231213005011.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20231213005011 extends AbstractMigration {
+    public function getDescription() : string {
+        return '';
+    }
+
+    public function up(Schema $schema) : void {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE contribution DROP FOREIGN KEY FK_EA351E1513CCE206');
+        $this->addSql('DROP TABLE contributor_role');
+        $this->addSql('DROP INDEX IDX_EA351E1513CCE206 ON contribution');
+        $this->addSql('ALTER TABLE contribution ADD role VARCHAR(255) DEFAULT NULL, DROP contributor_role_id');
+    }
+
+    public function down(Schema $schema) : void {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE contributor_role (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(191) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, label VARCHAR(200) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, description LONGTEXT CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, created DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', updated DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', relator_term VARCHAR(10) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, FULLTEXT INDEX IDX_8421DF24EA750E8 (label), FULLTEXT INDEX IDX_8421DF246DE44026 (description), FULLTEXT INDEX IDX_8421DF24EA750E86DE44026 (label, description), UNIQUE INDEX UNIQ_8421DF245E237E06 (name), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = \'\' ');
+        $this->addSql('ALTER TABLE contribution ADD contributor_role_id INT NOT NULL, DROP role');
+        $this->addSql('ALTER TABLE contribution ADD CONSTRAINT FK_EA351E1513CCE206 FOREIGN KEY (contributor_role_id) REFERENCES contributor_role (id) ON DELETE CASCADE');
+        $this->addSql('CREATE INDEX IDX_EA351E1513CCE206 ON contribution (contributor_role_id)');
+    }
+}
diff --git a/migrations/2023/12/Version20231215210331.php b/migrations/2023/12/Version20231215210331.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20231215210331 extends AbstractMigration {
+    public function getDescription() : string {
+        return '';
+    }
+
+    public function up(Schema $schema) : void {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('TRUNCATE TABLE contribution');
+        $this->addSql('ALTER TABLE person DROP FOREIGN KEY FK_34DCD17610405986');
+        $this->addSql('DROP TABLE institution');
+        $this->addSql('ALTER TABLE episode CHANGE keywords keywords JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\', CHANGE status status JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\'');
+        $this->addSql('DROP INDEX IDX_34DCD17610405986 ON person');
+        $this->addSql('ALTER TABLE person ADD institution VARCHAR(255) DEFAULT NULL, DROP institution_id');
+        $this->addSql('ALTER TABLE podcast CHANGE categories categories JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\', CHANGE keywords keywords JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\', CHANGE status status JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\'');
+        $this->addSql('ALTER TABLE season CHANGE status status JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\'');
+    }
+
+    public function down(Schema $schema) : void {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('CREATE TABLE institution (id INT AUTO_INCREMENT NOT NULL, country VARCHAR(40) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, name VARCHAR(100) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, created DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', updated DATETIME NOT NULL COMMENT \'(DC2Type:datetime_immutable)\', FULLTEXT INDEX institution_ft (name), UNIQUE INDEX institutions_uniq (country, name), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = \'\' ');
+        $this->addSql('ALTER TABLE episode CHANGE keywords keywords JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\', CHANGE status status JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\'');
+        $this->addSql('ALTER TABLE person ADD institution_id INT DEFAULT NULL, DROP institution');
+        $this->addSql('ALTER TABLE person ADD CONSTRAINT FK_34DCD17610405986 FOREIGN KEY (institution_id) REFERENCES institution (id)');
+        $this->addSql('CREATE INDEX IDX_34DCD17610405986 ON person (institution_id)');
+        $this->addSql('ALTER TABLE season CHANGE status status JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\'');
+        $this->addSql('ALTER TABLE podcast CHANGE categories categories JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\', CHANGE keywords keywords JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\', CHANGE status status JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\'');
+    }
+}
diff --git a/migrations/2023/12/Version20231218213700.php b/migrations/2023/12/Version20231218213700.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20231218213700 extends AbstractMigration {
+    public function getDescription() : string {
+        return '';
+    }
+
+    public function up(Schema $schema) : void {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE contribution ADD roles JSON DEFAULT \'[]\' NOT NULL COMMENT \'(DC2Type:json)\', DROP role');
+        $this->addSql('ALTER TABLE contribution DROP FOREIGN KEY FK_EA351E15786136AB');
+        $this->addSql('ALTER TABLE contribution DROP FOREIGN KEY FK_EA351E15362B62A0');
+        $this->addSql('ALTER TABLE contribution DROP FOREIGN KEY FK_EA351E154EC001D1');
+        $this->addSql('ALTER TABLE contribution ADD CONSTRAINT FK_EA351E15786136AB FOREIGN KEY (podcast_id) REFERENCES podcast (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE contribution ADD CONSTRAINT FK_EA351E15362B62A0 FOREIGN KEY (episode_id) REFERENCES episode (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE contribution ADD CONSTRAINT FK_EA351E154EC001D1 FOREIGN KEY (season_id) REFERENCES season (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE episode CHANGE number number DOUBLE PRECISION NOT NULL');
+        $this->addSql('ALTER TABLE podcast DROP FOREIGN KEY FK_D7E805BD40C86FCE');
+        $this->addSql('ALTER TABLE podcast ADD CONSTRAINT FK_D7E805BD40C86FCE FOREIGN KEY (publisher_id) REFERENCES publisher (id) ON DELETE SET NULL');
+        $this->addSql('ALTER TABLE season DROP FOREIGN KEY FK_F0E45BA940C86FCE');
+        $this->addSql('ALTER TABLE season ADD CONSTRAINT FK_F0E45BA940C86FCE FOREIGN KEY (publisher_id) REFERENCES publisher (id) ON DELETE SET NULL');
+    }
+
+    public function down(Schema $schema) : void {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE contribution ADD role VARCHAR(255) DEFAULT NULL, DROP roles');
+        $this->addSql('ALTER TABLE contribution DROP FOREIGN KEY FK_EA351E15786136AB');
+        $this->addSql('ALTER TABLE contribution DROP FOREIGN KEY FK_EA351E154EC001D1');
+        $this->addSql('ALTER TABLE contribution DROP FOREIGN KEY FK_EA351E15362B62A0');
+        $this->addSql('ALTER TABLE contribution ADD CONSTRAINT FK_EA351E15786136AB FOREIGN KEY (podcast_id) REFERENCES podcast (id)');
+        $this->addSql('ALTER TABLE contribution ADD CONSTRAINT FK_EA351E154EC001D1 FOREIGN KEY (season_id) REFERENCES season (id)');
+        $this->addSql('ALTER TABLE contribution ADD CONSTRAINT FK_EA351E15362B62A0 FOREIGN KEY (episode_id) REFERENCES episode (id)');
+        $this->addSql('ALTER TABLE episode CHANGE number number INT NOT NULL');
+        $this->addSql('ALTER TABLE season DROP FOREIGN KEY FK_F0E45BA940C86FCE');
+        $this->addSql('ALTER TABLE season ADD CONSTRAINT FK_F0E45BA940C86FCE FOREIGN KEY (publisher_id) REFERENCES publisher (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE podcast DROP FOREIGN KEY FK_D7E805BD40C86FCE');
+        $this->addSql('ALTER TABLE podcast ADD CONSTRAINT FK_D7E805BD40C86FCE FOREIGN KEY (publisher_id) REFERENCES publisher (id)');
+    }
+}
diff --git a/migrations/2023/12/Version20231218213930.php b/migrations/2023/12/Version20231218213930.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20231218213930 extends AbstractMigration {
+    public function getDescription() : string {
+        return '';
+    }
+
+    public function up(Schema $schema) : void {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('DELETE FROM person');
+        $this->addSql('DELETE FROM publisher');
+        $this->addSql('ALTER TABLE person ADD podcast_id INT NOT NULL');
+        $this->addSql('ALTER TABLE person ADD CONSTRAINT FK_34DCD176786136AB FOREIGN KEY (podcast_id) REFERENCES podcast (id) ON DELETE CASCADE');
+        $this->addSql('CREATE INDEX IDX_34DCD176786136AB ON person (podcast_id)');
+        $this->addSql('ALTER TABLE publisher ADD podcast_id INT NOT NULL');
+        $this->addSql('ALTER TABLE publisher ADD CONSTRAINT FK_9CE8D546786136AB FOREIGN KEY (podcast_id) REFERENCES podcast (id) ON DELETE CASCADE');
+        $this->addSql('CREATE INDEX IDX_9CE8D546786136AB ON publisher (podcast_id)');
+    }
+
+    public function down(Schema $schema) : void {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE publisher DROP FOREIGN KEY FK_9CE8D546786136AB');
+        $this->addSql('DROP INDEX IDX_9CE8D546786136AB ON publisher');
+        $this->addSql('ALTER TABLE publisher DROP podcast_id');
+        $this->addSql('ALTER TABLE person DROP FOREIGN KEY FK_34DCD176786136AB');
+        $this->addSql('DROP INDEX IDX_34DCD176786136AB ON person');
+        $this->addSql('ALTER TABLE person DROP podcast_id');
+    }
+}
diff --git a/public/css/base.css b/public/css/base.css
@@ -195,6 +195,21 @@ div.collection-complex > div:not(:last-child) {
     color: #fff !important;
     background-color: RGBA(2,125,130,var(--bs-bg-opacity,1)) !important;
 }
+.bg-primary {
+    --bs-primary-rgb: 2,125,130;
+}
+.text-primary {
+    --bs-primary-rgb: 2,125,130;
+}
+.link-primary {
+    color: #027D82 !important;
+}
+.alert-success {
+    --bs-alert-color: #027D82;
+    --bs-alert-bg: rgba(2,125,130 , 0.125);
+    --bs-alert-border-color: rgba(2,125,130 , 0.25);
+  }
+
 
 /* amplify pink #DD1B70 or 221,27,122 */
 .btn-danger {
@@ -217,10 +232,13 @@ div.collection-complex > div:not(:last-child) {
     color: #fff !important;
     background-color: RGBA(221,27,122,var(--bs-bg-opacity,1)) !important;
 }
+.bg-danger {
+    --bs-primary-rgb: 221,27,122;
+}
 .alert-danger {
-    --bs-alert-color: #842029;
-    --bs-alert-bg: #f8d7da;
-    --bs-alert-border-color: #f5c2c7;
+    --bs-alert-color: #DD1B70;
+    --bs-alert-bg: rgba(0, 0, 0, 0.125);
+    --bs-alert-border-color: rgba(0, 0, 0, 0.25);
 }
 .btn-warning {
     --bs-btn-color: #fff;
@@ -237,4 +255,26 @@ div.collection-complex > div:not(:last-child) {
     --bs-btn-disabled-color: #fff;
     --bs-btn-disabled-bg: #DD1B70;
     --bs-btn-disabled-border-color: #DD1B70;
+}
+
+select.select2-hidden-accessible {
+    position: relative !important;
+    display: block !important;
+    width: 0px !important;
+    height: 0px !important;
+    border: none !important;
+    top: calc(1.5em + .75rem + 2px) !important;
+}
+
+textarea.tinymce {
+    position: relative !important;
+    display: block !important;
+    width: 0px !important;
+    height: 0px !important;
+    min-height: 0px !important;
+    padding: 0px !important;
+    border: none !important;
+    resize: none !important;
+    outline: none !important;
+    box-shadow: none !important;
 }