Browse Source

update security and CI (#1102)

* Dependency workflow add dependency correction value

* Download workflow instance map width adjustment and change "desc" field to "description"

* The third-party library that builds the dependency is recommended to be placed in 'devDependencies'

* Tree chart and Gantt chart style modification

* The workflow instance can be deleted only when its status is success, failure, stop and pause.

* change desc to description

* Maximum width of tooltip is set to 500px, note the copyright number of login page

* Delete copyright number

* No tenant in the list of selected tenants the default is default, and the status not shown in the repair page

* repair

* Repair security center module prompt

* Remove blank character during verification

* Remove blank character during verification

* Non admin users cannot create users, tenants, alarm groups, queues and worker groups

* Remove CI windows detection
pull/2/head
break60 5 years ago committed by lgcareer
parent
commit
7815a628c4
  1. 2
      .github/workflows/ci_frontend.yml
  2. 6
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
  3. 6
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
  4. 6
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
  5. 6
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue

2
.github/workflows/ci_frontend.yml

@ -15,7 +15,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, windows-latest, macos-latest] os: [ubuntu-latest, macos-latest]
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: Set up Node.js - name: Set up Node.js

6
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue

@ -18,7 +18,7 @@
<m-list-construction :title="$t('Queue manage')"> <m-list-construction :title="$t('Queue manage')">
<template slot="conditions"> <template slot="conditions">
<m-conditions @on-conditions="_onConditions"> <m-conditions @on-conditions="_onConditions">
<template slot="button-group"> <template slot="button-group" v-if="isADMIN">
<x-button type="ghost" size="small" @click="_create('')">{{$t('Create queue')}}</x-button> <x-button type="ghost" size="small" @click="_create('')">{{$t('Create queue')}}</x-button>
</template> </template>
</m-conditions> </m-conditions>
@ -46,6 +46,7 @@
import _ from 'lodash' import _ from 'lodash'
import { mapActions } from 'vuex' import { mapActions } from 'vuex'
import mList from './_source/list' import mList from './_source/list'
import store from '@/conf/home/store'
import mSpin from '@/module/components/spin/spin' import mSpin from '@/module/components/spin/spin'
import mCreateQueue from './_source/createQueue' import mCreateQueue from './_source/createQueue'
import mNoData from '@/module/components/noData/noData' import mNoData from '@/module/components/noData/noData'
@ -64,7 +65,8 @@
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
searchVal: '' searchVal: ''
} },
isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER'
} }
}, },
mixins: [listUrlParamHandle], mixins: [listUrlParamHandle],

6
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue

@ -18,7 +18,7 @@
<m-list-construction :title="$t('Tenant Manage')"> <m-list-construction :title="$t('Tenant Manage')">
<template slot="conditions"> <template slot="conditions">
<m-conditions @on-conditions="_onConditions"> <m-conditions @on-conditions="_onConditions">
<template slot="button-group"> <template slot="button-group" v-if="isADMIN">
<x-button type="ghost" size="small" @click="_create('')">{{$t('Create Tenant')}}</x-button> <x-button type="ghost" size="small" @click="_create('')">{{$t('Create Tenant')}}</x-button>
</template> </template>
</m-conditions> </m-conditions>
@ -46,6 +46,7 @@
import _ from 'lodash' import _ from 'lodash'
import { mapActions } from 'vuex' import { mapActions } from 'vuex'
import mList from './_source/list' import mList from './_source/list'
import store from '@/conf/home/store'
import mSpin from '@/module/components/spin/spin' import mSpin from '@/module/components/spin/spin'
import mCreateTenement from './_source/createTenement' import mCreateTenement from './_source/createTenement'
import mNoData from '@/module/components/noData/noData' import mNoData from '@/module/components/noData/noData'
@ -64,7 +65,8 @@
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
searchVal: '' searchVal: ''
} },
isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER'
} }
}, },
mixins: [listUrlParamHandle], mixins: [listUrlParamHandle],

6
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue

@ -18,7 +18,7 @@
<m-list-construction :title="$t('Warning group manage')"> <m-list-construction :title="$t('Warning group manage')">
<template slot="conditions"> <template slot="conditions">
<m-conditions @on-conditions="_onConditions"> <m-conditions @on-conditions="_onConditions">
<template slot="button-group"> <template slot="button-group" v-if="isADMIN">
<x-button type="ghost" size="small" @click="_create('')">{{$t('Create alarm group')}}</x-button> <x-button type="ghost" size="small" @click="_create('')">{{$t('Create alarm group')}}</x-button>
</template> </template>
</m-conditions> </m-conditions>
@ -46,6 +46,7 @@
import _ from 'lodash' import _ from 'lodash'
import { mapActions } from 'vuex' import { mapActions } from 'vuex'
import mList from './_source/list' import mList from './_source/list'
import store from '@/conf/home/store'
import mSpin from '@/module/components/spin/spin' import mSpin from '@/module/components/spin/spin'
import mCreateWarning from './_source/createWarning' import mCreateWarning from './_source/createWarning'
import mNoData from '@/module/components/noData/noData' import mNoData from '@/module/components/noData/noData'
@ -64,7 +65,8 @@
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
searchVal: '' searchVal: ''
} },
isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER'
} }
}, },
mixins: [listUrlParamHandle], mixins: [listUrlParamHandle],

6
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue

@ -18,7 +18,7 @@
<m-list-construction :title="$t('Worker group manage')"> <m-list-construction :title="$t('Worker group manage')">
<template slot="conditions"> <template slot="conditions">
<m-conditions @on-conditions="_onConditions"> <m-conditions @on-conditions="_onConditions">
<template slot="button-group"> <template slot="button-group" v-if="isADMIN">
<x-button type="ghost" size="small" @click="_create('')">{{$t('Create worker group')}}</x-button> <x-button type="ghost" size="small" @click="_create('')">{{$t('Create worker group')}}</x-button>
</template> </template>
</m-conditions> </m-conditions>
@ -45,6 +45,7 @@
import _ from 'lodash' import _ from 'lodash'
import { mapActions } from 'vuex' import { mapActions } from 'vuex'
import mList from './_source/list' import mList from './_source/list'
import store from '@/conf/home/store'
import mSpin from '@/module/components/spin/spin' import mSpin from '@/module/components/spin/spin'
import mCreateWorker from './_source/createWorker' import mCreateWorker from './_source/createWorker'
import mNoData from '@/module/components/noData/noData' import mNoData from '@/module/components/noData/noData'
@ -63,7 +64,8 @@
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
searchVal: '' searchVal: ''
} },
isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER'
} }
}, },
mixins: [listUrlParamHandle], mixins: [listUrlParamHandle],

Loading…
Cancel
Save