feat: display sync operation status message on app details page (argo…

…proj#3918)

go.mod

@@ -8,7 +8,7 @@ require (
  github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d
  github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 // indirect
  github.com/alicebob/miniredis v2.5.0+incompatible
- github.com/argoproj/gitops-engine v0.1.3-0.20200706234313-97d4a75189b1
+ github.com/argoproj/gitops-engine v0.1.3-0.20200713172125-eb210cf6d14c
  github.com/argoproj/pkg v0.0.0-20200624215116-23e74cb168fe
  github.com/bsm/redislock v0.4.3
  github.com/casbin/casbin v1.9.1

go.sum

@@ -55,8 +55,8 @@ github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+Dx
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/argoproj/gitops-engine v0.1.3-0.20200706234313-97d4a75189b1 h1:GSWbg53S6kPrQ1T3zCJCQb2NKdFm4NOR9EhH3v32paI=
-github.com/argoproj/gitops-engine v0.1.3-0.20200706234313-97d4a75189b1/go.mod h1:PoQpSD0unSv022NUqsKluVR1gFBPINXjyEPmuqZjp+0=
+github.com/argoproj/gitops-engine v0.1.3-0.20200713172125-eb210cf6d14c h1:eswNu5p39s8WO5eowCzgyAa+I4APngOzg/P5AGRVnm8=
+github.com/argoproj/gitops-engine v0.1.3-0.20200713172125-eb210cf6d14c/go.mod h1:FZLcsT40Y5taI/zhFjC//avBm9Aly7COw0F6bxtTG0A=
 github.com/argoproj/pkg v0.0.0-20200102163130-2dd1f3f6b4de/go.mod h1:2EZ44RG/CcgtPTwrRR0apOc7oU6UIw8GjCUJWZ8X3bM=
 github.com/argoproj/pkg v0.0.0-20200624215116-23e74cb168fe h1:HjTM7H8Z+J1xt340LNpH9q4jc8pXeqzkC8QKIjQphp4=
 github.com/argoproj/pkg v0.0.0-20200624215116-23e74cb168fe/go.mod h1:2EZ44RG/CcgtPTwrRR0apOc7oU6UIw8GjCUJWZ8X3bM=
@@ -385,8 +385,6 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM=
-github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
 github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
@@ -631,12 +629,6 @@ github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0B
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yudai/gojsondiff v1.0.1-0.20180504020246-0525c875b75c h1:vGHScYm0uhmaxwGX38tj1TB1u1zVdO0vlgcz1fEVxc8=
-github.com/yudai/gojsondiff v1.0.1-0.20180504020246-0525c875b75c/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
-github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
-github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
-github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI=
-github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4 h1:1yOVVSFiradDwXpgdkDjlGOcGJqcohH/W49Zn8Ywgco=
 github.com/yuin/gopher-lua v0.0.0-20190115140932-732aa6820ec4/go.mod h1:fFiAh+CowNFr0NK5VASokuwKwkbacRmHsVA7Yb1Tqac=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=

ui/src/app/applications/components/application-status-panel/application-status-panel.tsx

@@ -80,13 +80,13 @@ export const ApplicationStatusPanel = ({application, showOperation, showConditio
  <div className='application-status-panel__item-name'>
  {appOperationState.phase} <Timestamp date={appOperationState.finishedAt || appOperationState.startedAt} />
  </div>
- {appOperationState.syncResult && appOperationState.syncResult.revision && (
+ {(appOperationState.syncResult && appOperationState.syncResult.revision && (
  <RevisionMetadataPanel
  appName={application.metadata.name}
  type={application.spec.source.chart && 'helm'}
  revision={appOperationState.syncResult.revision}
  />
- )}
+ )) || <div>{appOperationState.message}</div>}
  </div>
  )}
  {application.status.conditions && (

ui/src/app/applications/components/utils.tsx

@@ -251,6 +251,7 @@ export const getAppOperationState = (app: appModels.Application): appModels.Oper
  } else if (app.operation) {
  return {
  phase: appModels.OperationPhases.Running,
+ message: (app.status && app.status.operationState && app.status.operationState.message) || 'waiting to start',
  startedAt: new Date().toISOString(),
  operation: {
  sync: {}