Merge branch 'main' into develop

anzusystems · Jul 8, 2024 · 6746fc2 · 6746fc2
2 parents 3f67f56 + 36ab4a4
commit 6746fc2
Show file tree

Hide file tree

Showing 18 changed files with 81 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [1.3.3](https://github.com/anzusystems/admin-dam/compare/1.3.2...1.3.3) (2024-03-12)
+
+### Features
+* Podcast episode extUrl, podcast extUrl
+
+## [1.3.2](https://github.com/anzusystems/admin-dam/compare/1.3.1...1.3.2) (2024-02-29)
+
+### Features
+* changed Podcast rssUrl max length validation
+
 ## [1.3.1](https://github.com/anzusystems/admin-dam/compare/1.2.0...1.3.0) (2024-01-19)
 
 ### Features

diff --git a/src/locales/en/coreDam/podcast.json b/src/locales/en/coreDam/podcast.json
@@ -8,6 +8,7 @@
  },
  "attributes": {
  "rssUrl": "RSS URL",
+ "extUrl": "Ext feed link",
  "mode": "Mode",
  "lastImportStatus": "Last import status"
  },

diff --git a/src/locales/en/coreDam/podcastEpisode.json b/src/locales/en/coreDam/podcastEpisode.json
@@ -8,6 +8,8 @@
  "seasonNumber": "Season number",
  "episodeNumber": "Episode number",
  "extId": "Ext id",
+ "rssUrl": "Rss audio URL",
+ "extUrl": "Ext link",
  "lastImportStatus": "Last import status"
  },
  "texts": {

diff --git a/src/locales/sk/coreDam/podcast.json b/src/locales/sk/coreDam/podcast.json
@@ -8,6 +8,7 @@
  },
  "attributes": {
  "rssUrl": "RSS URL",
+ "extUrl": "Externá URL podcastu",
  "mode": "Mód",
  "lastImportStatus": "Posledný stav importu"
  },

diff --git a/src/locales/sk/coreDam/podcastEpisode.json b/src/locales/sk/coreDam/podcastEpisode.json
@@ -8,6 +8,8 @@
  "seasonNumber": "Číslo sezóny",
  "episodeNumber": "Číslo epizódy",
  "extId": "Externé ID",
+ "rssUrl": "Rss audio URL",
+ "extUrl": "Externá URL epizódy",
  "lastImportStatus": "Posledný stav importu"
  },
  "texts": {

diff --git a/src/model/coreDam/factory/PodcastEpisodeFactory.ts b/src/model/coreDam/factory/PodcastEpisodeFactory.ts
@@ -21,6 +21,8 @@ export function usePodcastEpisodeFactory() {
  seasonNumber: null,
  episodeNumber: null,
  extId: '',
+ rssUrl: '',
+ extUrl: '',
  lastImportStatus: PodcastLastImportStatus.Default,
  },
  dates: {

diff --git a/src/model/coreDam/factory/PodcastFactory.ts b/src/model/coreDam/factory/PodcastFactory.ts
@@ -17,6 +17,7 @@ export function usePodcastFactory() {
  },
  attributes: {
  rssUrl: '',
+ extUrl: '',
  mode: PodcastMode.Default,
  lastImportStatus: PodcastLastImportStatus.Default,
  },

diff --git a/src/types/coreDam/Podcast.ts b/src/types/coreDam/Podcast.ts
@@ -17,6 +17,7 @@ interface Texts {
 
 export interface Attributes {
  rssUrl: string
+ extUrl: string
  mode: PodcastMode
  lastImportStatus: PodcastLastImportStatus
 }

diff --git a/src/types/coreDam/PodcastEpisode.ts b/src/types/coreDam/PodcastEpisode.ts
@@ -19,6 +19,8 @@ interface Attributes {
  seasonNumber: number | null
  episodeNumber: number | null
  extId: string
+ extUrl: string
+ rssUrl: string
  lastImportStatus: PodcastLastImportStatus
 }
 

diff --git a/src/views/coreDam/asset/detail/components/podcast/PodcastEpisodeNewDialog.vue b/src/views/coreDam/asset/detail/components/podcast/PodcastEpisodeNewDialog.vue
@@ -88,6 +88,7 @@ const loadFormData = async () => {
  podcastEpisode.value.attributes.episodeNumber = res.attributes.episodeNumber
  podcastEpisode.value.attributes.seasonNumber = res.attributes.seasonNumber
  podcastEpisode.value.attributes.extId = res.attributes.extId
+ podcastEpisode.value.attributes.extUrl = res.attributes.extUrl
  loadingFormData.value = false
 }
 
@@ -174,6 +175,14 @@ onMounted(async () => {
  data-cy="field-episode-num-podcast"
  />
  </ARow>
+ <ARow>
+ <AFormTextField
+ v-model="podcastEpisode.attributes.extUrl"
+ :label="t('coreDam.podcastEpisode.model.attributes.extUrl')"
+ :v="v$.podcastEpisode.attributes.extUrl"
+ data-cy="episode-ext-url"
+ />
+ </ARow>
  </template>
  </ASystemEntityScope>
  </VCardText>

diff --git a/src/views/coreDam/podcast/components/PodcastCreateButton.vue b/src/views/coreDam/podcast/components/PodcastCreateButton.vue
@@ -107,6 +107,14 @@ const { v$ } = usePodcastValidation(podcast)
  data-cy="podcast-rss-url"
  />
  </ARow>
+ <ARow>
+ <AFormTextField
+ v-model="podcast.attributes.extUrl"
+ :label="t('coreDam.podcast.model.attributes.extUrl')"
+ :v="v$.podcast.attributes.extUrl"
+ data-cy="podcast-ext-url"
+ />
+ </ARow>
  <ARow>
  <AFormDatetimePicker
  v-model="podcast.dates.importFrom"

diff --git a/src/views/coreDam/podcast/components/PodcastDetail.vue b/src/views/coreDam/podcast/components/PodcastDetail.vue
@@ -38,6 +38,10 @@ const altImgSrc = computed(() => {
  :title="t('coreDam.podcast.model.attributes.rssUrl')"
  :value="podcast.attributes.rssUrl"
  />
+ <ARow
+ :title="t('coreDam.podcast.model.attributes.extUrl')"
+ :value="podcast.attributes.extUrl"
+ />
  <ARow :title="t('coreDam.podcast.model.attributes.lastImportStatus')">
  <PodcastLastImportStatusChip :status="podcast.attributes.lastImportStatus" />
  </ARow>

diff --git a/src/views/coreDam/podcast/components/PodcastEditForm.vue b/src/views/coreDam/podcast/components/PodcastEditForm.vue
@@ -66,6 +66,14 @@ const { podcastModeOptions } = usePodcastMode()
  data-cy="podcast-rss-url"
  />
  </ARow>
+ <ARow>
+ <AFormTextField
+ v-model="podcast.attributes.extUrl"
+ :label="t('coreDam.podcast.model.attributes.extUrl')"
+ :v="v$.podcast.attributes.extUrl"
+ data-cy="podcast-ext-url"
+ />
+ </ARow>
  <ARow>
  <AFormDatetimePicker
  v-model="podcast.dates.importFrom"

diff --git a/src/views/coreDam/podcast/composables/podcastValidation.ts b/src/views/coreDam/podcast/composables/podcastValidation.ts
@@ -25,6 +25,9 @@ export function usePodcastValidation(podcast: Ref<Podcast>) {
  minLength: minLength(1),
  maxLength: maxLength(2048),
  },
+ extUrl: {
+ maxLength: maxLength(2048),
+ },
  },
  dates: {
  importFrom: {},

diff --git a/src/views/coreDam/podcastEpisode/components/PodcastEpisodeCreateButton.vue b/src/views/coreDam/podcastEpisode/components/PodcastEpisodeCreateButton.vue
@@ -103,6 +103,14 @@ const create = async () => {
  data-cy="episode-number"
  />
  </ARow>
+ <ARow>
+ <AFormTextField
+ v-model="podcastEpisode.attributes.extUrl"
+ :label="t('coreDam.podcastEpisode.model.attributes.extUrl')"
+ :v="v$.podcastEpisode.attributes.extUrl"
+ data-cy="episode-ext-url"
+ />
+ </ARow>
  </ASystemEntityScope>
  </template>
  </ACreateDialog>

diff --git a/src/views/coreDam/podcastEpisode/components/PodcastEpisodeDetail.vue b/src/views/coreDam/podcastEpisode/components/PodcastEpisodeDetail.vue
@@ -50,6 +50,14 @@ const onAssetChipClick = () => {
  :title="t('coreDam.podcastEpisode.model.attributes.episodeNumber')"
  :value="podcastEpisode.attributes.episodeNumber"
  />
+ <ARow
+ :title="t('coreDam.podcastEpisode.model.attributes.rssUrl')"
+ :value="podcastEpisode.attributes.rssUrl"
+ />
+ <ARow
+ :title="t('coreDam.podcastEpisode.model.attributes.extUrl')"
+ :value="podcastEpisode.attributes.extUrl"
+ />
  <ARow
  :title="t('coreDam.podcastEpisode.model.attributes.extId')"
  :value="podcastEpisode.attributes.extId"

diff --git a/src/views/coreDam/podcastEpisode/components/PodcastEpisodeEditForm.vue b/src/views/coreDam/podcastEpisode/components/PodcastEpisodeEditForm.vue
@@ -68,6 +68,14 @@ const { t } = useI18n()
  data-cy="episode-ext-id"
  />
  </ARow>
+ <ARow>
+ <AFormTextField
+ v-model="podcastEpisode.attributes.extUrl"
+ :label="t('coreDam.podcastEpisode.model.attributes.extUrl')"
+ :v="v$.podcastEpisode.attributes.extUrl"
+ data-cy="podcast-ext-url"
+ />
+ </ARow>
  <ARow>
  <AFormDatetimePicker
  v-model="podcastEpisode.dates.publicationDate"

diff --git a/src/views/coreDam/podcastEpisode/composables/podcastEpisodeValidation.ts b/src/views/coreDam/podcastEpisode/composables/podcastEpisodeValidation.ts
@@ -36,6 +36,9 @@ export function usePodcastEpisodeValidation(podcastEpisode: Ref<PodcastEpisode>)
  minLength: minLength(1),
  maxLength: maxLength(256),
  },
+ extUrl: {
+ maxLength: maxLength(2048),
+ },
  },
  },
  }))