verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

#2051 - DMS unify methods #1888

Merged
jsegarra merged 17 commits from 2051_dms_methods_refactor into dev 2023-12-18 07:14:37 +00:00
Conversation 0 Commits 17 Files Changed 9 +103 -148
jsegarra commented 2023-12-12 11:02:02 +00:00
Member
Copy Link
No description provided.
jsegarra added 4 commits 2023-12-12 14:03:12 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
d206c93305 refs #2051 feat: getAllowedContentTypes approach
jgallego requested changes 2023-12-13 08:29:14 +00:00
back/methods/dms/removeFile.js Outdated
@ -35,3 +35,3 @@
try {
const dms = await models.Dms.findById(id, null, myOptions);
let modelDms = null;
jgallego commented 2023-12-13 08:19:44 +00:00
Owner
Copy Link

dejar el codigo como estaba, y que el que llama pase el dmsFk

dejar el codigo como estaba, y que el que llama pase el dmsFk
jsegarra marked this conversation as resolved
modules/claim/back/methods/claim-dms/removeFile.js
@ -40,3 +42,1 @@
await targetClaimDms.destroy(myOptions);
await targetDms.updateAttribute('dmsTypeFk', trashDmsType.id, myOptions);
// await targetDms.updateAttribute('dmsTypeFk', trashDmsType.id, myOptions);
jgallego commented 2023-12-13 08:29:07 +00:00
Owner
Copy Link

dejar aquí lo que aplica al modelo claim-dms y lo otro moverlo a dms

dejar aquí lo que aplica al modelo claim-dms y lo otro moverlo a dms
jsegarra marked this conversation as resolved
jgallego requested changes 2023-12-13 08:39:19 +00:00
front/salix/components/section-dms/index.js Outdated
@ -0,0 +2,4 @@
import Component from 'core/lib/component';
import './style.scss';
export default class SectionDms extends Component {
jgallego commented 2023-12-13 08:33:48 +00:00
Owner
Copy Link

extends section

extends section
jsegarra marked this conversation as resolved
jsegarra added 5 commits 2023-12-13 14:39:04 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
06bae44824 refs #2051 perf: uploadFile after review
jsegarra changed title from WIP: #2051 - DMS unify methods to #2051 - DMS unify methods 2023-12-13 14:39:43 +00:00
jsegarra requested review from jgallego 2023-12-14 06:13:19 +00:00
jsegarra added 1 commit 2023-12-14 06:22:25 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
397eb4d32b Merge branch 'dev' into 2051_dms_methods_refactor
jgallego requested changes 2023-12-14 07:13:55 +00:00
modules/claim/back/methods/claim-dms/specs/removeFile.spec.js Outdated
@ -2,2 +2,3 @@
describe('TicketDms removeFile()', () => {
// f
fdescribe('TicketDms removeFile()', () => {
jgallego commented 2023-12-14 06:22:35 +00:00
Owner
Copy Link

esto sin f

esto sin f
jsegarra marked this conversation as resolved
modules/client/back/methods/client-dms/removeFile.js Outdated
@ -40,0 +38,4 @@
if (!targetDms || !clientDms)
throw new UserError('Try again');
const clientDestroyed = await clientDms.destroy(myOptions);
jgallego commented 2023-12-14 06:30:19 +00:00
Owner
Copy Link

ya que cambiamos el nombre de la variable, para mi queda mas claro,
clientDmsDestroyed porque en realidad no se elimina un cliente sino la relacion entre cliente y dms

ya que cambiamos el nombre de la variable, para mi queda mas claro, clientDmsDestroyed porque en realidad no se elimina un cliente sino la relacion entre cliente y dms
jsegarra marked this conversation as resolved
modules/client/back/methods/client-dms/specs/removeFile.spec.js Outdated
@ -2,2 +2,3 @@
describe('ClientDms removeFile()', () => {
// f
fdescribe('ClientDms removeFile()', () => {
jgallego commented 2023-12-14 06:30:46 +00:00
Owner
Copy Link

sin f

sin f
jsegarra marked this conversation as resolved
modules/ticket/back/methods/ticket-dms/removeFile.js Outdated
@ -43,0 +38,4 @@
if (!targetDms || !ticketDms)
throw new UserError('Try again');
const ticketDestroyed = await ticketDms.destroy(myOptions);
jgallego commented 2023-12-14 06:33:38 +00:00
Owner
Copy Link

ticketDmsDestroyed o si lo quieres generico selfDestroyed...

ticketDmsDestroyed o si lo quieres generico selfDestroyed...
jsegarra commented 2023-12-14 11:40:13 +00:00
Author
Member
Copy Link

He usado la misma sintaxis para todo %modelo%DmsDestroyed

He usado la misma sintaxis para todo %modelo%DmsDestroyed
jsegarra marked this conversation as resolved
modules/ticket/back/methods/ticket/specs/uploadFile.spec.js Outdated
@ -24,2 +24,4 @@
expect(error.message).toEqual(`You don't have enough privileges`);
});
// fit(`should uploadFile`, async() => {
jgallego commented 2023-12-14 06:38:28 +00:00
Owner
Copy Link

elimina el codigo comentado

elimina el codigo comentado
jsegarra marked this conversation as resolved
jsegarra changed title from #2051 - DMS unify methods to WIP: #2051 - DMS unify methods 2023-12-14 11:27:38 +00:00
jsegarra added 1 commit 2023-12-14 11:28:57 +00:00
gitea/salix/pipeline/head This commit looks good Details
d0af29c0c5 refs #6264 test: remove force describe for dms test
jsegarra added 2 commits 2023-12-14 11:36:57 +00:00
gitea/salix/pipeline/head This commit looks good Details
9316c31180 refs #6264 perf: rename variable when destroy ids
jsegarra changed title from WIP: #2051 - DMS unify methods to #2051 - DMS unify methods 2023-12-14 11:41:07 +00:00
jsegarra added 1 commit 2023-12-14 11:41:14 +00:00
gitea/salix/pipeline/head This commit looks good Details
043c411f68 Merge branch 'dev' into 2051_dms_methods_refactor
jsegarra requested review from jgallego 2023-12-14 11:41:44 +00:00
jgallego approved these changes 2023-12-14 12:16:22 +00:00
Dismissed
jsegarra added 2 commits 2023-12-15 12:02:08 +00:00
jsegarra dismissed jgallego’s review 2023-12-15 12:02:09 +00:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

jsegarra added 1 commit 2023-12-15 12:06:15 +00:00
gitea/salix/pipeline/head This commit looks good Details
1515b55f7d Merge branch 'dev' into 2051_dms_methods_refactor
jgallego approved these changes 2023-12-16 11:01:54 +00:00
modules/worker/back/methods/worker-dms/removeFile.js Outdated
@ -21,3 +21,1 @@
Self.removeFile = async(ctx, id) => {
const models = Self.app.models;
const workerDms = await Self.findById(id);
Self.removeFile = async(ctx, id, options) => {
jgallego commented 2023-12-15 10:15:45 +00:00
Owner
Copy Link

renombrar id por dmsFk

renombrar id por dmsFk
jsegarra merged commit 1810377738 into dev 2023-12-18 07:14:37 +00:00
jsegarra deleted branch 2051_dms_methods_refactor 2023-12-18 07:14:38 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
jgallego
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1888
No description provided.
Delete Branch "2051_dms_methods_refactor"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?