luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity
23572 commits 1 branch 0 tags 311 MiB
Commit graph

2093 commits

Author SHA1 Message Date
Michael Klein e096a0a5ab
Upgrade Ember and friends 3.28 (#12215) 
* chore: upgrade forward compatible packages

* chore: v3.20.2...v3.24.0

* chore: silence string prototype extension deprecation

* refact: don't test clicking disabled button job-list

Recent test-helper upgrades will guard against clicking disabled buttons
as this is not something that real users can do. We need to change our
tests accordingly.

* fix: await async test helper `expectError`

We have to await this async test function otherwise the test's
rendering context will be torn down before we run assertions
against it.

* fix: don't try to click disabled two-step-button

Recent test-helper updates prohibit clicking disabled buttons. We need
to adapt the tests accordingly.

* fix: recommendation-accordion

Use up-to-date semantics for handling list-accordion closing
in recommendation-accordion.

* fixes toggling recommendation-accordion toggle.

* fix: simple-unless linting error application.hbs

There's no reason to use unless here - we can use if instead.

* fix: no-quoteless-attributes recommendation accordion

* fix: no-quoteless-attributes recommendation-chart

* fix: allow `unless` - global-header.hbs

This is a valid use of unless in our opinion.

* fix: allow unless in job-diff

This is not a great use for unless but we don't want to change this
behavior atm.

* fix: no-attrs-in-components list-pager

There is no need to use this.attrs in classic components. When we
will convert to glimmer we will use `@`-instead.

* fix: simple-unless job/definition

We can convert to a simple if here.

* fix: allow inline-styles stats-box component

To make linter happy.

* fix: disable no-action and no-invalid-interactive

Will be adressed in follow-up PRs.

* chore: update ember-classic-decorator to latest

* chore: upgrade ember-can to latest

* chore: upgrade ember-composable-helpers to latest

* chore: upgrade ember-concurrency

* fix: recomputation deprecation `Trigger`

schedule `do` on actions queue to work around recomputation deprecation
when triggering Trigger on `did-insert`.

* chore: upgrade ember-cli-string-helpers

* chore: upgrade ember-copy

* chore: upgrade ember-data-model-fragments

* chore: upgrade ember-deprecation-workflow

* chore: upgrade ember-inline-svg

* chore: upgrade ember-modifier

* chore: upgrade ember-truth-helpers

* chore: upgrade ember-moment & ember-cli-moment-shim

* chore: upgrade ember-power-select

* chore: upgrade ember-responsive

* chore: upgrade ember-sinon

* chore: upgrade ember-cli-mirage

For now we will stay on 2.2 - upgrades > 2.3 break the build.

* chore: upgrade 3.24.0 to 3.28.5

* fix: add missing classic decorators on adapters

* fix: missing classic decorators to serializers

* fix: don't reopen Ember.Object anymore

* fix: remove unused useNativeEvents

ember-cli-page-objects doesn't provide this method anymore

* fix: add missing attributeBindings for test-selectors

ember-test-selectors doesn't provides automatic bindings for
data-test-* attributes anymore.

* fix: classic decorator for application serializer test

* fix: remove `removeContext` from tests.

It is unneeded and ember-cli-page-objects doesn't provides
this method anymore.

* fix: remove deprecations `run.*`-invocations

* fix: `collapseWhitespace` in optimize test

* fix: make sure to load async relationship before access

* fix: dependent keys for relationship computeds

We need to add `*.isFulfilled` as dependent keys for computeds that
access async relationships.

* fix: `computed.read`-invocations use `read` instead

* chore: prettify templates

* fix: use map instead of mapBy ember-cli-page-object

Doesn't work with updated ember-cli-page-object anymore.

* fix: remove remaining deprecated `run.*`-calls

* chore: add more deprecations deprecation-workflow

* fix: `implicit-injection`-deprecation

All routes that add watchers will need to inject the store-service
as the store service is internally used in watchers.

* fix: more implicit injection deprecations

* chore: silence implicit-injection deprecation

We can tackle the deprecation when we find the time.

* fix: new linting errors after upgrade

* fix: remove merge conflicts prettierignore

* chore: upgrade to run node 12.22 when building binaries
 2022-03-08 12:28:36 -05:00
Jai Bhagat 8958d48ca9 ui: external links open in new tabs 2022-02-25 09:24:37 -05:00
Michael Klein 99e8583990 fix: linting issues and remove remainidn pauseTest 2022-02-17 16:06:49 +01:00
Michael Klein 8c4bbdb38c fix: reflect namespace change volume-detail-test 2022-02-17 15:20:11 +01:00
Michael Klein 0f07af68cc fix: prettier related volume-list - test 2022-02-17 15:19:45 +01:00
Michael Klein 8d4a915941 fix: prettier related test-failutre task-group-detail 2022-02-17 15:19:20 +01:00
Michael Klein a41ed7d10f fix: task-group-detail tests due to namespace changes 
URLs have changed - tests need to reflect that.
 2022-02-17 14:50:05 +01:00
Michael Klein 649f59190e fix: breadcrumbs allocations due to recent namespace changes 
* change the breadcrumbs generation to use `idWithNamespace`
* adapt tests to reflect new URLs for jobs with namespaces
 2022-02-17 14:38:27 +01:00
Michael Klein e15883ad79 fix: use @<namespace> with remaining JobDetail.visits 2022-02-17 13:22:15 +01:00
Michael Klein e46df89a7a fix: pack-detail test 
We need to change the way we access `JobDetail`-pages based on recent
namespace changes.
 2022-02-17 12:59:58 +01:00
Michael Klein 9a37550204 fix: anonymous policy test job-details 
We need to access job-details differently when they have a namespace
due to recent namespace changes - we need to make the tests reflect
that.
 2022-02-17 12:45:01 +01:00
Michael Klein c9a839b76f fix: less cleverness™ when checking currentURL job-details 
There is no need to check the namespace query-param anymore with
`urlWithNamespace` but some tests still are using this. We refactor
the tests to be less clever and check the URL in a more manual approach
by explicitly defining how the URL should look like if a job belongs
to a namespace.
 2022-02-17 12:42:23 +01:00
Michael Klein 37993d9fb8 fix: client-detail-test no default namespace param 
Recent changes changed the behavior of not adding the `@default`
-namespace - we need to adapt the tests accordingly
 2022-02-17 12:41:33 +01:00
Michael Klein b0a90b425e fix: allocations page tests regarding job links 
Default namespaced jobs don't append the `@default`-id anymore due
to recent `jobs.job#serialize` changes.
 2022-02-17 11:56:29 +01:00
Michael Klein d8b89e64dc fix: some test fixes module-for-job 
* less clever™ metaprogramming when checking for expectedURL
* clicking slices job-client-status-summary needs to change its
  behavior and not pass the namespace query-param anymore.
 2022-02-16 17:47:29 +01:00
Michael Klein ecaf6d3299 refact: don't pass namespace as query-param in job-subnav 
The new ID handling gives us this behavior for free and we don't need
to drill the namespace down through all the route-layers anymore.
 2022-02-16 17:44:16 +01:00
Michael Klein 3202e5036d refact: use idWithNamespace in serialize hook jobs.job 
This will give us 'correct' URLs for free when we only pass a `job`-model
to a `LinkTo` that links to the `jobs.job.*`-routes.
 2022-02-16 17:42:26 +01:00
Michael Klein 913eee982a fix: job-versions-test 
We need to adapt the test due to recent namespace changes.
 2022-02-16 15:31:10 +01:00
Michael Klein cbb72edf68 fix: job-dispatch tests after namespace changes 2022-02-16 15:22:41 +01:00
Michael Klein b75188d8ed feat: improve namespace handling job-route 2022-02-16 15:03:02 +01:00
Michael Klein dd410401bd refact: use idWithNamespace in job-row links 2022-02-16 15:02:39 +01:00
Michael Klein 6903ba33b3 refact: render jobs.index template again 2022-02-16 15:02:06 +01:00
Michael Klein 34cb277f9c feat: add idWithNamespace-getter job model 2022-02-16 15:01:25 +01:00
Jai Bhagat 6a5fa75078 temp: bug in region selector causing failing test 2022-02-10 10:55:32 -05:00
Jai Bhagat fd5d766c41 temp: csi refactor 2022-02-10 09:14:32 -05:00
Jai Bhagat 4f802449dc temp: namespace model refact 2022-02-10 09:11:42 -05:00
ttys3 5faf344152
style: fix up very long tag word breaking the allocation service table width (#11995) 2022-02-04 19:40:03 -05:00
ttys3 1ab3b4d3d8
correct task row memory unit (#11980) 2022-02-02 17:00:25 -05:00
Jai Bhagat 8533abde2e fix: update eval serializer to latest changes 2022-01-28 10:16:23 -05:00
Jai Bhagat ead706037d ui: add assert.expect to a11y test 2022-01-28 09:47:23 -05:00
Jai Bhagat 3cc798d967 chore: fix js linting 2022-01-28 09:37:32 -05:00
Jai Bhagat 3eb34a577e style: add styling icons and padding to table footer buttons 2022-01-28 09:35:44 -05:00
Jai Bhagat e5b154e295 feat: add pagination and filtering to evaluations view 2022-01-28 09:35:44 -05:00
Jai Bhagat 1f80081c9d feat: add pagination to evaluations.index 2022-01-28 09:35:44 -05:00
Jai Bhagat 9086d4e2d4 feat: add meta evaluations 
To support pagination on evaluations queries.
 2022-01-28 09:35:44 -05:00
Jai Bhagat 9128f13676 feat: extract status cell logic into component 2022-01-28 09:35:44 -05:00
Jai Bhagat e3ca737f97 fix: move evaluations template to index and inside page layout 2022-01-28 09:35:43 -05:00
Jai Bhagat aaa2dadf16 chore: run prettier on gutter-menu 2022-01-28 09:35:43 -05:00
Jai Bhagat ab4c768340 feat: add evalutions view with table 2022-01-28 09:35:43 -05:00
Jai ff9d39a6b3
Merge pull request #11942 from hashicorp/f-ui/test-tooling 
ui:  test tooling
 2022-01-27 11:21:23 -05:00
Jai Bhagat e950300ecb fix: differentiate commands for circleci and local use 2022-01-27 09:19:03 -05:00
André 518fc11dca
ui: move volume link to the source column and fix the link target (#11896) 
The link target used the volume name instead of the volume id.
Fixes issue #11884.
 2022-01-26 14:17:29 -05:00
Jai Bhagat d88f70265b ui: add local testing script 2022-01-26 13:36:26 -05:00
Jai Bhagat 7e46fb319e ui: replace qunit start tests with ember-exam start 2022-01-26 13:35:59 -05:00
Jai Bhagat df87911cb9 ui: allow parallel test-runs 2022-01-26 13:06:56 -05:00
Jai Bhagat 36b1681d6d ui: add ember-exam 2022-01-26 13:06:00 -05:00
Jai Bhagat 14adca3a1f ui: add npm script for running ember test server 2022-01-26 12:48:39 -05:00
Jai Bhagat 37886861e2 refact: extract setPolicy into utils 2022-01-26 12:06:18 -05:00
Jai Bhagat 2249722ec6 refact: fix tests after contextual job page changes 2022-01-26 11:31:18 -05:00
Jai Bhagat be43976db0 ui: prettify remaining files 2022-01-26 11:28:21 -05:00
Jai Bhagat 6f32b9d62e fix: no longer need gotoTaskGroup prop 2022-01-24 11:11:05 -05:00
Jai Bhagat 7c3ace8c41 test: add tests for not auth behavior for job-client-status-summary 2022-01-24 11:08:33 -05:00
Jai Bhagat 5495e9f7bc fix: auth node requests with mirage 2022-01-24 11:07:17 -05:00
Jai Bhagat 0b368e43eb fix: protect route if not auth 2022-01-24 11:07:17 -05:00
Jai Bhagat d075d6f7cb feat: add conditional rendering logic to template for not auth concern 2022-01-24 11:07:15 -05:00
Jai Bhagat fe63af5484 fix: prevent async request for node relationship on alloc 2022-01-24 11:06:30 -05:00
Jai Bhagat 9bb3e7a4f7 fix: update component props for glimmer syntax 2022-01-24 11:06:10 -05:00
Jai Bhagat cc8c9672e7 fix: update conditional rendering of clients tab 2022-01-24 11:06:08 -05:00
Jai Bhagat c3a305f807 fix: move node loading to jobs.job route and add auth logic 2022-01-24 11:05:50 -05:00
Luiz Aoqui ee83fb8bb1 ui: add "read client" ability 2022-01-24 11:05:48 -05:00
Jai Bhagat b36864c476 refact: move gotoClients logic down to component 2022-01-24 11:04:52 -05:00
Jai Bhagat b027d0bec7 fix: remove debugger 2022-01-24 11:04:51 -05:00
Jai Bhagat 7797463228 fix: router expect identifier instead of model for trans to job page 2022-01-24 11:04:51 -05:00
Jai Bhagat 336c3b428a refact: move gotoJob to component 2022-01-24 11:04:51 -05:00
Jai Bhagat 16c90dd865 chore: prettify job/index controller 2022-01-24 11:04:51 -05:00
Jai Bhagat 0079fc3b6f chore: prettify children template 2022-01-24 11:04:51 -05:00
Jai Bhagat a12e60c822 chore: prettify jobs index template 2022-01-24 11:04:51 -05:00
Jai Bhagat f17ba0277e chore: prettify job-row template 2022-01-24 11:04:51 -05:00
Jai Bhagat 2ec864c67e refact: move gotoTaskGroup action to component 
Previously, the router service was not available to components. Now that it is,
we no longer need to prop-drill this linking action.
 2022-01-24 11:04:48 -05:00
Jai Bhagat 458100a0f9 chore: prettify task-groups template 2022-01-24 11:04:15 -05:00
Jai Bhagat 179103f2b6 refactor: compute jobClientStatus in summary backing class component 2022-01-24 11:04:14 -05:00
Jai Bhagat d130dea4e0 refact: move conditional rendering logic from job-page to job-client-status-summary 2022-01-24 11:04:12 -05:00
Jai Bhagat 28af157d35 refact: remove unused backing component classes and extend periodic and param-child to use Glimmer 2022-01-24 11:02:26 -05:00
Jai Bhagat c6c334d5d5 refact: job-page/batch template to use contextual components 2022-01-24 11:02:06 -05:00
Jai Bhagat b3ae93d51e refact: job-page/parameterized-child template to use contextual components 2022-01-24 11:02:05 -05:00
Jai Bhagat 02311dae72 refact: job-page/parameterized template to use contextual components 2022-01-24 11:02:05 -05:00
Jai Bhagat 961b0178e1 refact: job-page/periodic-child template to use contextual components 2022-01-24 11:02:05 -05:00
Jai Bhagat 689b0d9fb7 refact: job-page/periodic template to use contextual components 2022-01-24 11:02:05 -05:00
Jai Bhagat 46754b2f65 refact: job-page/service template to use contextual components 2022-01-24 11:02:05 -05:00
Jai Bhagat be0e624768 refact: job-page/sysbatch template to use contextual components 2022-01-24 11:02:05 -05:00
Jai Bhagat c938f7d109 refact: job-page/system template to use contextual components 2022-01-24 11:02:05 -05:00
Jai Bhagat d23dcc1ede feat: create job-page contextual component 2022-01-24 11:02:04 -05:00
Jai Bhagat 89390b71ee fix: remove sourceMaps false in ember-cli-build 
There was previously a bug with sourceMaps that slowed down the build.
This issue has been resolved by Ember and now we can expect the default
behavior of sourceMaps being enabled in dev and disabled in prod.
 2022-01-24 11:02:04 -05:00
Jai Bhagat 43a0983a23 ui: prepare rebase for contextual job-page 2022-01-24 10:58:28 -05:00
Jai Bhagat 08bf4498a5 fix: mirage fixtures are randomized so we cant assert.expect 2022-01-20 10:55:36 -05:00
Jai Bhagat 52cf998e2c ui: fix remaining linting errors 2022-01-20 10:39:02 -05:00
Jai Bhagat 3350f3fb11 ui: apply new qunit linting rules to tests 
Async tests should use  in integrations tests.
Acceptance tests are using Mirage and can't use
since we can't know the number of assertions.
 2022-01-20 10:01:35 -05:00
Jai Bhagat 3a9057a89c ui: prettify js files 2022-01-20 09:54:56 -05:00
Jai Bhagat 3cf01877a0 ui: upgrade prettier to match 3.28 ember-new-output 2022-01-20 09:46:50 -05:00
Jai Bhagat 88dd72a2ad ui: disable no-string-protype-extensions where its currently in use 2022-01-20 09:46:49 -05:00
Jai Bhagat d8c4351e3f ui: turn off tagless components linting error 
Classic components still use tagName decorator
 2022-01-20 09:46:49 -05:00
Jai Bhagat 5cb2013e3b ui: turn off no-component-lifecycle-hooks 
Classic components use lifecycle hooks.
 2022-01-20 09:46:49 -05:00
Jai Bhagat 62f63e14d2 ui: turn off no-classic-components 
This is a mixed codebase and still uses classic components
 2022-01-20 09:46:49 -05:00
Jai Bhagat b36f45a8b3 ui: storybook accesses private routing service 2022-01-20 09:46:49 -05:00
Jai Bhagat c0aeb1803f ui: replace this.render with render test-helper in tests 2022-01-20 09:46:49 -05:00
Jai Bhagat 645db53775 ui: disable linting on files that use controllerFor 2022-01-20 09:46:49 -05:00
Jai Bhagat 1e1f9957c8 ui: turn off no-computed-properties-in-native-classes 
We have ~60 uses of computed properties across routes (for watcher system), components,
and models.
 2022-01-20 09:46:48 -05:00
Jai Bhagat 8bf8a337c1 ui: turn off no-class-classes rule 
We still use classic classes because this is a mixed
codebase between Octane and Classic.
 2022-01-20 09:46:48 -05:00
Jai Bhagat c4bc5ab352 ui: fix auto-fixable linting errors 2022-01-20 09:46:45 -05:00
Jai Bhagat d281ef4d19 ui: match eslint script with ember-new-output 2022-01-20 09:29:10 -05:00
Jai Bhagat 2c73698d54 ui: match eslintrc with ember-new-output 2022-01-20 09:29:10 -05:00
Jai Bhagat bd2e9f0936 ui: match linting and prettier packages with ember-new-output 3.24 2022-01-20 09:29:10 -05:00
Jai Bhagat 4cd7c75f6c chore: add jsconfig to stop experimental decorator warnings 2022-01-20 09:29:10 -05:00
Luiz Aoqui e2e229f659
ui: fix test (#11870) 2022-01-18 10:36:10 -05:00
Jai Bhagat 862bc0341c test: add test stories for clicking allocation summary 2022-01-14 10:23:09 -05:00
Jai Bhagat 337920263f refact: add data-test-selectors and correct css selectors in summary 2022-01-14 10:23:06 -05:00
Jai Bhagat 2268cc1d6c styling: remove clickable link text decoration override to match new mocks 2022-01-14 10:20:36 -05:00
Jai Bhagat dc85cd29a9 refact: allocation and child summaries into ember-cli-page-object components 2022-01-14 10:20:33 -05:00
Jai Bhagat 2dddb20471 fix: typo in data-test-selector 2022-01-14 10:19:01 -05:00
Jai Bhagat d058029f90 styling: update styling to match new figma mocks 2022-01-14 10:14:44 -05:00
Jai Bhagat fe9f35c587 feat: add clicking functionality to alloc status legend 2022-01-14 10:14:44 -05:00
Luiz Aoqui c7ae13a1f3
Fix ACL requirements for job details UI (#11672) 2022-01-12 21:26:02 -05:00
Luiz Aoqui 7a1500c122
ui: fix CI (#11785) 2022-01-06 16:01:55 -05:00
Jai Bhagat d1342550df refact: clean-up breadcrumb invocations 2021-12-23 12:41:52 -05:00
Jai Bhagat 3533f62c6f fix: remove unecessary breadcrumb 2021-12-23 12:33:15 -05:00
Jai Bhagat 6369c4af7d chore: clean-up merge conflict after rebase 2021-12-21 07:52:06 -05:00
Jai Bhagat 420a7ff351 fix: add ember-a11y-testing-audit-call 2021-12-21 07:47:22 -05:00
Jai Bhagat b859406bd5 styling: fix opacity for last child in the list 2021-12-21 07:47:06 -05:00
Jai Bhagat 0d97780654 fix: test specs should expect to receive breadcrumb titles 2021-12-21 07:47:06 -05:00
Jai Bhagat c765d4c519 style: centering and spacing for titled breadcrumbs 2021-12-21 07:47:05 -05:00
Jai Bhagat c24923a858 feat: handle title behavior for job breadcrumb 2021-12-21 07:47:05 -05:00
Jai Bhagat 9551d41c08 refact: add title to breadcrumb generator 
All breadcrumbs do not need a title property because some views
drill down by using a tab-based UI (e.g. CSI volumes and the Job Overview)

The goal is to help us identify breadcrumbs that are non-descriptive (i.e.
breadcrumbs that display as an ID).
 2021-12-21 07:47:05 -05:00
Jai Bhagat 008f538222 style: add styling for title on breadcrumbs 2021-12-21 07:47:05 -05:00
Jai Bhagat f6dda0526c feat: add title to default breadcrumb component 2021-12-21 07:47:05 -05:00
Jai Bhagat c302f3a5cd update: add comment to explain loading namespaces in alloc route 2021-12-21 07:47:05 -05:00
Jai Bhagat edb330e701 fix: delete jobs route - ember creates this for us 2021-12-21 07:47:05 -05:00
Jai Bhagat 34a55dec48 fix: add in for topology route 2021-12-21 07:47:03 -05:00
Jai Bhagat db3abcbed4 fix: update breadcrumb tests according to new breadcrumb structure 2021-12-21 07:46:28 -05:00
Jai Bhagat 86b9c1fe03 refactor: delete unit tests for old breadcrumbs service 2021-12-21 07:46:28 -05:00
Jai Bhagat 88526aac65 refactor: delete app-breadcrumbs component file 2021-12-21 07:46:28 -05:00
Jai Bhagat 5cc0fc20cc refactor: remove double each in app breadcrumbs 2021-12-21 07:46:28 -05:00
Jai Bhagat 63d096a56a test: breadcrumbs functionality 2021-12-21 07:46:28 -05:00
Jai Bhagat e53a6072de chore: write tests for trigger component 2021-12-21 07:46:28 -05:00
Jai Bhagat 1188a5632f fix: handle case for async relationships 2021-12-21 07:46:27 -05:00
Jai Bhagat f7602d9a2a fix: resolve parent on job still issue with alloc job async relationship 2021-12-21 07:46:27 -05:00
Jai Bhagat e957e5b7d7 feat: create trigger component 
Create Trigger Component and deprecate Breadcrumb-Utils pattern.
 2021-12-21 07:46:25 -05:00
Jai Bhagat ede70ab0d9 fix: delete old breadcrumbs and replace with bucket 2021-12-21 07:45:24 -05:00
Jai Bhagat 346c436a6e fix: delete state from routes and move to controllers and add renderless component to templates 2021-12-21 07:45:12 -05:00
Jai Bhagat 0ffd638d19 feat: create bucket service to register, deregister and store breadcrumbs 2021-12-21 07:42:26 -05:00
Jai 90cdc7b47a
Merge pull request #11578 from hashicorp/f-ui/clickable-links-allocs 
clickable links in allocations chart
 2021-12-20 10:08:01 -05:00
Jai 93d5ef596f
Merge pull request #11545 from hashicorp/f-ui/add-alloc-filters-on-table 
Add Allocation Filters in Client View
 2021-12-18 09:39:53 -05:00
Jai 2b7fb2c5bd
Merge pull request #11544 from hashicorp/f-ui/add-filters-to-allocs 
Add filters to Allocations
 2021-12-18 09:38:28 -05:00
Luiz Aoqui dad4a0984b
ui: fix action call to set filter query param 2021-12-17 20:41:53 -05:00
Luiz Aoqui 1c7c1f3222
ui: fix volume serializer tests 2021-12-17 20:23:28 -05:00
Luiz Aoqui 5054a6d97f
ui: fix allocation serializer tests 2021-12-17 20:02:59 -05:00
Luiz Aoqui c7dafba66e
ui: fix job allocation filter by status, remove version filter, and add tests 2021-12-17 19:50:43 -05:00
Luiz Aoqui fdc023019e
ui: fix file formating 2021-12-17 19:47:25 -05:00
Luiz Aoqui e6a202b408
ui: fix linting 2021-12-17 18:55:41 -05:00
Luiz Aoqui dbb47b5bc9
ui: fix task group alloc filter and add tests 2021-12-17 18:49:47 -05:00
Luiz Aoqui 1ae40fcc37
ui: display empty message in the client details page if there are no allocations to show 2021-12-17 18:49:47 -05:00