fix: resolve comments

Author: rodcoffani

packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue

@@ -199,7 +199,12 @@ export default defineComponent({
       options: UpdateLinkOptions['options']
     }) => {
       try {
-        if (unref(resource).isFolder && options.type === 'edit' && !linkShare.expirationDateTime) {
+        if (
+          options.type === 'edit' &&
+          unref(resource).isFolder &&
+          !linkShare.expirationDateTime &&
+          sharingPublicExpireDateDefaultRWFolders
+        ) {
           Object.assign(options, {
             ...options,
             expirationDateTime: DateTime.now()
@@ -208,7 +213,12 @@ export default defineComponent({
               .toISO()
           })
         }
-        if (unref(resource).isFolder && linkShare.expirationDateTime) {
+        if (
+          unref(resource).isFolder &&
+          linkShare.expirationDateTime &&
+          sharingPublicExpireDateDefaultRWFolders &&
+          sharingPublicExpireDateMaxRWFolders
+        ) {
           if (
             DateTime.fromISO(linkShare.expirationDateTime).diff(DateTime.now(), 'days').as('days') >
             Duration.fromObject(sharingPublicExpireDateMaxRWFolders).as('days')

packages/web-app-files/src/components/SideBar/Shares/Links/EditDropdown.vue

@@ -114,7 +114,9 @@ export default defineComponent({
           currentDate: currentDate.isValid ? currentDate : null,
           minDate: DateTime.now(),
           maxDate:
-            resource.value.isFolder && props.linkShare.type === SharingLinkType.Edit
+            resource.value.isFolder &&
+            props.linkShare.type === SharingLinkType.Edit &&
+            sharingPublicExpireDateMaxRWFolders
               ? DateTime.now().plus(sharingPublicExpireDateMaxRWFolders).endOf('day')
               : null
         }),
@@ -220,8 +222,14 @@ export default defineComponent({
           method: showDatePickerModal
         })
 
-        // only if is not a edit folder link
-        if (!(props.linkShare.type === SharingLinkType.Edit && resource.value.isFolder)) {
+        // only if it isn't a edit folder link
+        if (
+          !(
+            props.linkShare.type === SharingLinkType.Edit &&
+            resource.value.isFolder &&
+            sharingPublicExpireDateMaxRWFolders
+          )
+        ) {
           result.push({
             id: 'remove-expiration',
             title: $gettext('Remove expiration date'),

packages/web-pkg/src/components/CreateLinkModal.vue

@@ -49,7 +49,7 @@
       class="oc-mt-s"
       :min-date="DateTime.now()"
       :max-date="
-        isFolder && selectedType === 'edit'
+        isFolder && selectedType === 'edit' && sharingPublicExpireDateMaxRWFolders
           ? DateTime.now().plus(sharingPublicExpireDateMaxRWFolders).endOf('day')
           : null
       "
@@ -313,6 +313,7 @@ export default defineComponent({
       onExpiryDateChanged({
         date: unref(selectedExpiry),
         error:
+          sharingPublicExpireDateMaxRWFolders &&
           unref(selectedExpiry)?.toISO() >
             DateTime.now().plus(sharingPublicExpireDateMaxRWFolders).endOf('day').toISO() &&
           isFolder &&

packages/web-pkg/src/composables/piniaStores/config/config.ts

@@ -38,10 +38,7 @@ const defaultOptions = {
   tokenStorageLocal: true,
   userListRequiresFilter: false,
   hideLogo: false,
-  alertRwFolders: {
-    en: '',
-    fr: ''
-  }
+  alertRwFolders: {}
 } satisfies Partial<OptionsConfig>
 
 export const useConfigStore = defineStore('config', () => {

packages/web-pkg/src/composables/piniaStores/config/types.ts

@@ -127,12 +127,7 @@ const OptionsConfigSchema = z.object({
   hideAccountMenu: z.boolean().optional(),
   hideNavigation: z.boolean().optional(),
   defaultLanguage: z.string().optional(),
-  alertRwFolders: z
-    .object({
-      en: z.string().optional(),
-      fr: z.string().optional()
-    })
-    .optional()
+  alertRwFolders: z.object({}).optional()
 })
 
 export type OptionsConfig = z.infer<typeof OptionsConfigSchema>