fix: @cond on new line to prevent parsing issues in sasjs cli

chore: doxy formatting
fix: adding outds and parameters to mv_jobexecute
2026-01-03 15:40:05 +00:00 · 2020-12-02 08:09:51 +01:00 · 2020-11-29 22:03:20 +01:00 · 2020-11-29 21:55:21 +01:00 · 2020-11-29 21:06:39 +01:00 · 2020-11-29 13:58:04 +01:00
38 changed files with 628 additions and 4324 deletions
--- a/2452
+++ b/2452
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright 2018 (Allan Bowe)
+Copyright 2020 (Allan Bowe)

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

--- a/all.sas
+++ b/all.sas
@@ -40,6 +40,7 @@ options noquotelenmax;
  @version 9.2
  @author Allan Bowe
 **/
+/** @cond */

 %macro mf_abort(mac=mf_abort.sas, type=, msg=, iftrue=%str(1=1)
 )/*/STORE SOURCE*/;
@@ -157,7 +158,8 @@ options noquotelenmax;
    %abort cancel;
  %end;
 %mend;
-/**
+
+/** @endcond *//**
  @file mf_existds.sas
  @brief Checks whether a dataset OR a view exists.
  @details Can be used in open code, eg as follows:
@@ -183,7 +185,7 @@ options noquotelenmax;
  %else 1;

 %mend;/**
-  @file mf_existfeature.sas
+  @file
  @brief Checks whether a feature exists
  @details Check to see if a feature is supported in your environment.
    Run without arguments to see a list of detectable features.
@@ -191,10 +193,10 @@ options noquotelenmax;
    actual feature detection, as that is tricky / impossible to do
    without generating errors in most cases.

-      %put %mf_existfeature(PROCLUA);
+        %put %mf_existfeature(PROCLUA);

  @param feature the feature to detect.  Leave blank to list all in log.
-  
+
  @return output returns 1 or 0 (or -1 if not found)

  <h4> Dependencies </h4>
@@ -204,6 +206,7 @@ options noquotelenmax;
  @version 8
  @author Allan Bowe
 **/
+/** @cond */

 %macro mf_existfeature(feature
 )/*/STORE SOURCE*/;
@@ -223,7 +226,9 @@ options noquotelenmax;
    -1
    %put &sysmacroname: &feature not found;
  %end;
-%mend;/**
+%mend;
+
+/** @endcond *//**
  @file
  @brief Checks if a variable exists in a data set.
  @details Returns 0 if the variable does NOT exist, and return the position of
@@ -237,6 +242,7 @@ options noquotelenmax;
  @version 9.2
  @author Allan Bowe
 **/
+/** @cond */

 %macro mf_existvar(libds /* 2 part dataset name */
      , var /* variable name */
@@ -254,7 +260,9 @@ options noquotelenmax;
      %let rc=%sysfunc(close(&dsid));
  %end;

-%mend;/**
+%mend;
+
+/** @endcond *//**
  @file
  @brief Checks if a set of variables ALL exist in a data set.
  @details Returns 0 if ANY of the variables do not exist, or 1 if they ALL do.
@@ -400,6 +408,7 @@ options noquotelenmax;
  @author Allan Bowe

 **/
+/** @cond */

 %macro mf_getengine(libref
 )/*/STORE SOURCE*/;
@@ -419,7 +428,9 @@ options noquotelenmax;

 &engine

-%mend;/**
+%mend;
+
+/** @endcond *//**
  @file
  @brief Returns the size of a file in bytes.
  @details Provide full path/filename.extension to the file, eg:
@@ -646,17 +657,18 @@ options noquotelenmax;
 /**
  @file
  @brief Assigns and returns an unused fileref
-  @details Use as follows:
+  @details
+  Use as follows:

-    %let fileref1=%mf_getuniquefileref();
-    %let fileref2=%mf_getuniquefileref();
-    %put &fileref1 &fileref2;
+      %let fileref1=%mf_getuniquefileref();
+      %let fileref2=%mf_getuniquefileref();
+      %put &fileref1 &fileref2;

  which returns:

 > mcref0 mcref1

-  @prefix= first part of fileref. Remember that filerefs can only be 8
+  @param prefix= first part of fileref. Remember that filerefs can only be 8
    characters, so a 7 letter prefix would mean that `maxtries` should be 10.
  @param maxtries= the last part of the libref.  Provide an integer value.

@@ -694,7 +706,7 @@ options noquotelenmax;

 > mclib3

-  @prefix= first part of libref.  Remember that librefs can only be 8 characters,
+  @param prefix= first part of libref.  Remember that librefs can only be 8 characters,
    so a 7 letter prefix would mean that maxtries should be 10.
  @param maxtries= the last part of the libref.  Provide an integer value.

@@ -2940,7 +2952,10 @@ run;
    data &pkds.4;
      file &outref mod;
      set &pkds.2(where=(cols="&pkcols" and curds not in (&curdslist)));
-      line='Ref: "'!!"&curds"!!cats('".(',cols,')')!!' - '!!cats(quote(trim(curds)),'.(',cols,')');
+      line='Ref: "'!!"&curds"
+        !!cats('".(',"%mf_getquotedstr(&pkcols,dlm=%str(,),quote=%str( ))",')')
+        !!' - '
+        !!cats(quote(trim(curds)),'.(',"%mf_getquotedstr(&pkcols,dlm=%str(,),quote=%str( ))",')');
      put line;
    run;

@@ -6038,15 +6053,15 @@ run;

  Usage:

-    %mm_createlibrary(
-       libname=My New Library
-      ,libref=mynewlib
-      ,libdesc=Super & <fine>
-      ,engine=BASE
-      ,tree=/User Folders/sasdemo
-      ,servercontext=SASApp
-      ,directory=/tmp/tests
-      ,mDebug=1)
+      %mm_createlibrary(
+        libname=My New Library
+        ,libref=mynewlib
+        ,libdesc=Super & <fine>
+        ,engine=BASE
+        ,tree=/User Folders/sasdemo
+        ,servercontext=SASApp
+        ,directory=/tmp/tests
+        ,mDebug=1)

  <h4> Dependencies </h4>
  @li mf_verifymacvars.sas
@@ -8667,8 +8682,8 @@ filename __outdoc clear;
    combine with the <code>tree=</code> parameter.
  @param outds= the dataset to create that contains the list of stps.
  @param mDebug= set to 1 to show debug messages in the log
-  @showDesc= provide a non blank value to return stored process descriptions
-  @showUsageVersion= provide a non blank value to return the UsageVersion.  This
+  @param showDesc= provide a non blank value to return stored process descriptions
+  @param showUsageVersion= provide a non blank value to return the UsageVersion.  This
    is either 1000000 (type 1, 9.2) or 2000000 (type2, 9.3 onwards).

  @returns outds  dataset containing the following columns
@@ -9148,7 +9163,7 @@ libname _XML_ clear;
 /**
  @file
  @brief Retrieves properties of the SAS web app server
-  @details 
+  @details
  Usage:

      %mm_getwebappsrvprops(outds= some_ds)
@@ -9168,8 +9183,7 @@ libname _XML_ clear;
      libname __shake clear;

  @version 9.4
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe https://github.com/sasjs/core

 **/

@@ -10319,8 +10333,7 @@ run;


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -10346,7 +10359,7 @@ run;
 %end;

 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -10425,7 +10438,7 @@ options noquotelenmax;
        out=&fname2
        &oauth_bearer
        url=%unquote(%superq(href));
-        headers 
+        headers
      %if &grant_type=authorization_code %then %do;
                "Authorization"="Bearer &&&access_token_var"
      %end;
@@ -10457,27 +10470,28 @@ options noquotelenmax;
 %mend;/**
  @file mv_createwebservice.sas
  @brief Creates a JobExecution web service if it doesn't already exist
-  @details  Code is passed in as one or more filerefs.
+  @details
+  Code is passed in as one or more filerefs.

-    %* Step 1 - compile macros ;
-    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
-    %inc mc;
+      %* Step 1 - compile macros ;
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+      %inc mc;

-    %* Step 2 - Create some code and add it to a web service;
-    filename ft15f001 temp;
-    parmcards4;
-        %webout(FETCH) %* fetch any tables sent from frontend;
-        %* do some sas, any inputs are now already WORK tables;
-        data example1 example2;
-          set sashelp.class;
-        run;
-        %* send data back;
-        %webout(OPEN)
-        %webout(ARR,example1) * Array format, fast, suitable for large tables ;
-        %webout(OBJ,example2) * Object format, easier to work with ;
-        %webout(CLOSE)
-    ;;;;
-    %mv_createwebservice(path=/Public/app/common,name=appinit)
+      %* Step 2 - Create some code and add it to a web service;
+      filename ft15f001 temp;
+      parmcards4;
+          %webout(FETCH) %* fetch any tables sent from frontend;
+          %* do some sas, any inputs are now already WORK tables;
+          data example1 example2;
+            set sashelp.class;
+          run;
+          %* send data back;
+          %webout(OPEN)
+          %webout(ARR,example1) * Array format, fast, suitable for large tables ;
+          %webout(OBJ,example2) * Object format, easier to work with ;
+          %webout(CLOSE)
+      ;;;;
+      %mv_createwebservice(path=/Public/app/common,name=appinit)


  Notes:
@@ -10510,8 +10524,7 @@ options noquotelenmax;
    a shared context - see https://go.documentation.sas.com/?docsetId=calcontexts&docsetTarget=n1hjn8eobk5pyhn1wg3ja0drdl6h.htm&docsetVersion=3.5&locale=en

  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

 **/

@@ -11114,7 +11127,7 @@ run;
 /**
  @file mv_deletefoldermember.sas
  @brief Deletes an item in a Viya folder
-  @details If not executed in Studio 5+  will expect oauth token in a global 
+  @details If not executed in Studio 5+  will expect oauth token in a global
  macro variable (default ACCESS_TOKEN).

      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
@@ -11133,8 +11146,7 @@ run;


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -11161,7 +11173,7 @@ run;
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -11242,7 +11254,7 @@ run;
  %return;
 %end;
 proc http method="DELETE" url="&base_uri&uri" &oauth_bearer;
-  headers 
+  headers
 %if &grant_type=authorization_code %then %do;
      "Authorization"="Bearer &&&access_token_var"
 %end;
@@ -11265,7 +11277,7 @@ libname &libref1a clear;
 %mend;/**
  @file mv_deletejes.sas
  @brief Creates a job execution service if it does not already exist
-  @details If not executed in Studio 5+  will expect oauth token in a global 
+  @details If not executed in Studio 5+  will expect oauth token in a global
  macro variable (default ACCESS_TOKEN).

      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
@@ -11283,8 +11295,7 @@ libname &libref1a clear;


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -11310,7 +11321,7 @@ libname &libref1a clear;
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -11390,7 +11401,7 @@ run;
  %return;
 %end;
 proc http method="DELETE" url="&uri" &oauth_bearer;
-  headers 
+  headers
 %if &grant_type=authorization_code %then %do;
      "Authorization"="Bearer &&&access_token_var"
 %end;
@@ -11413,7 +11424,7 @@ libname &libref1a clear;
 %mend;/**
  @file mv_deleteviyafolder.sas
  @brief Creates a viya folder if that folder does not already exist
-  @details If not running in Studo 5 +, will expect an oauth token in a global 
+  @details If not running in Studo 5 +, will expect an oauth token in a global
  macro variable (default ACCESS_TOKEN).

      options mprint;
@@ -11428,8 +11439,7 @@ libname &libref1a clear;


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -11454,7 +11464,7 @@ libname &libref1a clear;
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -11533,10 +11543,10 @@ run;
 %let fname2=%mf_getuniquefileref();
 proc http method='DELETE' out=&fname2 &oauth_bearer
    url=%unquote(%superq(href));
-    headers 
+    headers
  %if &grant_type=authorization_code %then %do;
            "Authorization"="Bearer &&&access_token_var"
-  %end;   
+  %end;
            'Accept'='*/*'; /**/
 run;
 %if &SYS_PROCHTTP_STATUS_CODE ne 204 %then %do;
@@ -11557,14 +11567,13 @@ libname &libref1 clear;
   @brief deprecated - replaced by mv_tokenrefresh.sas

   @version VIYA V.03.04
-   @author Allan Bowe
-   @source https://github.com/sasjs/core
- 
+   @author Allan Bowe, source: https://github.com/sasjs/core
+
   <h4> Dependencies </h4>
   @li mv_tokenrefresh.sas

 **/
- 
+
 %macro mv_getaccesstoken(client_id=someclient
     ,client_secret=somesecret
     ,grant_type=authorization_code
@@ -11589,14 +11598,13 @@ libname &libref1 clear;
   @brief deprecated - replaced by mv_registerclient.sas

   @version VIYA V.03.04
-   @author Allan Bowe
-   @source https://github.com/sasjs/core
- 
+   @author Allan Bowe, source: https://github.com/sasjs/core
+
   <h4> Dependencies </h4>
   @li mv_registerclient.sas

 **/
- 
+
 %macro mv_getapptoken(client_id=someclient
     ,client_secret=somesecret
     ,grant_type=authorization_code
@@ -11638,8 +11646,7 @@ libname &libref1 clear;


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -11704,7 +11711,7 @@ run;



-/* clear refs 
+/* clear refs
 filename &fname1 clear;
 libname &libref1 clear;
 */
@@ -11725,8 +11732,7 @@ libname &libref1 clear;


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -11752,7 +11758,7 @@ libname &libref1 clear;
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -11795,10 +11801,16 @@ options noquotelenmax;
  /*data _null_;infile &fname1;input;putlog _infile_;run;*/
  libname &libref1 JSON fileref=&fname1;
  /* now get the followon link to list members */
+  %local href;
+  %let href=0;
  data _null_;
    set &libref1..links;
    if rel='members' then call symputx('href',quote("&base_uri"!!trim(href)),'l');
  run;
+  %if &href=0 %then %do;
+    %put NOTE:;%put NOTE-  No members found in &root!!;%put NOTE-;
+    %return;
+  %end;
  %local fname2 libref2;
  %let fname2=%mf_getuniquefileref();
  %let libref2=%mf_getuniquelibref();
@@ -11853,8 +11865,7 @@ libname &libref1 clear;


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -11879,7 +11890,7 @@ libname &libref1 clear;
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -11896,7 +11907,7 @@ options noquotelenmax;
 %let fname1=%mf_getuniquefileref();
 proc http method='GET' out=&fname1 &oauth_bearer
  url="&base_uri/identities/groups/&group/members?limit=10000";
-  headers 
+  headers
  %if &grant_type=authorization_code %then %do;
          "Authorization"="Bearer &&&access_token_var"
  %end;
@@ -11958,8 +11969,7 @@ filename &fname1 clear;


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -11983,7 +11993,7 @@ filename &fname1 clear;
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -12001,7 +12011,7 @@ options noquotelenmax;

 proc http method='GET' out=&fname1 &oauth_bearer
  url="&base_uri/identities/groups?limit=10000";
-  headers 
+  headers
  %if &grant_type=authorization_code %then %do;
          "Authorization"="Bearer &&&access_token_var"
  %end;
@@ -12029,14 +12039,13 @@ libname &libref1 clear;
   @brief deprecated - replaced by mv_tokenauth.sas

   @version VIYA V.03.04
-   @author Allan Bowe
-   @source https://github.com/sasjs/core
- 
+   @author Allan Bowe, source: https://github.com/sasjs/core
+
   <h4> Dependencies </h4>
   @li mv_tokenauth.sas

 **/
- 
+
 %macro mv_getrefreshtoken(client_id=someclient
     ,client_secret=somesecret
     ,grant_type=authorization_code
@@ -12079,8 +12088,7 @@ libname &libref1 clear;


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -12185,12 +12193,12 @@ libname &libref1 clear;
      creationTimeStamp char(24),
      modifiedTimeStamp char(24),
      state char(6)
- 
+
  @param access_token_var= The global macro variable to contain the access token
  @param grant_type= valid values:
   * password
   * authorization_code
-   * detect - will check if access_token exists, if not will use sas_services if 
+   * detect - will check if access_token exists, if not will use sas_services if
    a SASStudioV session else authorization_code.  Default option.
   * sas_services - will use oauth_bearer=sas_services

@@ -12198,8 +12206,7 @@ libname &libref1 clear;


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -12223,7 +12230,7 @@ libname &libref1 clear;
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -12265,6 +12272,173 @@ run;
 filename &fname1 clear;
 libname &libref1 clear;

+%mend;/**
+  @file
+  @brief Executes a SAS Viya Job
+  @details Triggers a SAS Viya Job, with optional URL parameters, using
+  the JES web app.
+
+  First, compile the macros:
+
+      filename mc url
+      "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+      %inc mc;
+
+  Then, execute the job!
+
+      %mv_jobexecute(path=/Public/folder
+        ,name=somejob
+      )
+
+  Example with parameters:
+
+      %mv_jobexecute(path=/Public/folder
+        ,name=somejob
+        ,paramstring=%str("macvarname":"macvarvalue","answer":42)
+      )
+
+  @param access_token_var= The global macro variable to contain the access token
+  @param grant_type= valid values:
+   * password
+   * authorization_code
+   * detect - will check if access_token exists, if not will use sas_services if
+    a SASStudioV session else authorization_code.  Default option.
+   * sas_services - will use oauth_bearer=sas_services
+
+  @param path= The SAS Drive path to the job being executed
+  @param name= The name of the job to execute
+  @param paramstring= A JSON fragment with name:value pairs, eg: `"name":"value"`
+  or "name":"value","name2":42`.  This will need to be wrapped in `%str()`.
+
+  @param contextName= Context name with which to run the job.
+    Default = `SAS Job Execution compute context`
+
+  @param outds= The output dataset containing links (Default=work.mv_jobexecute)
+
+
+  @version VIYA V.03.04
+  @author Allan Bowe, source: https://github.com/sasjs/core
+
+  <h4> Dependencies </h4>
+  @li mp_abort.sas
+  @li mf_getplatform.sas
+  @li mf_getuniquefileref.sas
+  @li mf_getuniquelibref.sas
+  @li mv_getfoldermembers.sas
+
+**/
+
+%macro mv_jobexecute(path=0
+    ,name=0
+    ,contextName=SAS Job Execution compute context
+    ,access_token_var=ACCESS_TOKEN
+    ,grant_type=sas_services
+    ,paramstring=0
+    ,outds=work.mv_jobexecute
+  );
+%local oauth_bearer;
+%if &grant_type=detect %then %do;
+  %if %symexist(&access_token_var) %then %let grant_type=authorization_code;
+  %else %let grant_type=sas_services;
+%end;
+%if &grant_type=sas_services %then %do;
+    %let oauth_bearer=oauth_bearer=sas_services;
+    %let &access_token_var=;
+%end;
+%put &sysmacroname: grant_type=&grant_type;
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
+    and &grant_type ne sas_services
+  )
+  ,mac=&sysmacroname
+  ,msg=%str(Invalid value for grant_type: &grant_type)
+)
+
+%mp_abort(iftrue=("&path"="0")
+  ,mac=&sysmacroname
+  ,msg=%str(Path not provided)
+)
+%mp_abort(iftrue=("&name"="0")
+  ,mac=&sysmacroname
+  ,msg=%str(Job Name not provided)
+)
+
+options noquotelenmax;
+
+%local base_uri; /* location of rest apis */
+%let base_uri=%mf_getplatform(VIYARESTAPI);
+
+data;run;
+%local foldermembers;
+%let foldermembers=&syslast;
+%mv_getfoldermembers(root=&path
+    ,access_token_var=&access_token_var
+    ,grant_type=&grant_type
+    ,outds=&foldermembers
+)
+
+%local joburi;
+%let joburi=0;
+data _null_;
+  set &foldermembers;
+  if name="&name" and uri=:'/jobDefinitions/definitions'
+    then call symputx('joburi',uri);
+run;
+
+%mp_abort(iftrue=("&joburi"="0")
+  ,mac=&sysmacroname
+  ,msg=%str(Job &path/&name not found)
+)
+
+/* prepare request*/
+%local fname0 fname1;
+%let fname0=%mf_getuniquefileref();
+%let fname1=%mf_getuniquefileref();
+
+data _null_;
+  file &fname0;
+  length joburi contextname $128 paramstring $32765;
+  joburi=quote(trim(symget('joburi')));
+  contextname=quote(trim(symget('contextname')));
+  paramstring=symget('paramstring');
+  put '{"jobDefinitionUri":' joburi ;
+  put '  ,"arguments":{"_contextName":' contextname;
+  if paramstring ne "0" then do;
+    put '    ,' paramstring;
+  end;
+  put '}}';
+run;
+
+proc http method='POST' in=&fname0 out=&fname1 &oauth_bearer
+  url="&base_uri/jobExecution/jobs";
+  headers "Content-Type"="application/vnd.sas.job.execution.job.request+json"
+          "Accept"="application/vnd.sas.job.execution.job+json"
+  %if &grant_type=authorization_code %then %do;
+          "Authorization"="Bearer &&&access_token_var"
+  %end;
+  ;
+run;
+%if &SYS_PROCHTTP_STATUS_CODE ne 200 and &SYS_PROCHTTP_STATUS_CODE ne 201 %then
+%do;
+  data _null_;infile &fname0;input;putlog _infile_;run;
+  data _null_;infile &fname1;input;putlog _infile_;run;
+  %mp_abort(mac=&sysmacroname
+    ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
+  )
+%end;
+
+%local libref;
+%let libref=%mf_getuniquelibref();
+libname &libref JSON fileref=&fname1;
+
+data &outds;
+  set &libref..links;
+run;
+
+/* clear refs */
+filename &fname0 clear;
+filename &fname1 clear;
+libname &libref;
+
 %mend;/**
  @file mv_registerclient.sas
  @brief Register Client and Secret (admin task)
@@ -12302,25 +12476,24 @@ libname &libref1 clear;
  @param scopes= list of space-seperated unquoted scopes (default is openid)
  @param grant_type= valid values are "password" or "authorization_code" (unquoted)
  @param outds= the dataset to contain the registered client id and secret
-  @param access_token_validity= The duration of validity of the access token 
+  @param access_token_validity= The duration of validity of the access token
    in seconds.  A value of DEFAULT will omit the entry (and use system default)
  @param refresh_token_validity= The duration of validity of the refresh token
    in seconds.  A value of DEFAULT will omit the entry (and use system default)
  @param name= A human readable name for the client
-  @param required_user_groups= A list of group names. If a user does not belong 
-    to all the required groups, the user will not be authenticated and no tokens 
-    are issued to this client for that user. If this field is not specified, 
+  @param required_user_groups= A list of group names. If a user does not belong
+    to all the required groups, the user will not be authenticated and no tokens
+    are issued to this client for that user. If this field is not specified,
    authentication and token issuance proceeds normally.
-  @param autoapprove= During the auth step the user can choose which scope to 
+  @param autoapprove= During the auth step the user can choose which scope to
    apply.  Setting this to true will autoapprove all the client scopes.
-  @param use_session= If true, access tokens issued to this client will be 
+  @param use_session= If true, access tokens issued to this client will be
    associated with an HTTP session and revoked upon logout or time-out.
  @param outjson= A dataset containing the lines of JSON submitted.  Useful
    for debugging.  Default= _null_.
-    
+
  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -12410,7 +12583,7 @@ data _null_;
  if not missing(autoapprove) then autoapprove=cats(',"autoapprove":',autoapprove);
  use_session=trim(symget('use_session'));
  if not missing(use_session) then use_session=cats(',"use_session":',use_session);
-  
+
  put '{'  clientid  ;
  put clientsecret ;
  put clientname;
@@ -12543,8 +12716,7 @@ libname &libref clear;
  @param base_uri= The Viya API server location

  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -12686,8 +12858,7 @@ filename &fref2 clear;
  @param refresh_token_var= The global macro variable containing the refresh token

  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -12809,13 +12980,13 @@ filename &fref1 clear;
  @li mf_getuser.sas

  @version Viya 3.3
-  @author Allan Bowe
+  @author Allan Bowe, source: https://github.com/sasjs/core

 **/
 %macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y);
 %global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name
  sasjs_tables SYS_JES_JOB_URI;
-%if %index("&_debug",log) %then %let _debug=131; 
+%if %index("&_debug",log) %then %let _debug=131;

 %local i tempds;
 %let action=%upcase(&action);
@@ -12921,8 +13092,8 @@ filename &fref1 clear;
     filename _webout temp lrecl=999999 mod;
  %end;
  %else %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" 
-      name="_webout.json" lrecl=999999 mod; 
+    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI"
+      name="_webout.json" lrecl=999999 mod;
  %end;

  /* setup temp ref */
--- a/base/mf_abort.sas
+++ b/base/mf_abort.sas
@@ -22,6 +22,7 @@
  @version 9.2
  @author Allan Bowe
 **/
+/** @cond */

 %macro mf_abort(mac=mf_abort.sas, type=, msg=, iftrue=%str(1=1)
 )/*/STORE SOURCE*/;
@@ -139,3 +140,5 @@
    %abort cancel;
  %end;
 %mend;
+
+/** @endcond */
--- a/base/mf_existfeature.sas
+++ b/base/mf_existfeature.sas
@@ -1,5 +1,5 @@
 /**
-  @file mf_existfeature.sas
+  @file
  @brief Checks whether a feature exists
  @details Check to see if a feature is supported in your environment.
    Run without arguments to see a list of detectable features.
@@ -7,10 +7,10 @@
    actual feature detection, as that is tricky / impossible to do
    without generating errors in most cases.

-      %put %mf_existfeature(PROCLUA);
+        %put %mf_existfeature(PROCLUA);

  @param feature the feature to detect.  Leave blank to list all in log.
-  
+
  @return output returns 1 or 0 (or -1 if not found)

  <h4> Dependencies </h4>
@@ -20,6 +20,7 @@
  @version 8
  @author Allan Bowe
 **/
+/** @cond */

 %macro mf_existfeature(feature
 )/*/STORE SOURCE*/;
@@ -39,4 +40,6 @@
    -1
    %put &sysmacroname: &feature not found;
  %end;
-%mend;
+%mend;
+
+/** @endcond */
--- a/base/mf_existvar.sas
+++ b/base/mf_existvar.sas
@@ -12,6 +12,7 @@
  @version 9.2
  @author Allan Bowe
 **/
+/** @cond */

 %macro mf_existvar(libds /* 2 part dataset name */
      , var /* variable name */
@@ -29,4 +30,6 @@
      %let rc=%sysfunc(close(&dsid));
  %end;

-%mend;
+%mend;
+
+/** @endcond */
--- a/base/mf_getengine.sas
+++ b/base/mf_getengine.sas
@@ -23,6 +23,7 @@
  @author Allan Bowe

 **/
+/** @cond */

 %macro mf_getengine(libref
 )/*/STORE SOURCE*/;
@@ -42,4 +43,6 @@

 &engine

-%mend;
+%mend;
+
+/** @endcond */
--- a/base/mf_getuniquefileref.sas
+++ b/base/mf_getuniquefileref.sas
@@ -1,17 +1,18 @@
 /**
  @file
  @brief Assigns and returns an unused fileref
-  @details Use as follows:
+  @details
+  Use as follows:

-    %let fileref1=%mf_getuniquefileref();
-    %let fileref2=%mf_getuniquefileref();
-    %put &fileref1 &fileref2;
+      %let fileref1=%mf_getuniquefileref();
+      %let fileref2=%mf_getuniquefileref();
+      %put &fileref1 &fileref2;

  which returns:

 > mcref0 mcref1

-  @prefix= first part of fileref. Remember that filerefs can only be 8
+  @param prefix= first part of fileref. Remember that filerefs can only be 8
    characters, so a 7 letter prefix would mean that `maxtries` should be 10.
  @param maxtries= the last part of the libref.  Provide an integer value.

--- a/base/mf_getuniquelibref.sas
+++ b/base/mf_getuniquelibref.sas
@@ -14,7 +14,7 @@

 > mclib3

-  @prefix= first part of libref.  Remember that librefs can only be 8 characters,
+  @param prefix= first part of libref.  Remember that librefs can only be 8 characters,
    so a 7 letter prefix would mean that maxtries should be 10.
  @param maxtries= the last part of the libref.  Provide an integer value.

--- a/base/mp_getdbml.sas
+++ b/base/mp_getdbml.sas
@@ -256,7 +256,10 @@ run;
    data &pkds.4;
      file &outref mod;
      set &pkds.2(where=(cols="&pkcols" and curds not in (&curdslist)));
-      line='Ref: "'!!"&curds"!!cats('".(',cols,')')!!' - '!!cats(quote(trim(curds)),'.(',cols,')');
+      line='Ref: "'!!"&curds"
+        !!cats('".(',"%mf_getquotedstr(&pkcols,dlm=%str(,),quote=%str( ))",')')
+        !!' - '
+        !!cats(quote(trim(curds)),'.(',"%mf_getquotedstr(&pkcols,dlm=%str(,),quote=%str( ))",')');
      put line;
    run;

--- a/doxy/Doxyfile
+++ b/doxy/Doxyfile
@@ -24,6 +24,7 @@ LAYOUT_FILE            = ./doxy/DoxygenLayout.xml
 MAX_INITIALIZER_LINES  = 0
 PROJECT_NAME           = Macro Core
 PROJECT_LOGO           = doxy/Macro_core_website_1.png
+PROJECT_BRIEF          = "Production Ready Macros for SAS Application Developers"
 RECURSIVE              = YES
 REPEAT_BRIEF           = NO
 SHOW_NAMESPACES        = NO
--- a/doxy/DoxygenLayout.xml
+++ b/doxy/DoxygenLayout.xml
@@ -101,11 +101,11 @@
  <!-- Layout definition for a directory page -->
  <directory>
    <briefdescription visible="yes"/>
+    <detaileddescription visible="yes" title=""/>
    <directorygraph visible="yes"/>
    <memberdecl>
      <dirs visible="yes"/>
      <files visible="yes"/>
    </memberdecl>
-    <detaileddescription title=""/>
  </directory>
 </doxygenlayout>
--- a/doxy/build.sh
+++ b/doxy/build.sh
@@ -33,11 +33,11 @@ cd core.github.io
 rm -r *
 mv $BUILD_FOLDER/out/doxy/* .
 echo 'core.sasjs.io' > CNAME
-git add *
+git add .
 git commit -m "build.sh build on $(date +%F:%H:%M:%S)"
 git push
 npx sitemap-generator-cli https://core.sasjs.io
-git add *
+git add .
 git commit -m "adding sitemap"
 git push

--- a/doxy/new_footer.html
+++ b/doxy/new_footer.html
@@ -1,22 +1,23 @@
+<!-- HTML footer for doxygen 1.8.17-->
+<!-- start footer part -->
 <!--BEGIN GENERATE_TREEVIEW-->
-    <li class="footer"><b>$generatedby</b>
-    <a href="http://www.doxygen.org/index.html">
-    <img class="footer" src="doxygen.png" alt="doxygen"/></a>
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    $navpath
+    <li class="footer">$generatedby
+    <a href="https://www.doxygen.org/index.html">
+      <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a> $doxygenversion </li>
   <i> For more information visit the </i> <a href="https://github.com/sasjs/core">Macro Core library</a>.</li>

   </ul>
 </div>
 <!--END GENERATE_TREEVIEW-->
 <!--BEGIN !GENERATE_TREEVIEW-->
-<hr class="footer"/>
-<table width="100%"><tbody><tr><td>
-For more information visit the <a href="https://github.com/sasjs/core">Macro Core library</a>.
-</td><td><address class="footer"><small>
-&copy;$year<br/>
-$generatedby <a href="http://www.doxygen.org/index.html">
-<!--<img class="footer" src="$relpath$doxygen.png" alt="doxygen"/>-->doxygen
-</a> $doxygenversion
-</small></address></tr></tbody></table>
+<hr class="footer"/><address class="footer"><small>
+  $generatedby &#160;<a href="http://www.doxygen.org/index.html">
+  <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/>
+  </a> $doxygenversion
+  </small></address>
 <!--END !GENERATE_TREEVIEW-->
 </body>
 </html>
--- a/doxy/new_header.html
+++ b/doxy/new_header.html
@@ -1,6 +1,6 @@
-<!-- HTML header for doxygen 1.8.14-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- HTML header for doxygen 1.8.17-->
+<html xmlns="https://www.w3.org/1999/xhtml" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
@@ -16,51 +16,51 @@ $search
 $mathjax
 <link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
 <link REL="icon" HREF="https://sasjs.io/img/runningman.jpg">
-
 $extrastylesheet
 </head>
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->

 <!--BEGIN TITLEAREA-->
-<div id="titlearea" style='background-color:white' >
+<div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
- <tr style="height: 26px;">
+  <tr style="height: 56px;">
  <!--BEGIN PROJECT_LOGO-->
-  <td id="projectlogo"></td>
-
+  <td id="projectlogo">
+    <img alt="Logo" src="$relpath^$projectlogo"/></td>
  <!--END PROJECT_LOGO-->
 <!--BEGIN PROJECT_NAME-->
-  <td>
+<td id="projectalign" style="padding-left: 0.5em;">
  <div id="projectname">
-    <!--a href=".">
-      <img alt="Macro Core" src="https://macropeople.com/wp-content/uploads/2018/05/macropeople2014retina_V2.png" height=60/>
-     </a-->
-     <a href=".">
-        <img alt="Macro Core" src="./Macro_core_website_1.png" height=60/>
-       </a>
+   <!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber">$projectnumber</span><!--END PROJECT_NUMBER-->
   </div>
+   <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">
+    Production Ready Macros for SAS Application Developers</br>
+    <a href="https://github.com/sasjs/core">
+        https://github.com/sasjs/core
+    </a>
+
+   </div>
+   <meta name="Description" content="$projectbrief">
+   <!--END PROJECT_BRIEF-->
  </td>
-  <td>
+  <!--END PROJECT_NAME-->
+  <!--BEGIN !PROJECT_NAME-->
+   <!--BEGIN PROJECT_BRIEF-->
+   <td style="padding-left: 0.5em;">
+    <div id="projectbrief">$projectbrief</div>
    <table style="padding-left: 2em;" cellspacing="0" cellpadding="0">
      <tr><td> Production Ready Macros for SAS Application Developers</td></tr>
      <tr><td><a href="https://github.com/sasjs/core">
          https://github.com/sasjs/core
      </a></td></tr>
    </table>
-  </td>
-  <!--END PROJECT_NAME-->
-  <!--BEGIN !PROJECT_NAME-->
-   <!--BEGIN PROJECT_BRIEF-->
+    </td>
   <!--END PROJECT_BRIEF-->
  <!--END !PROJECT_NAME-->
-  <div class="header">
-  <div class="headertitle">
-
  <!--BEGIN DISABLE_INDEX-->
   <!--BEGIN SEARCHENGINE-->
-
   <td>$searchbox</td>
   <!--END SEARCHENGINE-->
  <!--END DISABLE_INDEX-->
--- a/doxy/new_stylesheet.css
+++ b/doxy/new_stylesheet.css
--- a/meta/mm_createlibrary.sas
+++ b/meta/mm_createlibrary.sas
@@ -9,15 +9,15 @@

  Usage:

-    %mm_createlibrary(
-       libname=My New Library
-      ,libref=mynewlib
-      ,libdesc=Super & <fine>
-      ,engine=BASE
-      ,tree=/User Folders/sasdemo
-      ,servercontext=SASApp
-      ,directory=/tmp/tests
-      ,mDebug=1)
+      %mm_createlibrary(
+        libname=My New Library
+        ,libref=mynewlib
+        ,libdesc=Super & <fine>
+        ,engine=BASE
+        ,tree=/User Folders/sasdemo
+        ,servercontext=SASApp
+        ,directory=/tmp/tests
+        ,mDebug=1)

  <h4> Dependencies </h4>
  @li mf_verifymacvars.sas
--- a/meta/mm_getstps.sas
+++ b/meta/mm_getstps.sas
@@ -23,8 +23,8 @@
    combine with the <code>tree=</code> parameter.
  @param outds= the dataset to create that contains the list of stps.
  @param mDebug= set to 1 to show debug messages in the log
-  @showDesc= provide a non blank value to return stored process descriptions
-  @showUsageVersion= provide a non blank value to return the UsageVersion.  This
+  @param showDesc= provide a non blank value to return stored process descriptions
+  @param showUsageVersion= provide a non blank value to return the UsageVersion.  This
    is either 1000000 (type 1, 9.2) or 2000000 (type2, 9.3 onwards).

  @returns outds  dataset containing the following columns
--- a/meta/mm_getwebappsrvprops.sas
+++ b/meta/mm_getwebappsrvprops.sas
@@ -1,7 +1,7 @@
 /**
  @file
  @brief Retrieves properties of the SAS web app server
-  @details 
+  @details
  Usage:

      %mm_getwebappsrvprops(outds= some_ds)
@@ -21,8 +21,7 @@
      libname __shake clear;

  @version 9.4
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe https://github.com/sasjs/core

 **/

--- a/viya/mv_createfolder.sas
+++ b/viya/mv_createfolder.sas
@@ -15,8 +15,7 @@


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -42,7 +41,7 @@
 %end;

 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -121,7 +120,7 @@ options noquotelenmax;
        out=&fname2
        &oauth_bearer
        url=%unquote(%superq(href));
-        headers 
+        headers
      %if &grant_type=authorization_code %then %do;
                "Authorization"="Bearer &&&access_token_var"
      %end;
--- a/viya/mv_createwebservice.sas
+++ b/viya/mv_createwebservice.sas
@@ -1,27 +1,28 @@
 /**
  @file mv_createwebservice.sas
  @brief Creates a JobExecution web service if it doesn't already exist
-  @details  Code is passed in as one or more filerefs.
+  @details
+  Code is passed in as one or more filerefs.

-    %* Step 1 - compile macros ;
-    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
-    %inc mc;
+      %* Step 1 - compile macros ;
+      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+      %inc mc;

-    %* Step 2 - Create some code and add it to a web service;
-    filename ft15f001 temp;
-    parmcards4;
-        %webout(FETCH) %* fetch any tables sent from frontend;
-        %* do some sas, any inputs are now already WORK tables;
-        data example1 example2;
-          set sashelp.class;
-        run;
-        %* send data back;
-        %webout(OPEN)
-        %webout(ARR,example1) * Array format, fast, suitable for large tables ;
-        %webout(OBJ,example2) * Object format, easier to work with ;
-        %webout(CLOSE)
-    ;;;;
-    %mv_createwebservice(path=/Public/app/common,name=appinit)
+      %* Step 2 - Create some code and add it to a web service;
+      filename ft15f001 temp;
+      parmcards4;
+          %webout(FETCH) %* fetch any tables sent from frontend;
+          %* do some sas, any inputs are now already WORK tables;
+          data example1 example2;
+            set sashelp.class;
+          run;
+          %* send data back;
+          %webout(OPEN)
+          %webout(ARR,example1) * Array format, fast, suitable for large tables ;
+          %webout(OBJ,example2) * Object format, easier to work with ;
+          %webout(CLOSE)
+      ;;;;
+      %mv_createwebservice(path=/Public/app/common,name=appinit)


  Notes:
@@ -54,8 +55,7 @@
    a shared context - see https://go.documentation.sas.com/?docsetId=calcontexts&docsetTarget=n1hjn8eobk5pyhn1wg3ja0drdl6h.htm&docsetVersion=3.5&locale=en

  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

 **/

--- a/viya/mv_deletefoldermember.sas
+++ b/viya/mv_deletefoldermember.sas
@@ -1,7 +1,7 @@
 /**
  @file mv_deletefoldermember.sas
  @brief Deletes an item in a Viya folder
-  @details If not executed in Studio 5+  will expect oauth token in a global 
+  @details If not executed in Studio 5+  will expect oauth token in a global
  macro variable (default ACCESS_TOKEN).

      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
@@ -20,8 +20,7 @@


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -48,7 +47,7 @@
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -129,7 +128,7 @@ run;
  %return;
 %end;
 proc http method="DELETE" url="&base_uri&uri" &oauth_bearer;
-  headers 
+  headers
 %if &grant_type=authorization_code %then %do;
      "Authorization"="Bearer &&&access_token_var"
 %end;
--- a/viya/mv_deletejes.sas
+++ b/viya/mv_deletejes.sas
@@ -1,7 +1,7 @@
 /**
  @file mv_deletejes.sas
  @brief Creates a job execution service if it does not already exist
-  @details If not executed in Studio 5+  will expect oauth token in a global 
+  @details If not executed in Studio 5+  will expect oauth token in a global
  macro variable (default ACCESS_TOKEN).

      filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
@@ -19,8 +19,7 @@


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -46,7 +45,7 @@
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -126,7 +125,7 @@ run;
  %return;
 %end;
 proc http method="DELETE" url="&uri" &oauth_bearer;
-  headers 
+  headers
 %if &grant_type=authorization_code %then %do;
      "Authorization"="Bearer &&&access_token_var"
 %end;
--- a/viya/mv_deleteviyafolder.sas
+++ b/viya/mv_deleteviyafolder.sas
@@ -1,7 +1,7 @@
 /**
  @file mv_deleteviyafolder.sas
  @brief Creates a viya folder if that folder does not already exist
-  @details If not running in Studo 5 +, will expect an oauth token in a global 
+  @details If not running in Studo 5 +, will expect an oauth token in a global
  macro variable (default ACCESS_TOKEN).

      options mprint;
@@ -16,8 +16,7 @@


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -42,7 +41,7 @@
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -121,10 +120,10 @@ run;
 %let fname2=%mf_getuniquefileref();
 proc http method='DELETE' out=&fname2 &oauth_bearer
    url=%unquote(%superq(href));
-    headers 
+    headers
  %if &grant_type=authorization_code %then %do;
            "Authorization"="Bearer &&&access_token_var"
-  %end;   
+  %end;
            'Accept'='*/*'; /**/
 run;
 %if &SYS_PROCHTTP_STATUS_CODE ne 204 %then %do;
--- a/viya/mv_getaccesstoken.sas
+++ b/viya/mv_getaccesstoken.sas
@@ -3,14 +3,13 @@
   @brief deprecated - replaced by mv_tokenrefresh.sas

   @version VIYA V.03.04
-   @author Allan Bowe
-   @source https://github.com/sasjs/core
- 
+   @author Allan Bowe, source: https://github.com/sasjs/core
+
   <h4> Dependencies </h4>
   @li mv_tokenrefresh.sas

 **/
- 
+
 %macro mv_getaccesstoken(client_id=someclient
     ,client_secret=somesecret
     ,grant_type=authorization_code
--- a/viya/mv_getapptoken.sas
+++ b/viya/mv_getapptoken.sas
@@ -3,14 +3,13 @@
   @brief deprecated - replaced by mv_registerclient.sas

   @version VIYA V.03.04
-   @author Allan Bowe
-   @source https://github.com/sasjs/core
- 
+   @author Allan Bowe, source: https://github.com/sasjs/core
+
   <h4> Dependencies </h4>
   @li mv_registerclient.sas

 **/
- 
+
 %macro mv_getapptoken(client_id=someclient
     ,client_secret=somesecret
     ,grant_type=authorization_code
--- a/viya/mv_getclients.sas
+++ b/viya/mv_getclients.sas
@@ -29,8 +29,7 @@


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -95,7 +94,7 @@ run;



-/* clear refs 
+/* clear refs
 filename &fname1 clear;
 libname &libref1 clear;
 */
--- a/viya/mv_getfoldermembers.sas
+++ b/viya/mv_getfoldermembers.sas
@@ -15,8 +15,7 @@


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -42,7 +41,7 @@
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -85,10 +84,16 @@ options noquotelenmax;
  /*data _null_;infile &fname1;input;putlog _infile_;run;*/
  libname &libref1 JSON fileref=&fname1;
  /* now get the followon link to list members */
+  %local href;
+  %let href=0;
  data _null_;
    set &libref1..links;
    if rel='members' then call symputx('href',quote("&base_uri"!!trim(href)),'l');
  run;
+  %if &href=0 %then %do;
+    %put NOTE:;%put NOTE-  No members found in &root!!;%put NOTE-;
+    %return;
+  %end;
  %local fname2 libref2;
  %let fname2=%mf_getuniquefileref();
  %let libref2=%mf_getuniquelibref();
--- a/viya/mv_getgroupmembers.sas
+++ b/viya/mv_getgroupmembers.sas
@@ -30,8 +30,7 @@


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -56,7 +55,7 @@
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -73,7 +72,7 @@ options noquotelenmax;
 %let fname1=%mf_getuniquefileref();
 proc http method='GET' out=&fname1 &oauth_bearer
  url="&base_uri/identities/groups/&group/members?limit=10000";
-  headers 
+  headers
  %if &grant_type=authorization_code %then %do;
          "Authorization"="Bearer &&&access_token_var"
  %end;
--- a/viya/mv_getgroups.sas
+++ b/viya/mv_getgroups.sas
@@ -29,8 +29,7 @@


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -54,7 +53,7 @@
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
@@ -72,7 +71,7 @@ options noquotelenmax;

 proc http method='GET' out=&fname1 &oauth_bearer
  url="&base_uri/identities/groups?limit=10000";
-  headers 
+  headers
  %if &grant_type=authorization_code %then %do;
          "Authorization"="Bearer &&&access_token_var"
  %end;
--- a/viya/mv_getrefreshtoken.sas
+++ b/viya/mv_getrefreshtoken.sas
@@ -3,14 +3,13 @@
   @brief deprecated - replaced by mv_tokenauth.sas

   @version VIYA V.03.04
-   @author Allan Bowe
-   @source https://github.com/sasjs/core
- 
+   @author Allan Bowe, source: https://github.com/sasjs/core
+
   <h4> Dependencies </h4>
   @li mv_tokenauth.sas

 **/
- 
+
 %macro mv_getrefreshtoken(client_id=someclient
     ,client_secret=somesecret
     ,grant_type=authorization_code
--- a/viya/mv_getusergroups.sas
+++ b/viya/mv_getusergroups.sas
@@ -20,8 +20,7 @@


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
--- a/viya/mv_getusers.sas
+++ b/viya/mv_getusers.sas
@@ -34,12 +34,12 @@
      creationTimeStamp char(24),
      modifiedTimeStamp char(24),
      state char(6)
- 
+
  @param access_token_var= The global macro variable to contain the access token
  @param grant_type= valid values:
   * password
   * authorization_code
-   * detect - will check if access_token exists, if not will use sas_services if 
+   * detect - will check if access_token exists, if not will use sas_services if
    a SASStudioV session else authorization_code.  Default option.
   * sas_services - will use oauth_bearer=sas_services

@@ -47,8 +47,7 @@


  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -72,7 +71,7 @@
    %let &access_token_var=;
 %end;
 %put &sysmacroname: grant_type=&grant_type;
-%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password 
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
    and &grant_type ne sas_services
  )
  ,mac=&sysmacroname
--- a/viya/mv_jobexecute.sas
+++ b/viya/mv_jobexecute.sas
@@ -0,0 +1,168 @@
+/**
+  @file
+  @brief Executes a SAS Viya Job
+  @details Triggers a SAS Viya Job, with optional URL parameters, using
+  the JES web app.
+
+  First, compile the macros:
+
+      filename mc url
+      "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+      %inc mc;
+
+  Then, execute the job!
+
+      %mv_jobexecute(path=/Public/folder
+        ,name=somejob
+      )
+
+  Example with parameters:
+
+      %mv_jobexecute(path=/Public/folder
+        ,name=somejob
+        ,paramstring=%str("macvarname":"macvarvalue","answer":42)
+      )
+
+  @param access_token_var= The global macro variable to contain the access token
+  @param grant_type= valid values:
+   * password
+   * authorization_code
+   * detect - will check if access_token exists, if not will use sas_services if
+    a SASStudioV session else authorization_code.  Default option.
+   * sas_services - will use oauth_bearer=sas_services
+
+  @param path= The SAS Drive path to the job being executed
+  @param name= The name of the job to execute
+  @param paramstring= A JSON fragment with name:value pairs, eg: `"name":"value"`
+  or "name":"value","name2":42`.  This will need to be wrapped in `%str()`.
+
+  @param contextName= Context name with which to run the job.
+    Default = `SAS Job Execution compute context`
+
+  @param outds= The output dataset containing links (Default=work.mv_jobexecute)
+
+
+  @version VIYA V.03.04
+  @author Allan Bowe, source: https://github.com/sasjs/core
+
+  <h4> Dependencies </h4>
+  @li mp_abort.sas
+  @li mf_getplatform.sas
+  @li mf_getuniquefileref.sas
+  @li mf_getuniquelibref.sas
+  @li mv_getfoldermembers.sas
+
+**/
+
+%macro mv_jobexecute(path=0
+    ,name=0
+    ,contextName=SAS Job Execution compute context
+    ,access_token_var=ACCESS_TOKEN
+    ,grant_type=sas_services
+    ,paramstring=0
+    ,outds=work.mv_jobexecute
+  );
+%local oauth_bearer;
+%if &grant_type=detect %then %do;
+  %if %symexist(&access_token_var) %then %let grant_type=authorization_code;
+  %else %let grant_type=sas_services;
+%end;
+%if &grant_type=sas_services %then %do;
+    %let oauth_bearer=oauth_bearer=sas_services;
+    %let &access_token_var=;
+%end;
+%put &sysmacroname: grant_type=&grant_type;
+%mp_abort(iftrue=(&grant_type ne authorization_code and &grant_type ne password
+    and &grant_type ne sas_services
+  )
+  ,mac=&sysmacroname
+  ,msg=%str(Invalid value for grant_type: &grant_type)
+)
+
+%mp_abort(iftrue=("&path"="0")
+  ,mac=&sysmacroname
+  ,msg=%str(Path not provided)
+)
+%mp_abort(iftrue=("&name"="0")
+  ,mac=&sysmacroname
+  ,msg=%str(Job Name not provided)
+)
+
+options noquotelenmax;
+
+%local base_uri; /* location of rest apis */
+%let base_uri=%mf_getplatform(VIYARESTAPI);
+
+data;run;
+%local foldermembers;
+%let foldermembers=&syslast;
+%mv_getfoldermembers(root=&path
+    ,access_token_var=&access_token_var
+    ,grant_type=&grant_type
+    ,outds=&foldermembers
+)
+
+%local joburi;
+%let joburi=0;
+data _null_;
+  set &foldermembers;
+  if name="&name" and uri=:'/jobDefinitions/definitions'
+    then call symputx('joburi',uri);
+run;
+
+%mp_abort(iftrue=("&joburi"="0")
+  ,mac=&sysmacroname
+  ,msg=%str(Job &path/&name not found)
+)
+
+/* prepare request*/
+%local fname0 fname1;
+%let fname0=%mf_getuniquefileref();
+%let fname1=%mf_getuniquefileref();
+
+data _null_;
+  file &fname0;
+  length joburi contextname $128 paramstring $32765;
+  joburi=quote(trim(symget('joburi')));
+  contextname=quote(trim(symget('contextname')));
+  paramstring=symget('paramstring');
+  put '{"jobDefinitionUri":' joburi ;
+  put '  ,"arguments":{"_contextName":' contextname;
+  if paramstring ne "0" then do;
+    put '    ,' paramstring;
+  end;
+  put '}}';
+run;
+
+proc http method='POST' in=&fname0 out=&fname1 &oauth_bearer
+  url="&base_uri/jobExecution/jobs";
+  headers "Content-Type"="application/vnd.sas.job.execution.job.request+json"
+          "Accept"="application/vnd.sas.job.execution.job+json"
+  %if &grant_type=authorization_code %then %do;
+          "Authorization"="Bearer &&&access_token_var"
+  %end;
+  ;
+run;
+%if &SYS_PROCHTTP_STATUS_CODE ne 200 and &SYS_PROCHTTP_STATUS_CODE ne 201 %then
+%do;
+  data _null_;infile &fname0;input;putlog _infile_;run;
+  data _null_;infile &fname1;input;putlog _infile_;run;
+  %mp_abort(mac=&sysmacroname
+    ,msg=%str(&SYS_PROCHTTP_STATUS_CODE &SYS_PROCHTTP_STATUS_PHRASE)
+  )
+%end;
+
+%local libref;
+%let libref=%mf_getuniquelibref();
+libname &libref JSON fileref=&fname1;
+
+data &outds;
+  set &libref..links;
+run;
+
+/* clear refs */
+filename &fname0 clear;
+filename &fname1 clear;
+libname &libref;
+
+%mend;
--- a/viya/mv_registerclient.sas
+++ b/viya/mv_registerclient.sas
@@ -35,25 +35,24 @@
  @param scopes= list of space-seperated unquoted scopes (default is openid)
  @param grant_type= valid values are "password" or "authorization_code" (unquoted)
  @param outds= the dataset to contain the registered client id and secret
-  @param access_token_validity= The duration of validity of the access token 
+  @param access_token_validity= The duration of validity of the access token
    in seconds.  A value of DEFAULT will omit the entry (and use system default)
  @param refresh_token_validity= The duration of validity of the refresh token
    in seconds.  A value of DEFAULT will omit the entry (and use system default)
  @param name= A human readable name for the client
-  @param required_user_groups= A list of group names. If a user does not belong 
-    to all the required groups, the user will not be authenticated and no tokens 
-    are issued to this client for that user. If this field is not specified, 
+  @param required_user_groups= A list of group names. If a user does not belong
+    to all the required groups, the user will not be authenticated and no tokens
+    are issued to this client for that user. If this field is not specified,
    authentication and token issuance proceeds normally.
-  @param autoapprove= During the auth step the user can choose which scope to 
+  @param autoapprove= During the auth step the user can choose which scope to
    apply.  Setting this to true will autoapprove all the client scopes.
-  @param use_session= If true, access tokens issued to this client will be 
+  @param use_session= If true, access tokens issued to this client will be
    associated with an HTTP session and revoked upon logout or time-out.
  @param outjson= A dataset containing the lines of JSON submitted.  Useful
    for debugging.  Default= _null_.
-    
+
  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
@@ -143,7 +142,7 @@ data _null_;
  if not missing(autoapprove) then autoapprove=cats(',"autoapprove":',autoapprove);
  use_session=trim(symget('use_session'));
  if not missing(use_session) then use_session=cats(',"use_session":',use_session);
-  
+
  put '{'  clientid  ;
  put clientsecret ;
  put clientname;
--- a/viya/mv_tokenauth.sas
+++ b/viya/mv_tokenauth.sas
@@ -41,8 +41,7 @@
  @param base_uri= The Viya API server location

  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
--- a/viya/mv_tokenrefresh.sas
+++ b/viya/mv_tokenrefresh.sas
@@ -40,8 +40,7 @@
  @param refresh_token_var= The global macro variable containing the refresh token

  @version VIYA V.03.04
-  @author Allan Bowe
-  @source https://github.com/sasjs/core
+  @author Allan Bowe, source: https://github.com/sasjs/core

  <h4> Dependencies </h4>
  @li mp_abort.sas
--- a/viya/mv_webout.sas
+++ b/viya/mv_webout.sas
@@ -32,13 +32,13 @@
  @li mf_getuser.sas

  @version Viya 3.3
-  @author Allan Bowe
+  @author Allan Bowe, source: https://github.com/sasjs/core

 **/
 %macro mv_webout(action,ds,fref=_mvwtemp,dslabel=,fmt=Y);
 %global _webin_file_count _webin_fileuri _debug _omittextlog _webin_name
  sasjs_tables SYS_JES_JOB_URI;
-%if %index("&_debug",log) %then %let _debug=131; 
+%if %index("&_debug",log) %then %let _debug=131;

 %local i tempds;
 %let action=%upcase(&action);
@@ -144,8 +144,8 @@
     filename _webout temp lrecl=999999 mod;
  %end;
  %else %do;
-    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" 
-      name="_webout.json" lrecl=999999 mod; 
+    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI"
+      name="_webout.json" lrecl=999999 mod;
  %end;

  /* setup temp ref */
Author	SHA1	Message	Date
Allan Bowe	bedc2a443a	fix: @cond on new line to prevent parsing issues in sasjs cli	2020-12-02 08:09:51 +01:00
Allan Bowe	6f86ed62a2	chore: doxy formatting	2020-11-29 22:03:20 +01:00
Allan Bowe	def0cc8476	fix: adding outds and parameters to mv_jobexecute	2020-11-29 21:55:21 +01:00
Allan Bowe	3a9029557e	chore: doxygen updates	2020-11-29 21:06:39 +01:00
Allan Bowe	9dc3bcd513	fix: updating all.sas	2020-11-29 13:58:04 +01:00
Allan Bowe	2bcf6346ac	fix: upgrading to latest doxygen	2020-11-29 13:57:44 +01:00
Allan Bowe	0eccc169f5	feat: adding mv_jobexecute macro (and a fix for mv_getfoldermembers where there are no members)	2020-11-29 13:56:51 +01:00
Allan Bowe	493639fe4a	fix: composite PK	2020-11-26 01:26:16 +01:00