From 1c9846bb8f5c9f10952a26dc4e44bfd58ddbe9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 9 Jun 2022 11:59:32 +0200 Subject: [PATCH] OAPI: regenerate code --- addon/flamenco/manager/__init__.py | 2 +- addon/flamenco/manager/api_client.py | 2 +- addon/flamenco/manager/configuration.py | 2 +- addon/flamenco/manager/docs/Task.md | 1 + addon/flamenco/manager/model/task.py | 4 + addon/flamenco/manager_README.md | 2 +- pkg/api/openapi_spec.gen.go | 266 ++++++++++++------------ pkg/api/openapi_types.gen.go | 17 +- web/app/src/manager-api/ApiClient.js | 2 +- web/app/src/manager-api/model/Task.js | 9 + 10 files changed, 162 insertions(+), 145 deletions(-) diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index 559273e5..7b988185 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "31e128d7" +__version__ = "f020582b" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index fe815e8f..caa0ba4f 100644 --- a/addon/flamenco/manager/api_client.py +++ b/addon/flamenco/manager/api_client.py @@ -76,7 +76,7 @@ class ApiClient(object): self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = 'Flamenco/31e128d7 (Blender add-on)' + self.user_agent = 'Flamenco/f020582b (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 41af0b05..a128654b 100644 --- a/addon/flamenco/manager/configuration.py +++ b/addon/flamenco/manager/configuration.py @@ -404,7 +404,7 @@ conf = flamenco.manager.Configuration( "OS: {env}\n"\ "Python Version: {pyversion}\n"\ "Version of the API: 1.0.0\n"\ - "SDK Package Version: 31e128d7".\ + "SDK Package Version: f020582b".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager/docs/Task.md b/addon/flamenco/manager/docs/Task.md index 87e43973..375396b9 100644 --- a/addon/flamenco/manager/docs/Task.md +++ b/addon/flamenco/manager/docs/Task.md @@ -16,6 +16,7 @@ Name | Type | Description | Notes **activity** | **str** | | **commands** | [**[Command]**](Command.md) | | **worker** | [**TaskWorker**](TaskWorker.md) | | [optional] +**last_touched** | **datetime** | Timestamp of when any worker worked on this task. | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/addon/flamenco/manager/model/task.py b/addon/flamenco/manager/model/task.py index 02a2783f..ee934292 100644 --- a/addon/flamenco/manager/model/task.py +++ b/addon/flamenco/manager/model/task.py @@ -102,6 +102,7 @@ class Task(ModelNormal): 'activity': (str,), # noqa: E501 'commands': ([Command],), # noqa: E501 'worker': (TaskWorker,), # noqa: E501 + 'last_touched': (datetime,), # noqa: E501 } @cached_property @@ -121,6 +122,7 @@ class Task(ModelNormal): 'activity': 'activity', # noqa: E501 'commands': 'commands', # noqa: E501 'worker': 'worker', # noqa: E501 + 'last_touched': 'last_touched', # noqa: E501 } read_only_vars = { @@ -177,6 +179,7 @@ class Task(ModelNormal): through its discriminator because we passed in _visited_composed_classes = (Animal,) worker (TaskWorker): [optional] # noqa: E501 + last_touched (datetime): Timestamp of when any worker worked on this task.. [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -281,6 +284,7 @@ class Task(ModelNormal): through its discriminator because we passed in _visited_composed_classes = (Animal,) worker (TaskWorker): [optional] # noqa: E501 + last_touched (datetime): Timestamp of when any worker worked on this task.. [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index 4a2cafef..3f0a7f14 100644 --- a/addon/flamenco/manager_README.md +++ b/addon/flamenco/manager_README.md @@ -4,7 +4,7 @@ Render Farm manager API The `flamenco.manager` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: 1.0.0 -- Package version: 31e128d7 +- Package version: f020582b - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) diff --git a/pkg/api/openapi_spec.gen.go b/pkg/api/openapi_spec.gen.go index 77c1f4da..38ae5dad 100644 --- a/pkg/api/openapi_spec.gen.go +++ b/pkg/api/openapi_spec.gen.go @@ -18,139 +18,139 @@ import ( // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "H4sIAAAAAAAC/+R97XIbt7Lgq6DmblWSWoqUJdmOdf+sjx2fKMeJvZF8slWxSwJnmiSiIcAAGNGMS1X3", - "IfZNdm/V/tj7a18g54220A3MYDgYkpItRyfXP1ySZgZodDf6C92ND1mu5gslQVqTHX/ITD6DOccfnxoj", - "phKKM24u3e8FmFyLhRVKZsetp0wYxpl1P3HDhHW/a8hBXEHBxitmZ8B+UvoS9DAbZAutFqCtAJwlV/M5", - "lwX+LCzM8Yf/omGSHWf/MmqAG3nIRs/og+x6kNnVArLjjGvNV+73X9TYfe3/bKwWcur/fr7QQmlhV9EL", - "QlqYgg5v0F8Tn0s+Tz/YPKax3FZbl+Pwd0pvuhVxc9kPSFWJwj2YKD3nNjumPwzWX7weZBp+rYSGIjv+", - "ObzkkOPXUsMWLWENSxFKYqgGDb3e1fOq8S+QWwfg0ysuSj4u4Ts1PgVrHTgdzjkVcloCM/ScqQnj7Ds1", - "Zm40k2CQmRI5/dge56cZSDYVVyAHrBRzYZHPrngpCvd/BYZZ5f5mgPlBhuyVLFesMg5GthR2xghpOLmb", - "u2bBDvLXma2ACa9K24XrbAbMPyQ4mJmppfTAsMqAZksHewEW9FxInH8mTEDJkIaPxkxPUf9lZJUqrVj4", - "iYRsJnL8qCc8BxwUCmHd0mlED/+ElwYGXeTaGWgHNC9LtWTu03VAGZ9Y984M2C9qzGbcsDGAZKYaz4W1", - "UAzZT6oqCybmi3LFCiiBPitLBu+FoQG5uTRsojQN/YsaDxiXhRMgar4QpXtH2OFb2TD6WKkSuMQVXfGy", - "i5/XKztTksH7hQZjhELkj4G5tytuoXA4UrqgBQY6AK6kTboarpo2gy5rXMKqC8NJAdKKiQDtB6lZfsDm", - "lbEOnkqKXytiRE+0X/xGSM7jNgbX08ReeCpXDN5bzRnX02ruJEzgt/FiNXQfmuGpmsNr2lurL79iuSND", - "ZaBwb+YauAVaqt9/qwiGZos3kuUGLCTmcygEt1CumAY3FOO41AImQgr3wcAJApzeTTlAnKjKeoi4tiKv", - "Sq5rOvTwg6nGQXxukroJQXXqv6y3+o1HOPOfXwkj/Ca74Qh/d1+K0gngdSnueMxDtqPkPW1QsSaAq/Ge", - "e0IYJ54LaGXPKq1B2nLFlBOVPIyLTBwJSzNkF98+Pf32m+fnL05efnP++unZtxdkCBRCQ26VXrEFtzP2", - "X9nF22z0L/jvbXbB+GIBsoCCSAiymrv1TUQJ5+79bJAVQocf8c9eac24mUFx3rz5LrFH+ujSlaEeA9Hq", - "o41JGoIbdvI8bBlcthMcfykd/HrIflBMgnHixFhd5bbSYNiXqCHMgBUid1NxLcB8xbgGZqrFQmm7vnQP", - "/MAZD4cHbtGl4jYbIF/vusiIdeKdWTPjIKU9rUKV0ZZw7MJ/c3HMeLnkK4MvDdkFynWUpxfHxB74tRdd", - "b05IlyNCvQbQ7MtSXALjAWmMF8Wekl8N2cUSxqlhljButBZy3ZxLPgUn1AZsXFkmlSUF6mchtYR8PGQX", - "M1EU4ACUcAUah/7XdV72otFBSkrGvYjIQQPWzS552ZY1gVoNQmmmDIWOx0s2yJYw3kqzNEcGI6jhEzKe", - "hWHfIwo0aUZhUSLyudNbCYup5GMob2bJ+pXuboWnLL2OkbQmwvw2JvCiObfJM4ethM57KYwNGxglUj/e", - "ujgK1u3tVnzWUhQ9y22mSC0wuDGdZfkHTIMzXlCTc2bIZvbGt+NfeA95ZWGbe9Xvu9QMFD0O4KUJF32S", - "WtE3WivdXc9fQYIWOQP3mGkwCyUNpBzBIrEnvj07e83IW2HujdpKqAdiJ27H5mVVkFnnsLHgq1Lxghm3", - "z7ltEEjQtnDrbFEETUjyq4SSw7fymZvs4f6hU2loJKHEQQORWz7mBtyTcWVWQ+bMcQQ0AMWWoixZrqTl", - "QjLOvvgRrF7tPXXm8hf06gw4mp8OPCELkXMLxhvUy5nIZ8yKOVmkjhRgLMu5dLpJg9XC2dYvlLPMg/Tz", - "AwqD8tGxCXc6OIiMLwyrFkHw5aUAadH2VcyoOTj7c8o0cKMkSkiU2vCeNoHgJRvz/FJNJiQLawc0aKyu", - "9zsHY/g0xXtrzIV0b95PcdaLks9B5urvoI33h3bk8qvmi81QhBe9jExB8R1FF3hZvppkxz9vlhanwQVy", - "X10P1gHmuRVXta6OGf5581uwz0puLAtfMOfMeEcp6SSQJZ8SLO4B+kJiDsby+SKmZMEt7LknqTFFYrg3", - "b06eBwi/w9jClrDErhERp1HqgEi1KNKrOQuLcDAghujV4Y6LWqM/AhxQ10wbRUpqkr27fkfc8D1Y7oQB", - "ErQo0I3h5esWoTs4WPPb9FhYzfWKzf1g3sY2Q/a90ijxFyW8jw1MLwbmyvnTqOoqJ93YBR+Oh/mF2/5E", - "5+B2XgK6cvCeu7H87kGuPs5OF1pYYC+0mM6cyVkZ0EOYc1E6qFdjDfK/jb29q/Q0vEEbLjvFF9ip/X//", - "9wrKSCO2ds1pZFyk8WR1BT3f1iwT7C+kA0aiuMwdBigotSjB+p8lIUsouTfhgt6of1hwJ82zQfZrBRX+", - "wHU+E1fRj2SM0/B7XvjiY/y5AnpeOZzsxbMlzb56Dc9mXE6hK7tI6KZjPPQsCkJ4RYhDDT/JFlvbBzW7", - "e7B6BOEZN5fmtJrPuV6lInzzRSkmAgpWeiONojzBPxiyZ6QbSf/iw8a2d39yyti9DtxpQm4uuwYDfrWz", - "+YZxVg/wDpab6Vu5+e8V0Jqj/YThx+z4oVNjjUzo22XXgwxjT+fjFcZn12XNu/DTuZAtjq9Z1nPzu+uO", - "6U+AfMjmQoq52zAP0sr5oyXXC1E6U2XcSK5BkEMvT/72TSOGklEkNZkYaAO6nwK0wdOHG4RmzY4Cp29F", - "UUjA3GRVEdXWt8SPYCstyQ917EXBZx52tPBKHZfQikPvrCk7HN3PvT+C8ZHrjlO0+4Yiw+aWG8n7Zc+U", - "nIhppblNmnVmxudcfoMWaZE8AKAA4wzYKb7KJsJ595pLMwHNnr4+wYhU8NyG6ZChVZpP4aXKeTra/ryO", - "Z6Ej4KSx4xCcy3883GpgrM8yWFtdGkurvwEsfqykTJ6knNR+wzJCxRJdQTbnK3YJsGCaPsdnaUk678zT", - "xVKjpnp0Dum3H2t1uQHa4JPF2ozVira2W2ghQ3ZimZnhOUJlyCO6oEeO+eGCuaV4yzYO5pMX5SbBgM9U", - "uf8lvLdDduKdSGHYhRMFFwN20UbCBfv+zemZs7MuMLh9kQ44rxF5DZE11vpwlCL6jzAVxoKGgnz67rbg", - "RaHBpEWhFPllv89fcuts4zQV1cQuuYYNJN4mEn6qqUIiqY7HnNcniOZmkvyjTjxrXAxqlMUnnwEZgyyn", - "mDdCmUWY6FlBimqnkFda2FUdBFnbYbt6w5vcYJJxz2aQX6oqcfB4CmhqObnk9YudgdDs9NunBw8fsdx9", - "aKr5gBnxGwayxysLhgIEBRgHAiu9fAqRlNzP1gT111wJnA3dYQzJH2fNkc5wqkjMZcfZ4cPx/tGTB/nB", - "4/H+4eFh8WAyPno4yfcff/2EPzjI+f6j8YPi0dF+cfDw0ZPHX++Pv95/XMDD/aPi8f7BE9h3A4nfIDt+", - "cHRwhP40zVaq6VTIaTzVo8Px44P80eH4ydHB0aR4cDh+cvh4fzJ+tL//6Mn+1/v5IX/w8PGDx/nkkBdH", - "RwePDh+OH3z9OH/Ev37ycP/xk2aqg8fXXRMrYOQ1AtA5eeR25qSxJkHl9VyQX/EpWxgH5RsGtEru7LwQ", - "o/EarSYAnqVww3KvM6GgUEA9yZCdSKbKAjTz0QwT/HM/Fs675Ib9Uhk6LX9bL4edPH+bkQ0ejBE/ChN1", - "6IkTFBgcuvDm7Z4pq+nI5CBhz+22ER1q7p08b8vMZpN7ltnRziDYX4gSTheQbzU5aPBBm0zbd1NjEqW8", - "MPeMnJc1qqTSFW7BHj7wsM4YZ/grob4QkwlojNrNuGRLp0IdKWu1OXDMEQ+KMUiQptKOcP6oudnGGLVE", - "cn4S5kuRej3StxtJalJ3BdwCcjERXkIhPdAI87LKAx2ZZG3SLJIkCRZZ2CvxiAHipKc94wkI26I2HjM5", - "BsqZD11HBNoyOhFhXTcvZzzIrUG22A3BPwk7a+IrO6F64K2qHMXZuAf1A6a085QGrIAFyALTfCSeW5H6", - "/ZPTZld7KSJHTzSmQ9U4SLCJvJ2wWSUvpVpKjG2WihdknzqCtezQZv002I8EDWaUeLv11oYHGhot3PXa", - "EndkNHwWA+EzqLd+4rfpRadRaa1G1JpoNWec6eizoFIGMSm9r6ba2x30lbM7XuBQ5NVpYMhoTpP419zf", - "4L0/ocMJ6VSrOQn8XDzQbMx6P9wNW8QT1dvtE/NKJL4/lmsoJbMtONa2uKf/TXXupxKEG4Seyi/Bnrz6", - "To3fYCQ1mfBkwNaZpgNmnB2lrkCz8DUd71LyCgUkzJC9cGoMlhiwGziDF66Eqsw5QXNBFta4YW4ygtoI", - "+ERHZ8Gnbw/0A5/HWVzpnMEW0DcKKcb5zXVG0cNkoFbDRIOZnddB+Y2xn+gM2ntG/ns6DqDVfGHoYMDb", - "wZihJK3PCDLGn/eZgben8VdnaeCRgZCFuBJFxel0gS1xlilI0BQPUmzO5SoM4vNDF5rnVuS87E0vvDkS", - "+7O5b3q0+REnm4nzTJ/PHWV8t2m4aa+5DdWfnXwKEo8l671FpDbOgbgYmejbCwZX6NJgyqdVPtUr6Jzo", - "TffQ7U1PryF7FsakDLUp2Pg5ObIYSHTUD1QOv5dqir7SikkAn06zKEUubLkK046BBIDBw6xc2NWgXojz", - "yShxLbzrxlCSUsq+tArhaU1NQU2OUH6FlpB73b3yhXHwMAyJOoqmpIhabBWhCdK8CoHRXZNaU4OEXKcQ", - "iusXZZREYlUbKyNWyeYPTv0Ptwu8NR5Wi025r5uXHtnANRh4fNv8ljR/+1CROIbgll0KR9HJjXBQn2iX", - "5XdqjDkGZUkxVFMXbDgOKdV0I4xn3Fy+VNM+9XfmWZ7ls0peeu1nFePNDtVKzVkBJKQLeuhTphwAuDf5", - "lRKF+7igJbYlaIprHdzdNBQHRM0yHrQh+56v6oSpeVVascAsJAkUxIL3NnnejWHZbYx5RnHdm/FcGHmQ", - "tdHf5Ts3/C6mxxlist/2QGR0jA9/OH476yPOM7pxVs9uaKNKoZ3C9LuYMT4G/7F2TLus6jbffE717DFY", - "l2dtTD/awIkkPHbhRXpzEzf6Y8TAj7cwbf351S7WbXRq1c8ayzDexzJH55zqI746z+u8nl0/bp0C3iWr", - "3SD/cf3ALMGBYawkA8bpjsnE9uZYqCkPc1ol5HauhQF2yaP5+Gw1/+Dw9//J/vFvv//77//x+//+/d//", - "8W+//5/f/+P3/xUbx+j1xGklfpbzfF5kx9kH/+s1HjxU8vKcIgGHbk3WORXnvCqECoknzoP2B1gjjV+O", - "zGTk3Ew6SHlwcDjEIWNCv/7hr+7XhcmOD44G2UTzuduH2YO9B/vZIBNzPgVzrvT5lShAOfcM/5INMlXZ", - "RWWpcAbeW5DEE9lw4Q+pcSn+rS5cNFMN2SiNLl/h0xlPK2U3jhdFL9DWhj2PzT36JOtETWLm2OKH1Tma", - "u9bxbvFzYx7Y5gKGV/udwHSe/bpnltpw6aLss2BSURk21liaEKoJ50Ihf33AxBCGbAwTpYFdcS0w81vD", - "ouQ5hgKHN7MnPmUp991lMd+FOfPHV4bfVZr0IFvWWSjbgPX6fufU6nWrJ1WUHpee18y3pQo9QtwN8obr", - "DOE6y9Koid1bTxxO+WHNhPcpyTfmn1tk+cYJs12NXhnLQKpqOovrZhgfU82uF0OhvrApbvZBPcwLHvZY", - "lP+U2+62pv+OvB9m6qPUJt+fntUB1PGqtv8dgWhkqk8nzntb7e8fPKIgGToLSDEsIaKqM6wSfVqWrKEe", - "HvKoBWXa/itT3sBbe0FMpdJQsC9R86hQvHkRdrZ3aqWyDDT3yX515UuoS49dxa+2eb1tdLySsFcK6avS", - "fVAakym+MCyvS59nWKPsQAtHYJQ5yV5dgV46G9Sw4HOUK0JrDWYo4EhxbjIi8lJNfaSjlgEUdAkefqiY", - "dkAjVXBC4LoUVPOXDIuc3kZKJJnrNomIH7eVN+yUMGlqJzSA7lal5b2yuixgfYFicR6tce1I4zXzzzr+", - "7sbEyzWGpDilnDKzMhbm28f62KTKLY5fLYiitbeSJZtKuXRy5PW7TpGTr+doK4kggxq6vRSp5IJQ5kt2", - "SCJ1xD/Y2epcJ/pm/ITR+9mNEnb7ctg/IiEXck01EnfNA36mFpmTU0Sc0o+PUzGVr26KiZBze94fsfjk", - "y465Pr3aDlQbVm25hT7zz4eKdJwcv3uoKWm8RYPtBFTRB9UngGULBG073FiuLWUf8SW/RJFuSgDnx2Eh", - "thN6YPwrajJxqjFpdvfH1BLlN1RC7RRsbPz42oMmM8398cJH2BP2qTkv+W+rzaUo7bIGf75NFkXcCAeT", - "5JoGSiRnGivEG12GTYQUZhbC+7c9kt6FioN6fRvo2ecR/IUbkW8Q87c39jeKjT84chtJqzY6fKm6U1wh", - "wkmWnec9YUJdzo5uQkJD9wsl0h5YkHDqlhErynNepVIt3xjQbgIHWVRFdPJ8wBbcmKXSRXhE6oJarzFu", - "w6s60oOO2ohAZFbHGs0yZ9YusmsHo+MWav0gLc9tU8lfV/yzM+BOG1W69F+a49FoEmLGQo26lYk/UqOZ", - "F1zPfT4BVoJlg6wUOfh8OD/PX1+/vDrsjL9cLodTWQ2Vno78N2Y0XZR7h8P9IcjhzM6p2FnYsgWtny6i", - "zXH2YLg/3MdaxgVIvhDZcXaIf6KMTqTMiC/EKF8vhpuS9q/Lm04KbKdh21Vzjlkokw6HOtjfDygFid/z", - "xaL0ibyjX3wUgph7G+snq/SQcm2MS7eHyzqjj/gvCAoHMSX8xMPUfTyiDi2WTw3VwFiOta3NGN/IYqGE", - "z/6Z+u5znQFrOtSDXg8It6GycaFMAqd0ekGZWF6t/kUVq0+Gx3YziC7+sPGP8uciWbz7ra7g+g4pvAGg", - "JTfMVHkOZlKV5So0SiqYkN53jvKrzHCtJeIngY6KqRLw4QMWaqXa7EbIZjxk7iHLrHNG1EEn5jyqV20N", - "913oZkV9BMEzYpu1Rr+GovA0g2HVrc/xuAsGa+rSE8jqpPJTCj9WIVOm0vBz81yrDDkB8g8kUBCrtVgZ", - "hFIYmC/sijoLiAmTinJu5tzmM6yhAfrw/rDkC7D5rG6F4BC/helejTEPpikUn2BtOvbOlAUzStd9Qhse", - "dOp19MH9/wOfw/UmDRJaWLXbQP38IRNuKb7QwKvIMGCHRwYRytYtmHd3yD/dRlw9EpWerasin9YUuob1", - "dFTbQJwTOVG1cWv85ooad3aIYnYghck+I8ZMCmX1S01DtQT2yk7TNexHhvmaO2OwmaqWy780DYBb+PtA", - "h0T93Ix7i1T3dl6uT5z6OXlbkti7P0Ybo6mckiqi4cbQA3G7QqOPZBG1VkyjfWTANj5Wj/WETHxaH2B8", - "NirciR5tneMliHHW8fCtChUzu+jRo97aCj+cs7t4nsPCQoGb4ejgoO/gMHRMaAPkW8BRJ+zQTCGEFUxd", - "yFGzy+dUk28kvF9A7oDGYM+QTh362TVEbtbbRYR1kRca1pHg4LoiYaP4wIZGfxIZ0mrOlKABakF8LMDE", - "h2mm9sruCV+sCzvu4cYjwLpzVFhCxAqb1Y9zakzPipGD8NHog08B3qJ8fJrsDpZUnVF8P1kHF9Ij8iga", - "KSfqnrJFk6u+hfiJL/rIPirV1GJu4Tbyv1TTM/fi/eECC+/taFFysUaF9ZH6iV0qcjCSKovaWcVdUfGb", - "GXeqB2sNVmDvI6vU/TQnsIzKC2ZxKc5OHBR/Uo8XDvJ7JcmO9lR0KP9ZWerTW1Sd1Kg/vUlFMuhPYFNR", - "xgvWXs75is34FTCYTCC3oQwc++TRCNywJZSlfz9EyRze5sB93HZWzbk05HM0N39cCd7t+z705ySGuT2C", - "h3K4neioAXdVs6kumJDGAscjsrDxopOZPtf773Umw52p1PXOxbcOnteO8lVzsBTHzzeHz59FdYvUQ00Y", - "Ov6E/LJuhcZzW/GyXDHeTOdL/Gu0EgH25lM7ivIu+rVjU852ZziOkkcS6P0bNiMIsPYHNKL0koDIZq3p", - "8Fz4NLBq3fcg7ouzAXOjD/5EbquJWWcDbdcF9ZD31sys04Q7tApnozvGOpb1wfJWijlKF2AxlzecV9bW", - "7A7k2UVve6naPS/+3HT79Fp8wxn4fVDn90TT9nLfbvo2sHObI0fa94PcaxLx+/iPXqyFxd1xQivlrX8j", - "I90JqM96wtRpobmL2v2MbFStsdGasAvg+zPMpuyxxWcdHmtI4pRS86VZ5ygjpnJPTSYbXBAxla8mk2yX", - "vXn/EOkzX1DStnJefsbk1AZn33N9GSe7cGfEU77ZFmw/46XvvR+Uv1Ws9LZaOGN29gB2mfhCA5squuwQ", - "hx+mSSK3UETe6ab2U/Rv57rs7nPu5W525T/FZt6ZB59WdgbSUiGCr7xw3FBfh9Vj5Hw0Q2rgxcq95caj", - "JrCtahDRELzLrtYXmyRN1ohk2R/NGdT+eb3FdG9cSyrW/8X9Zqmbswd5f1HrcI2BDi5XPUhI88FeHiUY", - "J4VXIhn5ru3UeqJUdkmtGmmdt7NJ/4llzk9xawcKdUHoNhsae6KN7QRGCQWdEFMtmJcle+1IWeAVTGoW", - "srkIy8sX0HulynmJoo2X5lPLsytoraYyHVa1vmC6R73mMyiqEvxZzt1lYsR3aqd8J181Weem9QmqH5QP", - "n7Uv6IxSjCnQuX/46bIYWy3OE8C/Bh3S5J6DFCQ0j/afJNLl6yRoqWzQdFSgS+w0YEaFx3j/MLQuvaOl", - "YxcIJtXSx3QPP69qCbuISwelophQ1LFnXFm6T5RuHuBSoZyl3XbDHesjTrweP8LGtq2EPGU8g+tEBmMy", - "qNq/V6Jy0z/B4YRfSd9e9PZQVNdwO21xNoMwVvc0IrVFmkNXw7iXGjEbLUMDH3+reDM27pk/JDzykWrp", - "TVOJ7JuOrRYix4h0XK270GqqwZiBvxzN3x6t2YSLstKwVbcEjWJAFq2YokN3GN1JMWcRbdkmozlf7Yk9", - "XfWfNHzPVz5qUsk/RZ7A2rU0fy5/7CxqTRxdzJm4YEeYWDXpSrJRz4U77JUvjC/rHneGcUaNJmJTtGn7", - "QMVeu3Bxx4pH7y6CbA0mX11OfE13EI1CL/URtenYYCe1ryC5o3KJ9iSplPa44Xjtyfj7GD5fbCJ5hUQC", - "3PAGiudw10NUWxFrgbvdHDUkvCT/n1oEeQPq6O4BOEMvc+n+I+qhxSinQ/bGALswaxhtupJfODrT3RMM", - "UYlFDCokW9yX2O0zuuElugSfQitmNS+FvKzv88XLdggDVE9j6UIOjxRnNvKypEP3MYBk1EacdrRvuu07", - "NzkNWW/txrprxAchdU18nHqAODPxZkJgWhf/cA08LSzipvG7ioyYpHcqPlIXF+wqSf4AIZLs25+Ct+7h", - "iPdcK/TAY0IMgtIKGsg3uqcl3q+9gvdCNJfqxDjwt434i9CVtsbveKIU1/XCtnL6U6cK3TTNrddBZ7YH", - "bFxpn99CyQ8ERSNv8F1jRVk2IETbA8cbfQiXXlyPPuBfxG8bSnLi/vdKwzPPhGum4s7XmeAFkl27Mrx6", - "o0qeQfdy199g/T6W+jKPxKxh9bvM2txu8+7Od1znzoP+OrTmqor7tnvihgPN3QzJWzpaFmW0UTZJ7Zoj", - "/3Mz4yDlnHtpIto3G/i70gqYgGb11R+kmxEbqOXfZgf7X7/NGkejbnuFXeXpkv+1BFtanqktN6rKbeUc", - "tQhOASheGkVjGDUHJYFBaXCcpttVCkzkFkTgDHiBx88ehf9jj6bZe8bl3nO3zr03OECWwGF0UWYKh0qL", - "qZC8xDnd+Hg1J7XTKlXcfqu+k0bYui2WkP5OGRGLa+yQVd9TxSXjAt8oYFzRXYE7rO2VB2zvhQcs21rt", - "uIsho3ILds9YDXzelhC1Pz8W0u3vwfZM7Wc0h1m7yOqWwSlkr05o6mD/622ve3ZsMWKUNXj04HFyBO0/", - "dw4Alu6yMdgleGb36IxKCkOdoc9S9Lfv4vbXHblTG8uBl9G9eZjoJtq6hGTLrg07sNk5nvEWWuW+D9gY", - "3If1/ONVa9+RKXHRu4WOGd5GS7X3JF1idPiV3BcNhJrBx6T79Q77QWFQz1/70nqI+3OidC7G5YrlpfIt", - "/749O3vNciUl4MX6viW5j3x6wev74pgWvYDBe55bZvgcvAlpFbbqc58UqnLWHX1ghm9loOoXeLMh7SbP", - "C2NIUYCNVbHqVaVxKNNN0bgVXbT4sJT7mRQqtSAZZdFZbvcWnVb+Y6epgbAGysmwkWeYCtwVvd+pcUg1", - "wJjnrxVoAWYQNToYrJWHDlsFcCYx6NPXJ+1WC/FJs5rPK+mbLTqR3u3UsZYImZjAn7d8X8PEnr4+GTS3", - "Rcf5425S6h7gluFoq1UZIOpMhil7CeOCCFbPgjzecJvHIMZz3O90dRS5ufEcnkGu313//wAAAP//3SZv", - "q22XAAA=", + "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", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/pkg/api/openapi_types.gen.go b/pkg/api/openapi_types.gen.go index 308991c9..43fbeea6 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -483,13 +483,16 @@ type Task struct { Commands []Command `json:"commands"` // Creation timestamp - Created time.Time `json:"created"` - Id string `json:"id"` - JobId string `json:"job_id"` - Name string `json:"name"` - Priority int `json:"priority"` - Status TaskStatus `json:"status"` - TaskType string `json:"task_type"` + Created time.Time `json:"created"` + Id string `json:"id"` + JobId string `json:"job_id"` + + // Timestamp of when any worker worked on this task. + LastTouched *time.Time `json:"last_touched,omitempty"` + Name string `json:"name"` + Priority int `json:"priority"` + Status TaskStatus `json:"status"` + TaskType string `json:"task_type"` // Timestamp of last update. Updated time.Time `json:"updated"` diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index dd6a3f3e..70b189ee 100644 --- a/web/app/src/manager-api/ApiClient.js +++ b/web/app/src/manager-api/ApiClient.js @@ -55,7 +55,7 @@ class ApiClient { * @default {} */ this.defaultHeaders = { - 'User-Agent': 'Flamenco/31e128d7 / webbrowser' + 'User-Agent': 'Flamenco/f020582b / webbrowser' }; /** diff --git a/web/app/src/manager-api/model/Task.js b/web/app/src/manager-api/model/Task.js index f00f1e89..d3880fb3 100644 --- a/web/app/src/manager-api/model/Task.js +++ b/web/app/src/manager-api/model/Task.js @@ -104,6 +104,9 @@ class Task { if (data.hasOwnProperty('worker')) { obj['worker'] = TaskWorker.constructFromObject(data['worker']); } + if (data.hasOwnProperty('last_touched')) { + obj['last_touched'] = ApiClient.convertToType(data['last_touched'], 'Date'); + } } return obj; } @@ -168,6 +171,12 @@ Task.prototype['commands'] = undefined; */ Task.prototype['worker'] = undefined; +/** + * Timestamp of when any worker worked on this task. + * @member {Date} last_touched + */ +Task.prototype['last_touched'] = undefined; +