Unverified Commit 95afc66c authored by David López's avatar David López Committed by GitHub
Browse files

Merge pull request #14063 from mvdbeek/fix_library_date_handling 

Use standard date format in library folder contents
parents 93fb577c 4d9cf367

client/src/components/Libraries/LibraryFolder/LibraryFolder.vue

+1 −5
Original line number Diff line number Diff line
@@ -159,11 +159,7 @@ 
                    </div>

                </template>

                <template v-slot:cell(update_time)="row">

                    <UtcDate

                        v-if="row.item.update_time"

                        :date="row.item.update_time"

                        custom-format="'YYYY-MM-DD- HH:mm a'"

                        mode="elapsed" />

                    <UtcDate v-if="row.item.update_time" :date="row.item.update_time" mode="elapsed" />

                </template>

                <template v-slot:cell(is_unrestricted)="row">

                    <font-awesome-icon v-if="row.item.is_unrestricted" title="Unrestricted dataset" icon="globe" />

client/src/components/UtcDate.vue

+3 −11
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
</template>



<script>

import { formatDistanceToNow, parse, parseISO } from "date-fns";

import { formatDistanceToNow, parseISO } from "date-fns";

import { formatInTimeZone } from "date-fns-tz";



export default {
@@ -24,10 +24,6 @@ export default { 
            type: String,

            default: "date", // or elapsed

        },

        customFormat: {

            type: String,

            default: undefined,

        },

    },

    computed: {

        elapsedTime: function () {
@@ -37,12 +33,8 @@ export default { 
            return this.parsedDate.toISOString();

        },

        parsedDate: function () {

            if (this.customFormat !== undefined) {

                return parse(this.date, this.customFormat, new Date());

            } else {

            // assume ISO format date, except in Galaxy this won't have TZinfo -- it will always be Zulu

            return parseISO(`${this.date}Z`);

            }

        },

        pretty: function () {

            return `${formatInTimeZone(this.parsedDate, "Etc/Zulu", "eeee MMM do H:mm:ss yyyy")} UTC`;

lib/galaxy/managers/cloudauthzs.py

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ class CloudAuthzsSerializer(base.ModelSerializer): 
            else None,

            "last_update": lambda item, key, **context: str(item.last_update),

            "last_activity": lambda item, key, **context: str(item.last_activity),

            "create_time": lambda item, key, **context: str(item.create_time),

            "create_time": lambda item, key, **context: item.create_time.isoformat(),

            "description": lambda item, key, **context: str(item.description),

        }

        self.serializers.update(serializers)

lib/galaxy/managers/library_datasets.py

+2 −2
Original line number Diff line number Diff line
@@ -243,8 +243,8 @@ class LibraryDatasetsManager(datasets.DatasetAssociationManager): 
        rval["folder_id"] = f"F{rval['folder_id']}"

        rval["full_path"] = full_path

        rval["file_size"] = util.nice_size(int(ldda.get_size()))

        rval["date_uploaded"] = ldda.create_time.strftime("%Y-%m-%d %I:%M %p")

        rval["update_time"] = ldda.update_time.strftime("%Y-%m-%d %I:%M %p")

        rval["date_uploaded"] = ldda.create_time.isoformat()

        rval["update_time"] = ldda.update_time.isoformat()

        rval["can_user_modify"] = trans.user_is_admin or trans.app.security_agent.can_modify_library_item(

            current_user_roles, ld

        )

lib/galaxy/model/__init__.py

+2 −2
Original line number Diff line number Diff line
@@ -8919,8 +8919,8 @@ class PageRevision(Base, Dictifiable, RepresentById): 


    def to_dict(self, view="element"):

        rval = super().to_dict(view=view)

        rval["create_time"] = str(self.create_time)

        rval["update_time"] = str(self.update_time)

        rval["create_time"] = self.create_time.isoformat()

        rval["update_time"] = self.update_time.isoformat()

        return rval